From f81885904c1cf773620a7cd5472fea7205362a82 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Mon, 9 Aug 2010 22:56:41 +0200 Subject: [PATCH] glibc: updated to 2.12.1. --- glibc/.footprint | 82 +++++++++++++----------- glibc/.md5sum | 7 +- glibc/Optimize-__getpagesize-a-bit.patch | 63 ++++++++++++++++++ glibc/Pkgfile | 11 +++- glibc/glibc-fedora_i686.patch | 21 +++--- 5 files changed, 129 insertions(+), 55 deletions(-) create mode 100644 glibc/Optimize-__getpagesize-a-bit.patch diff --git a/glibc/.footprint b/glibc/.footprint index cdd0073a..6ab7468d 100644 --- a/glibc/.footprint +++ b/glibc/.footprint @@ -9,49 +9,49 @@ lrwxrwxrwx root/root etc/localtime -> ../usr/share/zoneinfo/UTC -rw-r--r-- root/root etc/resolv.conf -rw-r--r-- root/root etc/rpc drwxr-xr-x root/root lib/ --rwxr-xr-x root/root lib/ld-2.11.2.so -lrwxrwxrwx root/root lib/ld-linux.so.2 -> ld-2.11.2.so --rwxr-xr-x root/root lib/libBrokenLocale-2.11.2.so -lrwxrwxrwx root/root lib/libBrokenLocale.so.1 -> libBrokenLocale-2.11.2.so +-rwxr-xr-x root/root lib/ld-2.12.1.so +lrwxrwxrwx root/root lib/ld-linux.so.2 -> ld-2.12.1.so +-rwxr-xr-x root/root lib/libBrokenLocale-2.12.1.so +lrwxrwxrwx root/root lib/libBrokenLocale.so.1 -> libBrokenLocale-2.12.1.so -rwxr-xr-x root/root lib/libSegFault.so --rwxr-xr-x root/root lib/libanl-2.11.2.so -lrwxrwxrwx root/root lib/libanl.so.1 -> libanl-2.11.2.so --rwxr-xr-x root/root lib/libc-2.11.2.so -lrwxrwxrwx root/root lib/libc.so.6 -> libc-2.11.2.so --rwxr-xr-x root/root lib/libcidn-2.11.2.so -lrwxrwxrwx root/root lib/libcidn.so.1 -> libcidn-2.11.2.so --rwxr-xr-x root/root lib/libcrypt-2.11.2.so -lrwxrwxrwx root/root lib/libcrypt.so.1 -> libcrypt-2.11.2.so --rwxr-xr-x root/root lib/libdl-2.11.2.so -lrwxrwxrwx root/root lib/libdl.so.2 -> libdl-2.11.2.so --rwxr-xr-x root/root lib/libm-2.11.2.so -lrwxrwxrwx root/root lib/libm.so.6 -> libm-2.11.2.so +-rwxr-xr-x root/root lib/libanl-2.12.1.so +lrwxrwxrwx root/root lib/libanl.so.1 -> libanl-2.12.1.so +-rwxr-xr-x root/root lib/libc-2.12.1.so +lrwxrwxrwx root/root lib/libc.so.6 -> libc-2.12.1.so +-rwxr-xr-x root/root lib/libcidn-2.12.1.so +lrwxrwxrwx root/root lib/libcidn.so.1 -> libcidn-2.12.1.so +-rwxr-xr-x root/root lib/libcrypt-2.12.1.so +lrwxrwxrwx root/root lib/libcrypt.so.1 -> libcrypt-2.12.1.so +-rwxr-xr-x root/root lib/libdl-2.12.1.so +lrwxrwxrwx root/root lib/libdl.so.2 -> libdl-2.12.1.so +-rwxr-xr-x root/root lib/libm-2.12.1.so +lrwxrwxrwx root/root lib/libm.so.6 -> libm-2.12.1.so -rwxr-xr-x root/root lib/libmemusage.so --rwxr-xr-x root/root lib/libnsl-2.11.2.so -lrwxrwxrwx root/root lib/libnsl.so.1 -> libnsl-2.11.2.so --rwxr-xr-x root/root lib/libnss_compat-2.11.2.so -lrwxrwxrwx root/root lib/libnss_compat.so.2 -> libnss_compat-2.11.2.so --rwxr-xr-x root/root lib/libnss_dns-2.11.2.so -lrwxrwxrwx root/root lib/libnss_dns.so.2 -> libnss_dns-2.11.2.so --rwxr-xr-x root/root lib/libnss_files-2.11.2.so -lrwxrwxrwx root/root lib/libnss_files.so.2 -> libnss_files-2.11.2.so --rwxr-xr-x root/root lib/libnss_hesiod-2.11.2.so -lrwxrwxrwx root/root lib/libnss_hesiod.so.2 -> libnss_hesiod-2.11.2.so --rwxr-xr-x root/root lib/libnss_nis-2.11.2.so -lrwxrwxrwx root/root lib/libnss_nis.so.2 -> libnss_nis-2.11.2.so --rwxr-xr-x root/root lib/libnss_nisplus-2.11.2.so -lrwxrwxrwx root/root lib/libnss_nisplus.so.2 -> libnss_nisplus-2.11.2.so +-rwxr-xr-x root/root lib/libnsl-2.12.1.so +lrwxrwxrwx root/root lib/libnsl.so.1 -> libnsl-2.12.1.so +-rwxr-xr-x root/root lib/libnss_compat-2.12.1.so +lrwxrwxrwx root/root lib/libnss_compat.so.2 -> libnss_compat-2.12.1.so +-rwxr-xr-x root/root lib/libnss_dns-2.12.1.so +lrwxrwxrwx root/root lib/libnss_dns.so.2 -> libnss_dns-2.12.1.so +-rwxr-xr-x root/root lib/libnss_files-2.12.1.so +lrwxrwxrwx root/root lib/libnss_files.so.2 -> libnss_files-2.12.1.so +-rwxr-xr-x root/root lib/libnss_hesiod-2.12.1.so +lrwxrwxrwx root/root lib/libnss_hesiod.so.2 -> libnss_hesiod-2.12.1.so +-rwxr-xr-x root/root lib/libnss_nis-2.12.1.so +lrwxrwxrwx root/root lib/libnss_nis.so.2 -> libnss_nis-2.12.1.so +-rwxr-xr-x root/root lib/libnss_nisplus-2.12.1.so +lrwxrwxrwx root/root lib/libnss_nisplus.so.2 -> libnss_nisplus-2.12.1.so -rwxr-xr-x root/root lib/libpcprofile.so --rwxr-xr-x root/root lib/libpthread-2.11.2.so -lrwxrwxrwx root/root lib/libpthread.so.0 -> libpthread-2.11.2.so --rwxr-xr-x root/root lib/libresolv-2.11.2.so -lrwxrwxrwx root/root lib/libresolv.so.2 -> libresolv-2.11.2.so --rwxr-xr-x root/root lib/librt-2.11.2.so -lrwxrwxrwx root/root lib/librt.so.1 -> librt-2.11.2.so +-rwxr-xr-x root/root lib/libpthread-2.12.1.so +lrwxrwxrwx root/root lib/libpthread.so.0 -> libpthread-2.12.1.so +-rwxr-xr-x root/root lib/libresolv-2.12.1.so +lrwxrwxrwx root/root lib/libresolv.so.2 -> libresolv-2.12.1.so +-rwxr-xr-x root/root lib/librt-2.12.1.so +lrwxrwxrwx root/root lib/librt.so.1 -> librt-2.12.1.so -rwxr-xr-x root/root lib/libthread_db-1.0.so lrwxrwxrwx root/root lib/libthread_db.so.1 -> libthread_db-1.0.so --rwxr-xr-x root/root lib/libutil-2.11.2.so -lrwxrwxrwx root/root lib/libutil.so.1 -> libutil-2.11.2.so +-rwxr-xr-x root/root lib/libutil-2.12.1.so +lrwxrwxrwx root/root lib/libutil.so.1 -> libutil-2.12.1.so drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/ldconfig -rwxr-xr-x root/root sbin/sln @@ -498,6 +498,7 @@ drwxr-xr-x root/root usr/include/linux/hdlc/ -rw-r--r-- root/root usr/include/linux/if_tun.h -rw-r--r-- root/root usr/include/linux/if_tunnel.h -rw-r--r-- root/root usr/include/linux/if_vlan.h +-rw-r--r-- root/root usr/include/linux/if_x25.h -rw-r--r-- root/root usr/include/linux/igmp.h -rw-r--r-- root/root usr/include/linux/in.h -rw-r--r-- root/root usr/include/linux/in6.h @@ -595,6 +596,7 @@ drwxr-xr-x root/root usr/include/linux/netfilter/ -rw-r--r-- root/root usr/include/linux/netfilter/xt_SECMARK.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_TCPMSS.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_TCPOPTSTRIP.h +-rw-r--r-- root/root usr/include/linux/netfilter/xt_TEE.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_TPROXY.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_cluster.h -rw-r--r-- root/root usr/include/linux/netfilter/xt_comment.h @@ -819,6 +821,7 @@ drwxr-xr-x root/root usr/include/linux/tc_ematch/ drwxr-xr-x root/root usr/include/linux/usb/ -rw-r--r-- root/root usr/include/linux/usb/audio.h -rw-r--r-- root/root usr/include/linux/usb/cdc.h +-rw-r--r-- root/root usr/include/linux/usb/ch11.h -rw-r--r-- root/root usr/include/linux/usb/ch9.h -rw-r--r-- root/root usr/include/linux/usb/g_printer.h -rw-r--r-- root/root usr/include/linux/usb/gadgetfs.h @@ -1731,6 +1734,7 @@ drwxr-xr-x root/root usr/share/i18n/locales/ -rw-r--r-- root/root usr/share/i18n/locales/crh_UA -rw-r--r-- root/root usr/share/i18n/locales/cs_CZ -rw-r--r-- root/root usr/share/i18n/locales/csb_PL +-rw-r--r-- root/root usr/share/i18n/locales/cv_RU -rw-r--r-- root/root usr/share/i18n/locales/cy_GB -rw-r--r-- root/root usr/share/i18n/locales/da_DK -rw-r--r-- root/root usr/share/i18n/locales/de_AT @@ -1844,6 +1848,7 @@ drwxr-xr-x root/root usr/share/i18n/locales/ -rw-r--r-- root/root usr/share/i18n/locales/km_KH -rw-r--r-- root/root usr/share/i18n/locales/kn_IN -rw-r--r-- root/root usr/share/i18n/locales/ko_KR +-rw-r--r-- root/root usr/share/i18n/locales/kok_IN -rw-r--r-- root/root usr/share/i18n/locales/ks_IN -rw-r--r-- root/root usr/share/i18n/locales/ks_IN@devanagari -rw-r--r-- root/root usr/share/i18n/locales/ku_TR @@ -1909,6 +1914,7 @@ drwxr-xr-x root/root usr/share/i18n/locales/ -rw-r--r-- root/root usr/share/i18n/locales/so_KE -rw-r--r-- root/root usr/share/i18n/locales/so_SO -rw-r--r-- root/root usr/share/i18n/locales/sq_AL +-rw-r--r-- root/root usr/share/i18n/locales/sq_MK -rw-r--r-- root/root usr/share/i18n/locales/sr_ME -rw-r--r-- root/root usr/share/i18n/locales/sr_RS -rw-r--r-- root/root usr/share/i18n/locales/sr_RS@latin diff --git a/glibc/.md5sum b/glibc/.md5sum index 168f3c24..e0d1f0c8 100644 --- a/glibc/.md5sum +++ b/glibc/.md5sum @@ -1,8 +1,9 @@ -4af7b09a785fb683097a7f92a546b885 glibc-2.11.2.tar.xz -458a43cf62e4d5d9c6270e4f9b73c758 glibc-fedora_i686.patch +6c8b3f5c56d80eba760cc896e7462b0e Optimize-__getpagesize-a-bit.patch +4802b783766b5b487c601a19b5ce35f1 glibc-2.12.1.tar.xz +6144e4b4074fc01deea1549de4920df1 glibc-fedora_i686.patch 96156bec8e05de67384dc93e72bdc313 host.conf fbbc215a9b15ba4846f326cc88108057 hosts -2def7decd65d3c7eb135b84649c2c2a9 kernel-headers-2.6.34.tar.xz +34fe6c5433cd6cda30123b7bb73ef378 kernel-headers-2.6.35.tar.xz f7fefce570a3c776e26e778c5e401490 ld.so.conf 75931315bf9bc9be15a5e25e4ddd5f0d nsswitch.conf acf9daad1ee85de5efd3543965596a63 resolv.conf diff --git a/glibc/Optimize-__getpagesize-a-bit.patch b/glibc/Optimize-__getpagesize-a-bit.patch new file mode 100644 index 00000000..38aa4b28 --- /dev/null +++ b/glibc/Optimize-__getpagesize-a-bit.patch @@ -0,0 +1,63 @@ +This is the important part of 8f4a5048eea6536ee85c0f2670adbb97d71e427d. +Unfortunately the assertion fails in statically linked binaries. + +diff --git a/sysdeps/unix/sysv/linux/getpagesize.c b/sysdeps/unix/sysv/linux/getpagesize.c +index 6d03b3b..0866079 100644 +--- a/sysdeps/unix/sysv/linux/getpagesize.c ++++ b/sysdeps/unix/sysv/linux/getpagesize.c +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1991,1992,1995-1997,2000,2002,2004 ++/* Copyright (C) 1991,1992,1995-1997,2000,2002,2004,2010 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -17,30 +17,37 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#include + #include + #include + + #include ++#include + + /* Return the system page size. */ + int + __getpagesize () + { ++#ifdef __ASSUME_AT_PAGESIZE ++ assert (GLRO(dl_pagesize) != 0); ++ return GLRO(dl_pagesize); ++#else + if (GLRO(dl_pagesize) != 0) + return GLRO(dl_pagesize); + +-#ifdef EXEC_PAGESIZE ++# ifdef EXEC_PAGESIZE + return EXEC_PAGESIZE; +-#else /* No EXEC_PAGESIZE. */ +-#ifdef NBPG +-#ifndef CLSIZE +-#define CLSIZE 1 +-#endif /* No CLSIZE. */ ++# else /* No EXEC_PAGESIZE. */ ++# ifdef NBPG ++# ifndef CLSIZE ++# define CLSIZE 1 ++# endif /* No CLSIZE. */ + return NBPG * CLSIZE; +-#else /* No NBPG. */ ++# else /* No NBPG. */ + return NBPC; +-#endif /* NBPG. */ +-#endif /* EXEC_PAGESIZE. */ ++# endif /* NBPG. */ ++# endif /* EXEC_PAGESIZE. */ ++#endif + } + libc_hidden_def (__getpagesize) + weak_alias (__getpagesize, getpagesize) +-- +1.7.2.1 + diff --git a/glibc/Pkgfile b/glibc/Pkgfile index 3eb0c11e..635e81a1 100644 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -3,20 +3,24 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=glibc -version=2.11.2 +version=2.12.1 release=1 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz - http://crux.nu/files/distfiles/kernel-headers-2.6.34.tar.xz + http://crux.nu/files/distfiles/kernel-headers-2.6.35.tar.xz glibc-fedora_i686.patch + Optimize-__getpagesize-a-bit.patch hosts resolv.conf nsswitch.conf host.conf ld.so.conf) build() { # install kernel headers mkdir $PKG/usr/ - cp -r kernel-headers-2.6.34/include $PKG/usr + cp -r kernel-headers-2.6.35/include $PKG/usr chown root:root $PKG/usr patch -p1 -d $name-$version -i $SRC/$name-fedora_i686.patch + patch -R -p1 -d $name-$version -i $SRC/Optimize-__getpagesize-a-bit.patch + + sed -i '/^all-subdirs/,+6s/manual//' $name-$version/Makeconfig mkdir build cd build @@ -35,6 +39,7 @@ build() { cp $SRC/{hosts,resolv.conf,nsswitch.conf,host.conf,ld.so.conf} $PKG/etc ln -sf ../usr/share/zoneinfo/UTC $PKG/etc/localtime mkdir -p $PKG/etc/ld.so.conf.d $PKG/usr/lib/locale + touch $PKG/etc/ld.so.cache rm -rf $PKG/usr/share/{info,locale} } diff --git a/glibc/glibc-fedora_i686.patch b/glibc/glibc-fedora_i686.patch index 5bad0cd7..192ea578 100644 --- a/glibc/glibc-fedora_i686.patch +++ b/glibc/glibc-fedora_i686.patch @@ -1,4 +1,5 @@ # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=3aba072d90b500e76f7f1cb06c659fb3cf02c6b8 +# 2010-08-03: reapplied for glibc 2.12.1 commit 3aba072d90b500e76f7f1cb06c659fb3cf02c6b8 Author: Jakub Jelinek @@ -6,16 +7,15 @@ Date: Wed Jul 22 13:23:08 2009 +0200 Undefine __i686 on x86. -diff --git a/Makeconfig b/Makeconfig -index 9f134cc..2ebe184 100644 ---- a/Makeconfig -+++ b/Makeconfig -@@ -780,12 +780,12 @@ endif +diff -Nru glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig +--- glibc-2.12.1.orig/Makeconfig 2010-07-27 13:34:39.000000000 +0200 ++++ glibc-2.12.1/Makeconfig 2010-08-03 23:10:22.519954554 +0200 +@@ -789,12 +789,12 @@ # The assembler can generate debug information too. ifndef ASFLAGS ifeq ($(have-cpp-asm-debuginfo),yes) --ASFLAGS := $(filter -g%,$(CFLAGS)) -+ASFLAGS = $(filter -g%,$(CFLAGS)) +-ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS)) ++ASFLAGS = $(filter -g% -fdebug-prefix-map=%,$(CFLAGS)) else -ASFLAGS := +ASFLAGS = @@ -26,10 +26,9 @@ index 9f134cc..2ebe184 100644 ifndef BUILD_CC BUILD_CC = $(CC) -diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile -index 5f0d9be..8cac74a 100644 ---- a/sysdeps/i386/Makefile -+++ b/sysdeps/i386/Makefile +diff -Nru glibc-2.12.1.orig/sysdeps/i386/Makefile glibc-2.12.1/sysdeps/i386/Makefile +--- glibc-2.12.1.orig/sysdeps/i386/Makefile 2010-07-27 13:34:39.000000000 +0200 ++++ glibc-2.12.1/sysdeps/i386/Makefile 2010-08-03 23:12:02.319954272 +0200 @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX