pyrox.dev
lol
glibc: update 2.20 -> 2.21, including security fixes
Fixes #6578.
https://sourceware.org/ml/libc-alpha/2015-02/msg00119.html
- I had to disable one warning-error type.
- One of our patches needed modification - it seemed that just the context
changed without affecting the purpose of the patch.
+9
-7
+4
-3
pkgs/development/libraries/glibc/common.nix
+4
-3
pkgs/development/libraries/glibc/common.nix
···
13
13
14
14
let
15
15
16
-
version = "2.20";
16
+
version = "2.21";
17
17
18
18
in
19
19
···
127
127
# I.e. when gcc is compiled with --with-arch=i686, then the
128
128
# preprocessor symbol `__i686' will be defined to `1'. This causes
129
129
# the symbol __i686.get_pc_thunk.dx to be mangled.
130
-
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686";
130
+
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"
131
+
+ " -Wno-error=strict-prototypes";
131
132
}
132
133
133
134
# Remove the `gccCross' attribute so that the *native* glibc store path
···
150
151
}
151
152
else fetchurl {
152
153
url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
153
-
sha256 = "1g6ysvk15arpi7c1f1fpx5slgfr2k3dqd5xr0yvijajp1m0xxq9p";
154
+
sha256 = "0f4prv4c0fcpi85wv4028wqxn075197gwxhgf0vp571fiw2pi3wd";
154
155
};
155
156
156
157
# Remove absolute paths from `configure' & co.; build out-of-tree.
+5
-4
pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch
+5
-4
pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch
···
15
15
+++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400
16
16
@@ -415,12 +415,12 @@
17
17
18
-
$(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o)
18
+
$(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
19
19
20
20
-SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
21
21
-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
22
22
+PREFIX-FLAGS := -D'PREFIX="$(prefix)"'
23
23
+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \
24
-
-D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
24
+
-D'SLIBDIR="$(slibdir)"'
25
+
libof-ldconfig = ldconfig
25
26
-CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
26
27
-CFLAGS-cache.c = $(SYSCONF-FLAGS)
27
28
-CFLAGS-rtld.c = $(SYSCONF-FLAGS)
···
29
30
+CFLAGS-cache.c = $(PREFIX-FLAGS)
30
31
+CFLAGS-rtld.c = $(PREFIX-FLAGS)
31
32
32
-
CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
33
-
-DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld)
33
+
cpp-srcs-left := $(all-rtld-routines:=.os)
34
+
lib := rtld
34
35
diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h
35
36
--- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400
36
37
+++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400