From 5ca088f1cc4216fe4a11a769ec5d55343a3f978a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 3 Feb 2020 18:07:49 +0100 Subject: [PATCH] glibc/*.patch: revert no-op changes done in 447edaa3 I suppose the diff of the glibc-upgrade branch is a bit cleaner without including these unnecessary changes. --- .../glibc/dont-use-system-ld-so-cache.patch | 35 ++++++++++--------- .../glibc/dont-use-system-ld-so-preload.patch | 7 ++-- .../libraries/glibc/fix-x64-abi.patch | 13 ++++--- .../glibc/fix_path_attribute_in_getconf.patch | 5 +-- .../libraries/glibc/nix-locale-archive.patch | 35 ++++++++++--------- .../libraries/glibc/rpcgen-path.patch | 13 +++---- 6 files changed, 58 insertions(+), 50 deletions(-) diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch index f45e39525f55..f84b1049adf8 100644 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch +++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch @@ -1,6 +1,19 @@ ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -589,13 +589,13 @@ $(objpfx)sln: $(sln-modules:%=$(objpfx)%.o) +diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c +--- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500 +@@ -51,7 +51,7 @@ + #endif + + #ifndef LD_SO_CONF +-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" ++# define LD_SO_CONF PREFIX "/etc/ld.so.conf" + #endif + + /* Get libc version number. */ +diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile +--- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500 +@@ -559,13 +559,13 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) @@ -19,19 +32,9 @@ cpp-srcs-left := $(all-rtld-routines:=.os) lib := rtld ---- a/elf/ldconfig.c -+++ b/elf/ldconfig.c -@@ -51,7 +51,7 @@ - #endif - - #ifndef LD_SO_CONF --# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" -+# define LD_SO_CONF PREFIX "/etc/ld.so.conf" - #endif - - /* Get libc version number. */ ---- a/sysdeps/generic/dl-cache.h -+++ b/sysdeps/generic/dl-cache.h +diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h +--- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500 @@ -28,7 +28,7 @@ #endif diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch index 69b63a5bcfee..894e2a11cf87 100644 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch +++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch @@ -1,6 +1,7 @@ ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -1697,7 +1697,7 @@ ERROR: '%s': cannot process note segment.\n", _dl_argv[0]); +diff -ru glibc-2.20-orig/elf/rtld.c glibc-2.20/elf/rtld.c +--- glibc-2.20-orig/elf/rtld.c 2014-09-07 10:09:09.000000000 +0200 ++++ glibc-2.20/elf/rtld.c 2014-10-27 11:32:25.203043157 +0100 +@@ -1513,7 +1513,7 @@ open(). So we do this first. If it succeeds we do almost twice the work but this does not matter, since it is not for production use. */ diff --git a/pkgs/development/libraries/glibc/fix-x64-abi.patch b/pkgs/development/libraries/glibc/fix-x64-abi.patch index f5a6d603bf85..1d60dcd7988b 100644 --- a/pkgs/development/libraries/glibc/fix-x64-abi.patch +++ b/pkgs/development/libraries/glibc/fix-x64-abi.patch @@ -1,4 +1,4 @@ -From d9e6dd5631c8d97fd2d3128317c6352e34bf3ca7 Mon Sep 17 00:00:00 2001 +From 3288c6da64add3b4561b8c10fff522027caea01c Mon Sep 17 00:00:00 2001 From: Nicholas Miell Date: Sat, 17 Jun 2017 18:21:07 -0700 Subject: [PATCH] Align the stack on entry to __tls_get_addr() @@ -17,13 +17,13 @@ engine and available for purchase on Steam. 1 file changed, 4 insertions(+) diff --git a/elf/dl-tls.c b/elf/dl-tls.c -index b425d661..b02c2afa 100644 +index 5aba33b3fa..3f3cb917de 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c -@@ -818,6 +818,10 @@ rtld_hidden_proto (__tls_get_addr) +@@ -827,6 +827,10 @@ rtld_hidden_proto (__tls_get_addr) rtld_hidden_def (__tls_get_addr) #endif - + +#ifdef __x86_64__ +/* Old versions of gcc didn't align the stack. */ +__attribute__((force_align_arg_pointer)) @@ -31,6 +31,5 @@ index b425d661..b02c2afa 100644 /* The generic dynamic and local dynamic model cannot be used in statically linked applications. */ void * --- -2.17.1 - +-- +2.13.0 diff --git a/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch b/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch index b13cea4dcb33..714e49db5607 100644 --- a/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch +++ b/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch @@ -1,5 +1,6 @@ ---- a/sysdeps/unix/confstr.h -+++ b/sysdeps/unix/confstr.h +diff -ubr glibc-2.17-orig/sysdeps/unix/confstr.h glibc-2.17/sysdeps/unix/confstr.h +--- glibc-2.17-orig/sysdeps/unix/confstr.h 2013-06-03 22:01:44.829726968 +0200 ++++ glibc-2.17/sysdeps/unix/confstr.h 2013-06-03 22:04:39.469376740 +0200 @@ -1 +1 @@ -#define CS_PATH "/bin:/usr/bin" +#define CS_PATH "/run/current-system/sw/bin:/bin:/usr/bin" diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch index f2feabc36ada..39312951fcf9 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch @@ -1,6 +1,7 @@ ---- a/locale/loadarchive.c -+++ b/locale/loadarchive.c -@@ -123,6 +123,23 @@ calculate_head_size (const struct locarhead *h) +diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c +--- glibc-2.27-orig/locale/loadarchive.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/loadarchive.c 2018-02-17 22:32:25.680169462 -0500 +@@ -123,6 +123,23 @@ return MAX (namehash_end, MAX (string_end, locrectab_end)); } @@ -24,7 +25,7 @@ /* Find the locale *NAMEP in the locale archive, and return the internalized data structure for its CATEGORY data. If this locale has -@@ -202,7 +219,7 @@ _nl_load_locale_from_archive (int category, const char **namep) +@@ -202,7 +219,7 @@ archmapped = &headmap; /* The archive has never been opened. */ @@ -33,7 +34,7 @@ if (fd < 0) /* Cannot open the archive, for whatever reason. */ return NULL; -@@ -397,8 +414,7 @@ _nl_load_locale_from_archive (int category, const char **namep) +@@ -397,8 +414,7 @@ if (fd == -1) { struct stat64 st; @@ -43,13 +44,13 @@ if (fd == -1) /* Cannot open the archive, for whatever reason. */ return NULL; ---- a/locale/programs/locale.c -+++ b/locale/programs/locale.c -@@ -633,6 +633,24 @@ nameentcmp (const void *a, const void *b) - } +diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c +--- glibc-2.27-orig/locale/programs/locale.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/programs/locale.c 2018-02-17 22:36:39.726293213 -0500 +@@ -633,6 +633,24 @@ -+static int + static int +open_locale_archive (void) +{ + int fd = -1; @@ -67,10 +68,11 @@ +} + + - static int ++static int write_archive_locales (void **all_datap, char *linebuf) { -@@ -645,7 +663,7 @@ write_archive_locales (void **all_datap, char *linebuf) + struct stat64 st; +@@ -644,7 +662,7 @@ int fd, ret = 0; uint32_t cnt; @@ -79,9 +81,10 @@ if (fd < 0) return 0; ---- a/locale/programs/locarchive.c -+++ b/locale/programs/locarchive.c -@@ -117,6 +117,22 @@ prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags, +diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c +--- glibc-2.27-orig/locale/programs/locarchive.c 2018-02-01 11:17:18.000000000 -0500 ++++ glibc-2.27/locale/programs/locarchive.c 2018-02-17 22:40:51.245293975 -0500 +@@ -117,6 +117,22 @@ } @@ -104,7 +107,7 @@ static void create_archive (const char *archivefname, struct locarhandle *ah) { -@@ -578,7 +594,7 @@ open_archive (struct locarhandle *ah, bool readonly) +@@ -578,7 +594,7 @@ while (1) { /* Open the archive. We must have exclusive write access. */ diff --git a/pkgs/development/libraries/glibc/rpcgen-path.patch b/pkgs/development/libraries/glibc/rpcgen-path.patch index 4f427879f241..3349449d9163 100644 --- a/pkgs/development/libraries/glibc/rpcgen-path.patch +++ b/pkgs/development/libraries/glibc/rpcgen-path.patch @@ -1,6 +1,7 @@ ---- a/sunrpc/rpc_main.c -+++ b/sunrpc/rpc_main.c -@@ -78,7 +78,7 @@ static const char *cmdname; +diff -ru glibc-2.18-orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c +--- glibc-2.18-orig/sunrpc/rpc_main.c 2013-08-11 00:52:55.000000000 +0200 ++++ glibc-2.18/sunrpc/rpc_main.c 2013-11-15 12:04:48.041006977 +0100 +@@ -78,7 +78,7 @@ static const char *svcclosetime = "120"; static int cppDefined; /* explicit path for C preprocessor */ @@ -9,7 +10,7 @@ static const char CPPFLAGS[] = "-C"; static char *pathbuf; static int cpp_pid; -@@ -107,7 +107,6 @@ static char *extendfile (const char *file, const char *ext); +@@ -107,7 +107,6 @@ static void open_output (const char *infile, const char *outfile); static void add_warning (void); static void clear_args (void); @@ -17,7 +18,7 @@ static void open_input (const char *infile, const char *define); static int check_nettype (const char *name, const char *list_to_check[]); static void c_output (const char *infile, const char *define, -@@ -322,25 +321,6 @@ clear_args (void) +@@ -322,25 +321,6 @@ argcount = FIXEDARGS; } @@ -43,7 +44,7 @@ /* * Open input file with given define for C-preprocessor */ -@@ -359,7 +339,6 @@ open_input (const char *infile, const char *define) +@@ -359,7 +339,6 @@ switch (cpp_pid) { case 0: