[oe-commits] org.oe.dev libmutil: dropped empty dir
hrw commit
openembedded-commits at lists.openembedded.org
Sun Oct 14 19:47:25 UTC 2007
libmutil: dropped empty dir
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 6491515c0991b335eb83774c7692f5c94ed7c304
ViewMTN: http://monotone.openembedded.org/revision/info/6491515c0991b335eb83774c7692f5c94ed7c304
Files:
1
packages/libmutil
packages/xfcalendar
packages/xfcalendar/xfcalendar.inc
packages/xfcalendar/xfcalendar_4.2.0.bb
packages/xfcalendar/xfcalendar_4.2.2.bb
packages/xfcalendar/xfcalendar_4.2.3.bb
packages/xffm
packages/xffm/xffm-4.2.0
packages/xffm/xffm-4.2.0/link.patch
packages/xffm/xffm.inc
packages/xffm/xffm_4.2.0.bb
packages/xffm/xffm_4.2.2.bb
packages/xffm/xffm_4.2.3.bb
packages/xffm/xffm_4.3.99.2.bb
packages/xfprint
packages/xfprint/xfprint_4.3.99.2.bb
packages/gnupg/gnupg_1.4.2.2.bb
packages/gnupg/gnupg_1.4.7.bb
packages/gnutls/gnutls-1.4.4
packages/gnutls/gnutls-1.4.5
packages/gnupg/gnupg-1.4.7
packages/gnupg/gnupg-1.4.7/15_free_caps.dpatch
packages/gnupg/gnupg-1.4.7/16_min_privileges.dpatch
packages/gnupg/gnupg-1.4.7/24_gpgv_manpage_cleanup.dpatch
packages/gnupg/gnupg-1.4.7/25_de.po_fixes.dpatch
packages/speex/speex_1.1.12+1.2beta2.bb
packages/xorg-driver/xf86-video-ati_6.6.191.bb
packages/bluez/bluez-gnome_0.14.bb
packages/centericq/centericq.inc
packages/ffmpeg/ffmpeg_svn.bb
packages/gcc/gcc_4.1.1.bb
packages/networkmanager/networkmanager_0.6.4.bb
packages/openmoko-pim/openmoko-dates_svn.bb
packages/perl/libxml-parser-perl_2.34.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/speex/speex_1.1.12+1.2beta1.bb
packages/tasks/task-gpe.bb
packages/tasks/task-native-sdk.bb
packages/tasks/task-python-everything.bb
packages/wpa-supplicant/wpa-supplicant-0.5.inc
packages/xorg-font/xorg-font-common.inc
Diffs:
#
# mt diff -rd9d4befda54bf3a21fd6e143a4e7e1382afbc9a1 -r6491515c0991b335eb83774c7692f5c94ed7c304
#
#
#
# delete "packages/libmutil"
#
# delete "packages/xfcalendar"
#
# delete "packages/xfcalendar/xfcalendar.inc"
#
# delete "packages/xfcalendar/xfcalendar_4.2.0.bb"
#
# delete "packages/xfcalendar/xfcalendar_4.2.2.bb"
#
# delete "packages/xfcalendar/xfcalendar_4.2.3.bb"
#
# delete "packages/xffm"
#
# delete "packages/xffm/xffm-4.2.0"
#
# delete "packages/xffm/xffm-4.2.0/link.patch"
#
# delete "packages/xffm/xffm.inc"
#
# delete "packages/xffm/xffm_4.2.0.bb"
#
# delete "packages/xffm/xffm_4.2.2.bb"
#
# delete "packages/xffm/xffm_4.2.3.bb"
#
# delete "packages/xffm/xffm_4.3.99.2.bb"
#
# delete "packages/xfprint"
#
# delete "packages/xfprint/xfprint_4.3.99.2.bb"
#
# rename "packages/gnupg/gnupg_1.4.2.2.bb"
# to "packages/gnupg/gnupg_1.4.7.bb"
#
# rename "packages/gnutls/gnutls-1.4.4"
# to "packages/gnutls/gnutls-1.4.5"
#
# add_dir "packages/gnupg/gnupg-1.4.7"
#
# add_file "packages/gnupg/gnupg-1.4.7/15_free_caps.dpatch"
# content [359f9a79688628ebd999221dbd66d938d55a3c88]
#
# add_file "packages/gnupg/gnupg-1.4.7/16_min_privileges.dpatch"
# content [ad88a573e6ce4909510446b49a710f8bc603e2e9]
#
# add_file "packages/gnupg/gnupg-1.4.7/24_gpgv_manpage_cleanup.dpatch"
# content [a8f29853506b1528b052fc50f813958b6b3fde0b]
#
# add_file "packages/gnupg/gnupg-1.4.7/25_de.po_fixes.dpatch"
# content [419d7003b5d438de3e632eef6d7a7ba83cf83729]
#
# add_file "packages/speex/speex_1.1.12+1.2beta2.bb"
# content [bd2741f2a01848366c65e4180de65df618dbdb46]
#
# add_file "packages/xorg-driver/xf86-video-ati_6.6.191.bb"
# content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
#
# patch "packages/bluez/bluez-gnome_0.14.bb"
# from [6cbb9f5eeecaf368ffa6b829edd445c7877dc847]
# to [6f8c158ca65fb4a5cb27eddcdf261e41247cb725]
#
# patch "packages/centericq/centericq.inc"
# from [72c59d12972c15e9ce5cc3cead4f8044cb583747]
# to [7fb2b997f90e1a503628f672609db7a0a6459b84]
#
# patch "packages/ffmpeg/ffmpeg_svn.bb"
# from [bbec70f8e24f42a23765cb68308fc94056887e01]
# to [de570d6c591080bef0196eaaabeb01690089e56b]
#
# patch "packages/gcc/gcc_4.1.1.bb"
# from [8e2e89fd333b81001c31085136fec6cbacb242c7]
# to [57b2a6ef757588d363f6178899923d1f8ba81935]
#
# patch "packages/gnupg/gnupg_1.4.7.bb"
# from [5a90b4c56a68edeb635c3bb6c3ca650cc78cfd0f]
# to [a9f4128e0563415a1947b36388f0130ff1090642]
#
# patch "packages/networkmanager/networkmanager_0.6.4.bb"
# from [b1274deaa3c615657b3e20a606f5068f0e90fad8]
# to [8bf3442eb8c3e64114858528c3237b64fdb3eeb4]
#
# patch "packages/openmoko-pim/openmoko-dates_svn.bb"
# from [e07494a2099214592b089a9dd799caf49d1da5d9]
# to [d1f71a4b42b0624f88ddd37a9339e31ec0059b0f]
#
# patch "packages/perl/libxml-parser-perl_2.34.bb"
# from [9fe85cf758444af63185e9cfaffa8e9c253451ce]
# to [1354c107006a8c889df1d1f0ee501550b321ff62]
#
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
# from [2a8bfa1b9cc3aa059dd561726a7bbdfc8bcc4e79]
# to [a606ca0d6027a92bf25af3207106359e70128be6]
#
# patch "packages/speex/speex_1.1.12+1.2beta1.bb"
# from [c6b6b1dc0344b37bac21f628f9284b1837d22d28]
# to [6bef3448155084d592d5887a9fb6e1621f5e30f7]
#
# patch "packages/tasks/task-gpe.bb"
# from [6d67c2a586f7786deaf06a8760041f2b4f96e72e]
# to [17060c74700cc76bfe56a95d7acae1879a7796f3]
#
# patch "packages/tasks/task-native-sdk.bb"
# from [13fe14442e966c706388a77f8cf5ebbd35a55e9b]
# to [df0de007a558fe89275da61a10f36909ecf67c60]
#
# patch "packages/tasks/task-python-everything.bb"
# from [7c5d8562b7e55c346c3e9537d5021584b770f3dc]
# to [d070ff3eb0a10a3ad1a120fb1890cf14f0c5b0ce]
#
# patch "packages/wpa-supplicant/wpa-supplicant-0.5.inc"
# from [2122683c4f4b58f9716ecc268a1807bedb3c2bd4]
# to [5ceb68d064548247960e7148427d2acc9fdcce2a]
#
# patch "packages/xorg-font/xorg-font-common.inc"
# from [4342e2953b28ed598a06972b879f0b58701193a5]
# to [78d22159584b395c1573c1945463e486fb563e27]
#
============================================================
--- packages/gnupg/gnupg-1.4.7/15_free_caps.dpatch 359f9a79688628ebd999221dbd66d938d55a3c88
+++ packages/gnupg/gnupg-1.4.7/15_free_caps.dpatch 359f9a79688628ebd999221dbd66d938d55a3c88
@@ -0,0 +1,124 @@
+#! /bin/sh -e
+## 15_free_caps.dpatch by <mpitt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: cap_from_text() allocates a new capability context, which is not freed
+## DP: in the original sources. This patch fixes this.
+## DP: Please note that this approach alone is not safe: when using
+## DP: USE_CAPABILITIES the root user is not setuid() back any more to a normal
+## DP: user.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad /home/weasel/tmp/debian-gpg/gnupg-1.2.5/g10/status.c gnupg-1.2.5/g10/status.c
+--- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/g10/status.c 2004-07-21 09:59:45.000000000 +0200
++++ gnupg-1.2.5/g10/status.c 2004-08-01 20:07:42.071690680 +0200
+@@ -346,6 +346,9 @@
+ {
+ char buf[100];
+ struct shmid_ds shmds;
++#ifdef USE_CAPABILITIES
++ cap_t caps;
++#endif
+
+ #ifndef IPC_RMID_DEFERRED_RELEASE
+ atexit( remove_shmid );
+@@ -371,7 +374,9 @@
+ (unsigned)shm_size/1024, shm_area, shm_id );
+ if( lock_mem ) {
+ #ifdef USE_CAPABILITIES
+- cap_set_proc( cap_from_text("cap_ipc_lock+ep") );
++ caps = cap_from_text("cap_ipc_lock=ep");
++ cap_set_proc( caps );
++ cap_free( caps );
+ #endif
+ /* (need the cast for Solaris with Sun's workshop compilers) */
+ if ( mlock ( (char*)shm_area, shm_size) )
+@@ -380,7 +385,9 @@
+ else
+ shm_is_locked = 1;
+ #ifdef USE_CAPABILITIES
+- cap_set_proc( cap_from_text("cap_ipc_lock+p") );
++ caps = cap_from_text("cap_ipc_lock=p");
++ cap_set_proc( caps );
++ cap_free( caps );
+ #endif
+ }
+
+@@ -407,7 +414,9 @@
+
+ if( lock_mem ) {
+ #ifdef USE_CAPABILITIES
+- cap_set_proc( cap_from_text("cap_ipc_lock+ep") );
++ caps = cap_from_text("cap_ipc_lock=ep");
++ cap_set_proc( caps );
++ cap_free( caps );
+ #endif
+ #ifdef IPC_HAVE_SHM_LOCK
+ if ( shmctl (shm_id, SHM_LOCK, 0) )
+@@ -419,7 +428,9 @@
+ log_info("Locking shared memory %d failed: No way to do it\n", shm_id );
+ #endif
+ #ifdef USE_CAPABILITIES
+- cap_set_proc( cap_from_text("cap_ipc_lock+p") );
++ caps = cap_from_text("cap_ipc_lock=p");
++ cap_set_proc( caps );
++ cap_free( caps );
+ #endif
+ }
+
+diff -urNad /home/weasel/tmp/debian-gpg/gnupg-1.2.5/util/secmem.c gnupg-1.2.5/util/secmem.c
+--- /home/weasel/tmp/debian-gpg/gnupg-1.2.5/util/secmem.c 2004-02-24 17:06:58.000000000 +0100
++++ gnupg-1.2.5/util/secmem.c 2004-08-01 20:08:10.873412378 +0200
+@@ -97,12 +97,18 @@
+ {
+ #if defined(USE_CAPABILITIES) && defined(HAVE_MLOCK)
+ int err;
++ cap_t caps;
++
++ caps = cap_from_text("cap_ipc_lock=ep");
++ cap_set_proc( caps );
++ cap_free( caps );
+
+- cap_set_proc( cap_from_text("cap_ipc_lock+ep") );
+ err = mlock( p, n );
+ if( err && errno )
+ err = errno;
+- cap_set_proc( cap_from_text("cap_ipc_lock+p") );
++ caps = cap_from_text("cap_ipc_lock=p");
++ cap_set_proc( caps );
++ cap_free( caps );
+
+ if( err ) {
+ if( errno != EPERM
+@@ -301,8 +307,12 @@
+ if( !n ) {
+ #ifndef __riscos__
+ #ifdef USE_CAPABILITIES
++ cap_t caps;
++
+ /* drop all capabilities */
+- cap_set_proc( cap_from_text("all-eip") );
++ caps = cap_from_text("all-eip");
++ cap_set_proc( caps );
++ cap_free( caps );
+
+ #elif !defined(HAVE_DOSISH_SYSTEM)
+ uid_t uid;
============================================================
--- packages/gnupg/gnupg-1.4.7/16_min_privileges.dpatch ad88a573e6ce4909510446b49a710f8bc603e2e9
+++ packages/gnupg/gnupg-1.4.7/16_min_privileges.dpatch ad88a573e6ce4909510446b49a710f8bc603e2e9
@@ -0,0 +1,98 @@
+#! /bin/sh -e
+## 16_min_privileges.dpatch by <mpitt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: when using USE_CAPABILITIES, the uid was not setuid() back to a normal
+## DP: user; this would allow to regain _all_ capabilities just by doing
+## DP: exec(). This patch ensures minimal privileges by immediately revoking
+## DP: root user and all capabilities except CAP_IPC_LOCK. After the shared
+## DP: memory is set up, this last capability is dropped as well.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad gnupg-1.4.0/g10/gpg.c /tmp/dpep.O5S02c/gnupg-1.4.0/g10/gpg.c
+--- gnupg-1.4.0/g10/gpg.c 2004-12-16 09:47:36.000000000 +0000
++++ /tmp/dpep.O5S02c/gnupg-1.4.0/g10/gpg.c 2005-02-03 23:31:40.645873299 +0000
+@@ -69,6 +69,11 @@
+ #endif
+
+
++#ifdef USE_CAPABILITIES
++#include <sys/capability.h>
++#include <sys/prctl.h>
++#endif
++
+ enum cmd_and_opt_values
+ {
+ aNull = 0,
+@@ -1618,6 +1623,10 @@
+ #ifdef USE_SHM_COPROCESSING
+ ulong requested_shm_size=0;
+ #endif
++#ifdef USE_CAPABILITIES
++ uid_t curr_uid;
++ cap_t caps;
++#endif
+
+ #ifdef __riscos__
+ opt.lock_once = 1;
+@@ -1629,6 +1638,33 @@
+ * when adding any stuff between here and the call to
+ * secmem_init() somewhere after the option parsing
+ */
++
++ /* if we use capabilities and run as root, we can immediately setuid back
++ * to the normal user and only keep CAP_IPC_LOCK until the shared memory is
++ * set up.
++ */
++#ifdef USE_CAPABILITIES
++ curr_uid = getuid();
++ if( curr_uid && !geteuid() ) { /* we are setuid root */
++ if( prctl( PR_SET_KEEPCAPS, 1, 0, 0, 0 ) ) {
++ perror( "main(): could not keep capabilities" );
++ return -100;
++ }
++
++ if( setuid( curr_uid ) ) {
++ perror( "main(): could not set user id" );
++ return -100;
++ }
++
++ caps = cap_from_text( "cap_ipc_lock=p" );
++ if( cap_set_proc( caps ) ) {
++ perror( "main(): could not install capabilities" );
++ return -100;
++ }
++ cap_free( caps );
++ }
++#endif
++
+ log_set_name("gpg");
+ secure_random_alloc(); /* put random number into secure memory */
+ may_coredump = disable_core_dumps();
+@@ -1747,7 +1783,7 @@
+ }
+ #endif
+ /* initialize the secure memory. */
+- got_secmem=secmem_init( 32768 );
++ got_secmem=secmem_init( 32768 ); /* this will drop all remaining privileges */
+ maybe_setuid = 0;
+ /* Okay, we are now working under our real uid */
+
============================================================
--- packages/gnupg/gnupg-1.4.7/24_gpgv_manpage_cleanup.dpatch a8f29853506b1528b052fc50f813958b6b3fde0b
+++ packages/gnupg/gnupg-1.4.7/24_gpgv_manpage_cleanup.dpatch a8f29853506b1528b052fc50f813958b6b3fde0b
@@ -0,0 +1,85 @@
+#! /bin/sh -e
+## 24_gpgv_manpage_cleanup.dpatch
+##
+## DP: Description: Small fixes for gpgv manpage (#177951)
+## DP: Author: "Jim W. Jaszewski" <grok at sprint.ca>
+## DP: Upstream status: Not yet submitted
+## DP: Date: 2003-01-22
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad gnupg-1.4.6~/doc/gpgv.texi gnupg-1.4.6/doc/gpgv.texi
+--- gnupg-1.4.6~/doc/gpgv.texi 2006-12-04 14:01:31.000000000 +0000
++++ gnupg-1.4.6/doc/gpgv.texi 2006-12-07 02:33:20.000000000 +0000
+@@ -55,8 +55,8 @@
+ @mansect description
+ @code{@gpgvname} is an OpenPGP signature verification tool.
+
+-This program is actually a stripped down version of @code{gpg} which is
+-only able to check signatures. It is somewhat smaller than the fully blown
++This program is actually a stripped-down version of @code{gpg} which is
++only able to check signatures. It is somewhat smaller than the fully-blown
+ @code{gpg} and uses a different (and simpler) way to check that
+ the public keys used to make the signature are valid. There are
+ no configuration files and only a few options are implemented.
+@@ -114,7 +114,7 @@
+
+ @mansect return value
+
+-The program returns 0 if everything was fine, 1 if at least
++The program returns 0 if everything is fine, 1 if at least
+ one signature was bad, and other error codes for fatal errors.
+
+ @mansect examples
+@@ -126,7 +126,7 @@
+ @itemx @gpgvname @code{sigfile}
+ Verify the signature of the file. The second form
+ is used for detached signatures, where @code{sigfile} is the detached
+-signature (either ASCII armored or binary) and are the signed
++signature (either ASCII-armored or binary) and are the signed
+ data; if this is not given the name of the file holding the signed data is
+ constructed by cutting off the extension (".asc", ".sig" or ".sign") from
+ @code{sigfile}.
+@@ -152,7 +152,7 @@
+ @table @asis
+
+ @item ~/.gnupg/trustedkeys.gpg
+-The default keyring with the allowed keys
++The default keyring with the allowed keys.
+
+ @end table
+
+diff -urNad gnupg-1.4.6~/doc/opt-homedir.texi gnupg-1.4.6/doc/opt-homedir.texi
+--- gnupg-1.4.6~/doc/opt-homedir.texi 2006-12-04 13:31:56.000000000 +0000
++++ gnupg-1.4.6/doc/opt-homedir.texi 2006-12-07 02:32:48.000000000 +0000
+@@ -1,11 +1,11 @@
+ @c This option is included at several places.
+ @item --homedir @var{dir}
+ @opindex homedir
+-Set the name of the home directory to @var{dir}. If his option is not
++Set the name of the home directory to @var{dir}. If this option is not
+ used, the home directory defaults to @file{~/.gnupg}. It is only
+ recognized when given on the command line. It also overrides any home
+ directory stated through the environment variable @env{GNUPGHOME} or
+-(on W32 systems) by means on the Registry entry
++(on W32 systems) by means of the Registry entry
+ @ifset isman
+ @var{HKCU\\Software\\GNU\\GnuPG:HomeDir}.
+ @end ifset
============================================================
--- packages/gnupg/gnupg-1.4.7/25_de.po_fixes.dpatch 419d7003b5d438de3e632eef6d7a7ba83cf83729
+++ packages/gnupg/gnupg-1.4.7/25_de.po_fixes.dpatch 419d7003b5d438de3e632eef6d7a7ba83cf83729
@@ -0,0 +1,195 @@
+#! /bin/sh -e
+## 25_de.po_fixes.dpatch
+##
+## DP: Description: Small fixes for the German translation (#314069)
+## DP: Author: Jens Seidel <jensseidel at users.sf.net>
+## DP: Upstream status: Not yet submitted
+## DP: Date: 2005-06-14
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad gnupg-1.4.5~/po/de.po gnupg-1.4.5/po/de.po
+--- gnupg-1.4.5~/po/de.po 2006-08-01 12:08:06.000000000 +0100
++++ gnupg-1.4.5/po/de.po 2006-08-01 21:50:19.000000000 +0100
+@@ -1241,7 +1241,7 @@
+
+ #: g10/gpg.c:791
+ msgid "Pubkey: "
+-msgstr "Öff.Schlüssel: "
++msgstr "Öff. Schlüssel: "
+
+ #: g10/gpg.c:797 g10/keyedit.c:2310
+ msgid "Cipher: "
+@@ -2330,7 +2330,7 @@
+ #: g10/import.c:319
+ #, c-format
+ msgid " secret keys unchanged: %lu\n"
+-msgstr " unveränderte geh.Schl.: %lu\n"
++msgstr " unveränderte geh. Schl.: %lu\n"
+
+ #: g10/import.c:321
+ #, c-format
+@@ -3388,11 +3388,11 @@
+
+ #: g10/keyedit.c:2035
+ msgid "Do you really%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list