glibc-32: update to 2.21

3 files changed, 55 insertions, 56 deletions

diff --git a/glibc-32/.footprint b/glibc-32/.footprint
index 63d1706c..34648be8 100644
--- a/glibc-32/.footprint
+++ b/glibc-32/.footprint
@@ -4,51 +4,51 @@ drwxr-xr-x	root/root	etc/ld.so.conf.d/
 drwxr-xr-x	root/root	lib/
 lrwxrwxrwx	root/root	lib/ld-linux.so.2 -> /lib32/ld-linux.so.2
 drwxr-xr-x	root/root	lib32/
--rwxr-xr-x	root/root	lib32/ld-2.19.so
-lrwxrwxrwx	root/root	lib32/ld-linux.so.2 -> ld-2.19.so
--rwxr-xr-x	root/root	lib32/libBrokenLocale-2.19.so
-lrwxrwxrwx	root/root	lib32/libBrokenLocale.so.1 -> libBrokenLocale-2.19.so
+-rwxr-xr-x	root/root	lib32/ld-2.21.so
+lrwxrwxrwx	root/root	lib32/ld-linux.so.2 -> ld-2.21.so
+-rwxr-xr-x	root/root	lib32/libBrokenLocale-2.21.so
+lrwxrwxrwx	root/root	lib32/libBrokenLocale.so.1 -> libBrokenLocale-2.21.so
 -rwxr-xr-x	root/root	lib32/libSegFault.so
--rwxr-xr-x	root/root	lib32/libanl-2.19.so
-lrwxrwxrwx	root/root	lib32/libanl.so.1 -> libanl-2.19.so
--rwxr-xr-x	root/root	lib32/libc-2.19.so
-lrwxrwxrwx	root/root	lib32/libc.so.6 -> libc-2.19.so
--rwxr-xr-x	root/root	lib32/libcidn-2.19.so
-lrwxrwxrwx	root/root	lib32/libcidn.so.1 -> libcidn-2.19.so
--rwxr-xr-x	root/root	lib32/libcrypt-2.19.so
-lrwxrwxrwx	root/root	lib32/libcrypt.so.1 -> libcrypt-2.19.so
--rwxr-xr-x	root/root	lib32/libdl-2.19.so
-lrwxrwxrwx	root/root	lib32/libdl.so.2 -> libdl-2.19.so
--rwxr-xr-x	root/root	lib32/libm-2.19.so
-lrwxrwxrwx	root/root	lib32/libm.so.6 -> libm-2.19.so
+-rwxr-xr-x	root/root	lib32/libanl-2.21.so
+lrwxrwxrwx	root/root	lib32/libanl.so.1 -> libanl-2.21.so
+-rwxr-xr-x	root/root	lib32/libc-2.21.so
+lrwxrwxrwx	root/root	lib32/libc.so.6 -> libc-2.21.so
+-rwxr-xr-x	root/root	lib32/libcidn-2.21.so
+lrwxrwxrwx	root/root	lib32/libcidn.so.1 -> libcidn-2.21.so
+-rwxr-xr-x	root/root	lib32/libcrypt-2.21.so
+lrwxrwxrwx	root/root	lib32/libcrypt.so.1 -> libcrypt-2.21.so
+-rwxr-xr-x	root/root	lib32/libdl-2.21.so
+lrwxrwxrwx	root/root	lib32/libdl.so.2 -> libdl-2.21.so
+-rwxr-xr-x	root/root	lib32/libm-2.21.so
+lrwxrwxrwx	root/root	lib32/libm.so.6 -> libm-2.21.so
 -rwxr-xr-x	root/root	lib32/libmemusage.so
--rwxr-xr-x	root/root	lib32/libnsl-2.19.so
-lrwxrwxrwx	root/root	lib32/libnsl.so.1 -> libnsl-2.19.so
--rwxr-xr-x	root/root	lib32/libnss_compat-2.19.so
-lrwxrwxrwx	root/root	lib32/libnss_compat.so.2 -> libnss_compat-2.19.so
--rwxr-xr-x	root/root	lib32/libnss_db-2.19.so
-lrwxrwxrwx	root/root	lib32/libnss_db.so.2 -> libnss_db-2.19.so
--rwxr-xr-x	root/root	lib32/libnss_dns-2.19.so
-lrwxrwxrwx	root/root	lib32/libnss_dns.so.2 -> libnss_dns-2.19.so
--rwxr-xr-x	root/root	lib32/libnss_files-2.19.so
-lrwxrwxrwx	root/root	lib32/libnss_files.so.2 -> libnss_files-2.19.so
--rwxr-xr-x	root/root	lib32/libnss_hesiod-2.19.so
-lrwxrwxrwx	root/root	lib32/libnss_hesiod.so.2 -> libnss_hesiod-2.19.so
--rwxr-xr-x	root/root	lib32/libnss_nis-2.19.so
-lrwxrwxrwx	root/root	lib32/libnss_nis.so.2 -> libnss_nis-2.19.so
--rwxr-xr-x	root/root	lib32/libnss_nisplus-2.19.so
-lrwxrwxrwx	root/root	lib32/libnss_nisplus.so.2 -> libnss_nisplus-2.19.so
+-rwxr-xr-x	root/root	lib32/libnsl-2.21.so
+lrwxrwxrwx	root/root	lib32/libnsl.so.1 -> libnsl-2.21.so
+-rwxr-xr-x	root/root	lib32/libnss_compat-2.21.so
+lrwxrwxrwx	root/root	lib32/libnss_compat.so.2 -> libnss_compat-2.21.so
+-rwxr-xr-x	root/root	lib32/libnss_db-2.21.so
+lrwxrwxrwx	root/root	lib32/libnss_db.so.2 -> libnss_db-2.21.so
+-rwxr-xr-x	root/root	lib32/libnss_dns-2.21.so
+lrwxrwxrwx	root/root	lib32/libnss_dns.so.2 -> libnss_dns-2.21.so
+-rwxr-xr-x	root/root	lib32/libnss_files-2.21.so
+lrwxrwxrwx	root/root	lib32/libnss_files.so.2 -> libnss_files-2.21.so
+-rwxr-xr-x	root/root	lib32/libnss_hesiod-2.21.so
+lrwxrwxrwx	root/root	lib32/libnss_hesiod.so.2 -> libnss_hesiod-2.21.so
+-rwxr-xr-x	root/root	lib32/libnss_nis-2.21.so
+lrwxrwxrwx	root/root	lib32/libnss_nis.so.2 -> libnss_nis-2.21.so
+-rwxr-xr-x	root/root	lib32/libnss_nisplus-2.21.so
+lrwxrwxrwx	root/root	lib32/libnss_nisplus.so.2 -> libnss_nisplus-2.21.so
 -rwxr-xr-x	root/root	lib32/libpcprofile.so
--rwxr-xr-x	root/root	lib32/libpthread-2.19.so
-lrwxrwxrwx	root/root	lib32/libpthread.so.0 -> libpthread-2.19.so
--rwxr-xr-x	root/root	lib32/libresolv-2.19.so
-lrwxrwxrwx	root/root	lib32/libresolv.so.2 -> libresolv-2.19.so
--rwxr-xr-x	root/root	lib32/librt-2.19.so
-lrwxrwxrwx	root/root	lib32/librt.so.1 -> librt-2.19.so
+-rwxr-xr-x	root/root	lib32/libpthread-2.21.so
+lrwxrwxrwx	root/root	lib32/libpthread.so.0 -> libpthread-2.21.so
+-rwxr-xr-x	root/root	lib32/libresolv-2.21.so
+lrwxrwxrwx	root/root	lib32/libresolv.so.2 -> libresolv-2.21.so
+-rwxr-xr-x	root/root	lib32/librt-2.21.so
+lrwxrwxrwx	root/root	lib32/librt.so.1 -> librt-2.21.so
 -rwxr-xr-x	root/root	lib32/libthread_db-1.0.so
 lrwxrwxrwx	root/root	lib32/libthread_db.so.1 -> libthread_db-1.0.so
--rwxr-xr-x	root/root	lib32/libutil-2.19.so
-lrwxrwxrwx	root/root	lib32/libutil.so.1 -> libutil-2.19.so
+-rwxr-xr-x	root/root	lib32/libutil-2.21.so
+lrwxrwxrwx	root/root	lib32/libutil.so.1 -> libutil-2.21.so
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/gnu/
diff --git a/glibc-32/.md5sum b/glibc-32/.md5sum
index 89d507c9..ade276e4 100644
--- a/glibc-32/.md5sum
+++ b/glibc-32/.md5sum
@@ -1,9 +1,7 @@
-1d06c7a6084db7710bec7215143c5799  CVE-2014-0475.patch
-e26b8cc666b162f999404b03970f14e4  glibc-2.19.tar.xz
-c3f3499e0a6272cba7b6e46bfe6bbcea  glibc-32-2.19-multilib-dirs.patch
+9cb398828e8f84f57d1f7d5588cf40cd  glibc-2.21.tar.xz
 96156bec8e05de67384dc93e72bdc313  host.conf
 fbbc215a9b15ba4846f326cc88108057  hosts
-2297992bd1eb0d62211effafd84b6454  kernel-headers-3.12.tar.bz2
+87bb2a93d7887505a39fd65a2ee86b8e  kernel-headers-4.1.tar.xz
 f7fefce570a3c776e26e778c5e401490  ld.so.conf
 a8f4549c716cd37244fbf1ed059497f8  lib32.conf
 75931315bf9bc9be15a5e25e4ddd5f0d  nsswitch.conf
diff --git a/glibc-32/Pkgfile b/glibc-32/Pkgfile
index 10feaaff..96a79092 100644
--- a/glibc-32/Pkgfile
+++ b/glibc-32/Pkgfile
@@ -3,36 +3,37 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=glibc-32
-version=2.19
-release=2
+version=2.21
+release=1
 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
-	http://crux.nu/files/distfiles/kernel-headers-3.12.tar.bz2 \
-	$name-$version-multilib-dirs.patch
-	CVE-2014-0475.patch \
+	http://crux.nu/files/distfiles/kernel-headers-4.1.tar.xz \
 	hosts resolv.conf nsswitch.conf host.conf ld.so.conf \
 	lib32.conf) 
 
 build() {
 	# install kernel headers
 	mkdir $PKG/usr/
-	cp -r kernel-headers-3.12/include $PKG/usr
+	cp -r kernel-headers-4.1/include $PKG/usr
 	chown root:root $PKG/usr
 
-	patch -p1 -d glibc-$version -i $SRC/$name-$version-multilib-dirs.patch
-	patch -p1 -d glibc-$version -i $SRC/CVE-2014-0475.patch
-
 	mkdir build
 	cd build
-	CC="${CC:-gcc} -m32" ../glibc-$version/configure --prefix=/usr \
+
+	export libc_cv_slibdir=/lib32
+	export CC="${CC:-gcc} -m32"
+
+	../glibc-$version/configure --prefix=/usr \
 		--libdir=/usr/lib32 \
 		--libexecdir=/usr/lib32 \
 		--with-headers=$PKG/usr/include \
-		--enable-kernel=3.10 \
+		--enable-kernel=3.12 \
 		--enable-add-ons \
 		--disable-profile \
 		--without-gd \
 		--enable-obsolete-rpc \
-		--enable-multi-arch i686-pc-linux-gnu
+		--enable-multi-arch \
+		i686-pc-linux-gnu
+
 	make 
 	#make check
 	make install_root=$PKG install