glibc: Update to 2.5 on i586.

This enabled IPFire to run some precompiled third-party software
on it. We may as well expect some performance improvements.

diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc
index 77db7bcfbf4187c8e855d615523ac260df84ae3c..51cd8399ad6528e3c8089371d7949907f0fefea3 100644 (file)
--- a/config/rootfiles/common/armv5tel/glibc
+++ b/config/rootfiles/common/armv5tel/glibc
@@ -2,10 +2,10 @@
 lib/ld-2.5.so
 lib/ld-linux.so.3
 lib/libBrokenLocale-2.5.so
-#lib/libBrokenLocale.so.1
+lib/libBrokenLocale.so.1
 #lib/libSegFault.so
 lib/libanl-2.5.so
-#lib/libanl.so.1
+lib/libanl.so.1
 lib/libc-2.5.so
 lib/libc.so.6
 lib/libcrypt-2.5.so
@@ -24,11 +24,11 @@ lib/libnss_dns.so.2
 lib/libnss_files-2.5.so
 lib/libnss_files.so.2
 lib/libnss_hesiod-2.5.so
-#lib/libnss_hesiod.so.2
+lib/libnss_hesiod.so.2
 lib/libnss_nis-2.5.so
-#lib/libnss_nis.so.2
+lib/libnss_nis.so.2
 lib/libnss_nisplus-2.5.so
-#lib/libnss_nisplus.so.2
+lib/libnss_nisplus.so.2
 #lib/libpcprofile.so
 lib/libpthread-2.5.so
 lib/libpthread.so.0
@@ -36,8 +36,8 @@ lib/libresolv-2.5.so
 lib/libresolv.so.2
 lib/librt-2.5.so
 lib/librt.so.1
-#lib/libthread_db-1.0.so
-#lib/libthread_db.so.1
+lib/libthread_db-1.0.so
+lib/libthread_db.so.1
 lib/libutil-2.5.so
 lib/libutil.so.1
 sbin/ldconfig

diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc
index 2648e70a417e4ffedad6cca3c4872c3b57aecd8c..7ceb057d912eab31607a1ccd379c105952168c76 100644 (file)
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -1,46 +1,46 @@
-etc/ld.so.cache
+#etc/ld.so.cache
 etc/localtime
 #etc/rpc
-lib/ld-2.3.6.so
+lib/ld-2.5.so
 lib/ld-linux.so.2
-#lib/libBrokenLocale-2.3.6.so
-#lib/libBrokenLocale.so.1
+lib/libBrokenLocale-2.5.so
+lib/libBrokenLocale.so.1
 #lib/libSegFault.so
-#lib/libanl-2.3.6.so
-#lib/libanl.so.1
-lib/libc-2.3.6.so
+lib/libanl-2.5.so
+lib/libanl.so.1
+lib/libc-2.5.so
 lib/libc.so.6
-lib/libcrypt-2.3.6.so
+lib/libcrypt-2.5.so
 lib/libcrypt.so.1
-lib/libdl-2.3.6.so
+lib/libdl-2.5.so
 lib/libdl.so.2
-lib/libm-2.3.6.so
+lib/libm-2.5.so
 lib/libm.so.6
 #lib/libmemusage.so
-lib/libnsl-2.3.6.so
+lib/libnsl-2.5.so
 lib/libnsl.so.1
-lib/libnss_compat-2.3.6.so
+lib/libnss_compat-2.5.so
 lib/libnss_compat.so.2
-lib/libnss_dns-2.3.6.so
+lib/libnss_dns-2.5.so
 lib/libnss_dns.so.2
-lib/libnss_files-2.3.6.so
+lib/libnss_files-2.5.so
 lib/libnss_files.so.2
-#lib/libnss_hesiod-2.3.6.so
-#lib/libnss_hesiod.so.2
-#lib/libnss_nis-2.3.6.so
-#lib/libnss_nis.so.2
-#lib/libnss_nisplus-2.3.6.so
-#lib/libnss_nisplus.so.2
+lib/libnss_hesiod-2.5.so
+lib/libnss_hesiod.so.2
+lib/libnss_nis-2.5.so
+lib/libnss_nis.so.2
+lib/libnss_nisplus-2.5.so
+lib/libnss_nisplus.so.2
 #lib/libpcprofile.so
-lib/libpthread-2.3.6.so
+lib/libpthread-2.5.so
 lib/libpthread.so.0
-lib/libresolv-2.3.6.so
+lib/libresolv-2.5.so
 lib/libresolv.so.2
-lib/librt-2.3.6.so
+lib/librt-2.5.so
 lib/librt.so.1
-#lib/libthread_db-1.0.so
-#lib/libthread_db.so.1
-lib/libutil-2.3.6.so
+lib/libthread_db-1.0.so
+lib/libthread_db.so.1
+lib/libutil-2.5.so
 lib/libutil.so.1
 sbin/ldconfig
 #sbin/sln
@@ -100,12 +100,15 @@ usr/bin/ldd
 #usr/include/bits/ipc.h
 #usr/include/bits/ipctypes.h
 #usr/include/bits/libc-lock.h
+#usr/include/bits/libio-ldbl.h
+#usr/include/bits/link.h
 #usr/include/bits/local_lim.h
 #usr/include/bits/locale.h
 #usr/include/bits/mathcalls.h
 #usr/include/bits/mathdef.h
 #usr/include/bits/mathinline.h
 #usr/include/bits/mman.h
+#usr/include/bits/monetary-ldbl.h
 #usr/include/bits/mqueue.h
 #usr/include/bits/msq.h
 #usr/include/bits/nan.h
@@ -114,6 +117,7 @@ usr/bin/ldd
 #usr/include/bits/posix1_lim.h
 #usr/include/bits/posix2_lim.h
 #usr/include/bits/posix_opt.h
+#usr/include/bits/printf-ldbl.h
 #usr/include/bits/pthreadtypes.h
 #usr/include/bits/resource.h
 #usr/include/bits/sched.h
@@ -131,32 +135,42 @@ usr/bin/ldd
 #usr/include/bits/sigthread.h
 #usr/include/bits/sockaddr.h
 #usr/include/bits/socket.h
+#usr/include/bits/socket2.h
 #usr/include/bits/stab.def
 #usr/include/bits/stat.h
 #usr/include/bits/statfs.h
 #usr/include/bits/statvfs.h
+#usr/include/bits/stdio-ldbl.h
 #usr/include/bits/stdio-lock.h
 #usr/include/bits/stdio.h
 #usr/include/bits/stdio2.h
 #usr/include/bits/stdio_lim.h
+#usr/include/bits/stdlib-ldbl.h
+#usr/include/bits/stdlib.h
 #usr/include/bits/string.h
 #usr/include/bits/string2.h
 #usr/include/bits/string3.h
 #usr/include/bits/stropts.h
 #usr/include/bits/sys_errlist.h
 #usr/include/bits/syscall.h
+#usr/include/bits/syslog-ldbl.h
+#usr/include/bits/syslog-path.h
+#usr/include/bits/syslog.h
 #usr/include/bits/termios.h
 #usr/include/bits/time.h
 #usr/include/bits/types.h
 #usr/include/bits/typesizes.h
 #usr/include/bits/uio.h
+#usr/include/bits/unistd.h
 #usr/include/bits/ustat.h
 #usr/include/bits/utmp.h
 #usr/include/bits/utmpx.h
 #usr/include/bits/utsname.h
 #usr/include/bits/waitflags.h
 #usr/include/bits/waitstatus.h
+#usr/include/bits/wchar-ldbl.h
 #usr/include/bits/wchar.h
+#usr/include/bits/wchar2.h
 #usr/include/bits/wordsize.h
 #usr/include/bits/xopen_lim.h
 #usr/include/bits/xtitypes.h
@@ -190,6 +204,7 @@ usr/bin/ldd
 #usr/include/gnu-versions.h
 #usr/include/gnu/lib-names.h
 #usr/include/gnu/libc-version.h
+#usr/include/gnu/stubs-32.h
 #usr/include/gnu/stubs.h
 #usr/include/grp.h
 #usr/include/iconv.h
@@ -534,18 +549,52 @@ usr/bin/ldd
 #usr/lib/gconv/IBM037.so
 #usr/lib/gconv/IBM038.so
 #usr/lib/gconv/IBM1004.so
+#usr/lib/gconv/IBM1008.so
+#usr/lib/gconv/IBM1008_420.so
+#usr/lib/gconv/IBM1025.so
 #usr/lib/gconv/IBM1026.so
 #usr/lib/gconv/IBM1046.so
 #usr/lib/gconv/IBM1047.so
+#usr/lib/gconv/IBM1097.so
+#usr/lib/gconv/IBM1112.so
+#usr/lib/gconv/IBM1122.so
+#usr/lib/gconv/IBM1123.so
 #usr/lib/gconv/IBM1124.so
 #usr/lib/gconv/IBM1129.so
+#usr/lib/gconv/IBM1130.so
 #usr/lib/gconv/IBM1132.so
 #usr/lib/gconv/IBM1133.so
+#usr/lib/gconv/IBM1137.so
+#usr/lib/gconv/IBM1140.so
+#usr/lib/gconv/IBM1141.so
+#usr/lib/gconv/IBM1142.so
+#usr/lib/gconv/IBM1143.so
+#usr/lib/gconv/IBM1144.so
+#usr/lib/gconv/IBM1145.so
+#usr/lib/gconv/IBM1146.so
+#usr/lib/gconv/IBM1147.so
+#usr/lib/gconv/IBM1148.so
+#usr/lib/gconv/IBM1149.so
+#usr/lib/gconv/IBM1153.so
+#usr/lib/gconv/IBM1154.so
+#usr/lib/gconv/IBM1155.so
+#usr/lib/gconv/IBM1156.so
+#usr/lib/gconv/IBM1157.so
+#usr/lib/gconv/IBM1158.so
 #usr/lib/gconv/IBM1160.so
 #usr/lib/gconv/IBM1161.so
 #usr/lib/gconv/IBM1162.so
 #usr/lib/gconv/IBM1163.so
 #usr/lib/gconv/IBM1164.so
+#usr/lib/gconv/IBM1166.so
+#usr/lib/gconv/IBM1167.so
+#usr/lib/gconv/IBM12712.so
+#usr/lib/gconv/IBM1364.so
+#usr/lib/gconv/IBM1371.so
+#usr/lib/gconv/IBM1388.so
+#usr/lib/gconv/IBM1390.so
+#usr/lib/gconv/IBM1399.so
+#usr/lib/gconv/IBM16804.so
 #usr/lib/gconv/IBM256.so
 #usr/lib/gconv/IBM273.so
 #usr/lib/gconv/IBM274.so
@@ -562,7 +611,13 @@ usr/bin/ldd
 #usr/lib/gconv/IBM423.so
 #usr/lib/gconv/IBM424.so
 #usr/lib/gconv/IBM437.so
+#usr/lib/gconv/IBM4517.so
+#usr/lib/gconv/IBM4899.so
+#usr/lib/gconv/IBM4909.so
+#usr/lib/gconv/IBM4971.so
 #usr/lib/gconv/IBM500.so
+#usr/lib/gconv/IBM5347.so
+#usr/lib/gconv/IBM803.so
 #usr/lib/gconv/IBM850.so
 #usr/lib/gconv/IBM851.so
 #usr/lib/gconv/IBM852.so
@@ -585,10 +640,15 @@ usr/bin/ldd
 #usr/lib/gconv/IBM875.so
 #usr/lib/gconv/IBM880.so
 #usr/lib/gconv/IBM891.so
+#usr/lib/gconv/IBM901.so
+#usr/lib/gconv/IBM902.so
 #usr/lib/gconv/IBM903.so
+#usr/lib/gconv/IBM9030.so
 #usr/lib/gconv/IBM904.so
 #usr/lib/gconv/IBM905.so
+#usr/lib/gconv/IBM9066.so
 #usr/lib/gconv/IBM918.so
+#usr/lib/gconv/IBM921.so
 #usr/lib/gconv/IBM922.so
 #usr/lib/gconv/IBM930.so
 #usr/lib/gconv/IBM932.so
@@ -597,6 +657,7 @@ usr/bin/ldd
 #usr/lib/gconv/IBM937.so
 #usr/lib/gconv/IBM939.so
 #usr/lib/gconv/IBM943.so
+#usr/lib/gconv/IBM9448.so
 #usr/lib/gconv/IEC_P27-1.so
 #usr/lib/gconv/INIS-8.so
 #usr/lib/gconv/INIS-CYRILLIC.so
@@ -626,6 +687,7 @@ usr/bin/ldd
 #usr/lib/gconv/ISO8859-8.so
 #usr/lib/gconv/ISO8859-9.so
 #usr/lib/gconv/ISO_10367-BOX.so
+#usr/lib/gconv/ISO_11548-1.so
 #usr/lib/gconv/ISO_2033.so
 #usr/lib/gconv/ISO_5427-EXT.so
 #usr/lib/gconv/ISO_5427.so
@@ -643,6 +705,7 @@ usr/bin/ldd
 #usr/lib/gconv/MAC-SAMI.so
 #usr/lib/gconv/MAC-UK.so
 #usr/lib/gconv/MACINTOSH.so
+#usr/lib/gconv/MIK.so
 #usr/lib/gconv/NATS-DANO.so
 #usr/lib/gconv/NATS-SEFI.so
 #usr/lib/gconv/PT154.so
@@ -713,7 +776,6 @@ usr/bin/ldd
 usr/lib/locale/locale-archive
 #usr/sbin/iconvconfig
 #usr/sbin/nscd
-#usr/sbin/nscd_nischeck
 #usr/sbin/rpcinfo
 #usr/sbin/zdump
 #usr/sbin/zic
@@ -868,6 +930,7 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/charmaps/ISO-IR-90.gz
 #usr/share/i18n/charmaps/ISO_10367-BOX.gz
 #usr/share/i18n/charmaps/ISO_10646.gz
+#usr/share/i18n/charmaps/ISO_11548-1.gz
 #usr/share/i18n/charmaps/ISO_2033-1983.gz
 #usr/share/i18n/charmaps/ISO_5427-EXT.gz
 #usr/share/i18n/charmaps/ISO_5427.gz
@@ -905,6 +968,7 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/charmaps/MAC-SAMI.gz
 #usr/share/i18n/charmaps/MAC-UK.gz
 #usr/share/i18n/charmaps/MACINTOSH.gz
+#usr/share/i18n/charmaps/MIK.gz
 #usr/share/i18n/charmaps/MSZ_7795.3.gz
 #usr/share/i18n/charmaps/NATS-DANO-ADD.gz
 #usr/share/i18n/charmaps/NATS-DANO.gz
@@ -963,8 +1027,10 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/ar_SY
 #usr/share/i18n/locales/ar_TN
 #usr/share/i18n/locales/ar_YE
+#usr/share/i18n/locales/as_IN
 #usr/share/i18n/locales/az_AZ
 #usr/share/i18n/locales/be_BY
+#usr/share/i18n/locales/be_BY@latin
 #usr/share/i18n/locales/bg_BG
 #usr/share/i18n/locales/bn_BD
 #usr/share/i18n/locales/bn_IN
@@ -972,9 +1038,13 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/br_FR@euro
 #usr/share/i18n/locales/bs_BA
 #usr/share/i18n/locales/byn_ER
+#usr/share/i18n/locales/ca_AD
 #usr/share/i18n/locales/ca_ES
 #usr/share/i18n/locales/ca_ES@euro
+#usr/share/i18n/locales/ca_FR
+#usr/share/i18n/locales/ca_IT
 #usr/share/i18n/locales/cs_CZ
+#usr/share/i18n/locales/csb_PL
 #usr/share/i18n/locales/cy_GB
 #usr/share/i18n/locales/da_DK
 #usr/share/i18n/locales/de_AT
@@ -986,6 +1056,8 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/de_DE@euro
 #usr/share/i18n/locales/de_LU
 #usr/share/i18n/locales/de_LU@euro
+#usr/share/i18n/locales/dz_BT
+#usr/share/i18n/locales/el_CY
 #usr/share/i18n/locales/el_GR
 #usr/share/i18n/locales/el_GR@euro
 #usr/share/i18n/locales/en_AU
@@ -1039,6 +1111,7 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/fr_FR@euro
 #usr/share/i18n/locales/fr_LU
 #usr/share/i18n/locales/fr_LU@euro
+#usr/share/i18n/locales/fy_NL
 #usr/share/i18n/locales/ga_IE
 #usr/share/i18n/locales/ga_IE@euro
 #usr/share/i18n/locales/gd_GB
@@ -1053,6 +1126,7 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/he_IL
 #usr/share/i18n/locales/hi_IN
 #usr/share/i18n/locales/hr_HR
+#usr/share/i18n/locales/hsb_DE
 #usr/share/i18n/locales/hu_HU
 #usr/share/i18n/locales/hy_AM
 #usr/share/i18n/locales/i18n
@@ -1067,13 +1141,17 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/ka_GE
 #usr/share/i18n/locales/kk_KZ
 #usr/share/i18n/locales/kl_GL
+#usr/share/i18n/locales/km_KH
 #usr/share/i18n/locales/kn_IN
 #usr/share/i18n/locales/ko_KR
+#usr/share/i18n/locales/ku_TR
 #usr/share/i18n/locales/kw_GB
+#usr/share/i18n/locales/ky_KG
 #usr/share/i18n/locales/lg_UG
 #usr/share/i18n/locales/lo_LA
 #usr/share/i18n/locales/lt_LT
 #usr/share/i18n/locales/lv_LV
+#usr/share/i18n/locales/mg_MG
 #usr/share/i18n/locales/mi_NZ
 #usr/share/i18n/locales/mk_MK
 #usr/share/i18n/locales/ml_IN
@@ -1088,10 +1166,14 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/nl_NL
 #usr/share/i18n/locales/nl_NL@euro
 #usr/share/i18n/locales/nn_NO
+#usr/share/i18n/locales/nr_ZA
+#usr/share/i18n/locales/nso_ZA
 #usr/share/i18n/locales/oc_FR
 #usr/share/i18n/locales/om_ET
 #usr/share/i18n/locales/om_KE
+#usr/share/i18n/locales/or_IN
 #usr/share/i18n/locales/pa_IN
+#usr/share/i18n/locales/pa_PK
 #usr/share/i18n/locales/pl_PL
 #usr/share/i18n/locales/pt_BR
 #usr/share/i18n/locales/pt_PT
@@ -1099,7 +1181,9 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/ro_RO
 #usr/share/i18n/locales/ru_RU
 #usr/share/i18n/locales/ru_UA
+#usr/share/i18n/locales/rw_RW
 #usr/share/i18n/locales/se_NO
+#usr/share/i18n/locales/si_LK
 #usr/share/i18n/locales/sid_ET
 #usr/share/i18n/locales/sk_SK
 #usr/share/i18n/locales/sl_SI
@@ -1109,6 +1193,8 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/so_SO
 #usr/share/i18n/locales/sq_AL
 #usr/share/i18n/locales/sr_CS
+#usr/share/i18n/locales/sr_ME
+#usr/share/i18n/locales/ss_ZA
 #usr/share/i18n/locales/st_ZA
 #usr/share/i18n/locales/sv_FI
 #usr/share/i18n/locales/sv_FI@euro
@@ -1121,6 +1207,8 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/ti_ET
 #usr/share/i18n/locales/tig_ER
 #usr/share/i18n/locales/tl_PH
+#usr/share/i18n/locales/tn_ZA
+#usr/share/i18n/locales/tr_CY
 #usr/share/i18n/locales/tr_TR
 #usr/share/i18n/locales/translit_circle
 #usr/share/i18n/locales/translit_cjk_compat
@@ -1134,11 +1222,13 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/translit_neutral
 #usr/share/i18n/locales/translit_small
 #usr/share/i18n/locales/translit_wide
+#usr/share/i18n/locales/ts_ZA
 #usr/share/i18n/locales/tt_RU
 #usr/share/i18n/locales/uk_UA
 #usr/share/i18n/locales/ur_PK
 #usr/share/i18n/locales/uz_UZ
 #usr/share/i18n/locales/uz_UZ@cyrillic
+#usr/share/i18n/locales/ve_ZA
 #usr/share/i18n/locales/vi_VN
 #usr/share/i18n/locales/wa_BE
 #usr/share/i18n/locales/wa_BE@euro
@@ -1211,6 +1301,12 @@ usr/lib/locale/locale-archive
 #usr/share/locale/pt_BR
 #usr/share/locale/pt_BR/LC_MESSAGES
 #usr/share/locale/pt_BR/LC_MESSAGES/libc.mo
+#usr/share/locale/ru
+#usr/share/locale/ru/LC_MESSAGES
+#usr/share/locale/ru/LC_MESSAGES/libc.mo
+#usr/share/locale/rw
+#usr/share/locale/rw/LC_MESSAGES
+#usr/share/locale/rw/LC_MESSAGES/libc.mo
 #usr/share/locale/sk
 #usr/share/locale/sk/LC_MESSAGES
 #usr/share/locale/sk/LC_MESSAGES/libc.mo
@@ -1350,7 +1446,9 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/America/Indiana/Indianapolis
 #usr/share/zoneinfo/America/Indiana/Knox
 #usr/share/zoneinfo/America/Indiana/Marengo
+#usr/share/zoneinfo/America/Indiana/Petersburg
 #usr/share/zoneinfo/America/Indiana/Vevay
+#usr/share/zoneinfo/America/Indiana/Vincennes
 #usr/share/zoneinfo/America/Indianapolis
 #usr/share/zoneinfo/America/Inuvik
 #usr/share/zoneinfo/America/Iqaluit
@@ -1375,6 +1473,7 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/America/Merida
 #usr/share/zoneinfo/America/Mexico_City
 #usr/share/zoneinfo/America/Miquelon
+#usr/share/zoneinfo/America/Moncton
 #usr/share/zoneinfo/America/Monterrey
 #usr/share/zoneinfo/America/Montevideo
 #usr/share/zoneinfo/America/Montreal
@@ -1767,20 +1866,6 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/ROC
 #usr/share/zoneinfo/ROK
 #usr/share/zoneinfo/Singapore
-#usr/share/zoneinfo/SystemV
-#usr/share/zoneinfo/SystemV/AST4
-#usr/share/zoneinfo/SystemV/AST4ADT
-#usr/share/zoneinfo/SystemV/CST6
-#usr/share/zoneinfo/SystemV/CST6CDT
-#usr/share/zoneinfo/SystemV/EST5
-#usr/share/zoneinfo/SystemV/EST5EDT
-#usr/share/zoneinfo/SystemV/HST10
-#usr/share/zoneinfo/SystemV/MST7
-#usr/share/zoneinfo/SystemV/MST7MDT
-#usr/share/zoneinfo/SystemV/PST8
-#usr/share/zoneinfo/SystemV/PST8PDT
-#usr/share/zoneinfo/SystemV/YST9
-#usr/share/zoneinfo/SystemV/YST9YDT
 #usr/share/zoneinfo/Turkey
 #usr/share/zoneinfo/UCT
 #usr/share/zoneinfo/US
@@ -1927,7 +2012,9 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/America/Indiana/Indianapolis
 #usr/share/zoneinfo/posix/America/Indiana/Knox
 #usr/share/zoneinfo/posix/America/Indiana/Marengo
+#usr/share/zoneinfo/posix/America/Indiana/Petersburg
 #usr/share/zoneinfo/posix/America/Indiana/Vevay
+#usr/share/zoneinfo/posix/America/Indiana/Vincennes
 #usr/share/zoneinfo/posix/America/Indianapolis
 #usr/share/zoneinfo/posix/America/Inuvik
 #usr/share/zoneinfo/posix/America/Iqaluit
@@ -1952,6 +2039,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/America/Merida
 #usr/share/zoneinfo/posix/America/Mexico_City
 #usr/share/zoneinfo/posix/America/Miquelon
+#usr/share/zoneinfo/posix/America/Moncton
 #usr/share/zoneinfo/posix/America/Monterrey
 #usr/share/zoneinfo/posix/America/Montevideo
 #usr/share/zoneinfo/posix/America/Montreal
@@ -2344,20 +2432,6 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/ROC
 #usr/share/zoneinfo/posix/ROK
 #usr/share/zoneinfo/posix/Singapore
-#usr/share/zoneinfo/posix/SystemV
-#usr/share/zoneinfo/posix/SystemV/AST4
-#usr/share/zoneinfo/posix/SystemV/AST4ADT
-#usr/share/zoneinfo/posix/SystemV/CST6
-#usr/share/zoneinfo/posix/SystemV/CST6CDT
-#usr/share/zoneinfo/posix/SystemV/EST5
-#usr/share/zoneinfo/posix/SystemV/EST5EDT
-#usr/share/zoneinfo/posix/SystemV/HST10
-#usr/share/zoneinfo/posix/SystemV/MST7
-#usr/share/zoneinfo/posix/SystemV/MST7MDT
-#usr/share/zoneinfo/posix/SystemV/PST8
-#usr/share/zoneinfo/posix/SystemV/PST8PDT
-#usr/share/zoneinfo/posix/SystemV/YST9
-#usr/share/zoneinfo/posix/SystemV/YST9YDT
 #usr/share/zoneinfo/posix/Turkey
 #usr/share/zoneinfo/posix/UCT
 #usr/share/zoneinfo/posix/US
@@ -2504,7 +2578,9 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/America/Indiana/Indianapolis
 #usr/share/zoneinfo/right/America/Indiana/Knox
 #usr/share/zoneinfo/right/America/Indiana/Marengo
+#usr/share/zoneinfo/right/America/Indiana/Petersburg
 #usr/share/zoneinfo/right/America/Indiana/Vevay
+#usr/share/zoneinfo/right/America/Indiana/Vincennes
 #usr/share/zoneinfo/right/America/Indianapolis
 #usr/share/zoneinfo/right/America/Inuvik
 #usr/share/zoneinfo/right/America/Iqaluit
@@ -2529,6 +2605,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/America/Merida
 #usr/share/zoneinfo/right/America/Mexico_City
 #usr/share/zoneinfo/right/America/Miquelon
+#usr/share/zoneinfo/right/America/Moncton
 #usr/share/zoneinfo/right/America/Monterrey
 #usr/share/zoneinfo/right/America/Montevideo
 #usr/share/zoneinfo/right/America/Montreal
@@ -2921,20 +2998,6 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/ROC
 #usr/share/zoneinfo/right/ROK
 #usr/share/zoneinfo/right/Singapore
-#usr/share/zoneinfo/right/SystemV
-#usr/share/zoneinfo/right/SystemV/AST4
-#usr/share/zoneinfo/right/SystemV/AST4ADT
-#usr/share/zoneinfo/right/SystemV/CST6
-#usr/share/zoneinfo/right/SystemV/CST6CDT
-#usr/share/zoneinfo/right/SystemV/EST5
-#usr/share/zoneinfo/right/SystemV/EST5EDT
-#usr/share/zoneinfo/right/SystemV/HST10
-#usr/share/zoneinfo/right/SystemV/MST7
-#usr/share/zoneinfo/right/SystemV/MST7MDT
-#usr/share/zoneinfo/right/SystemV/PST8
-#usr/share/zoneinfo/right/SystemV/PST8PDT
-#usr/share/zoneinfo/right/SystemV/YST9
-#usr/share/zoneinfo/right/SystemV/YST9YDT
 #usr/share/zoneinfo/right/Turkey
 #usr/share/zoneinfo/right/UCT
 #usr/share/zoneinfo/right/US

diff --git a/lfs/glibc b/lfs/glibc
index e2638b6e9e4316f4565da4afa96bba2636b02319..97b1cfe2205646598417e9dbe56c597a96d506e9 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,11 +24,7 @@
 
 include Config
 
-ifeq "$(MACHINE_TYPE)" "arm"
-       VER = 2.5
-else
-       VER = 2.3.6
-endif
+VER = 2.5
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -73,13 +69,8 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2
 
-ifeq "$(MACHINE_TYPE)" "arm"
-       $(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
-       glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
-else
-       $(DL_FILE)_MD5 = bfdce99f82d6dbcb64b7f11c05d6bc96
-       glibc-libidn-$(VER).tar.bz2_MD5 = 49dbe06ce830fc73874d6b38bdc5b4db
-endif
+$(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
+glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
 
 # ARM needs glibc-ports
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -125,15 +116,9 @@ ifeq "$(MACHINE_TYPE)" "arm"
 
        # asm/page.h should not be included in sysdeps/unix/sysv/linux/arm/ioperm.c.
        cd $(DIR_APP) && sed "/asm\/page.h/d" -i ports/sysdeps/unix/sysv/linux/arm/ioperm.c
-else
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-dont_use_origin_on_privil_exec.patch
 endif
 
 ifeq "$(ROOT)" ""
-ifeq "$(MACHINE)" "i586"
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-linux_types-1.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-inotify-1.patch
-endif
        # This locale causes a loop on bash login - exclude it
        cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -150,9 +135,6 @@ ifeq "$(ROOT)" ""
        touch /etc/ld.so.conf
        cd $(DIR_SRC)/glibc-build && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
-ifeq "$(MACHINE)" "i586"
-       cp -v $(DIR_APP)/sysdeps/unix/sysv/linux/inotify.h /usr/include/sys
-endif
 else
        -mkdir /tools/etc
        touch /tools/etc/ld.so.conf

diff --git a/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch b/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch
deleted file mode 100644 (file)
index 26c8ac8..0000000
--- a/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur glibc-2.3.6.org/elf/dl-load.c glibc-2.3.6/elf/dl-load.c
---- glibc-2.3.6.org/elf/dl-load.c      2005-04-06 04:50:10.000000000 +0200
-+++ glibc-2.3.6/elf/dl-load.c  2010-10-19 17:41:09.000000000 +0200
-@@ -176,8 +176,7 @@
- 
- 
- static size_t
--is_dst (const char *start, const char *name, const char *str,
--      int is_path, int secure)
-+is_dst (const char *start, const char *name, const char *str, int is_path)
- {
-   size_t len;
-   bool is_curly = false;
-@@ -206,11 +205,6 @@
-          && (!is_path || name[len] != ':'))
-     return 0;
- 
--  if (__builtin_expect (secure, 0)
--      && ((name[len] != '\0' && (!is_path || name[len] != ':'))
--        || (name != start + 1 && (!is_path || name[-2] != ':'))))
--    return 0;
--
-   return len;
- }
- 
-@@ -225,13 +219,12 @@
-     {
-       size_t len;
- 
--      /* $ORIGIN is not expanded for SUID/GUID programs (except if it
--       is $ORIGIN alone) and it must always appear first in path.  */
-+      /* $ORIGIN is not expanded for SUID/GUID programs.  */
-       ++name;
--      if ((len = is_dst (start, name, "ORIGIN", is_path,
--                       INTUSE(__libc_enable_secure))) != 0
--        || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0
--        || (len = is_dst (start, name, "LIB", is_path, 0)) != 0)
-+      if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0
-+         && !INTUSE(__libc_enable_secure))
-+        || (len = is_dst (start, name, "PLATFORM", is_path)) != 0
-+        || (len = is_dst (start, name, "LIB", is_path)) != 0)
-       ++cnt;
- 
-       name = strchr (name + len, '$');
-@@ -263,12 +256,17 @@
-         size_t len;
- 
-         ++name;
--        if ((len = is_dst (start, name, "ORIGIN", is_path,
--                           INTUSE(__libc_enable_secure))) != 0)
--          repl = l->l_origin;
--        else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)
-+        if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0)
-+          {
-+              // Ignore this path at SUID/GUID
-+              if (INTUSE(__libc_enable_secure))
-+                      repl = (const char *) -1;
-+              else
-+              repl = l->l_origin;
-+          }
-+        else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0)
-           repl = GLRO(dl_platform);
--        else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0)
-+        else if ((len = is_dst (start, name, "LIB", is_path)) != 0)
-           repl = DL_DST_LIB;
- 
-         if (repl != NULL && repl != (const char *) -1)

diff --git a/src/patches/glibc-2.3.6-inotify-1.patch b/src/patches/glibc-2.3.6-inotify-1.patch
deleted file mode 100644 (file)
index 30af30c..0000000
--- a/src/patches/glibc-2.3.6-inotify-1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Submitted By: Dan Nicholson <dnicholson at linuxfromscratch dot org>
-Date: 2006-09-01
-Initial Package Version: 2.3.6
-Origin: udev-096, syscall functions generated by Alexander E. Patrakov
-Upstream Status: Added to syscall list in 2.4
-Description: Adds inotify syscall functions for use in userspace. Minimal
-             syscall functions borrowed from udev local implementation to
-             provide system inotify support.
-Testcase: dovecot-1.0rc2, ./configure --with-notify=inotify
-
-diff -pNur glibc-2.3.6.orig/sysdeps/unix/sysv/linux/inotify.h glibc-2.3.6/sysdeps/unix/sysv/linux/inotify.h
---- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/inotify.h 1970-01-01 00:00:00.000000000 +0000
-+++ glibc-2.3.6/sysdeps/unix/sysv/linux/inotify.h      2006-08-01 05:48:27.000000000 +0000
-@@ -0,0 +1,31 @@
-+/*
-+ * Inode based directory notification for Linux
-+ *
-+ * Copyright (C) 2005 John McCutchan
-+ */
-+
-+#ifndef _SYS_INOTIFY_H
-+#define _SYS_INOTIFY_H
-+
-+#include <stdint.h>
-+#include <linux/inotify.h>
-+#include <asm/unistd.h>
-+
-+extern long int syscall (long int __sysno, ...) __THROW;
-+
-+static inline int inotify_init(void)
-+{
-+      return syscall(__NR_inotify_init);
-+}
-+      
-+static inline int inotify_add_watch(int fd, const char *name, uint32_t mask)
-+{
-+      return syscall(__NR_inotify_add_watch, fd, name, mask);
-+}
-+
-+static inline int inotify_rm_watch (int fd, uint32_t wd)
-+{
-+      return syscall(__NR_inotify_rm_watch, fd, wd);
-+}
-+              
-+#endif        /* _SYS_INOTIFY_H */

diff --git a/src/patches/glibc-2.3.6-linux_types-1.patch b/src/patches/glibc-2.3.6-linux_types-1.patch
deleted file mode 100644 (file)
index a365b81..0000000
--- a/src/patches/glibc-2.3.6-linux_types-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Submitted By: DJ Lucas <dj at linuxfromscratch dot org>
-Date: 2006-04-05
-Initial Package Version: 2.3.6
-Upstream Status: Committed
-Origin: Glibc CVS
-Description: Fixes build errors where linux/types.h is included after sys/kd.h.
-
-diff -Naur glibc-2.3.6-orig/sysdeps/unix/sysv/linux/sys/kd.h glibc-2.3.6/sysdeps/unix/sysv/linux/sys/kd.h
---- glibc-2.3.6-orig/sysdeps/unix/sysv/linux/sys/kd.h  2001-07-05 23:56:21.000000000 -0500
-+++ glibc-2.3.6/sysdeps/unix/sysv/linux/sys/kd.h       2006-04-04 21:40:50.000000000 -0500
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-+/* Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -21,9 +21,15 @@
- 
- /* Make sure the <linux/types.h> header is not loaded.  */
- #ifndef _LINUX_TYPES_H
--# define _LINUX_TYPES_H       1
-+# define _LINUX_TYPES_H               1
-+# define __undef_LINUX_TYPES_H
- #endif
- 
- #include <linux/kd.h>
- 
-+#ifdef __undef_LINUX_TYPES_H
-+# undef _LINUX_TYPES_H
-+# undef __undef_LINUX_TYPES_H
-+#endif
-+
- #endif        /* sys/kd.h */