| 1 |
commit: 2c845bddd9f7815177d68c9bdb76c3612c8bce55 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 2 12:08:00 2013 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 2 12:08:00 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/heroxbd.git;a=commit;h=2c845bdd |
| 7 |
|
| 8 |
prefixify /etc/resolv.conf in glibc |
| 9 |
|
| 10 |
--- |
| 11 |
sys-libs/glibc/Manifest | 4 ++-- |
| 12 |
.../files/2.17/glibc-2.17-runtime-prefix.patch | 26 ++++++++++++++++++++++ |
| 13 |
sys-libs/glibc/glibc-2.17.ebuild | 4 ++-- |
| 14 |
3 files changed, 30 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest |
| 17 |
index d0ba78f..7351509 100644 |
| 18 |
--- a/sys-libs/glibc/Manifest |
| 19 |
+++ b/sys-libs/glibc/Manifest |
| 20 |
@@ -7,7 +7,7 @@ AUX 2.12/glibc-2.12-hardened-pie.patch 1542 SHA256 9d11da52900a4cfdaa9052476029c |
| 21 |
AUX 2.15/glibc-2.15-localstatedir-backport.patch 412 SHA256 465bedaaf735a48825cd6433007abfb1e40c2ef8ddf94d12d452b486c70ce36b SHA512 76506a540d47ad7e76073c3b25bc46278a9e56e34e17d49caf9fffc0622646e8e0d6905fe7d00599db02f444420ed0b9d64d3d70df78446564b137fd65021e45 WHIRLPOOL f21fb6d6eb3555421f7d90b179a7a2745e7056316eacbf209066f01e742037fd283689c5a5f5a313666a2fb79d5ad0631dbada94d9c7eb958ee01217b605533a |
| 22 |
AUX 2.16/glibc-2.16-hardened-pie.patch 1570 SHA256 9a8d8a8268605251782b1fba509cda090f39f56edc8a5497c7b4acfc428041f7 SHA512 1dff16b1ce4ba6246336d19fac21ea6e8d5710e138a23603fa6b79896d895834b6d28bb1948c83648120ca1d038805db7dd7138ba3e28e9071254d6320cdc092 WHIRLPOOL f96487ac4bd95a99e9e70204c686c3f19bb8238cfd4a9856b031be58ac23927886f228a8b4add14213e0489a204c51ebbeb8a376311305025116b8ae45fc90c2 |
| 23 |
AUX 2.17/glibc-2.17-hardened-pie.patch 1784 SHA256 bba32e40c73aef20122b2825f31e5c3aa058b61feae4f32f336e1941f83f82d1 SHA512 9ecfe2b6c8c982a42786181d6507d5fa588a6868109065451f58a779848837bd5e69c32a24e43a186c2ff63a9784015c51487e342c87982ac074139e36c169fc WHIRLPOOL 1baffbef9e6d870ea2f2ae5be014b71020a213a1a11e9856fa207545867de444ed164cb926b2aac23471854eaaf72a87e38760702b32bfcfa639add8733d925e |
| 24 |
-AUX 2.17/glibc-2.17-runtime-prefix.patch 15985 SHA256 df0bf5dea9b40efa851da6b554f1a3d3a63efad2a5f32068de640dd9da652d58 SHA512 98315741f692f0272f13f5e60b0eef5cacea44ddcb97ba144272bb239af0af66b6043d46ef1e6a8391ec3b1a9d293c98334d72d6ceb1b590799e079bb3306709 WHIRLPOOL ff8dd31090c07e8549829a1707e9f7a0e2da35e7a7cffe60f550f64c4c3d0f19c2094576d9ec0b390dcef39f646f2341ed5369fa9d6418e2d5d5dcbdc7189d60 |
| 25 |
+AUX 2.17/glibc-2.17-runtime-prefix.patch 16882 SHA256 712df22a8802a3b773878da3da7f632a6fb8e1f843861dbc65ae34434cf5c7c3 SHA512 55086dfd0ca9c056409d8d3d749dd023da2405b62ec20b33e663d2f91970a08bd4ab322e105add2c5c87c738a306b6799f2c7346b69f446bb5bd85fb6d0a3c84 WHIRLPOOL f6c6ececf21c7f2ef3865ff66442875369952b3c39114346c6d6ffb1bc969df3f13d7d5060443c0ebaee47640181878e923e37b803fdc38962e90c064aaef923 |
| 26 |
AUX 2.17/locale-gen_prefix.patch 2704 SHA256 0807c8979b7a1a63b48d155417ff8ecc7e14773e928a0d1fe6c349a36fcdadef SHA512 d6b41b953713f7fe0ba14af6d045fc0e6b649f278da691ca5f021d95be5cdabfc87de399880cf988fec2b189fac22864d004ec8d159e59a2348b41945de1d5db WHIRLPOOL 3c7d6b4e789ae494cebea620ed64a6ba8dd401837914f4ead72c7b2d6af94538c9a28f65781db7e6ae0d21c7fac13c531b71147fdb5456ffd39ae1246b331069 |
| 27 |
AUX 2.17/vdso-disable.patch 1136 SHA256 49006855c1ba3ae3d3aa5ed71787056dc64e993eec70a4bef05bcc9f4d824014 SHA512 6eeb6eae8b8c1777ebd18170a7651b9e95297125cfc3829786c4d02887cad4a5d768fc2950723d1d040d16d15d72491d7443a3c14ca9f20eb2adb1ba6d1649ca WHIRLPOOL 80367da491b958d0b7855d23d3225a5c17a3a7a1b1f9a54ebc093c53823a5ef1642b974b45e079aec0abff0476494368ed9afcaed83b87576ed8458b8348e41e |
| 28 |
AUX 2.17/vdso.patch 697 SHA256 26f2089344709de9c1bdd2f974d02ff5d4c465f6ebebd5d1ac2cd72b732de201 SHA512 a303a6828ed001b16f2f5c3532890cff66a50259c2e2aa2843e992f2bed5e6141abc9e120afed25f2e1f30d77bc218c3940d680c3d73c227d2056370d5e6b806 WHIRLPOOL edcaa815b8f86e17d77f0582453a717fbbd848400bfdbd302730fec20a952a584ea8f5ba4f7175b25d84752bc895519d7baa55664073cae5037962b0c1825aa3 |
| 29 |
@@ -78,7 +78,7 @@ EBUILD glibc-2.15-r1.ebuild 8143 SHA256 94c831d06eb6cd7c153db3267dfc7811739d90b8 |
| 30 |
EBUILD glibc-2.15-r2.ebuild 7692 SHA256 1ee891da4bbb450ce16318877a9043773c34a7418eb49f7f684155e48ecc1b6b SHA512 4e0e5c7e85a514a0fed90a9e339eef8748e3a0f06211a93463db355b9b921337ead3f645a3fe8b99dbe2f12d1c03e2ffcad7e2dbe2909b5d97fa5486fe53215f WHIRLPOOL 84ab863b0f70cf8d40291a155f21c987e9b48dce005890e34e105bb3fed950d463f0b053fe2d7988a9b218dc3ccc9afb0c952845009b2e7e2569b28298f8e479 |
| 31 |
EBUILD glibc-2.15-r3.ebuild 7764 SHA256 17540bbede72db02e113f556cd3c4a6873c45be1191bade644b5a78d2557c673 SHA512 b9f856356a1dad8f51a62610defce3984477e7f8265427c7e6d21c7868bb6756de4f66b16d3184fd51180155112339e33547a2348d55a2cf1059ccbdf68f0c3f WHIRLPOOL 9c36e9f55427b2cf0180db983446d572d63be309e64b42bbe3571105446f4eddaa815081faf79fe6fc639e3ddf3e3720f11e7af2e85ea19125ef561176eaeff5 |
| 32 |
EBUILD glibc-2.16.0.ebuild 7495 SHA256 d498eb21c832602c2711b4fd8607bbb36cbbbcd701405c5f84e2dbbe9ac81774 SHA512 caa429992f3510b4a530fb7d700ba8e67664d5df406ecd198bb7481009e4413cbf9a8f366b77f0e4949670f56dd5e21d7fccee13aa4d13684cfdb8ccf6054aa9 WHIRLPOOL 1f3a56785e164b4d2f8f258bc44b6a324dee3cecd8231b030ac68efdcc007c7cc906519d4f3f3585ed327bc572b8a2ded827afdeed9aaad1b81aeeca915571f7 |
| 33 |
-EBUILD glibc-2.17.ebuild 7548 SHA256 a42c24a0bfbbad3aa12c858df8cfcec595510d99921c6d04f0f17c898239befd SHA512 8c6d2a742dd4dc266ae9fdc0705f9e49917bb4137ad134469106dce9e321c7b65d10d4637abf5899be271d36186d92a04675c4fb9649189bdd8ada9e0f10d9a3 WHIRLPOOL cbf3ee0c2caf0a6a0a73b8a722f6e4b5150a9f3db511b6f032f92c40ee8907568623daba9492cc358d6d37044ad1d985270f17d1978480d4875bc75071bfe066 |
| 34 |
+EBUILD glibc-2.17.ebuild 7570 SHA256 99b486f387b55bba164f01ca95f05621c56f721ca67f3e19b9176263bbeaa7c0 SHA512 00b3a91eb189d532f1d957ddfc395a3187e68e4d9d932ef4a3119ab5f6008fa401770e369a75dae8ad994425b8ae72201e2dd0bae7b7c28c871f34ba2fdf1f0f WHIRLPOOL 128d411a2ff9fdae035d2b9db13c6806e64a1c3b92f1fa1f8ee15b423dc8352440efe530ce64934ef0ed762f316d4e014d2efe50c30e793fc1aebfac2f9aba27 |
| 35 |
EBUILD glibc-2.9_p20081201-r3.ebuild 6770 SHA256 87e75b306b69d170c7fd6083c7a40303ea292616a810c3e5302eb13ff72932b8 SHA512 3dc0d6f0b99a1e83caa8a152bb7752b8b504324876bed83657b683c73f8a3432150cb5d3b42aea11d064ee9d1a4d1788dab6c9da11cfc5cf716c214ec145e177 WHIRLPOOL 9fec37815cd88eab81f4452e02e13b96e13b1ad8284b1be7f77213280da54a9de85275cf665307d3920e36c3bc02f6005acd5316f6f2ed3dac5b3b60a80690b0 |
| 36 |
EBUILD glibc-9999.ebuild 6619 SHA256 523f30d0bd4fb9aef983b7e62e57239d089251d0f3907b6dfb70a00cbc0c2e6c SHA512 2d875c8434720b700bfc99836870e625b7c3010178a4a501e435832e826e7008764878d1e4f88d9f568d21f97de56589bff7984b37d3e9840f19492585cfe16f WHIRLPOOL 7da4b26e63d4f79592891ebd1cf1fb915d40049e8feeb61d9c55f7af601bfe2b7f1a03b1aed51f95be0451c90e93992920949c92ccd2401a0c129b600f5afdb9 |
| 37 |
MISC ChangeLog 59116 SHA256 c145cda049346dfd34078de4c7b7823136c0f4a25aab7bf2c479481966b74de2 SHA512 e2d51f169bde9d5c9ba4cd85857717b8d2fdc81e8f50fad9be9a9e426efd721de0523038960b1ea615b32d6d61a5bcc929d42a18d2db3732e008548ff3b3250e WHIRLPOOL 9bc612e38b91c84c3de5dbee260207321fdc0069c64851be83f294ecec0391ddf399a7ebe8d45a4ba5169b099597fed4edf9023541f95355028f37a01f79cda1 |
| 38 |
|
| 39 |
diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch b/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch |
| 40 |
index eee2087..50453b9 100644 |
| 41 |
--- a/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch |
| 42 |
+++ b/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch |
| 43 |
@@ -398,3 +398,29 @@ Index: work/glibc-2.17/sysdeps/unix/sysv/linux/paths.h |
| 44 |
#define _PATH_VARTMP "/var/tmp/" |
| 45 |
|
| 46 |
#endif /* !_PATHS_H_ */ |
| 47 |
+Index: work/glibc-2.17/nss/bug-erange.c |
| 48 |
+=================================================================== |
| 49 |
+--- work.orig/glibc-2.17/nss/bug-erange.c |
| 50 |
++++ work/glibc-2.17/nss/bug-erange.c |
| 51 |
+@@ -37,7 +37,7 @@ main (void) |
| 52 |
+ { |
| 53 |
+ printf ("gethostbyname_r failed: %s (errno: %m)\n", strerror (res)); |
| 54 |
+ |
| 55 |
+- if (access ("/etc/resolv.conf", R_OK)) |
| 56 |
++ if (access ("@GENTOO_PORTAGE_EPREFIX@/etc/resolv.conf", R_OK)) |
| 57 |
+ { |
| 58 |
+ puts ("DNS probably not set up"); |
| 59 |
+ return 0; |
| 60 |
+Index: work/glibc-2.17/resolv/resolv.h |
| 61 |
+=================================================================== |
| 62 |
+--- work.orig/glibc-2.17/resolv/resolv.h |
| 63 |
++++ work/glibc-2.17/resolv/resolv.h |
| 64 |
+@@ -170,7 +170,7 @@ typedef struct __res_state *res_state; |
| 65 |
+ */ |
| 66 |
+ |
| 67 |
+ #ifndef _PATH_RESCONF |
| 68 |
+-#define _PATH_RESCONF "/etc/resolv.conf" |
| 69 |
++#define _PATH_RESCONF "@GENTOO_PORTAGE_EPREFIX@/etc/resolv.conf" |
| 70 |
+ #endif |
| 71 |
+ |
| 72 |
+ struct res_sym { |
| 73 |
|
| 74 |
diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild |
| 75 |
index 7083fcb..4da9ff5 100644 |
| 76 |
--- a/sys-libs/glibc/glibc-2.17.ebuild |
| 77 |
+++ b/sys-libs/glibc/glibc-2.17.ebuild |
| 78 |
@@ -205,8 +205,8 @@ eblit-src_unpack-post() { |
| 79 |
epatch "${FILESDIR}"/2.17/glibc-2.17-runtime-prefix.patch |
| 80 |
eprefixify glibc-compat/nss_{compat/compat-{grp,{,s}pwd},files/files-netgrp}.c \ |
| 81 |
nis/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \ |
| 82 |
- nss/{db-Makefile,nss_files/files-init{,groups}.c} \ |
| 83 |
- resolv/netdb.h sysdeps/{generic,unix/sysv/linux}/paths.h |
| 84 |
+ nss/{db-Makefile,{bug-erange,nss_files/files-init{,groups}}.c} \ |
| 85 |
+ resolv/{netdb,resolv}.h sysdeps/{generic,unix/sysv/linux}/paths.h |
| 86 |
} |
| 87 |
|
| 88 |
eblit-pkg_preinst-post() { |
Archives