diff options
author | Maurice van der Pot <griffon26@gentoo.org> | 2005-02-05 12:46:30 +0000 |
---|---|---|
committer | Maurice van der Pot <griffon26@gentoo.org> | 2005-02-05 12:46:30 +0000 |
commit | 40439283ff647bd9009bcff865f1cd324e188952 (patch) | |
tree | e7899a96020436f916a6cbb07cfeb7b46f1b9979 /net-fs/autofs | |
parent | Stable on x86. (diff) | |
download | gentoo-2-40439283ff647bd9009bcff865f1cd324e188952.tar.gz gentoo-2-40439283ff647bd9009bcff865f1cd324e188952.tar.bz2 gentoo-2-40439283ff647bd9009bcff865f1cd324e188952.zip |
Added fixed signal race patch for autofs
Diffstat (limited to 'net-fs/autofs')
-rw-r--r-- | net-fs/autofs/ChangeLog | 6 | ||||
-rw-r--r-- | net-fs/autofs/autofs-4.1.3-r3.ebuild | 5 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-4.1.3-signal-race-fix.patch | 15 |
3 files changed, 24 insertions, 2 deletions
diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog index ab3a6019e720..ddf187a228e4 100644 --- a/net-fs/autofs/ChangeLog +++ b/net-fs/autofs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/autofs # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.38 2005/02/05 10:39:42 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.39 2005/02/05 12:46:30 griffon26 Exp $ + + 05 Feb 2005; Maurice van der Pot <griffon26@gentoo.org> + +files/autofs-4.1.3-signal-race-fix.patch, autofs-4.1.3-r3.ebuild: + Added hopefully corrected version of signal-race-fix patch for bug #77077. *autofs-4.1.3-r3 (05 Feb 2005) diff --git a/net-fs/autofs/autofs-4.1.3-r3.ebuild b/net-fs/autofs/autofs-4.1.3-r3.ebuild index 80dd1f839c59..2abfe870d1e2 100644 --- a/net-fs/autofs/autofs-4.1.3-r3.ebuild +++ b/net-fs/autofs/autofs-4.1.3-r3.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/net-fs/autofs/autofs-4.1.3-r3.ebuild,v 1.1 2005/02/05 10:39:42 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r3.ebuild,v 1.2 2005/02/05 12:46:30 griffon26 Exp $ inherit eutils @@ -29,6 +29,9 @@ src_unpack() { EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${i} done + # Upstream version of this patch is incorrect + epatch ${FILESDIR}/${P}-signal-race-fix.patch + cd ${S} autoconf || die "Autoconf failed" diff --git a/net-fs/autofs/files/autofs-4.1.3-signal-race-fix.patch b/net-fs/autofs/files/autofs-4.1.3-signal-race-fix.patch new file mode 100644 index 000000000000..217b9b130603 --- /dev/null +++ b/net-fs/autofs/files/autofs-4.1.3-signal-race-fix.patch @@ -0,0 +1,15 @@ +--- autofs-4.1.3/daemon/automount.c.orig 2004-08-18 11:23:49.430470256 -0400 ++++ autofs-4.1.3/daemon/automount.c 2004-08-18 11:24:45.047015256 -0400 +@@ -848,10 +848,10 @@ static int st_prepare_shutdown(void) + alarm(0); + + /* Prevent any new mounts */ +- ap.state = ST_SHUTDOWN_PENDING; +- + sigprocmask(SIG_SETMASK, &lock_sigs, NULL); + ++ ap.state = ST_SHUTDOWN_PENDING; ++ + /* Unmount everything */ + exp = expire_proc(1); + |