diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-21 18:17:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-21 18:17:26 +0000 |
| commit | 57701c851ffa54b1cd3aa92a4d89ecff25d354bf (patch) | |
| tree | 5836b203970b147a4a68f71cf1f218116e78d3c7 | |
| parent | Fix up metadata.xml. If there's no maintainer for the package, the metadata a... (diff) | |
| download | historical-57701c851ffa54b1cd3aa92a4d89ecff25d354bf.tar.gz historical-57701c851ffa54b1cd3aa92a4d89ecff25d354bf.tar.bz2 historical-57701c851ffa54b1cd3aa92a4d89ecff25d354bf.zip | |
Use non-common awk exit values so that the default exit values dont trigger false positives #218713 by Paolo Pedroni.
Package-Manager: portage-2.2_pre5
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | net-fs/nfs-utils/Manifest | 10 | ||||
| -rwxr-xr-x | net-fs/nfs-utils/files/nfsmount.initd | 8 |
3 files changed, 14 insertions, 10 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 244a2968358b..be41781cd29b 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.126 2008/04/21 07:56:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.127 2008/04/21 18:17:25 vapier Exp $ + + 21 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd: + Use non-common awk exit values so that the default exit values dont trigger + false positives #218713 by Paolo Pedroni. 21 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/rpc.gssd.initd, files/rpc.svcgssd.initd: diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 9f4d29dde57f..30afe7739763 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -9,7 +9,7 @@ AUX nfs.confd 630 RMD160 3628b5df5589c700905afc8054d1ee22fb5be0b9 SHA1 b5e8e37f3 AUX nfs.confd.old 533 RMD160 bad552a256a86bc374cd7ff3d685afa4ff5d816e SHA1 43fbdfba5a61ad79375265c120fb4784da7b1462 SHA256 a9b8395590b8d15b52eee8cb637fdc23afce007de42442ef4448e76f2ac899fd AUX nfs.initd 4004 RMD160 89bed24bd184fca28f23a8e034950b6bd1f2daaa SHA1 dc2a74ba75404b02bd4504aedb22ad98f0c748da SHA256 81dfed1f143fe8df05d9da3d5cec7cd7012f9b6cd1e63fb3ec9344e2b92027a4 AUX nfsmount 1131 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f SHA1 c88b592db4304f4d19798c1c2346ea688c9acde2 SHA256 8c1b12047327d707743bc579151ff7e3800696cc46cfcaea1c58a93fbc11f9e7 -AUX nfsmount.initd 1114 RMD160 ec8d2c3006773ead96e83685e45104ed1b42d22d SHA1 d77514af7980041a3b126206e764f5f9c48899ae SHA256 8e17646a90800d3ff81f45e20c5e8c6d81cc2dbfc563788da9659525cf7b713d +AUX nfsmount.initd 1119 RMD160 3b3c3eb22e33b1c28ca166d6109453be1fbc5c00 SHA1 dba5487b798ee586484337eae08b8c62fd45ef6b SHA256 5978d8fb85b45983652927d41e95dbdf307d6e8e13936c4083adb15cdbb23f7b AUX rpc.gssd.initd 855 RMD160 6eedf2b921ca3f505e8a4257000c62d6316e9ad9 SHA1 1fc47085188d816bf43ae62ff812700efeac32a8 SHA256 bca901627203c0d326ce2bc6520affdd1da9ddfa918084fd816054f262bf8f91 AUX rpc.idmapd.initd 1093 RMD160 445906d112d3794dfd8d9292f89bb562d5447779 SHA1 76256b3ac313a7a69e977631def7b7ff0fea77ff SHA256 c21d4ba7c00487cb45f486971dde036f3a704a888bf879e8017880d1a0800bc1 AUX rpc.statd.initd 858 RMD160 bb8cce615ce75ab478b034e32ebd571e01f03296 SHA1 4e282980452400a11eeff64db2f6988a25316ac2 SHA256 85f6bb77f8fc4ffabf1b2a111c631f0bd2e603e8f80170bf8bd0db074c10fcb0 @@ -26,12 +26,12 @@ EBUILD nfs-utils-1.1.0-r1.ebuild 3109 RMD160 39f05350068ae5c8ed3a4470c8ab050faa2 EBUILD nfs-utils-1.1.1-r1.ebuild 3476 RMD160 0e3eb6fbd0ae1730ce36f00b4bf6a063fdb9ccb9 SHA1 23fbd6747a87e753558dcd6cbd59861eca0f33fc SHA256 e866461cbe94ab5acada6b9a11448081518fbace7ee82e31fab4d20c67687c51 EBUILD nfs-utils-1.1.1.ebuild 3473 RMD160 da80132e799485c625dd4bb6630b4f687f41ec17 SHA1 a3778a9054ea2b1367afe099d609e9b0f6b9e1a9 SHA256 aeb695b65d9ff762018444996322bb71224c87e9e1a098871c45367db7ed32c4 EBUILD nfs-utils-1.1.2.ebuild 3102 RMD160 6446026077a1d06c48d30b46bb9222aab480c82f SHA1 746f48ad04cb87a613010e5ab2d7a4ebe448ff3e SHA256 b4fcd898214c866fdf67559395438f37fafcf5a1d79c8f94f028d72ac3994337 -MISC ChangeLog 19130 RMD160 4aaea8f505a66d9d4beb35741a63f605683687fc SHA1 61522a484e9c6c34e57091e7c240ea7741fbf588 SHA256 be6ba8d6fc90a1c329ddd97b8df918c4a4ff283a36e043bb606d78ba11dcabe9 +MISC ChangeLog 19325 RMD160 53ad0ee4ad3accb0d4ae50c0477c415f16721678 SHA1 719107fac7f6d1648ca3f7027443487ba441b7f5 SHA256 9edf1fa5e459beb9b60e8f54b8b3fad2560b8fcb368868e624d8f8f27dd1c608 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFIDEikj9hvisErhMIRAi0TAJwJ/L9O79HdnmYuaBNxXvRqgGcvowCg6Tvi -NbzOKSkSCOdP7HNAWo+xF04= -=3kWk +iD8DBQFIDNo7j9hvisErhMIRAg6xAKCsqj7cfknAOr8A7KuiqRoeciHbCQCgiQgC +f3JUwT+WyReQ9NcUd/qD4MM= +=f2aD -----END PGP SIGNATURE----- diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd index a4ba1396c724..1d6b91d54b2e 100755 --- a/net-fs/nfs-utils/files/nfsmount.initd +++ b/net-fs/nfs-utils/files/nfsmount.initd @@ -1,17 +1,17 @@ #!/sbin/runscript # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.9 2008/04/20 00:06:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.10 2008/04/21 18:17:26 vapier Exp $ [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs depend() { local myneed="" if [ -e /etc/fstab ] ; then - awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 1 : 2) }' /etc/fstab + awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 10 : 20) }' /etc/fstab local ret=$? - [ ${ret} -eq 1 ] && myneed="${myneed} rpc.gssd" - [ ${ret} -ne 2 ] && myneed="${myneed} rpc.idmapd" + [ ${ret} -eq 10 ] && myneed="${myneed} rpc.gssd" + [ ${ret} -ne 20 ] && myneed="${myneed} rpc.idmapd" fi type -t config 2>/dev/null 1>&2 && config /etc/fstab need net portmap rpc.statd ${myneed} |