commit: d83fdf3eb33a9400f376f930ffa46fde1b321931
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 18:29:22 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 18:32:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83fdf3e
sys-libs/glibc: Fix the cleanup
This partially reverts commit 78527a00ee720e32ca54a3c15335fe6e41d95e27 and
now deletes the correct files.
sys-libs/glibc/Manifest | 2 +-
sys-libs/glibc/{glibc-2.24-r3.ebuild => glibc-2.24-r4.ebuild} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b8d66c32d1a..548d8839e5c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -14,7 +14,7 @@ DIST glibc-2.22.tar.xz 12969072 SHA256
eb731406903befef1d8f878a46be75ef862b9056a
DIST glibc-2.23-patches-7.tar.bz2 315221 SHA256
97ef9e370ce9b09d8e9b9f6239f7ef94dd837d29b7bfc1404438c63da1d534ac SHA512
c0d0cab0a370acef0b085b0ab09ce868425a12bbb371d0a9ff91dc83a74a0d8d3b541d10c44650b00b7cb155f8ac1f87764e6a6bd9d6bae8a9a904b4df1650ef
WHIRLPOOL
128ea1a2eeaad3d95cdf1054d10232a34e8f88d10ed8907a67d9ff02734243d20b21595ca3698a4861d9c65e2a59aedbcf8e399bd1ed879dba1556ce2995ad9b
DIST glibc-2.23-patches-8.tar.bz2 304199 SHA256
6110777176abfb8d287d82804d98e007c255db6040a1beca589a212772c90482 SHA512
470814bbbd9d4ee5fa2dd7570a2e14b0229723e373e801472856fd6c2f089499eddc300f69b49af8ba0edbdca583ee3ca521fdb5c642509717cafea0ad925fd2
WHIRLPOOL
1ef9a431d67d7669f34f7db21185d50ddd6dc82c549a9ff274f0b98454417f4098ee771bfe10073be12d3c153ee46ff36e40b46ecb31844ab09791ae29b49074
DIST glibc-2.23.tar.xz 13455260 SHA256
94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 SHA512
b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf
WHIRLPOOL
7c7e3bf55a89a04bac917b9ca5a1cbb1613f22c427d2766f114b5a36f9635856005b823852ef5d3b73462b577fe4e5865e68e7b64633d48a95fa1e5eaa831a71
-DIST glibc-2.24-patches-8.tar.bz2 71769 SHA256
0a21549ed196c5c03efc37273fb991e199c585140d954dca61140c3d0c227af9 SHA512
897c9d158f898edb355ee6478a7e0372a29e6c9d0b98cd80ccaa3ed4f0aab35e3b038217735f2a3b6007ff0cf27c7d6b27a84daaceca9361dce04bc5b2124ada
WHIRLPOOL
222b375249c5a3e53fd0116fadf9612c5e5479cd845dc3fcebb496dfe38d70d0e2c84517b79258c73afe2c1f5d15ecec768d33659c10fb15ae59b9061072987d
+DIST glibc-2.24-patches-10.tar.bz2 73586 SHA256
d479033b63ff796fea56fb1bde390c442021acd856994b15c983b4a89e46fbbe SHA512
fc9191a85da53a2515bbaab228648936682e04267284049468e0c82284f618ab2907b9247baca701e16edc50640199ff6d8e2a6a93ccbd5a9d3b0eb73cc484ca
WHIRLPOOL
7afe94307900a70de2f5e028d8ec9e0f4b06b661ec6493217e51a13d750f891e10b45c0f66d86fa83c16cc3ce539bb257039b33bc3e363469cd03502d956d75e
DIST glibc-2.24.tar.xz 13554048 SHA256
99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 SHA512
a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb
WHIRLPOOL
be82b47fc73f7e780e8e73a5f58b313d8e861d5ea8c4320f95ef0d8c1e125ff011d61dcfc0380be0e83868bd8c3299de1ea662da7fc8d709050e89b2c126e3eb
DIST glibc-2.25-patches-8.tar.bz2 47110 SHA256
1dc41664153369886d240a1851b15bf0c3c3739c8319e6d68cb0c2f85fc98901 SHA512
41d772c47770a63502c863f3c9bb05164e0ceab69fb7b7f355c25685ae4285d73e9ab0e3836162bd11852339055329d0bdc7238f3191fde39a50ce0d9a60454c
WHIRLPOOL
c6e0443d75e2e4607226caa4df1ce2b10ef21ec2564b447e2a287888d1f593d51f334a6e1ab942f5d1602d02c6fee87ce4ef9a7db3409de6063bc377a470a42d
DIST glibc-2.25-patches-9.tar.bz2 67901 SHA256
cbd8af837aa0776940fd41e34874e930a7f25d78cdd212e138dd9a85e1349519 SHA512
b4f0be5b20834aff102394df23084cc0adf1ab674e6ce050550f6b6658cf0eab57f7685cac079b1a19388dba927a36b8ca31f58af3dddc559d7230674ffd59b5
WHIRLPOOL
81c18056fe26a79c7a7598da1181ba02e83daf7d9e9883a3c1195804a35fe22a79d7cc4a8411f2f4a4ce6430e506978199f59b61d3ed0a70b4e4f7dd05ecfafe
diff --git a/sys-libs/glibc/glibc-2.24-r3.ebuild
b/sys-libs/glibc/glibc-2.24-r4.ebuild
similarity index 97%
rename from sys-libs/glibc/glibc-2.24-r3.ebuild
rename to sys-libs/glibc/glibc-2.24-r4.ebuild
index edaf4e86a0e..29a17f827ae 100644
--- a/sys-libs/glibc/glibc-2.24-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.24-r4.ebuild
@@ -27,7 +27,7 @@ case ${PV} in
esac
GCC_BOOTSTRAP_VER="4.7.3-r1"
# patches live at
https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="8" # Gentoo patchset
+PATCH_VER="10" # Gentoo patchset
: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl
requires
IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap
profile suid vanilla crosscompile_opts_headers-only"
@@ -100,7 +100,7 @@ upstream_uris() {
echo mirror://gnu/glibc/$1
ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
}
gentoo_uris() {
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI
HTTP~tamiko/distfiles/URI"
+ local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI
HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
devspace=${devspace//HTTP/https://dev.gentoo.org/}
echo mirror://gentoo/$1 ${devspace//URI/$1}
}
