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 | 0c791ce0144ea518e4c043168b06d196f8cb4045 (patch) | |
| tree | 27c960ee9122cc8d10b9f418094285daf351c2d2 /sys-apps | |
| parent | grab a simple ia64 patch from redhat (diff) | |
| download | gentoo-2-0c791ce0144ea518e4c043168b06d196f8cb4045.tar.gz gentoo-2-0c791ce0144ea518e4c043168b06d196f8cb4045.tar.bz2 gentoo-2-0c791ce0144ea518e4c043168b06d196f8cb4045.zip | |
add pumount patch
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/eject/ChangeLog | 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 |
3 files changed, 31 insertions, 3 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/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; |