glibc maj 2.12.1-1

1 files changed, 55 insertions, 19 deletions

diff --git a/base/glibc/Pkgfile b/base/glibc/Pkgfile
index 4de3c040b..81463549f 100755
--- a/base/glibc/Pkgfile
+++ b/base/glibc/Pkgfile
@@ -4,14 +4,22 @@
 # Packager:thierryn1 at hispeed dot ch
 
 name=glibc
-version=2.11.2
+version=2.12.1
 release=1
-kernelversion=2.6.34
+kernelversion=2.6.36
+
 source=( http://ftp.gnu.org/gnu/glibc/$name-$version.tar.bz2 \
-	http://nutyx.meticul.eu/files/patchs/$name/gcc-4.5.0-glibc-01.patch \
-	http://www.linuxfromscratch.org/patches/lfs/development/glibc-2.11.2-gcc_fix-1.patch \
 	http://www.kernel.org/pub/linux/kernel/v2.6/linux-${kernelversion}.tar.bz2 \
-        http://nutyx.meticul.eu/files/patchs/$name/{nsswitch.conf,ld.so.conf,SUPPORTED}) 
+        http://nutyx.meticul.eu/files/patchs/$name/{nsswitch.conf,ld.so.conf,SUPPORTED} \
+	glibc-2.10-dont-build-timezone.patch
+        glibc-2.10-bz4781.patch
+        glibc-__i686.patch
+        glibc-2.12.1-make-3.82-compatibility.patch
+        glibc-2.12.1-static-shared-getpagesize.patch
+        glibc-2.12.1-but-I-am-an-i686.patch
+        glibc-2.12.1-fix-IPTOS_CLASS-definition.patch
+        glibc-2.12.1-never-expand-origin-when-privileged.patch
+        glibc-2.12.1-require-suid-on-audit.patch) 
 
 
 build() {
@@ -25,28 +33,56 @@ build() {
         cd ..
         # install glibc
         cd $name-$version
-	# patch -Np1 -i ../gcc-4.5.0-glibc-01.patch
+
+	# timezone data is in separate package (tzdata)
+#  	patch -Np1 -i $SRC/glibc-2.10-dont-build-timezone.patch
+
+  	# http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
+  	patch -Np1 -i $SRC/glibc-2.10-bz4781.patch
+
+  	# http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
+  	# http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
+  	patch -Np1 -i $SRC/glibc-__i686.patch
+
+  	# http://sourceware.org/git/?p=glibc.git;a=patch;h=32cf4069
+  	patch -Np1 -i $SRC/glibc-2.12.1-make-3.82-compatibility.patch
+
+  	# http://sourceware.org/bugzilla/show_bug.cgi?id=11929
+  	# using Fedora "fix" as patch in that bug report causes breakages...
+  	patch -Np1 -i $SRC/glibc-2.12.1-static-shared-getpagesize.patch
+  
+  	# fedora "fix" for excess linker optimization on i686
+  	# proper fix will be in binutils-2.21
+  	patch -Np1 -i $SRC/glibc-2.12.1-but-I-am-an-i686.patch
+
+  	# http://www.exploit-db.com/exploits/15274/
+  	# http://sourceware.org/git/?p=glibc.git;a=patch;h=2232b90f (only fedora branch...)
+  	patch -Np1 -i $SRC/glibc-2.12.1-never-expand-origin-when-privileged.patch
+
+  	# http://www.exploit-db.com/exploits/15304/
+  	# http://sourceware.org/git/?p=glibc.git;a=patch;h=8e9f92e9
+  	patch -Np1 -i $SRC/glibc-2.12.1-require-suid-on-audit.patch
+
+  	# http://sources.redhat.com/git/?p=glibc.git;a=patch;h=15bac72b
+  	patch -Np1 -i $SRC/glibc-2.12.1-fix-IPTOS_CLASS-definition.patch
+
+
+
         DL=$(readelf -l /bin/sh | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
-sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \
+	sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \
         scripts/test-installation.pl
-unset DL
-
-sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
-patch -Np1 -i ../glibc-2.11.2-gcc_fix-1.patch
-# sed -i s/utf8/UTF-8/ libio/tst-fgetwc.c
-# sed -i '/tst-fgetws-ENV/ a\
-# tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata' libio/Makefile
+	unset DL
 
-# sed -i -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \
-#         nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+	sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
 
 	mv ../SUPPORTED localedata/
 
 	mkdir -v ../glibc-build
         cd ../glibc-build
-case `uname -m` in
-  i?86) echo "CFLAGS += -march=i486 -mtune=native -O3 -pipe" > configparms ;;
-esac
+
+	case `uname -m` in
+	  i?86) echo "CFLAGS += -march=i486 -mtune=native -O3 -pipe" > configparms ;;
+	esac
 
         ../$name-$version/configure --prefix=/usr \
                 --with-headers=$PKG/usr/include \