diff options
Diffstat (limited to 'net-dns/openresolv')
| -rw-r--r-- | net-dns/openresolv/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/openresolv/Manifest | 11 | ||||
| -rw-r--r-- | net-dns/openresolv/files/restartcmd | 20 | ||||
| -rw-r--r-- | net-dns/openresolv/openresolv-3.5.4.ebuild | 16 |
4 files changed, 41 insertions, 12 deletions
diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog index d686dea7a0ee..7f7862ef7428 100644 --- a/net-dns/openresolv/ChangeLog +++ b/net-dns/openresolv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/openresolv # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.70 2013/03/10 22:05:53 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.71 2013/04/27 09:33:21 lxnay Exp $ + + 27 Apr 2013; Fabio Erculiani <lxnay@gentoo.org> openresolv-3.5.4.ebuild, + +files/restartcmd: + detect openrc/systemd at runtime, fix bug #465648 *openresolv-3.5.4 (10 Mar 2013) diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest index ce0c1b9e1efd..e6e2629ce3a4 100644 --- a/net-dns/openresolv/Manifest +++ b/net-dns/openresolv/Manifest @@ -2,6 +2,7 @@ Hash: SHA256 AUX pdnsd 19161 SHA256 a012a090e551c4a73ea0caf801dee2e4b467cb28aaff465890a002f8529e16ed SHA512 44c59eac111053ff90452421e0e2776dfb801edcd4a31c1cb1ac381286757b780b5408a67a934b71f97aadbf906e2d94d9ab34e59c34ba6a140cb09625fa0730 WHIRLPOOL 1c8224d9c60bf4b0946d3b2ae4696465e596f5f1352a6e7db123d2f43eb9d7f8cf4313059c6fbb690e0bd362905dbdc548bd89455a6677b42564ee9a78cdda38 +AUX restartcmd 415 SHA256 151383fb8e5e96b905cc907d6fa1e6301305506758e2d3ec04b886ba4979ba4b SHA512 e66f3de6c515b489a77c0a0aa88551446e4af64f54742143f989621f4f8527c6e38227037484b0d12a0c94fb6e5e648a3c655fc95e2784148ab8745c2d4984f2 WHIRLPOOL 1f60ce8cd4b462d88cdb56dee032fae768c05206cd665130845f7733178ba3565237e17ee6f9e6d00cf0c8e9a70f03378e0e7170cc01e5c85b09704ebed8bcda DIST openresolv-3.3.4.tar.bz2 10495 SHA256 8288e436c67e0f85bdda25916f6daba78009af353529944eb9fa6cdeb5c38e48 SHA512 9a203cf7ff950740ca75554743da962d5656d41e14803abb4ad34426adfb8baabd2cd4124558e33a66d044a45350f2dffaa864eb64cc281f7554867c6853939e WHIRLPOOL 21b297f8747c3f7e67856d3a124a804eb1e39fa7895ee0eaaf6a1d5b54c289ae1f6ef4d39a7dfb565466230168e44196619d1eb5910355777b821c6a61c08e74 DIST openresolv-3.4.1.tar.bz2 12741 SHA256 c01c7fee00f8582658753cc15af421b00106e9d7c6ba6c777b535814b2c02e69 DIST openresolv-3.4.6.tar.bz2 13446 SHA256 6a41cba441f036045b73c8850715f10431dfbd2bb69acc54b97883354e22df08 SHA512 ca3c583c978e72aba4b635aac176800bfd58ebad005c605a854e8a06430f85b542f2c48e5aef0fcb82571b7e74ce10fb4ff5b1c3929b2d9c9bc1cf9560f5cc01 WHIRLPOOL 3a0de837861a84a485895103d87feaa75f8e0d545f2e7f507ac974f58a6d8b804c1f580876b69ec56ddade5d963ae223673e12397d1988ca952c071a91f19fdb @@ -14,13 +15,13 @@ EBUILD openresolv-3.4.1-r1.ebuild 1166 SHA256 77133614bf277df0a828eeb87f46676f2e EBUILD openresolv-3.4.6.ebuild 1163 SHA256 7e85bd05b0e146592b638ac153c62010c13a8ede82412a9a2a2aeb1ea27c58c3 SHA512 6308d49c3159e3e282026d56850899e60984ffe1efcc6b696ae1adb0ed2545f1a3e86a70d421622540dc8ba6e1d7611a9cae32d0753d4b11856c5f33baf42e61 WHIRLPOOL 2e0539c0c3eab5cf69cf3f3b84b386e8043201176422b996ea93ad1a4a2f2af22b1273440e8017e8b1c26ccba30b5118dab4cbf925336ab4609b31d5923c34e2 EBUILD openresolv-3.5.2.ebuild 1163 SHA256 c34f2ebc326fa5ca1a5f797d4531da96335bca8bef05bf1c10369b6ac669b3df SHA512 a617751cf4129e2a755201889a5a2f509563e014b99dbef3cbb8a12d073b2e53bc4fb846adf03e6dfbb51918fed90a1cc6deb2e73e2af3c01242ede9611c46df WHIRLPOOL 34c53c505c5082d4b5852878cc05d704e138dfd53e4b3306386aedd69e06994b3f15ba4eee3e7887417c2ba602dabb2ab59c0ccd5094e7bdef93b8ac172958f4 EBUILD openresolv-3.5.3.ebuild 1163 SHA256 6378405c0ad4f5c54ade4d9cb7dfe2b83e7cbed27ef306c838bc0268f88a5017 SHA512 d75a19d364bfa86f82be9bfb673960cdc4d23028f961865b230093b13f9258935c29baaeb7e5a11c8cac422985d6ce373caa0b237bd0baaba790df23cf691cba WHIRLPOOL 1ad2f4cac1cf80f638457a4aa180c74519092da74648897cf1bed9f3aac1d2ebafd94c09ef3bc78efe03ac4f93c91471d8d5082b102348f8d753c9593e28927d -EBUILD openresolv-3.5.4.ebuild 1392 SHA256 2fee2bafaa3f1d7a202c89c269c270dfea8ec194d23d99c75bf5c9887a977b44 SHA512 dfdb9069e35f7b58713ece353cf1fb8118dada532177dcbe3e3de9608ceb4f2e83836a9704d15a6fa1021b81bc2b63c310239dbba38da4bf2d7edce84986b369 WHIRLPOOL c5fa1f7fc0bc1a4a73cb140126ffbfc74477d37e1a5d5c8e4b31418dfcedaf8bc57f222bf95907c702fc3f4a87484fae6bbf0462450fe9ecd5f86e0bd4e376b9 -MISC ChangeLog 9508 SHA256 01d7788a92e89dcc0f5601f7e6ea5df768d346dcc6e584944ba2f7232279f851 SHA512 a2b5b57f358d1aeb57451e17734887ad23d313f9cacb7ddcafc5000074c6d6e433eb8854a1569ccc03a79aedef2a9be58cfe0777807f900a1bbe404f82e1f4c3 WHIRLPOOL c0425eb61999dfce03c52c666d68faa550d33b8502c63e80115630f985a8fe105febfc29f7785f52582091c4e9d4aaf0e39df99d266e0e2f37a3a74ca53b5e43 +EBUILD openresolv-3.5.4.ebuild 1310 SHA256 743540029e095384f6434a08e331a1cb649b89dd08ceed5a00968457b5d8b3ae SHA512 b540e7d1e5df126b211ee1a4a68c2c6baad23b47a30028dc955e5235035bde274679dfc16085387bbb867ace84d7ab3e685e2d7061b76b5d9c99e569dd6a52da WHIRLPOOL b16f2a4ed9c0fa3b40007b7fecd4d32f08c8cad40572f171431d8902a83e39ae98352fe55b7d6c438154df864fbc5d2138acccede9b8740ec708921344589a71 +MISC ChangeLog 9655 SHA256 64282681b402810b74596572b9e148ddac15a85207aceca1e78d618774b73ded SHA512 4088cce377a3c1780c76c52cc87aea4839b56f4411eccc85703eae6a4a4426b73f5ae62dd680cdea4cf84d466ad30ef04f7a177088d7ab155890f301f57ca18b WHIRLPOOL 110f4ea37c4b2329ca88bd96142d43cbea07f45ca30932a048e70633fdc2d8652ef7c028fdd844cee9a29b1316d8d6db055da992e8943bba254d185208939bec MISC metadata.xml 319 SHA256 fc85594d02d846f63a1c00b842b393d2cc9bb8f09ede665e7d7e468fff38c011 SHA512 8f25a804a96586af9d5370ca77939fb72df20db034e0749e355759252a78ac271da573e8f0665c6f029c3c498e1c73f8319e494dc349811dc4322b72a439407d WHIRLPOOL 613242aef682edd2076dd1bb5ed3604938dab615eeff739ca465065904df8abf6d0e1694aa827289765b7f875bbe3d93cbdc3afdc89fc9a190b30f246a05f06b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlE9A8IACgkQC77qH+pIQ6TEoAD6A8+cQTnHTP/l98f9bVR7geIK -gNL4hB0NOiyo1V6ouBIA/1x8RzSXoxbKPOuE2Srd/Yz2/6Im3Fju3OKKAif6fVwJ -=rCf4 +iEYEAREIAAYFAlF7qTIACgkQfaj9zK3JFuUFEgCeKbpktJBWks0fRmac5CxEyReQ +wpMAninxzToDQOpXTFWXsRSH/B2jqxWD +=PGzB -----END PGP SIGNATURE----- diff --git a/net-dns/openresolv/files/restartcmd b/net-dns/openresolv/files/restartcmd new file mode 100644 index 000000000000..9a97b4de068d --- /dev/null +++ b/net-dns/openresolv/files/restartcmd @@ -0,0 +1,20 @@ +#!/bin/sh +# This script currently supports: +# - openrc +# - systemd + +if [ -z "${1}" ]; then + echo "Missing arguments." >&2 + exit 1 +fi + +if [ -e /run/openrc/softlevel ]; then + if /sbin/rc-service -e ${1}; then + exec /sbin/rc-service ${1} -- -Ds restart + fi +elif [ -d /run/systemd/system ]; then + exec /usr/bin/systemctl try-restart ${1} +else + echo "Unsupported init system." >&2 + exit 1 +fi diff --git a/net-dns/openresolv/openresolv-3.5.4.ebuild b/net-dns/openresolv/openresolv-3.5.4.ebuild index 5181121ea6ed..204bc4336465 100644 --- a/net-dns/openresolv/openresolv-3.5.4.ebuild +++ b/net-dns/openresolv/openresolv-3.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.5.4.ebuild,v 1.1 2013/03/10 22:05:53 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.5.4.ebuild,v 1.2 2013/04/27 09:33:21 lxnay Exp $ EAPI=5 @@ -13,20 +13,18 @@ SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2" LICENSE="BSD-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="systemd" +IUSE="" DEPEND="!net-dns/resolvconf-gentoo !<net-dns/dnsmasq-2.40-r1" -RDEPEND="systemd? ( sys-apps/systemd )" +RDEPEND="" src_configure() { - local systemd='/usr/bin/systemctl try-restart \1' - local openrc='if /sbin/rc-service -e \1; then /sbin/rc-service \1 -- -Ds restart; fi' econf \ --prefix= \ --rundir=/var/run \ --libexecdir=/$(get_libdir)/resolvconf \ - --restartcmd="$(usex systemd "${systemd}" "${openrc}")" + --restartcmd="/$(get_libdir)/resolvconf/restartcmd \1" } pkg_config() { @@ -44,3 +42,9 @@ pkg_config() { einfo "The dummy interface will disappear when you next reboot" fi } + +src_install() { + default + exeinto /$(get_libdir)/resolvconf + doexe "${FILESDIR}"/restartcmd +} |