git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commit5ca088f1cc4216fe4a11a769ec5d55343a3f978a authorVladimír Čunát <v@cunat.cz> dateMon 3 Feb 2020, 18:07 (7 years ago) parent53349b9
6 files changed+58−50
pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch+19−16 pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch+4−3 pkgs/development/libraries/glibc/fix-x64-abi.patch+6−7 pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch+3−2 pkgs/development/libraries/glibc/nix-locale-archive.patch+19−16 pkgs/development/libraries/glibc/rpcgen-path.patch+7−6
pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch+19−16
@@ -1,6 +1,19 @@
1−--- a/elf/Makefile
2−+++ b/elf/Makefile
3−@@ -589,13 +589,13 @@ $(objpfx)sln: $(sln-modules:%=$(objpfx)%.o)
1+diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c
2+--- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500
3++++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500
4+@@ -51,7 +51,7 @@
5+ #endif
6+
7+ #ifndef LD_SO_CONF
8+-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
9++# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
10+ #endif
11+
12+ /* Get libc version number. */
13+diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile
14+--- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500
15++++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500
16+@@ -559,13 +559,13 @@
417
518 $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
619
@@ -19,19 +32,9 @@
1932
2033 cpp-srcs-left := $(all-rtld-routines:=.os)
2134 lib := rtld
22−--- a/elf/ldconfig.c
23−+++ b/elf/ldconfig.c
24−@@ -51,7 +51,7 @@
25− #endif
26−
27− #ifndef LD_SO_CONF
28−-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
29−+# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
30− #endif
31−
32− /* Get libc version number. */
33−--- a/sysdeps/generic/dl-cache.h
34−+++ b/sysdeps/generic/dl-cache.h
35+diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h
36+--- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500
37++++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500
3538@@ -28,7 +28,7 @@
3639 #endif
3740
pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch+4−3
@@ -1,6 +1,7 @@
1−--- a/elf/rtld.c
2−+++ b/elf/rtld.c
3−@@ -1697,7 +1697,7 @@ ERROR: '%s': cannot process note segment.\n", _dl_argv[0]);
1+diff -ru glibc-2.20-orig/elf/rtld.c glibc-2.20/elf/rtld.c
2+--- glibc-2.20-orig/elf/rtld.c 2014-09-07 10:09:09.000000000 +0200
3++++ glibc-2.20/elf/rtld.c 2014-10-27 11:32:25.203043157 +0100
4+@@ -1513,7 +1513,7 @@
45 open(). So we do this first. If it succeeds we do almost twice
56 the work but this does not matter, since it is not for production
67 use. */
pkgs/development/libraries/glibc/fix-x64-abi.patch+6−7
@@ -1,4 +1,4 @@
1−From d9e6dd5631c8d97fd2d3128317c6352e34bf3ca7 Mon Sep 17 00:00:00 2001
1+From 3288c6da64add3b4561b8c10fff522027caea01c Mon Sep 17 00:00:00 2001
22From: Nicholas Miell <nmiell@gmail.com>
33Date: Sat, 17 Jun 2017 18:21:07 -0700
44Subject: [PATCH] Align the stack on entry to __tls_get_addr()
@@ -17,13 +17,13 @@ engine and available for purchase on Steam.
1717 1 file changed, 4 insertions(+)
1818
1919diff --git a/elf/dl-tls.c b/elf/dl-tls.c
20−index b425d661..b02c2afa 100644
20+index 5aba33b3fa..3f3cb917de 100644
2121--- a/elf/dl-tls.c
2222+++ b/elf/dl-tls.c
23−@@ -818,6 +818,10 @@ rtld_hidden_proto (__tls_get_addr)
23+@@ -827,6 +827,10 @@ rtld_hidden_proto (__tls_get_addr)
2424 rtld_hidden_def (__tls_get_addr)
2525 #endif
26−
26+
2727+#ifdef __x86_64__
2828+/* Old versions of gcc didn't align the stack. */
2929+__attribute__((force_align_arg_pointer))
@@ -31,6 +31,5 @@ index b425d661..b02c2afa 100644
3131 /* The generic dynamic and local dynamic model cannot be used in
3232 statically linked applications. */
3333 void *
34−--
35−2.17.1
36−
34+--
35+2.13.0
pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch+3−2
@@ -1,5 +1,6 @@
1−--- a/sysdeps/unix/confstr.h
2−+++ b/sysdeps/unix/confstr.h
1+diff -ubr glibc-2.17-orig/sysdeps/unix/confstr.h glibc-2.17/sysdeps/unix/confstr.h
2+--- glibc-2.17-orig/sysdeps/unix/confstr.h 2013-06-03 22:01:44.829726968 +0200
3++++ glibc-2.17/sysdeps/unix/confstr.h 2013-06-03 22:04:39.469376740 +0200
34@@ -1 +1 @@
45-#define CS_PATH "/bin:/usr/bin"
56+#define CS_PATH "/run/current-system/sw/bin:/bin:/usr/bin"
pkgs/development/libraries/glibc/nix-locale-archive.patch+19−16
@@ -1,6 +1,7 @@
1−--- a/locale/loadarchive.c
2−+++ b/locale/loadarchive.c
3−@@ -123,6 +123,23 @@ calculate_head_size (const struct locarhead *h)
1+diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c
2+--- glibc-2.27-orig/locale/loadarchive.c 2018-02-01 11:17:18.000000000 -0500
3++++ glibc-2.27/locale/loadarchive.c 2018-02-17 22:32:25.680169462 -0500
4+@@ -123,6 +123,23 @@
45 return MAX (namehash_end, MAX (string_end, locrectab_end));
56 }
67
@@ -24,7 +25,7 @@
2425
2526 /* Find the locale *NAMEP in the locale archive, and return the
2627 internalized data structure for its CATEGORY data. If this locale has
27−@@ -202,7 +219,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
28+@@ -202,7 +219,7 @@
2829 archmapped = &headmap;
2930
3031 /* The archive has never been opened. */
@@ -33,7 +34,7 @@
3334 if (fd < 0)
3435 /* Cannot open the archive, for whatever reason. */
3536 return NULL;
36−@@ -397,8 +414,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
37+@@ -397,8 +414,7 @@
3738 if (fd == -1)
3839 {
3940 struct stat64 st;
@@ -43,13 +44,13 @@
4344 if (fd == -1)
4445 /* Cannot open the archive, for whatever reason. */
4546 return NULL;
46−--- a/locale/programs/locale.c
47−+++ b/locale/programs/locale.c
48−@@ -633,6 +633,24 @@ nameentcmp (const void *a, const void *b)
49− }
47+diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c
48+--- glibc-2.27-orig/locale/programs/locale.c 2018-02-01 11:17:18.000000000 -0500
49++++ glibc-2.27/locale/programs/locale.c 2018-02-17 22:36:39.726293213 -0500
50+@@ -633,6 +633,24 @@
5051
5152
52−+static int
53+ static int
5354+open_locale_archive (void)
5455+{
5556+ int fd = -1;
@@ -67,10 +68,11 @@
6768+}
6869+
6970+
70− static int
71++static int
7172 write_archive_locales (void **all_datap, char *linebuf)
7273 {
73−@@ -645,7 +663,7 @@ write_archive_locales (void **all_datap, char *linebuf)
74+ struct stat64 st;
75+@@ -644,7 +662,7 @@
7476 int fd, ret = 0;
7577 uint32_t cnt;
7678
@@ -79,9 +81,10 @@
7981 if (fd < 0)
8082 return 0;
8183
82−--- a/locale/programs/locarchive.c
83−+++ b/locale/programs/locarchive.c
84−@@ -117,6 +117,22 @@ prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags,
84+diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c
85+--- glibc-2.27-orig/locale/programs/locarchive.c 2018-02-01 11:17:18.000000000 -0500
86++++ glibc-2.27/locale/programs/locarchive.c 2018-02-17 22:40:51.245293975 -0500
87+@@ -117,6 +117,22 @@
8588 }
8689
8790
@@ -104,7 +107,7 @@
104107 static void
105108 create_archive (const char *archivefname, struct locarhandle *ah)
106109 {
107−@@ -578,7 +594,7 @@ open_archive (struct locarhandle *ah, bool readonly)
110+@@ -578,7 +594,7 @@
108111 while (1)
109112 {
110113 /* Open the archive. We must have exclusive write access. */
pkgs/development/libraries/glibc/rpcgen-path.patch+7−6
@@ -1,6 +1,7 @@
1−--- a/sunrpc/rpc_main.c
2−+++ b/sunrpc/rpc_main.c
3−@@ -78,7 +78,7 @@ static const char *cmdname;
1+diff -ru glibc-2.18-orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c
2+--- glibc-2.18-orig/sunrpc/rpc_main.c 2013-08-11 00:52:55.000000000 +0200
3++++ glibc-2.18/sunrpc/rpc_main.c 2013-11-15 12:04:48.041006977 +0100
4+@@ -78,7 +78,7 @@
45
56 static const char *svcclosetime = "120";
67 static int cppDefined; /* explicit path for C preprocessor */
@@ -9,7 +10,7 @@
910 static const char CPPFLAGS[] = "-C";
1011 static char *pathbuf;
1112 static int cpp_pid;
12−@@ -107,7 +107,6 @@ static char *extendfile (const char *file, const char *ext);
13+@@ -107,7 +107,6 @@
1314 static void open_output (const char *infile, const char *outfile);
1415 static void add_warning (void);
1516 static void clear_args (void);
@@ -17,7 +18,7 @@
1718 static void open_input (const char *infile, const char *define);
1819 static int check_nettype (const char *name, const char *list_to_check[]);
1920 static void c_output (const char *infile, const char *define,
20−@@ -322,25 +321,6 @@ clear_args (void)
21+@@ -322,25 +321,6 @@
2122 argcount = FIXEDARGS;
2223 }
2324
@@ -43,7 +44,7 @@
4344 /*
4445 * Open input file with given define for C-preprocessor
4546 */
46−@@ -359,7 +339,6 @@ open_input (const char *infile, const char *define)
47+@@ -359,7 +339,6 @@
4748 switch (cpp_pid)
4849 {
4950 case 0: