From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 287F71389E2 for ; Thu, 11 Dec 2014 01:26:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F7FFE0850; Thu, 11 Dec 2014 01:21:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F4D0E0AD1 for ; Thu, 11 Dec 2014 01:20:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D9AC3407CA for ; Wed, 10 Dec 2014 03:09:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE70CC0AB for ; Wed, 10 Dec 2014 03:09:20 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1418181405.0dbab20951fdbc7b06fa7aeca16ed0b8c42de53b.heroxbd@gentoo> Subject: [gentoo-commits] dev/heroxbd:master commit in: sys-libs/glibc/files/2.20/, sys-libs/glibc/ X-VCS-Repository: dev/heroxbd X-VCS-Files: sys-libs/glibc/Manifest sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch X-VCS-Directories: sys-libs/glibc/ sys-libs/glibc/files/2.20/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 0dbab20951fdbc7b06fa7aeca16ed0b8c42de53b X-VCS-Branch: master Date: Wed, 10 Dec 2014 03:09:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 97efabbd-c506-4910-8956-d58a6911ca3c X-Archives-Hash: 7f6f4a6fb9e1bab2bc00fa93041f0f31 commit: 0dbab20951fdbc7b06fa7aeca16ed0b8c42de53b Author: Benda Xu gentoo org> AuthorDate: Wed Dec 10 03:16:16 2014 +0000 Commit: Benda XU gentoo org> CommitDate: Wed Dec 10 03:16:45 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/heroxbd.git;a=commit;h=0dbab209 sys-libs/glibc: Prefixify /var/cache/ldconfig/aux-cache --- sys-libs/glibc/Manifest | 2 +- .../files/2.20/glibc-2.20-configurable-paths.patch | 208 ++++++++++++++++++++- 2 files changed, 205 insertions(+), 5 deletions(-) diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 17d4244..0ea69f5 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -15,7 +15,7 @@ AUX 2.17/vdso.patch 697 SHA256 26f2089344709de9c1bdd2f974d02ff5d4c465f6ebebd5d1a AUX 2.19/glibc-2.19-configurable-paths.patch 81250 SHA256 ae15864d46cb4d5e061465249c9a9c4585961a312d61d6e9edbf8dd8a5dc8a22 SHA512 e9b4c4d48560fc4af41505996b40f3dd0023ba86a71182d965a5c0978f1ed6236311da5b990199e2916b9fc091ce374b2d346b03c133f2d8fcf7e6f07616a3fd WHIRLPOOL 67cf918f3f26b74cf34108806195465dbfe0a51b3c97a7ed19e398c093980dbb0bf5b9102f351cdd95acad58cb3b7c947a50efd593c6a161212afe2f4a9f8ac0 AUX 2.19/glibc-2.19-hardened-configure-picdefault.patch 865 SHA256 feeb2ddc276e90f55d2fd358837e8d4922d3b2875cb8080b1d8e27e5da83a2d9 SHA512 d8e6fea72e240f1fde8a487958463140a84e8bd6bb5b176f8ce84a34df3137943db9016300884f3efdd4da130e342448e57ed0c0dc6eb2956d647286ce1d00ce WHIRLPOOL 3a5d2882b5fc1bea78c45409c848c94a260659e3ea1e28a5dc8818de8825e55453aa1cc97b86eef99c91b17bde9f2a6db1fd8ae03839f7029d93a71feaa4d4d0 AUX 2.19/glibc-2.19-vdso-disable.patch 1120 SHA256 20048700be532bd1b692471420f930951cc0be2d2c9eb2a95e895e9771a0e13c SHA512 8f52408e5acd96708e5376b3aee77d4851dbe98a7f4b2d2503d3ce5c0088bc93640023659d9e49c8c802ab33ad9f987630667bd5094e4b4aab2c48bb1183a84e WHIRLPOOL 67b6bc23ef1a90886f8860396d52b9004764f3ebefd1d48736c734db419d47402c01c9b746a16147a84b77b8510d243c63d76048c8b2a46daed8aa0acac73fe4 -AUX 2.20/glibc-2.20-configurable-paths.patch 109416 SHA256 4aa8fb2d7cc006279afac59fbd5f862e4d2273fbfb4176080d33dd7827716d8b SHA512 c46a6b443dfc3aa31f7a1bd69bbdcb5188731e718fea3991e2a69a19dd96a992e0984966f4a2b8f7501f3c1d3fe8d74b808cf972d5a57bafaaaf968e53e076b1 WHIRLPOOL d16aea24f8863af6c70b3d94ccb56ad2e44af73b8ae1646a5c6b0040e9f93466dc825808743c6936a113369f7ae5d8c40d6e53dc1f6b99f7fc950e8ae3db266b +AUX 2.20/glibc-2.20-configurable-paths.patch 116486 SHA256 d7fe27619225d6e2941e52bc3dd049bfffbed2cf633329ad4ae9a76150ce5f1a SHA512 e2998c66d7c84e6da8f9f24e3b710c8c62f0042a65c7af6f0a2f9cf303724d732aec753e6002ed265c95947f72534de6da9fb0681328c5f8cebbb8c8a60ac61a WHIRLPOOL 50e5984c09e76dd5ebd9172c2e560dc2ff721af23a9be0d1c24fc289af20a5a4e0bf278ec4ef878151bf1cde4d51f42d536aeefdde1f5c206d7942630c8f93a2 AUX 2.20/glibc-2.20-gentoo-chk_fail.c 8978 SHA256 f9cc426b0fb21de1dc11bb36e43bca8e1b3114fe78f8b343f672a951a82c742e SHA512 5cb529ac9d18a315f25fd48a3a80a529924bee0588074c97e6df7dbe8568a67f786363c41da6300ea55818369e3609ed4315b2e2104f8a8b4f1266ba43076eda WHIRLPOOL 2d38c19a20226fc4687037b8bb19025065f039ddaa62466879ca98765c8899e64b147dd148565304419ed1a98fbe1f8403710b22c930b08a19bddba7e79b0f1d AUX 2.20/glibc-2.20-gentoo-stack_chk_fail.c 55 SHA256 ec73e74297b5eade591bfb3a2999989e2a7aa80752140048ffa67349635f05e7 SHA512 4dfec1bd17007b826110dcb73d09331a58b7a892c87de55b94480b14c28686442c567725b610082813411cf9911e180835a400a54ea704fe80f81cfba966a989 WHIRLPOOL b2b338a50f7895c530a71a19e4582bd0116a0b9d13b2e1505f0566924557493849f93cefb2c0ad1719ef684321e145129e0f72cfc9aa85a44ea7ebf910e7304c AUX 2.20/glibc-2.20-hardened-inittls-nosysenter.patch 9951 SHA256 992fb70b9b62674d94ef8938297a3f2591b3121495987d927f5a44c1d8788658 SHA512 a8302ee2963bd791be859233223b17cd154afbf04c13c046956bb1140d748272d7bcb3a6167ce8b61573ebcffe906dff064308374d2910656b8fad18480fe422 WHIRLPOOL b8753d6f1301650b91b5cf4f342de22010d819deb2bf4da27aac33d7540e15a140b8a7a4c5e111faba320873ed5784b22f6add29181fbaef14c3e9504b1b838f diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch b/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch index 395b911..1480595 100644 --- a/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch +++ b/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch @@ -1664,12 +1664,13 @@ Index: glibc-2.20/configure.ac =================================================================== --- glibc-2.20.orig/configure.ac +++ glibc-2.20/configure.ac -@@ -2038,7 +2038,7 @@ RELEASE=`sed -n -e 's/^#define RELEASE " +@@ -2038,7 +2038,8 @@ RELEASE=`sed -n -e 's/^#define RELEASE " AC_SUBST(VERSION) AC_SUBST(RELEASE) -AC_CONFIG_FILES([config.make Makefile]) -+AC_CONFIG_FILES([config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h]) ++AC_CONFIG_FILES([config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h ++ sysdeps/generic/ldconfig.h]) AC_CONFIG_COMMANDS([default],[[ case $CONFIG_FILES in *config.make*) echo "$config_vars" >> config.make;; @@ -2796,17 +2797,216 @@ Index: glibc-2.20/configure -ac_config_files="$ac_config_files config.make Makefile" -+ac_config_files="$ac_config_files config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h" ++ac_config_files="$ac_config_files config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h sysdeps/generic/ldconfig.h" ac_config_commands="$ac_config_commands default" -@@ -7897,6 +7897,9 @@ do +@@ -7897,6 +7897,10 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "nss/db-Makefile") CONFIG_FILES="$CONFIG_FILES nss/db-Makefile" ;; + "resolv/netdb.h") CONFIG_FILES="$CONFIG_FILES resolv/netdb.h" ;; + "resolv/resolv.h") CONFIG_FILES="$CONFIG_FILES resolv/resolv.h" ;; ++ "sysdeps/generic/ldconfig.h") CONFIG_FILES="$CONFIG_FILES sysdeps/generic/ldconfig.h" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; +Index: glibc-2.20/sysdeps/generic/ldconfig.h +=================================================================== +--- glibc-2.20.orig/sysdeps/generic/ldconfig.h ++++ /dev/null +@@ -1,94 +0,0 @@ +-/* Copyright (C) 1999-2014 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- Contributed by Andreas Jaeger , 1999. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, see +- . */ +- +-#ifndef _LDCONFIG_H +-#define _LDCONFIG_H +- +-#include +- +-#define FLAG_ANY -1 +-#define FLAG_TYPE_MASK 0x00ff +-#define FLAG_LIBC4 0x0000 +-#define FLAG_ELF 0x0001 +-#define FLAG_ELF_LIBC5 0x0002 +-#define FLAG_ELF_LIBC6 0x0003 +-#define FLAG_REQUIRED_MASK 0xff00 +-#define FLAG_SPARC_LIB64 0x0100 +-#define FLAG_IA64_LIB64 0x0200 +-#define FLAG_X8664_LIB64 0x0300 +-#define FLAG_S390_LIB64 0x0400 +-#define FLAG_POWERPC_LIB64 0x0500 +-#define FLAG_MIPS64_LIBN32 0x0600 +-#define FLAG_MIPS64_LIBN64 0x0700 +-#define FLAG_X8664_LIBX32 0x0800 +-#define FLAG_ARM_LIBHF 0x0900 +-#define FLAG_AARCH64_LIB64 0x0a00 +-#define FLAG_ARM_LIBSF 0x0b00 +-#define FLAG_MIPS_LIB32_NAN2008 0x0c00 +-#define FLAG_MIPS64_LIBN32_NAN2008 0x0d00 +-#define FLAG_MIPS64_LIBN64_NAN2008 0x0e00 +- +-/* Name of auxiliary cache. */ +-#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache" +- +-/* Declared in cache.c. */ +-extern void print_cache (const char *cache_name); +- +-extern void init_cache (void); +- +-extern void save_cache (const char *cache_name); +- +-extern void add_to_cache (const char *path, const char *lib, int flags, +- unsigned int osversion, uint64_t hwcap); +- +-extern void init_aux_cache (void); +- +-extern void load_aux_cache (const char *aux_cache_name); +- +-extern int search_aux_cache (struct stat64 *stat_buf, int *flags, +- unsigned int *osversion, char **soname); +- +-extern void add_to_aux_cache (struct stat64 *stat_buf, int flags, +- unsigned int osversion, const char *soname); +- +-extern void save_aux_cache (const char *aux_cache_name); +- +-/* Declared in readlib.c. */ +-extern int process_file (const char *real_file_name, const char *file_name, +- const char *lib, int *flag, unsigned int *osversion, +- char **soname, int is_link, struct stat64 *stat_buf); +- +-extern char *implicit_soname (const char *lib, int flag); +- +-/* Declared in readelflib.c. */ +-extern int process_elf_file (const char *file_name, const char *lib, int *flag, +- unsigned int *osversion, char **soname, +- void *file_contents, size_t file_length); +- +-/* Declared in chroot_canon.c. */ +-extern char *chroot_canon (const char *chroot, const char *name); +- +-/* Declared in ldconfig.c. */ +-extern int opt_verbose; +- +-extern int opt_format; +- +-/* Prototypes for a few program-wide used functions. */ +-#include +- +-#endif /* ! _LDCONFIG_H */ +Index: glibc-2.20/sysdeps/generic/ldconfig.h.in +=================================================================== +--- /dev/null ++++ glibc-2.20/sysdeps/generic/ldconfig.h.in +@@ -0,0 +1,94 @@ ++/* Copyright (C) 1999-2014 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Contributed by Andreas Jaeger , 1999. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#ifndef _LDCONFIG_H ++#define _LDCONFIG_H ++ ++#include ++ ++#define FLAG_ANY -1 ++#define FLAG_TYPE_MASK 0x00ff ++#define FLAG_LIBC4 0x0000 ++#define FLAG_ELF 0x0001 ++#define FLAG_ELF_LIBC5 0x0002 ++#define FLAG_ELF_LIBC6 0x0003 ++#define FLAG_REQUIRED_MASK 0xff00 ++#define FLAG_SPARC_LIB64 0x0100 ++#define FLAG_IA64_LIB64 0x0200 ++#define FLAG_X8664_LIB64 0x0300 ++#define FLAG_S390_LIB64 0x0400 ++#define FLAG_POWERPC_LIB64 0x0500 ++#define FLAG_MIPS64_LIBN32 0x0600 ++#define FLAG_MIPS64_LIBN64 0x0700 ++#define FLAG_X8664_LIBX32 0x0800 ++#define FLAG_ARM_LIBHF 0x0900 ++#define FLAG_AARCH64_LIB64 0x0a00 ++#define FLAG_ARM_LIBSF 0x0b00 ++#define FLAG_MIPS_LIB32_NAN2008 0x0c00 ++#define FLAG_MIPS64_LIBN32_NAN2008 0x0d00 ++#define FLAG_MIPS64_LIBN64_NAN2008 0x0e00 ++ ++/* Name of auxiliary cache. */ ++#define _PATH_LDCONFIG_AUX_CACHE "@libc_cv_localstatedir@/cache/ldconfig/aux-cache" ++ ++/* Declared in cache.c. */ ++extern void print_cache (const char *cache_name); ++ ++extern void init_cache (void); ++ ++extern void save_cache (const char *cache_name); ++ ++extern void add_to_cache (const char *path, const char *lib, int flags, ++ unsigned int osversion, uint64_t hwcap); ++ ++extern void init_aux_cache (void); ++ ++extern void load_aux_cache (const char *aux_cache_name); ++ ++extern int search_aux_cache (struct stat64 *stat_buf, int *flags, ++ unsigned int *osversion, char **soname); ++ ++extern void add_to_aux_cache (struct stat64 *stat_buf, int flags, ++ unsigned int osversion, const char *soname); ++ ++extern void save_aux_cache (const char *aux_cache_name); ++ ++/* Declared in readlib.c. */ ++extern int process_file (const char *real_file_name, const char *file_name, ++ const char *lib, int *flag, unsigned int *osversion, ++ char **soname, int is_link, struct stat64 *stat_buf); ++ ++extern char *implicit_soname (const char *lib, int flag); ++ ++/* Declared in readelflib.c. */ ++extern int process_elf_file (const char *file_name, const char *lib, int *flag, ++ unsigned int *osversion, char **soname, ++ void *file_contents, size_t file_length); ++ ++/* Declared in chroot_canon.c. */ ++extern char *chroot_canon (const char *chroot, const char *name); ++ ++/* Declared in ldconfig.c. */ ++extern int opt_verbose; ++ ++extern int opt_format; ++ ++/* Prototypes for a few program-wide used functions. */ ++#include ++ ++#endif /* ! _LDCONFIG_H */