diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-21 06:00:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-21 06:00:08 +0000 |
| commit | 33245518cdf9f1a6f33b2fbb0d107311b0645ef8 (patch) | |
| tree | c13d197b3171b4aa9df44685cda568c1af575484 /sys-apps/eject | |
| parent | grab a simple ia64 patch from redhat (diff) | |
| download | historical-33245518cdf9f1a6f33b2fbb0d107311b0645ef8.tar.gz historical-33245518cdf9f1a6f33b2fbb0d107311b0645ef8.tar.bz2 historical-33245518cdf9f1a6f33b2fbb0d107311b0645ef8.zip | |
add pumount patch
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-apps/eject')
| -rw-r--r-- | sys-apps/eject/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/eject/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/eject/eject-2.0.13-r2.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/eject/files/eject-2.0.13-pumount.patch | 26 |
4 files changed, 34 insertions, 5 deletions
diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog index f438a1def6f6..0ebac191a31d 100644 --- a/sys-apps/eject/ChangeLog +++ b/sys-apps/eject/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for sys-apps/eject # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.30 2005/05/21 03:31:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.31 2005/05/21 06:00:08 vapier Exp $ *eject-2.0.13-r2 (21 May 2005) @@ -10,7 +10,8 @@ +files/eject-2.0.13-no-umount.patch, +files/eject-2.0.13-prefix-defaultdevice-with-dev.patch, +files/eject-2.0.13-toggle.patch, +files/eject-2.0.13-xmalloc.patch, - +files/eject-2.0.13-xregcomp.patch, +eject-2.0.13-r2.ebuild: + +files/eject-2.0.13-xregcomp.patch, +eject-2.0.13-r2.ebuild, + +eject-2.0.13-pumount.patch: Add toggle support by Patrik Kullman #62612 and a bunch of patches from Debian #91977. diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest index b93c29b1280d..9363fa918a8f 100644 --- a/sys-apps/eject/Manifest +++ b/sys-apps/eject/Manifest @@ -1,8 +1,8 @@ -MD5 d27680dd2a8387b99aab629ce99cd9a7 ChangeLog 4755 +MD5 bdcabe999e75e0bd9d865289c1e283d2 ChangeLog 4786 MD5 3abee9d248f09594a7c0055005c73edd eject-2.0.13-r1.ebuild 1068 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 2964b180ad83ff32e8d171e33a70e300 eject-2.0.13.ebuild 1181 -MD5 e3744b260b441945b09d8ed7fca24b88 eject-2.0.13-r2.ebuild 1435 +MD5 925c5351d5bc1d44b2506f8a5fa76831 eject-2.0.13-r2.ebuild 1476 MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13 63 MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13-r1 63 MD5 3f842146dbaced2c09bf45e5cf14b8c8 files/eject-2.0.13-autoclose.patch 699 @@ -18,3 +18,4 @@ MD5 4c62f46d6d72dd079fd677db6ae57059 files/eject-2.0.13-xmalloc.patch 654 MD5 ba37ff5a9223af8de446a18e62dbe19d files/eject-2.0.13-no-umount.patch 2496 MD5 6511dfbfe2029a7e582f958af0d41ca7 files/eject-2.0.13-xregcomp.patch 649 MD5 31688554edc80b2d6cf1ae427a6533f7 files/eject-2.0.13-fstab-error.patch 956 +MD5 9741dfe0732a1a137742fc5302acb007 files/eject-2.0.13-pumount.patch 896 diff --git a/sys-apps/eject/eject-2.0.13-r2.ebuild b/sys-apps/eject/eject-2.0.13-r2.ebuild index ce4900933848..e7e222b24860 100644 --- a/sys-apps/eject/eject-2.0.13-r2.ebuild +++ b/sys-apps/eject/eject-2.0.13-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r2.ebuild,v 1.1 2005/05/21 03:31:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r2.ebuild,v 1.2 2005/05/21 06:00:08 vapier Exp $ inherit eutils @@ -31,6 +31,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-no-umount.patch epatch "${FILESDIR}"/${P}-toggle.patch epatch "${FILESDIR}"/${P}-fstab-error.patch + epatch "${FILESDIR}"/${P}-pumount.patch sed -i '/^AM_CFLAGS/s:-O3::' Makefile.in if ! use nls ; then diff --git a/sys-apps/eject/files/eject-2.0.13-pumount.patch b/sys-apps/eject/files/eject-2.0.13-pumount.patch new file mode 100644 index 000000000000..a0f0935b12c3 --- /dev/null +++ b/sys-apps/eject/files/eject-2.0.13-pumount.patch @@ -0,0 +1,26 @@ +Run pumount before umount so the hotplugging people will be happy. + +http://bugs.gentoo.org/91977 + +--- eject.c ++++ eject.c +@@ -540,11 +540,14 @@ + switch (fork()) { + case 0: /* child */ + seteuid(getuid()); /* reduce likelyhood of security holes when running setuid */ +- if(p_option) +- execl("/bin/umount", "/bin/umount", fullName, "-n", NULL); +- else +- execl("/bin/umount", "/bin/umount", fullName, NULL); +- fprintf(stderr, _("%s: unable to exec /bin/umount of `%s': %s\n"), ++ if(p_option) { ++ execlp("pumount", "pumount", fullName, "-n", NULL); ++ execlp("umount", "umount", fullName, "-n", NULL); ++ } else { ++ execlp("pumount", "pumount", fullName, NULL); ++ execlp("umount", "umount", fullName, NULL); ++ } ++ fprintf(stderr, _("%s: unable to exec umount of `%s': %s\n"), + programName, fullName, strerror(errno)); + exit(1); + break; |