r772 - crux-2.2/ports/core/glibc
Author: sip Date: 2006-02-23 18:31:48 +0100 (Thu, 23 Feb 2006) New Revision: 772 Added: crux-2.2/ports/core/glibc/glibc-2.3.6-kernelheaders.patch crux-2.2/ports/core/glibc/kd.h Removed: crux-2.2/ports/core/glibc/glibc-2.3.5-execvp.patch Modified: crux-2.2/ports/core/glibc/.footprint crux-2.2/ports/core/glibc/.md5sum crux-2.2/ports/core/glibc/Pkgfile Log: glibc: updated to 2.3.6 Modified: crux-2.2/ports/core/glibc/.footprint =================================================================== --- crux-2.2/ports/core/glibc/.footprint 2006-02-23 17:29:54 UTC (rev 771) +++ crux-2.2/ports/core/glibc/.footprint 2006-02-23 17:31:48 UTC (rev 772) @@ -8,47 +8,47 @@ -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.3.5.so -lrwxrwxrwx root/root lib/ld-linux.so.2 -> ld-2.3.5.so --rwxr-xr-x root/root lib/libBrokenLocale-2.3.5.so -lrwxrwxrwx root/root lib/libBrokenLocale.so.1 -> libBrokenLocale-2.3.5.so +-rwxr-xr-x root/root lib/ld-2.3.6.so +lrwxrwxrwx root/root lib/ld-linux.so.2 -> ld-2.3.6.so +-rwxr-xr-x root/root lib/libBrokenLocale-2.3.6.so +lrwxrwxrwx root/root lib/libBrokenLocale.so.1 -> libBrokenLocale-2.3.6.so -rwxr-xr-x root/root lib/libSegFault.so --rwxr-xr-x root/root lib/libanl-2.3.5.so -lrwxrwxrwx root/root lib/libanl.so.1 -> libanl-2.3.5.so --rwxr-xr-x root/root lib/libc-2.3.5.so -lrwxrwxrwx root/root lib/libc.so.6 -> libc-2.3.5.so --rwxr-xr-x root/root lib/libcrypt-2.3.5.so -lrwxrwxrwx root/root lib/libcrypt.so.1 -> libcrypt-2.3.5.so --rwxr-xr-x root/root lib/libdl-2.3.5.so -lrwxrwxrwx root/root lib/libdl.so.2 -> libdl-2.3.5.so --rwxr-xr-x root/root lib/libm-2.3.5.so -lrwxrwxrwx root/root lib/libm.so.6 -> libm-2.3.5.so +-rwxr-xr-x root/root lib/libanl-2.3.6.so +lrwxrwxrwx root/root lib/libanl.so.1 -> libanl-2.3.6.so +-rwxr-xr-x root/root lib/libc-2.3.6.so +lrwxrwxrwx root/root lib/libc.so.6 -> libc-2.3.6.so +-rwxr-xr-x root/root lib/libcrypt-2.3.6.so +lrwxrwxrwx root/root lib/libcrypt.so.1 -> libcrypt-2.3.6.so +-rwxr-xr-x root/root lib/libdl-2.3.6.so +lrwxrwxrwx root/root lib/libdl.so.2 -> libdl-2.3.6.so +-rwxr-xr-x root/root lib/libm-2.3.6.so +lrwxrwxrwx root/root lib/libm.so.6 -> libm-2.3.6.so -rwxr-xr-x root/root lib/libmemusage.so --rwxr-xr-x root/root lib/libnsl-2.3.5.so -lrwxrwxrwx root/root lib/libnsl.so.1 -> libnsl-2.3.5.so --rwxr-xr-x root/root lib/libnss_compat-2.3.5.so -lrwxrwxrwx root/root lib/libnss_compat.so.2 -> libnss_compat-2.3.5.so --rwxr-xr-x root/root lib/libnss_dns-2.3.5.so -lrwxrwxrwx root/root lib/libnss_dns.so.2 -> libnss_dns-2.3.5.so --rwxr-xr-x root/root lib/libnss_files-2.3.5.so -lrwxrwxrwx root/root lib/libnss_files.so.2 -> libnss_files-2.3.5.so --rwxr-xr-x root/root lib/libnss_hesiod-2.3.5.so -lrwxrwxrwx root/root lib/libnss_hesiod.so.2 -> libnss_hesiod-2.3.5.so --rwxr-xr-x root/root lib/libnss_nis-2.3.5.so -lrwxrwxrwx root/root lib/libnss_nis.so.2 -> libnss_nis-2.3.5.so --rwxr-xr-x root/root lib/libnss_nisplus-2.3.5.so -lrwxrwxrwx root/root lib/libnss_nisplus.so.2 -> libnss_nisplus-2.3.5.so +-rwxr-xr-x root/root lib/libnsl-2.3.6.so +lrwxrwxrwx root/root lib/libnsl.so.1 -> libnsl-2.3.6.so +-rwxr-xr-x root/root lib/libnss_compat-2.3.6.so +lrwxrwxrwx root/root lib/libnss_compat.so.2 -> libnss_compat-2.3.6.so +-rwxr-xr-x root/root lib/libnss_dns-2.3.6.so +lrwxrwxrwx root/root lib/libnss_dns.so.2 -> libnss_dns-2.3.6.so +-rwxr-xr-x root/root lib/libnss_files-2.3.6.so +lrwxrwxrwx root/root lib/libnss_files.so.2 -> libnss_files-2.3.6.so +-rwxr-xr-x root/root lib/libnss_hesiod-2.3.6.so +lrwxrwxrwx root/root lib/libnss_hesiod.so.2 -> libnss_hesiod-2.3.6.so +-rwxr-xr-x root/root lib/libnss_nis-2.3.6.so +lrwxrwxrwx root/root lib/libnss_nis.so.2 -> libnss_nis-2.3.6.so +-rwxr-xr-x root/root lib/libnss_nisplus-2.3.6.so +lrwxrwxrwx root/root lib/libnss_nisplus.so.2 -> libnss_nisplus-2.3.6.so -rwxr-xr-x root/root lib/libpcprofile.so --rwxr-xr-x root/root lib/libpthread-2.3.5.so -lrwxrwxrwx root/root lib/libpthread.so.0 -> libpthread-2.3.5.so --rwxr-xr-x root/root lib/libresolv-2.3.5.so -lrwxrwxrwx root/root lib/libresolv.so.2 -> libresolv-2.3.5.so --rwxr-xr-x root/root lib/librt-2.3.5.so -lrwxrwxrwx root/root lib/librt.so.1 -> librt-2.3.5.so +-rwxr-xr-x root/root lib/libpthread-2.3.6.so +lrwxrwxrwx root/root lib/libpthread.so.0 -> libpthread-2.3.6.so +-rwxr-xr-x root/root lib/libresolv-2.3.6.so +lrwxrwxrwx root/root lib/libresolv.so.2 -> libresolv-2.3.6.so +-rwxr-xr-x root/root lib/librt-2.3.6.so +lrwxrwxrwx root/root lib/librt.so.1 -> librt-2.3.6.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.3.5.so -lrwxrwxrwx root/root lib/libutil.so.1 -> libutil-2.3.5.so +-rwxr-xr-x root/root lib/libutil-2.3.6.so +lrwxrwxrwx root/root lib/libutil.so.1 -> libutil-2.3.6.so drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/ldconfig -rwxr-xr-x root/root sbin/sln @@ -219,8 +219,6 @@ -rw-r--r-- root/root usr/include/asm/param.h -rw-r--r-- root/root usr/include/asm/parport.h -rw-r--r-- root/root usr/include/asm/pgalloc.h --rw-r--r-- root/root usr/include/asm/pgtable-2level.h --rw-r--r-- root/root usr/include/asm/pgtable-3level.h -rw-r--r-- root/root usr/include/asm/poll.h -rw-r--r-- root/root usr/include/asm/posix_types.h -rw-r--r-- root/root usr/include/asm/processor.h @@ -492,7 +490,6 @@ -rw-r--r-- root/root usr/include/linux/dm-ioctl.h -rw-r--r-- root/root usr/include/linux/dn.h -rw-r--r-- root/root usr/include/linux/dnotify.h --rw-r--r-- root/root usr/include/linux/dp83840.h -rw-r--r-- root/root usr/include/linux/dqblk_v1.h -rw-r--r-- root/root usr/include/linux/dqblk_v2.h -rw-r--r-- root/root usr/include/linux/dqblk_xfs.h @@ -621,6 +618,7 @@ -rw-r--r-- root/root usr/include/linux/ioport.h -rw-r--r-- root/root usr/include/linux/ip.h -rw-r--r-- root/root usr/include/linux/ip6_tunnel.h +-rw-r--r-- root/root usr/include/linux/ip_mp_alg.h -rw-r--r-- root/root usr/include/linux/ipc.h -rw-r--r-- root/root usr/include/linux/ipmi.h -rw-r--r-- root/root usr/include/linux/ipmi_msgdefs.h @@ -644,8 +642,6 @@ -rw-r--r-- root/root usr/include/linux/isdnif.h -rw-r--r-- root/root usr/include/linux/isicom.h -rw-r--r-- root/root usr/include/linux/iso_fs.h --rw-r--r-- root/root usr/include/linux/iso_fs_i.h --rw-r--r-- root/root usr/include/linux/iso_fs_sb.h -rw-r--r-- root/root usr/include/linux/istallion.h -rw-r--r-- root/root usr/include/linux/ite_gpio.h -rw-r--r-- root/root usr/include/linux/ixjuser.h @@ -884,6 +880,7 @@ -rw-r--r-- root/root usr/include/linux/parport.h -rw-r--r-- root/root usr/include/linux/parport_pc.h -rw-r--r-- root/root usr/include/linux/parser.h +-rw-r--r-- root/root usr/include/linux/patchkey.h -rw-r--r-- root/root usr/include/linux/pci-dynids.h -rw-r--r-- root/root usr/include/linux/pci.h -rw-r--r-- root/root usr/include/linux/pci_ids.h @@ -1007,6 +1004,7 @@ -rw-r--r-- root/root usr/include/linux/sunrpc/timer.h -rw-r--r-- root/root usr/include/linux/sunrpc/types.h -rw-r--r-- root/root usr/include/linux/sunrpc/xprt.h +-rw-r--r-- root/root usr/include/linux/superhyway.h -rw-r--r-- root/root usr/include/linux/suspend.h -rw-r--r-- root/root usr/include/linux/swap.h -rw-r--r-- root/root usr/include/linux/swapops.h @@ -1019,10 +1017,15 @@ -rw-r--r-- root/root usr/include/linux/sysrq.h -rw-r--r-- root/root usr/include/linux/sysv_fs.h drwxr-xr-x root/root usr/include/linux/tc_act/ +-rw-r--r-- root/root usr/include/linux/tc_act/tc_defact.h -rw-r--r-- root/root usr/include/linux/tc_act/tc_gact.h -rw-r--r-- root/root usr/include/linux/tc_act/tc_ipt.h -rw-r--r-- root/root usr/include/linux/tc_act/tc_mirred.h -rw-r--r-- root/root usr/include/linux/tc_act/tc_pedit.h +drwxr-xr-x root/root usr/include/linux/tc_ematch/ +-rw-r--r-- root/root usr/include/linux/tc_ematch/tc_em_cmp.h +-rw-r--r-- root/root usr/include/linux/tc_ematch/tc_em_meta.h +-rw-r--r-- root/root usr/include/linux/tc_ematch/tc_em_nbyte.h -rw-r--r-- root/root usr/include/linux/tcp.h -rw-r--r-- root/root usr/include/linux/tcp_diag.h -rw-r--r-- root/root usr/include/linux/telephony.h @@ -1034,7 +1037,6 @@ -rw-r--r-- root/root usr/include/linux/timex.h -rw-r--r-- root/root usr/include/linux/tiocl.h -rw-r--r-- root/root usr/include/linux/toshiba.h --rw-r--r-- root/root usr/include/linux/tpqic02.h -rw-r--r-- root/root usr/include/linux/tty.h -rw-r--r-- root/root usr/include/linux/types.h -rw-r--r-- root/root usr/include/linux/udf_fs.h @@ -1049,6 +1051,7 @@ -rw-r--r-- root/root usr/include/linux/un.h -rw-r--r-- root/root usr/include/linux/unistd.h -rw-r--r-- root/root usr/include/linux/usb.h +-rw-r--r-- root/root usr/include/linux/usb_cdc.h -rw-r--r-- root/root usr/include/linux/usb_ch9.h -rw-r--r-- root/root usr/include/linux/usb_gadgetfs.h -rw-r--r-- root/root usr/include/linux/usbdevice_fs.h @@ -1973,6 +1976,7 @@ -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/sr_CS -rw-r--r-- root/root usr/share/i18n/locales/st_ZA -rw-r--r-- root/root usr/share/i18n/locales/sv_FI -rw-r--r-- root/root usr/share/i18n/locales/sv_FI@euro @@ -2106,6 +2110,7 @@ -rw-r--r-- root/root usr/share/zoneinfo/America/Cayman -rw-r--r-- root/root usr/share/zoneinfo/America/Chicago -rw-r--r-- root/root usr/share/zoneinfo/America/Chihuahua +-rw-r--r-- root/root usr/share/zoneinfo/America/Coral_Harbour -rw-r--r-- root/root usr/share/zoneinfo/America/Cordoba -rw-r--r-- root/root usr/share/zoneinfo/America/Costa_Rica -rw-r--r-- root/root usr/share/zoneinfo/America/Cuiaba @@ -2331,6 +2336,7 @@ -rw-r--r-- root/root usr/share/zoneinfo/Australia/Brisbane -rw-r--r-- root/root usr/share/zoneinfo/Australia/Broken_Hill -rw-r--r-- root/root usr/share/zoneinfo/Australia/Canberra +-rw-r--r-- root/root usr/share/zoneinfo/Australia/Currie -rw-r--r-- root/root usr/share/zoneinfo/Australia/Darwin -rw-r--r-- root/root usr/share/zoneinfo/Australia/Hobart -rw-r--r-- root/root usr/share/zoneinfo/Australia/LHI @@ -2681,6 +2687,7 @@ -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Cayman -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Chicago -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Chihuahua +-rw-r--r-- root/root usr/share/zoneinfo/posix/America/Coral_Harbour -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Cordoba -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Costa_Rica -rw-r--r-- root/root usr/share/zoneinfo/posix/America/Cuiaba @@ -2906,6 +2913,7 @@ -rw-r--r-- root/root usr/share/zoneinfo/posix/Australia/Brisbane -rw-r--r-- root/root usr/share/zoneinfo/posix/Australia/Broken_Hill -rw-r--r-- root/root usr/share/zoneinfo/posix/Australia/Canberra +-rw-r--r-- root/root usr/share/zoneinfo/posix/Australia/Currie -rw-r--r-- root/root usr/share/zoneinfo/posix/Australia/Darwin -rw-r--r-- root/root usr/share/zoneinfo/posix/Australia/Hobart -rw-r--r-- root/root usr/share/zoneinfo/posix/Australia/LHI @@ -3256,6 +3264,7 @@ -rw-r--r-- root/root usr/share/zoneinfo/right/America/Cayman -rw-r--r-- root/root usr/share/zoneinfo/right/America/Chicago -rw-r--r-- root/root usr/share/zoneinfo/right/America/Chihuahua +-rw-r--r-- root/root usr/share/zoneinfo/right/America/Coral_Harbour -rw-r--r-- root/root usr/share/zoneinfo/right/America/Cordoba -rw-r--r-- root/root usr/share/zoneinfo/right/America/Costa_Rica -rw-r--r-- root/root usr/share/zoneinfo/right/America/Cuiaba @@ -3481,6 +3490,7 @@ -rw-r--r-- root/root usr/share/zoneinfo/right/Australia/Brisbane -rw-r--r-- root/root usr/share/zoneinfo/right/Australia/Broken_Hill -rw-r--r-- root/root usr/share/zoneinfo/right/Australia/Canberra +-rw-r--r-- root/root usr/share/zoneinfo/right/Australia/Currie -rw-r--r-- root/root usr/share/zoneinfo/right/Australia/Darwin -rw-r--r-- root/root usr/share/zoneinfo/right/Australia/Hobart -rw-r--r-- root/root usr/share/zoneinfo/right/Australia/LHI Modified: crux-2.2/ports/core/glibc/.md5sum =================================================================== --- crux-2.2/ports/core/glibc/.md5sum 2006-02-23 17:29:54 UTC (rev 771) +++ crux-2.2/ports/core/glibc/.md5sum 2006-02-23 17:31:48 UTC (rev 772) @@ -1,8 +1,9 @@ -f42f3cccce84405f0d8b38870047be11 glibc-2.3.5-execvp.patch -93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 +cb99bd41b5308e6fc0eab4da6d13f421 glibc-2.3.6-kernelheaders.patch +bfdce99f82d6dbcb64b7f11c05d6bc96 glibc-2.3.6.tar.bz2 96156bec8e05de67384dc93e72bdc313 host.conf fbbc215a9b15ba4846f326cc88108057 hosts +b46e63c90b23416996750293c44a2881 kd.h 6379f71bfa744bbfc2a67548c44986dd ld.so.conf -2d21d8e7ff641da74272b114c786464e linux-libc-headers-2.6.11.2.tar.bz2 +eae2f562afe224ad50f65a6acfb4252c linux-libc-headers-2.6.12.0.tar.bz2 75931315bf9bc9be15a5e25e4ddd5f0d nsswitch.conf acf9daad1ee85de5efd3543965596a63 resolv.conf Modified: crux-2.2/ports/core/glibc/Pkgfile =================================================================== --- crux-2.2/ports/core/glibc/Pkgfile 2006-02-23 17:29:54 UTC (rev 771) +++ crux-2.2/ports/core/glibc/Pkgfile 2006-02-23 17:31:48 UTC (rev 772) @@ -3,17 +3,18 @@ # Maintainer: Per Lid�n <per@fukt.bth.se> name=glibc -version=2.3.5 +version=2.3.6 release=1 source=(http://mirrors.sunsite.dk/gnu/$name/$name-$version.tar.bz2 \ - http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.... \ - $name-$version-execvp.patch hosts resolv.conf nsswitch.conf host.conf ld.so.conf) + http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.... \ + hosts resolv.conf nsswitch.conf host.conf ld.so.conf \ + $name-$version-kernelheaders.patch kd.h) build() { mkdir -p $PKG/usr/include - cp -r linux-libc-headers-2.6.11.2/include/linux $PKG/usr/include/linux - cp -r linux-libc-headers-2.6.11.2/include/asm-i386 $PKG/usr/include/asm - patch -p0 < $name-$version-execvp.patch + cp -r linux-libc-headers-2.6.12.0/include/linux $PKG/usr/include/linux + cp -r linux-libc-headers-2.6.12.0/include/asm-i386 $PKG/usr/include/asm + patch -d $name-$version -p1 < $name-$version-kernelheaders.patch mkdir build cd build ../$name-$version/configure --prefix=/usr \ @@ -25,10 +26,12 @@ --disable-profile \ --without-gd make - make check + #make check make install_root=$PKG install make install_root=$PKG localedata/install-locales cp ../{hosts,resolv.conf,nsswitch.conf,host.conf,ld.so.conf} $PKG/etc ln -sf ../usr/share/zoneinfo/UTC $PKG/etc/localtime rm -rf $PKG/usr/share/locale + + install -m 644 $SRC/kd.h $PKG/usr/include/sys/kd.h } Deleted: crux-2.2/ports/core/glibc/glibc-2.3.5-execvp.patch =================================================================== --- crux-2.2/ports/core/glibc/glibc-2.3.5-execvp.patch 2006-02-23 17:29:54 UTC (rev 771) +++ crux-2.2/ports/core/glibc/glibc-2.3.5-execvp.patch 2006-02-23 17:31:48 UTC (rev 772) @@ -1,15 +0,0 @@ -Description: Execute shell with full script path, not just basename. -Origin: http://sources.redhat.com/ml/libc-alpha/2005-04/msg00080.html -Upstream status: Accepted, committed in CVS. - ---- glibc-2.3.5/posix/execvp.c.orig 2005-02-26 02:02:17.000000000 +0100 -+++ glibc-2.3.5/posix/execvp.c 2005-04-14 17:42:22.000000000 +0200 -@@ -140,7 +140,7 @@ - { - if (script_argv == NULL) - { -- script_argv = allocate_scripts_argv (file, argv); -+ script_argv = allocate_scripts_argv (startp, argv); - if (script_argv == NULL) - { - /* A possible EACCES error is not as important as Added: crux-2.2/ports/core/glibc/glibc-2.3.6-kernelheaders.patch =================================================================== --- crux-2.2/ports/core/glibc/glibc-2.3.6-kernelheaders.patch 2006-02-23 17:29:54 UTC (rev 771) +++ crux-2.2/ports/core/glibc/glibc-2.3.6-kernelheaders.patch 2006-02-23 17:31:48 UTC (rev 772) @@ -0,0 +1,20 @@ +--- glibc/sysdeps/unix/sysv/linux/sys/sysctl.h~ 2004-04-29 22:09:24.000000000 +0200 ++++ glibc/sysdeps/unix/sysv/linux/sys/sysctl.h 2005-01-10 20:01:28.956241560 +0100 +@@ -22,6 +22,9 @@ + #include <features.h> + #define __need_size_t + #include <stddef.h> ++#include <linux/version.h> ++ ++#ifndef LIBC_HEADERS_VERSION + /* Prevent more kernel headers than necessary to be included. */ + #ifndef _LINUX_KERNEL_H + # define _LINUX_KERNEL_H 1 +@@ -40,6 +43,7 @@ + # define __user + # define __undef__LINUX_COMPILER_H + #endif ++#endif /* LIBC_HEADERS_VERSION */ + + #include <linux/sysctl.h> + Added: crux-2.2/ports/core/glibc/kd.h =================================================================== --- crux-2.2/ports/core/glibc/kd.h 2006-02-23 17:29:54 UTC (rev 771) +++ crux-2.2/ports/core/glibc/kd.h 2006-02-23 17:31:48 UTC (rev 772) @@ -0,0 +1,24 @@ +/* + * Fix a bug in glibc which prevents recent x11 snapshots from building: + * http://bugzilla.ubuntu.com/show_bug.cgi?id=18157 + * + * Install this file as /usr/include/sys/kd.h + */ + +#ifndef _SYS_KD_H +#define _SYS_KD_H 1 + +/* Make sure the <linux/types.h> header is not loaded. */ +#ifndef _LINUX_TYPES_H +# define _LINUX_TYPES_H 1 +# define __undef_LINUX_TYPES_H 1 +#endif + +#include <linux/kd.h> + +#ifdef __undef_LINUX_TYPES_H +# undef _LINUX_TYPES_H +# undef __undef_LINUX_TYPES_H +#endif + +#endif /* sys/kd.h */
participants (1)
-
crux＠crux.nu