diff options
| author |   Mike Hammill <mike@kth.se> | 2011-01-05 21:55:50 +0100 |
|---|---|---|
| committer | Mike Hammill <mike@kth.se> | 2011-01-05 21:55:50 +0100 |
| commit | e056b1d9bda0bc28db8662fa98b9a2ca28b2a937 (patch) | |
| tree | e02617b0f997b675996271d8326a1a7cf06615f8 | |
| parent | Add all Gentoo standard openresolv ebuild files. (diff) | |
| download | mhammill-e056b1d9bda0bc28db8662fa98b9a2ca28b2a937.tar.gz mhammill-e056b1d9bda0bc28db8662fa98b9a2ca28b2a937.tar.bz2 mhammill-e056b1d9bda0bc28db8662fa98b9a2ca28b2a937.zip | |
Add Roy Marples's patch.
Apply the change Roy provided at
http://roy.marples.name/projects/openresolv/changeset/15d1462cefc815c488d6d3ab5123a4298bc94c5c/configure
as a fix to bug
http://bugs.gentoo.org/show_bug.cgi?id=349180
by implementing the change as a patch "configure.path" and adding the patch to the latest ebuild.
Tested the result on x86 and x86_64 systems running
sys-apps/openrc-0.6.8 and sys-apps/baselayout-2.0.1-r1. Worked fine.
| -rw-r--r-- | net-dns/openresolv/Manifest | 13 | ||||
| -rw-r--r-- | net-dns/openresolv/files/configure.patch | 19 | ||||
| -rw-r--r-- | net-dns/openresolv/openresolv-3.4.0.ebuild | 4 |
3 files changed, 25 insertions, 11 deletions
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest index cfe7b4e..009eebb 100644 --- a/net-dns/openresolv/Manifest +++ b/net-dns/openresolv/Manifest @@ -1,6 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX configure.patch 591 RMD160 5d7f39dc1285248fbd3395267c20b02cf3df5024 SHA1 a71f5f770e3d8db65bae8026a4e137969342c99b SHA256 fc140addecb21b5551ac9a18083786e86a7cbea7337d0e73f0a424450f8ab462 AUX pdnsd 19161 RMD160 6cd5e5202f24d6102b38f37bfc5a8d665cf99962 SHA1 83bfb3589ed542a6cf1c0d41ca0c563220095127 SHA256 a012a090e551c4a73ea0caf801dee2e4b467cb28aaff465890a002f8529e16ed DIST openresolv-3.3.2.tar.bz2 9485 RMD160 85d5678b5c4f591985ac9c00e7d0df456f52a1e7 SHA1 4a1a8c7127fe2dac44c6faedaca7ca2c2a2a4823 SHA256 f1996cddcaa9014455c225f93654eead9524416e882c3a08f44aa68c3fb5e9b1 DIST openresolv-3.3.4.tar.bz2 10495 RMD160 d87fdae8426b928fdf414cd335cbf0c2f70df9d1 SHA1 99532b1cb34922d139a827437f23cf9a0e843776 SHA256 8288e436c67e0f85bdda25916f6daba78009af353529944eb9fa6cdeb5c38e48 @@ -8,13 +6,6 @@ DIST openresolv-3.4.0.tar.bz2 12740 RMD160 4ac15ec009f1bcc8ebcd7de12a3504be017e2 EBUILD openresolv-3.3.2.ebuild 1444 RMD160 4f735fe8c6961be0c8aa327192bcf03f6259535b SHA1 5f064a758b543f83cfad3e59751fa3eff1d3b831 SHA256 9557df0ab4361606d00a76ed4ee88120e44f1506687e857af4f37ce34c3e1b89 EBUILD openresolv-3.3.4-r1.ebuild 1456 RMD160 c4424a56abea47363b178be17045e101dd31df8d SHA1 cf8093417d332ca51bdc7c876ab34d8712bd9ae4 SHA256 79dbf4f3a9c8c606fcbb0136c96ecc3faace9b9a66b50b8afa9b68f2f66b000b EBUILD openresolv-3.3.4.ebuild 1443 RMD160 d3b12af4d096b21bd5461c90d9fc5665052bd7de SHA1 bdd4b50f63cf8ca1b8fec71dc0d7ad101aac9db0 SHA256 b92146dddb8a959e6f0a6ac25df4bf7eee4653ff19ecfb672c8f050599311bc0 -EBUILD openresolv-3.4.0.ebuild 1357 RMD160 0a65dfbf5984f090aa906af4b0a1b161b16ac05f SHA1 faf31bae6606338f3035d465b7c24847aed86f0d SHA256 7f608ead9e45e73bfcfd610a9eb2e23c52fea06dcacc52ecb0cc8ea56cab95e5 +EBUILD openresolv-3.4.0.ebuild 1414 RMD160 2d88580452c1253cf733068cb5d14eb060828728 SHA1 6f6467582be68c8710e4cc930aa45aae4ede0bb7 SHA256 94cafe2faf97c900694691dbeb519af498ae07184bbe97bf2c7686608e2f79bc MISC ChangeLog 8137 RMD160 c059a35b04b649edfd39c175eb37ff49dec24636 SHA1 d63df05405086e8b830f62adb93829bb17133e44 SHA256 b47e70d8129ba16a1485ef2de278310df476c86a1a934d1642749a6237fd1ef2 MISC metadata.xml 407 RMD160 bc0655eb7762cddca121e3e2d75878723be9d751 SHA1 cd1f19d5ad1161f1fc701e0fc755e4165f49bc5b SHA256 4526608e180ccadf270ea13601c244268e3d9dff940c2d303ec63ffa30474861 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAk0M78EACgkQnGSe5QXeB7s+QACgmMLrqDUNzgqztrWcPAyrzLq0 -k4IAmQG0YXGfEQ34EBusXFhWQnXiWq25 -=916U ------END PGP SIGNATURE----- diff --git a/net-dns/openresolv/files/configure.patch b/net-dns/openresolv/files/configure.patch new file mode 100644 index 0000000..dd6ab00 --- /dev/null +++ b/net-dns/openresolv/files/configure.patch @@ -0,0 +1,19 @@ +*** configure Fri Nov 5 08:35:16 2010 +--- configure_correct Wed Jan 5 20:47:05 2011 +*************** +*** 128,134 **** + if [ -z "$RESTARTCMD" ]; then + printf "Checking for OpenRC ... " + if [ -x /sbin/rc-service ]; then +! RESTARTCMD="/sbin/rc-service -e \1 \&\& /sbin/rc-service \1 -Ds restart" + echo "yes" + else + echo "no" +--- 128,134 ---- + if [ -z "$RESTARTCMD" ]; then + printf "Checking for OpenRC ... " + if [ -x /sbin/rc-service ]; then +! RESTARTCMD="/sbin/rc-service -e \1 \&\& /sbin/rc-service \1 -- -Ds restart" + echo "yes" + else + echo "no" diff --git a/net-dns/openresolv/openresolv-3.4.0.ebuild b/net-dns/openresolv/openresolv-3.4.0.ebuild index 5988f44..879f251 100644 --- a/net-dns/openresolv/openresolv-3.4.0.ebuild +++ b/net-dns/openresolv/openresolv-3.4.0.ebuild @@ -25,6 +25,10 @@ src_configure() { --libexecdir=/$(get_libdir) } +src_prepare() { + epatch "${FILESDIR}/configure.patch" +} + pkg_postinst() { einfo "${PN}-3.0 has a new configuration file /etc/resolvconf.conf" einfo "instead of mini files in different directories." |