From 3d9de5a088f42cc6318109e022fa9391adb12e6f Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sun, 23 Oct 2011 18:15:50 +0000 Subject: [PATCH] Removed bashisms from init scripts (bug #260155) and replaced deprecated opts variable Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64 --- net-misc/mDNSResponder/ChangeLog | 9 ++++-- net-misc/mDNSResponder/Manifest | 28 ++++++++++++------- net-misc/mDNSResponder/files/dnsextd.init.d | 8 +++--- .../files/mDNSResponderPosix.init.d | 10 +++---- net-misc/mDNSResponder/files/mdnsd.init.d | 10 +++---- 5 files changed, 39 insertions(+), 26 deletions(-) diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog index 3c770a437cb6..bd953c08b6ce 100644 --- a/net-misc/mDNSResponder/ChangeLog +++ b/net-misc/mDNSResponder/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/mDNSResponder -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.56 2010/08/13 14:09:40 hwoarang Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.57 2011/10/23 18:15:50 polynomial-c Exp $ + + 23 Oct 2011; Lars Wendler files/dnsextd.init.d, + files/mDNSResponderPosix.init.d, files/mdnsd.init.d: + non-maintainer commit: Removed bashisms from init scripts reported by Timothy + Redaelli in bug #260155. Replaced deprecated opts variable in init scripts. 13 Aug 2010; Markos Chandras mDNSResponder-212.1-r1.ebuild: diff --git a/net-misc/mDNSResponder/Manifest b/net-misc/mDNSResponder/Manifest index 5c7d90f513e9..171b1475a251 100644 --- a/net-misc/mDNSResponder/Manifest +++ b/net-misc/mDNSResponder/Manifest @@ -1,24 +1,32 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX dnsextd.conf.d 426 RMD160 fb7e2a3eef91c441e140b7d883e681f80479d24d SHA1 e8d4c3655b3fceb692986234d0151000a063294f SHA256 dd1d5210743beb98aa631fcd3611313bbba7d3862b323ac52ccd57d81c337f0d -AUX dnsextd.init.d 998 RMD160 977ec57c04533fe44a15237dd093e7670daa5dd7 SHA1 9c51469658e3c00fd4323378007902b4456d1daa SHA256 47da76c48b3e380209b6ee98683121c783e4399535b1142601fafacfed59a153 +AUX dnsextd.init.d 1017 RMD160 1ce6725ce8f293b333f60ae147a1cf2748ba982e SHA1 e64906b87d25bbe67476335028bd3e9561474117 SHA256 65ca1ba64cfabf66d1e7685ccecc21f4c8ce03504c43cfa6874f9093701b1c36 AUX mDNSResponder-107.6-java.patch 1787 RMD160 5389adbf32ebb90255c60a448638063edf14f00e SHA1 c82b77006fbce40d1550d233b4eb37e70910280b SHA256 06517377d7e7f374004b3080d5d35c375ce6f0142354ae3b252232e41d2a578a AUX mDNSResponderPosix.conf 437 RMD160 1691be0362ec145874611696d3833e81a85d73d2 SHA1 8b89269617e362dd65cc44b37e5530214de4503a SHA256 e1c6b8967b6bf29aa54a71bbb91302655af3d6fcdd8d2e3e4df5770deb114493 AUX mDNSResponderPosix.conf.d 67 RMD160 dfd5c6dae9157eeef7a5c62c7b3d041b8bd63340 SHA1 f6fc660f7ea5f60f7796cb773bdc8edcc90e32fd SHA256 9b9880836a55fb24120454062936da1a2120736a3ade53992f000433a3d563e3 -AUX mDNSResponderPosix.init.d 1247 RMD160 2ef8feecba3481bda13a79627b6b664bbbda3793 SHA1 4c2e2ece22e8935edeccc80ba588a7f313ae0309 SHA256 4585aa2a9591e5af5d1d5f1b069c10d66f8f1ca2a35db7f5c6b13e317b8b4e16 -AUX mdnsd.init.d 845 RMD160 1dd264f5bb68dd2e73007b2d4f4133edae79339e SHA1 4b0e1a58b17e800b59e5b663e11df054e860bc22 SHA256 87df2b720556e5b3cdc5e6aedae45a237e9e58ecde8799429c02527cd0d9c072 +AUX mDNSResponderPosix.init.d 1271 RMD160 df470191ec2ae2bac0c18f8502a4403398f4d11d SHA1 b158a1e7c5586895a824e708b0c4223869bb9d75 SHA256 54760e3799ee82f35d562d44b3a7dced096030054b6d731771753e9e2fb49bbe +AUX mdnsd.init.d 869 RMD160 666569bf8ceeba4d9ec36a23fbfd552c8d98b2be SHA1 c281031a1dfeb0db03dc315aa08763ab816cc8c8 SHA256 66741210566694564a40b5718eaa4a1d4d58608a3f7f5009e73d09678e65d539 DIST mDNSResponder-212.1.tar.gz 1612617 RMD160 481cd350403c9373084f689119d21622be2f6342 SHA1 6552941a3008640796851370770d0d9484bca75c SHA256 9bad2c4428b344a32c923ddb540c8c65b2821bd92bae02a10349442fe3a4f67f EBUILD mDNSResponder-212.1-r1.ebuild 3996 RMD160 81bd49284ca2f81d59bb671ac8bde0dc252d1e06 SHA1 1b63ba3ae17d7bd30c74c2e284eff8c1f1b73c94 SHA256 2a412b30eb01ba5c6ebb00eb9969b24e3ae20c3bb7e70f9101606f9cb1a0ea38 EBUILD mDNSResponder-212.1.ebuild 3767 RMD160 2eb06472e77a6177f228e472f783f021c7d6cede SHA1 4ad7ccb540029eaa3e7e09d937e10accbf79fc69 SHA256 12daa01b5b40c1f46b084d4a9cf925a4a680151142be6078fd3cf54a03047671 -MISC ChangeLog 8569 RMD160 a113c1ae147c80f134490475a3897b180416f7a8 SHA1 3b16df5e9f6157b34326b06c7899bea176edbcd4 SHA256 16dfa26a7cc789c9ad20f42ac5e490d44f487d397ba9ca279ca1e3a3eed0f40a +MISC ChangeLog 8863 RMD160 d9fd9469ca5bcab93f3c26d4472f8319b091ac22 SHA1 60f00c703f38ca4ca8cb4680278a37e0dad4569a SHA256 7578e86997c9a2ad6ad49a09bf7b2fba442dfdffa05002ea362fe24e8f343cff MISC metadata.xml 218 RMD160 b8d59202c68b3f015db783c4b800120676c401e3 SHA1 6366b18a091033de638b10002f27fd5e9885720f SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59rQ4ACgkQfXuS5UK5QB3BdwP+K3N/wjhjiQ0zAAm8WTw6+Tzq -kCJfjAYKt4BD4kGNbGSpTSgx4kOlotelHn7859d2PfdbYnfAIIEZwvatQjOjICRm -Jh7qh8UyHPRtVDhQbqRhneYAflF3CDNVk5FqVGAUYUxzVwjo2BQcwiqUn5LVtElu -rQ4Dgd5lABd2Bh4QLcI= -=gGmb +iQIcBAEBCgAGBQJOpFnbAAoJEPiazRVxLXTFE3EQAJ5HzjQFpx3eCY+yR3LU8CGG +leu3HZ3PWkHzbnTWH3PeiWDcx74RTYMM3GZz9VL3a0ncPE8t5Ed2FWJw5hCtWlT9 +q6IDTFSGLYXnSXQncVtSjQeyx0MF3lPhJQAxsXHQSH/3SbCnIo7TLBHFvCKuKIkV +9w2Fv/2EtClpUh3hx9MC9xw4He5trmHvAJrW5s7YFQ7XJ4xk+MRfjKK0ans9oujA +KMiURI/C6jr0ZZmzZUZnO/ghTDZrlWXgq6URl+ZzOYC11J1bXq/nOmK5cO8uU6vD +S8FqLdzGIExnYGm69Dvxbj4I1NvVmiHFv8QW2JLDRurMgIZCwLUCQJYOQnBN8Wcf +k9ULJ1CPKwLydA7VgXF9/asRMSDpYOCOBhJIbRh3wHXXudC1Xiaay1DZ5OJq6anQ +/Ok+wwUeHh6o5q45L16SnLWADAARSVOdy4VwRYj1SC85FKSN0+lhcAf+7l1j0tnL +E7Sg/WNIZbejFKsArgQ94PSswwA38fbslMY78on1lz40Nx5Pd0Dnq+PyaRKMaZz3 +e0AeKsWotCG4+ugBjq2Xm91Lr7EMJEoPTw6Y4wvipTtaaNy+OogrUJr1c5ocYS8+ +e7Y/7omq/un9vynnM8QAKCq7g1uqcxlVElmbcoiBb8hLnY/O8Gj8uA54IbNqStM+ +UqHKE5doL3nPxCl3Hho0 +=clpg -----END PGP SIGNATURE----- diff --git a/net-misc/mDNSResponder/files/dnsextd.init.d b/net-misc/mDNSResponder/files/dnsextd.init.d index 4df7e9caa69e..0316981dba29 100644 --- a/net-misc/mDNSResponder/files/dnsextd.init.d +++ b/net-misc/mDNSResponder/files/dnsextd.init.d @@ -1,9 +1,9 @@ #!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/dnsextd.init.d,v 1.1 2005/08/27 16:46:45 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/dnsextd.init.d,v 1.2 2011/10/23 18:15:50 polynomial-c Exp $ -opts="${opts} dump" +extra_started_commands"dump" depend() { after named @@ -31,6 +31,6 @@ stop() { dump() { ebegin "Dumping dnsextd lease table" - kill -INFO `cat /var/run/dnsextd.pid` >&/dev/null + kill -INFO `cat /var/run/dnsextd.pid` >/dev/null 2>&1 eend $? "Failed to dump dnsextd lease table" } diff --git a/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d b/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d index 35bbf201477b..0fd973419819 100644 --- a/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d +++ b/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d @@ -1,9 +1,9 @@ #!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d,v 1.1 2005/08/27 16:46:45 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/mDNSResponderPosix.init.d,v 1.2 2011/10/23 18:15:50 polynomial-c Exp $ -opts="${opts} reload debug" +extra_started_commands="reload debug" depend() { need mdnsd @@ -32,12 +32,12 @@ stop() { reload() { ebegin "Reloading mDNSResponderPosix" - kill -HUP `cat /var/run/mDNSResponderPosix.pid` >&/dev/null + kill -HUP `cat /var/run/mDNSResponderPosix.pid` >/dev/null 2>&1 eend $? "Failed to reload mDNSResponderPosix" } debug() { ebegin "Changing verbosity of mDNSResponderPosix" - kill -USR1 `cat /var/run/mDNSResponderPosix.pid` >&/dev/null + kill -USR1 `cat /var/run/mDNSResponderPosix.pid` >/dev/null 2>&1 eend $? "Failed to change verbosity" } diff --git a/net-misc/mDNSResponder/files/mdnsd.init.d b/net-misc/mDNSResponder/files/mdnsd.init.d index 44a8a682c900..4a05569f61f4 100644 --- a/net-misc/mDNSResponder/files/mdnsd.init.d +++ b/net-misc/mDNSResponder/files/mdnsd.init.d @@ -1,9 +1,9 @@ #!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/mdnsd.init.d,v 1.2 2005/08/27 16:46:45 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/files/mdnsd.init.d,v 1.3 2011/10/23 18:15:50 polynomial-c Exp $ -opts="${opts} reload dump" +extra_started_commands="reload dump" depend() { after net @@ -25,12 +25,12 @@ stop() { reload() { ebegin "Reloading mdnsd" - kill -HUP `cat /var/run/mdnsd.pid` >&/dev/null + kill -HUP `cat /var/run/mdnsd.pid` >/dev/null 2>&1 eend $? "Failed to reload mdnsd" } dump() { ebegin "Dump mdnsd state to logs" - kill -USR1 `cat /var/run/mdnsd.pid` >&/dev/null + kill -USR1 `cat /var/run/mdnsd.pid` >/dev/null 2>&1 eend $? "Failed to dump mdnsd state" } -- 2.26.2