Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc...
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Aug 2012 10:12:20 +0000 (12:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Aug 2012 10:12:20 +0000 (12:12 +0200)
33 files changed:
config/rootfiles/common/hddtemp [deleted file]
config/rootfiles/common/i586/glibc
config/rootfiles/common/libsafe [deleted file]
config/rootfiles/packages/libvorbis
lfs/binutils
lfs/capi4k-utils
lfs/ccache
lfs/cleanup-toolchain
lfs/coreutils
lfs/dbus
lfs/glibc
lfs/hddtemp [deleted file]
lfs/imspector
lfs/libnl
lfs/libogg
lfs/libsafe [deleted file]
lfs/libvorbis
lfs/netpbm
lfs/openldap
lfs/qemu
lfs/xfsprogs
make.sh
src/headers/cpuid.h [new file with mode: 0644]
src/patches/binutils-2.18-configure-1.patch [deleted file]
src/patches/ccache-3.1.6-no_compiler_mtime.patch [deleted file]
src/patches/coreutils-5.96-futimes.patch [new file with mode: 0644]
src/patches/dbus-1.0.3-compile-fix-1.patch [new file with mode: 0644]
src/patches/glibc-ports-avoid-using-asm-procinfo.patch [deleted file]
src/patches/libnl-1.1-ULONG_MAX.patch [new file with mode: 0644]
src/patches/libsafe-alpha.diff [deleted file]
src/patches/libsafe-functioncaching.diff [deleted file]
src/patches/netpbm-10.26.46-getline.patch [new file with mode: 0644]
tools/make-functions

diff --git a/config/rootfiles/common/hddtemp b/config/rootfiles/common/hddtemp
deleted file mode 100644 (file)
index bc4c8d7..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#usr/man/man8/hddtemp.8
-usr/sbin/hddtemp
-#usr/share/locale/fr/LC_MESSAGES/hddtemp.mo
-#usr/share/locale/ru/LC_MESSAGES/hddtemp.mo
index 4e05e8ef093a17f70baff261d5a52be0da140974..499cdf222635a231056e819875402fb851d3c1bf 100644 (file)
@@ -1,46 +1,48 @@
 #etc/ld.so.cache
 etc/localtime
 #etc/rpc
-lib/ld-2.5.so
+lib/ld-2.12.2.so
 lib/ld-linux.so.2
-lib/libBrokenLocale-2.5.so
+lib/libBrokenLocale-2.12.2.so
 lib/libBrokenLocale.so.1
 #lib/libSegFault.so
-lib/libanl-2.5.so
+lib/libanl-2.12.2.so
 lib/libanl.so.1
-lib/libc-2.5.so
+lib/libc-2.12.2.so
 lib/libc.so.6
-lib/libcrypt-2.5.so
+lib/libcidn-2.12.2.so
+lib/libcidn.so.1
+lib/libcrypt-2.12.2.so
 lib/libcrypt.so.1
-lib/libdl-2.5.so
+lib/libdl-2.12.2.so
 lib/libdl.so.2
-lib/libm-2.5.so
+lib/libm-2.12.2.so
 lib/libm.so.6
 #lib/libmemusage.so
-lib/libnsl-2.5.so
+lib/libnsl-2.12.2.so
 lib/libnsl.so.1
-lib/libnss_compat-2.5.so
+lib/libnss_compat-2.12.2.so
 lib/libnss_compat.so.2
-lib/libnss_dns-2.5.so
+lib/libnss_dns-2.12.2.so
 lib/libnss_dns.so.2
-lib/libnss_files-2.5.so
+lib/libnss_files-2.12.2.so
 lib/libnss_files.so.2
-lib/libnss_hesiod-2.5.so
+lib/libnss_hesiod-2.12.2.so
 lib/libnss_hesiod.so.2
-lib/libnss_nis-2.5.so
+lib/libnss_nis-2.12.2.so
 lib/libnss_nis.so.2
-lib/libnss_nisplus-2.5.so
+lib/libnss_nisplus-2.12.2.so
 lib/libnss_nisplus.so.2
 #lib/libpcprofile.so
-lib/libpthread-2.5.so
+lib/libpthread-2.12.2.so
 lib/libpthread.so.0
-lib/libresolv-2.5.so
+lib/libresolv-2.12.2.so
 lib/libresolv.so.2
-lib/librt-2.5.so
+lib/librt-2.12.2.so
 lib/librt.so.1
 lib/libthread_db-1.0.so
 lib/libthread_db.so.1
-lib/libutil-2.5.so
+lib/libutil-2.12.2.so
 lib/libutil.so.1
 sbin/ldconfig
 #sbin/sln
@@ -86,7 +88,9 @@ usr/bin/ldd
 #usr/include/bits/endian.h
 #usr/include/bits/environments.h
 #usr/include/bits/errno.h
+#usr/include/bits/error.h
 #usr/include/bits/fcntl.h
+#usr/include/bits/fcntl2.h
 #usr/include/bits/fenv.h
 #usr/include/bits/fenvinline.h
 #usr/include/bits/huge_val.h
@@ -110,6 +114,7 @@ usr/bin/ldd
 #usr/include/bits/mman.h
 #usr/include/bits/monetary-ldbl.h
 #usr/include/bits/mqueue.h
+#usr/include/bits/mqueue2.h
 #usr/include/bits/msq.h
 #usr/include/bits/nan.h
 #usr/include/bits/netdb.h
@@ -125,6 +130,7 @@ usr/bin/ldd
 #usr/include/bits/sem.h
 #usr/include/bits/semaphore.h
 #usr/include/bits/setjmp.h
+#usr/include/bits/setjmp2.h
 #usr/include/bits/shm.h
 #usr/include/bits/sigaction.h
 #usr/include/bits/sigcontext.h
@@ -207,6 +213,7 @@ usr/bin/ldd
 #usr/include/gnu/stubs-32.h
 #usr/include/gnu/stubs.h
 #usr/include/grp.h
+#usr/include/gshadow.h
 #usr/include/iconv.h
 #usr/include/ieee754.h
 #usr/include/ifaddrs.h
@@ -262,6 +269,8 @@ usr/bin/ldd
 #usr/include/netinet/udp.h
 #usr/include/netipx
 #usr/include/netipx/ipx.h
+#usr/include/netiucv
+#usr/include/netiucv/iucv.h
 #usr/include/netpacket
 #usr/include/netpacket/packet.h
 #usr/include/netrom
@@ -347,8 +356,6 @@ usr/bin/ldd
 #usr/include/rpcsvc/yppasswd.x
 #usr/include/rpcsvc/ypupd.h
 #usr/include/sched.h
-#usr/include/scsi
-#usr/include/scsi/scsi.h
 #usr/include/scsi/scsi_ioctl.h
 #usr/include/scsi/sg.h
 #usr/include/search.h
@@ -375,6 +382,7 @@ usr/bin/ldd
 #usr/include/sys/elf.h
 #usr/include/sys/epoll.h
 #usr/include/sys/errno.h
+#usr/include/sys/eventfd.h
 #usr/include/sys/fcntl.h
 #usr/include/sys/file.h
 #usr/include/sys/fsuid.h
@@ -411,6 +419,7 @@ usr/bin/ldd
 #usr/include/sys/sendfile.h
 #usr/include/sys/shm.h
 #usr/include/sys/signal.h
+#usr/include/sys/signalfd.h
 #usr/include/sys/socket.h
 #usr/include/sys/socketvar.h
 #usr/include/sys/soundcard.h
@@ -427,6 +436,7 @@ usr/bin/ldd
 #usr/include/sys/termios.h
 #usr/include/sys/time.h
 #usr/include/sys/timeb.h
+#usr/include/sys/timerfd.h
 #usr/include/sys/times.h
 #usr/include/sys/timex.h
 #usr/include/sys/ttychars.h
@@ -470,20 +480,6 @@ usr/bin/ldd
 #usr/include/wctype.h
 #usr/include/wordexp.h
 #usr/include/xlocale.h
-#usr/info
-#usr/info/dir
-#usr/info/libc.info
-#usr/info/libc.info-1
-#usr/info/libc.info-10
-#usr/info/libc.info-11
-#usr/info/libc.info-2
-#usr/info/libc.info-3
-#usr/info/libc.info-4
-#usr/info/libc.info-5
-#usr/info/libc.info-6
-#usr/info/libc.info-7
-#usr/info/libc.info-8
-#usr/info/libc.info-9
 #usr/lib/Mcrt1.o
 #usr/lib/Scrt1.o
 #usr/lib/crt1.o
@@ -495,6 +491,7 @@ usr/lib/gconv
 #usr/lib/gconv/ASMO_449.so
 #usr/lib/gconv/BIG5.so
 #usr/lib/gconv/BIG5HKSCS.so
+#usr/lib/gconv/BRF.so
 #usr/lib/gconv/CP10007.so
 #usr/lib/gconv/CP1125.so
 #usr/lib/gconv/CP1250.so
@@ -545,7 +542,11 @@ usr/lib/gconv
 #usr/lib/gconv/GREEK-CCITT.so
 #usr/lib/gconv/GREEK7-OLD.so
 #usr/lib/gconv/GREEK7.so
+#usr/lib/gconv/HP-GREEK8.so
 #usr/lib/gconv/HP-ROMAN8.so
+#usr/lib/gconv/HP-ROMAN9.so
+#usr/lib/gconv/HP-THAI8.so
+#usr/lib/gconv/HP-TURKISH8.so
 #usr/lib/gconv/IBM037.so
 #usr/lib/gconv/IBM038.so
 #usr/lib/gconv/IBM1004.so
@@ -686,6 +687,7 @@ usr/lib/gconv
 #usr/lib/gconv/ISO8859-7.so
 #usr/lib/gconv/ISO8859-8.so
 #usr/lib/gconv/ISO8859-9.so
+#usr/lib/gconv/ISO8859-9E.so
 #usr/lib/gconv/ISO_10367-BOX.so
 #usr/lib/gconv/ISO_11548-1.so
 #usr/lib/gconv/ISO_2033.so
@@ -697,10 +699,12 @@ usr/lib/gconv
 #usr/lib/gconv/JOHAB.so
 #usr/lib/gconv/KOI-8.so
 #usr/lib/gconv/KOI8-R.so
+#usr/lib/gconv/KOI8-RU.so
 #usr/lib/gconv/KOI8-T.so
 #usr/lib/gconv/KOI8-U.so
 #usr/lib/gconv/LATIN-GREEK-1.so
 #usr/lib/gconv/LATIN-GREEK.so
+#usr/lib/gconv/MAC-CENTRALEUROPE.so
 #usr/lib/gconv/MAC-IS.so
 #usr/lib/gconv/MAC-SAMI.so
 #usr/lib/gconv/MAC-UK.so
@@ -735,6 +739,10 @@ usr/lib/gconv
 #usr/lib/glibc/getconf
 #usr/lib/glibc/getconf/POSIX_V6_ILP32_OFF32
 #usr/lib/glibc/getconf/POSIX_V6_ILP32_OFFBIG
+#usr/lib/glibc/getconf/POSIX_V7_ILP32_OFF32
+#usr/lib/glibc/getconf/POSIX_V7_ILP32_OFFBIG
+#usr/lib/glibc/getconf/XBS5_ILP32_OFF32
+#usr/lib/glibc/getconf/XBS5_ILP32_OFFBIG
 #usr/lib/glibc/pt_chown
 #usr/lib/libBrokenLocale.a
 #usr/lib/libBrokenLocale.so
@@ -744,6 +752,7 @@ usr/lib/gconv
 #usr/lib/libc.a
 #usr/lib/libc.so
 #usr/lib/libc_nonshared.a
+#usr/lib/libcidn.so
 #usr/lib/libcrypt.a
 #usr/lib/libcrypt.so
 #usr/lib/libdl.a
@@ -787,6 +796,7 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/charmaps/ASMO_449.gz
 #usr/share/i18n/charmaps/BIG5-HKSCS.gz
 #usr/share/i18n/charmaps/BIG5.gz
+#usr/share/i18n/charmaps/BRF.gz
 #usr/share/i18n/charmaps/BS_4730.gz
 #usr/share/i18n/charmaps/BS_VIEWDATA.gz
 #usr/share/i18n/charmaps/CP10007.gz
@@ -845,7 +855,11 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/charmaps/GREEK-CCITT.gz
 #usr/share/i18n/charmaps/GREEK7-OLD.gz
 #usr/share/i18n/charmaps/GREEK7.gz
+#usr/share/i18n/charmaps/HP-GREEK8.gz
 #usr/share/i18n/charmaps/HP-ROMAN8.gz
+#usr/share/i18n/charmaps/HP-ROMAN9.gz
+#usr/share/i18n/charmaps/HP-THAI8.gz
+#usr/share/i18n/charmaps/HP-TURKISH8.gz
 #usr/share/i18n/charmaps/IBM037.gz
 #usr/share/i18n/charmaps/IBM038.gz
 #usr/share/i18n/charmaps/IBM1004.gz
@@ -925,6 +939,7 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/charmaps/ISO-8859-7.gz
 #usr/share/i18n/charmaps/ISO-8859-8.gz
 #usr/share/i18n/charmaps/ISO-8859-9.gz
+#usr/share/i18n/charmaps/ISO-8859-9E.gz
 #usr/share/i18n/charmaps/ISO-IR-197.gz
 #usr/share/i18n/charmaps/ISO-IR-209.gz
 #usr/share/i18n/charmaps/ISO-IR-90.gz
@@ -958,11 +973,13 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/charmaps/JUS_I.B1.003-SERB.gz
 #usr/share/i18n/charmaps/KOI-8.gz
 #usr/share/i18n/charmaps/KOI8-R.gz
+#usr/share/i18n/charmaps/KOI8-RU.gz
 #usr/share/i18n/charmaps/KOI8-T.gz
 #usr/share/i18n/charmaps/KOI8-U.gz
 #usr/share/i18n/charmaps/KSC5636.gz
 #usr/share/i18n/charmaps/LATIN-GREEK-1.gz
 #usr/share/i18n/charmaps/LATIN-GREEK.gz
+#usr/share/i18n/charmaps/MAC-CENTRALEUROPE.gz
 #usr/share/i18n/charmaps/MAC-CYRILLIC.gz
 #usr/share/i18n/charmaps/MAC-IS.gz
 #usr/share/i18n/charmaps/MAC-SAMI.gz
@@ -1028,12 +1045,17 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/ar_TN
 #usr/share/i18n/locales/ar_YE
 #usr/share/i18n/locales/as_IN
+#usr/share/i18n/locales/ast_ES
 #usr/share/i18n/locales/az_AZ
 #usr/share/i18n/locales/be_BY
 #usr/share/i18n/locales/be_BY@latin
+#usr/share/i18n/locales/ber_DZ
+#usr/share/i18n/locales/ber_MA
 #usr/share/i18n/locales/bg_BG
 #usr/share/i18n/locales/bn_BD
 #usr/share/i18n/locales/bn_IN
+#usr/share/i18n/locales/bo_CN
+#usr/share/i18n/locales/bo_IN
 #usr/share/i18n/locales/br_FR
 #usr/share/i18n/locales/br_FR@euro
 #usr/share/i18n/locales/bs_BA
@@ -1043,8 +1065,10 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/ca_ES@euro
 #usr/share/i18n/locales/ca_FR
 #usr/share/i18n/locales/ca_IT
+#usr/share/i18n/locales/crh_UA
 #usr/share/i18n/locales/cs_CZ
 #usr/share/i18n/locales/csb_PL
+#usr/share/i18n/locales/cv_RU
 #usr/share/i18n/locales/cy_GB
 #usr/share/i18n/locales/da_DK
 #usr/share/i18n/locales/de_AT
@@ -1056,10 +1080,12 @@ 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/dv_MV
 #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_AG
 #usr/share/i18n/locales/en_AU
 #usr/share/i18n/locales/en_BW
 #usr/share/i18n/locales/en_CA
@@ -1069,6 +1095,7 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/en_IE
 #usr/share/i18n/locales/en_IE@euro
 #usr/share/i18n/locales/en_IN
+#usr/share/i18n/locales/en_NG
 #usr/share/i18n/locales/en_NZ
 #usr/share/i18n/locales/en_PH
 #usr/share/i18n/locales/en_SG
@@ -1102,6 +1129,7 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/fa_IR
 #usr/share/i18n/locales/fi_FI
 #usr/share/i18n/locales/fi_FI@euro
+#usr/share/i18n/locales/fil_PH
 #usr/share/i18n/locales/fo_FO
 #usr/share/i18n/locales/fr_BE
 #usr/share/i18n/locales/fr_BE@euro
@@ -1111,6 +1139,8 @@ 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/fur_IT
+#usr/share/i18n/locales/fy_DE
 #usr/share/i18n/locales/fy_NL
 #usr/share/i18n/locales/ga_IE
 #usr/share/i18n/locales/ga_IE@euro
@@ -1123,19 +1153,27 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/gl_ES@euro
 #usr/share/i18n/locales/gu_IN
 #usr/share/i18n/locales/gv_GB
+#usr/share/i18n/locales/ha_NG
 #usr/share/i18n/locales/he_IL
 #usr/share/i18n/locales/hi_IN
+#usr/share/i18n/locales/hne_IN
 #usr/share/i18n/locales/hr_HR
 #usr/share/i18n/locales/hsb_DE
+#usr/share/i18n/locales/ht_HT
 #usr/share/i18n/locales/hu_HU
 #usr/share/i18n/locales/hy_AM
 #usr/share/i18n/locales/i18n
 #usr/share/i18n/locales/id_ID
+#usr/share/i18n/locales/ig_NG
+#usr/share/i18n/locales/ik_CA
 #usr/share/i18n/locales/is_IS
 #usr/share/i18n/locales/iso14651_t1
+#usr/share/i18n/locales/iso14651_t1_common
+#usr/share/i18n/locales/iso14651_t1_pinyin
 #usr/share/i18n/locales/it_CH
 #usr/share/i18n/locales/it_IT
 #usr/share/i18n/locales/it_IT@euro
+#usr/share/i18n/locales/iu_CA
 #usr/share/i18n/locales/iw_IL
 #usr/share/i18n/locales/ja_JP
 #usr/share/i18n/locales/ka_GE
@@ -1144,13 +1182,19 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/km_KH
 #usr/share/i18n/locales/kn_IN
 #usr/share/i18n/locales/ko_KR
+#usr/share/i18n/locales/kok_IN
+#usr/share/i18n/locales/ks_IN
+#usr/share/i18n/locales/ks_IN@devanagari
 #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/li_BE
+#usr/share/i18n/locales/li_NL
 #usr/share/i18n/locales/lo_LA
 #usr/share/i18n/locales/lt_LT
 #usr/share/i18n/locales/lv_LV
+#usr/share/i18n/locales/mai_IN
 #usr/share/i18n/locales/mg_MG
 #usr/share/i18n/locales/mi_NZ
 #usr/share/i18n/locales/mk_MK
@@ -1159,8 +1203,13 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/mr_IN
 #usr/share/i18n/locales/ms_MY
 #usr/share/i18n/locales/mt_MT
+#usr/share/i18n/locales/my_MM
+#usr/share/i18n/locales/nan_TW@latin
 #usr/share/i18n/locales/nb_NO
+#usr/share/i18n/locales/nds_DE
+#usr/share/i18n/locales/nds_NL
 #usr/share/i18n/locales/ne_NP
+#usr/share/i18n/locales/nl_AW
 #usr/share/i18n/locales/nl_BE
 #usr/share/i18n/locales/nl_BE@euro
 #usr/share/i18n/locales/nl_NL
@@ -1174,7 +1223,9 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/or_IN
 #usr/share/i18n/locales/pa_IN
 #usr/share/i18n/locales/pa_PK
+#usr/share/i18n/locales/pap_AN
 #usr/share/i18n/locales/pl_PL
+#usr/share/i18n/locales/ps_AF
 #usr/share/i18n/locales/pt_BR
 #usr/share/i18n/locales/pt_PT
 #usr/share/i18n/locales/pt_PT@euro
@@ -1182,7 +1233,12 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/ru_RU
 #usr/share/i18n/locales/ru_UA
 #usr/share/i18n/locales/rw_RW
+#usr/share/i18n/locales/sa_IN
+#usr/share/i18n/locales/sc_IT
+#usr/share/i18n/locales/sd_IN
+#usr/share/i18n/locales/sd_IN@devanagari
 #usr/share/i18n/locales/se_NO
+#usr/share/i18n/locales/shs_CA
 #usr/share/i18n/locales/si_LK
 #usr/share/i18n/locales/sid_ET
 #usr/share/i18n/locales/sk_SK
@@ -1192,8 +1248,10 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/so_KE
 #usr/share/i18n/locales/so_SO
 #usr/share/i18n/locales/sq_AL
-#usr/share/i18n/locales/sr_CS
+#usr/share/i18n/locales/sq_MK
 #usr/share/i18n/locales/sr_ME
+#usr/share/i18n/locales/sr_RS
+#usr/share/i18n/locales/sr_RS@latin
 #usr/share/i18n/locales/ss_ZA
 #usr/share/i18n/locales/st_ZA
 #usr/share/i18n/locales/sv_FI
@@ -1206,6 +1264,7 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/ti_ER
 #usr/share/i18n/locales/ti_ET
 #usr/share/i18n/locales/tig_ER
+#usr/share/i18n/locales/tk_TM
 #usr/share/i18n/locales/tl_PH
 #usr/share/i18n/locales/tn_ZA
 #usr/share/i18n/locales/tr_CY
@@ -1224,7 +1283,10 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/translit_wide
 #usr/share/i18n/locales/ts_ZA
 #usr/share/i18n/locales/tt_RU
+#usr/share/i18n/locales/tt_RU@iqtelif
+#usr/share/i18n/locales/ug_CN
 #usr/share/i18n/locales/uk_UA
+#usr/share/i18n/locales/ur_IN
 #usr/share/i18n/locales/ur_PK
 #usr/share/i18n/locales/uz_UZ
 #usr/share/i18n/locales/uz_UZ@cyrillic
@@ -1233,16 +1295,34 @@ usr/lib/locale/locale-archive
 #usr/share/i18n/locales/wa_BE
 #usr/share/i18n/locales/wa_BE@euro
 #usr/share/i18n/locales/wal_ET
+#usr/share/i18n/locales/wo_SN
 #usr/share/i18n/locales/xh_ZA
 #usr/share/i18n/locales/yi_US
+#usr/share/i18n/locales/yo_NG
 #usr/share/i18n/locales/zh_CN
 #usr/share/i18n/locales/zh_HK
 #usr/share/i18n/locales/zh_SG
 #usr/share/i18n/locales/zh_TW
 #usr/share/i18n/locales/zu_ZA
+#usr/share/info/dir
+#usr/share/info/libc.info
+#usr/share/info/libc.info-1
+#usr/share/info/libc.info-10
+#usr/share/info/libc.info-11
+#usr/share/info/libc.info-2
+#usr/share/info/libc.info-3
+#usr/share/info/libc.info-4
+#usr/share/info/libc.info-5
+#usr/share/info/libc.info-6
+#usr/share/info/libc.info-7
+#usr/share/info/libc.info-8
+#usr/share/info/libc.info-9
 #usr/share/locale/be
 #usr/share/locale/be/LC_MESSAGES
 #usr/share/locale/be/LC_MESSAGES/libc.mo
+#usr/share/locale/bg
+#usr/share/locale/bg/LC_MESSAGES
+#usr/share/locale/bg/LC_MESSAGES/libc.mo
 #usr/share/locale/ca
 #usr/share/locale/ca/LC_MESSAGES
 #usr/share/locale/ca/LC_MESSAGES/libc.mo
@@ -1279,6 +1359,9 @@ usr/lib/locale/locale-archive
 #usr/share/locale/hu
 #usr/share/locale/hu/LC_MESSAGES
 #usr/share/locale/hu/LC_MESSAGES/libc.mo
+#usr/share/locale/id
+#usr/share/locale/id/LC_MESSAGES
+#usr/share/locale/id/LC_MESSAGES/libc.mo
 #usr/share/locale/it
 #usr/share/locale/it/LC_MESSAGES
 #usr/share/locale/it/LC_MESSAGES/libc.mo
@@ -1289,6 +1372,9 @@ usr/lib/locale/locale-archive
 #usr/share/locale/ko/LC_MESSAGES
 #usr/share/locale/ko/LC_MESSAGES/libc.mo
 #usr/share/locale/locale.alias
+#usr/share/locale/lt
+#usr/share/locale/lt/LC_MESSAGES
+#usr/share/locale/lt/LC_MESSAGES/libc.mo
 #usr/share/locale/nb
 #usr/share/locale/nb/LC_MESSAGES
 #usr/share/locale/nb/LC_MESSAGES/libc.mo
@@ -1316,6 +1402,9 @@ usr/lib/locale/locale-archive
 #usr/share/locale/tr
 #usr/share/locale/tr/LC_MESSAGES
 #usr/share/locale/tr/LC_MESSAGES/libc.mo
+#usr/share/locale/vi
+#usr/share/locale/vi/LC_MESSAGES
+#usr/share/locale/vi/LC_MESSAGES/libc.mo
 #usr/share/locale/zh_CN
 #usr/share/locale/zh_CN/LC_MESSAGES
 #usr/share/locale/zh_CN/LC_MESSAGES/libc.mo
@@ -1327,6 +1416,7 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/Africa/Accra
 #usr/share/zoneinfo/Africa/Addis_Ababa
 #usr/share/zoneinfo/Africa/Algiers
+#usr/share/zoneinfo/Africa/Asmara
 #usr/share/zoneinfo/Africa/Asmera
 #usr/share/zoneinfo/Africa/Bamako
 #usr/share/zoneinfo/Africa/Bangui
@@ -1390,16 +1480,20 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/America/Argentina/La_Rioja
 #usr/share/zoneinfo/America/Argentina/Mendoza
 #usr/share/zoneinfo/America/Argentina/Rio_Gallegos
+#usr/share/zoneinfo/America/Argentina/Salta
 #usr/share/zoneinfo/America/Argentina/San_Juan
+#usr/share/zoneinfo/America/Argentina/San_Luis
 #usr/share/zoneinfo/America/Argentina/Tucuman
 #usr/share/zoneinfo/America/Argentina/Ushuaia
 #usr/share/zoneinfo/America/Aruba
 #usr/share/zoneinfo/America/Asuncion
+#usr/share/zoneinfo/America/Atikokan
 #usr/share/zoneinfo/America/Atka
 #usr/share/zoneinfo/America/Bahia
 #usr/share/zoneinfo/America/Barbados
 #usr/share/zoneinfo/America/Belem
 #usr/share/zoneinfo/America/Belize
+#usr/share/zoneinfo/America/Blanc-Sablon
 #usr/share/zoneinfo/America/Boa_Vista
 #usr/share/zoneinfo/America/Bogota
 #usr/share/zoneinfo/America/Boise
@@ -1447,8 +1541,10 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/America/Indiana/Knox
 #usr/share/zoneinfo/America/Indiana/Marengo
 #usr/share/zoneinfo/America/Indiana/Petersburg
+#usr/share/zoneinfo/America/Indiana/Tell_City
 #usr/share/zoneinfo/America/Indiana/Vevay
 #usr/share/zoneinfo/America/Indiana/Vincennes
+#usr/share/zoneinfo/America/Indiana/Winamac
 #usr/share/zoneinfo/America/Indianapolis
 #usr/share/zoneinfo/America/Inuvik
 #usr/share/zoneinfo/America/Iqaluit
@@ -1466,6 +1562,7 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/America/Maceio
 #usr/share/zoneinfo/America/Managua
 #usr/share/zoneinfo/America/Manaus
+#usr/share/zoneinfo/America/Marigot
 #usr/share/zoneinfo/America/Martinique
 #usr/share/zoneinfo/America/Mazatlan
 #usr/share/zoneinfo/America/Mendoza
@@ -1485,6 +1582,7 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/America/Noronha
 #usr/share/zoneinfo/America/North_Dakota
 #usr/share/zoneinfo/America/North_Dakota/Center
+#usr/share/zoneinfo/America/North_Dakota/New_Salem
 #usr/share/zoneinfo/America/Panama
 #usr/share/zoneinfo/America/Pangnirtung
 #usr/share/zoneinfo/America/Paramaribo
@@ -1498,13 +1596,16 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/America/Rankin_Inlet
 #usr/share/zoneinfo/America/Recife
 #usr/share/zoneinfo/America/Regina
+#usr/share/zoneinfo/America/Resolute
 #usr/share/zoneinfo/America/Rio_Branco
 #usr/share/zoneinfo/America/Rosario
+#usr/share/zoneinfo/America/Santarem
 #usr/share/zoneinfo/America/Santiago
 #usr/share/zoneinfo/America/Santo_Domingo
 #usr/share/zoneinfo/America/Sao_Paulo
 #usr/share/zoneinfo/America/Scoresbysund
 #usr/share/zoneinfo/America/Shiprock
+#usr/share/zoneinfo/America/St_Barthelemy
 #usr/share/zoneinfo/America/St_Johns
 #usr/share/zoneinfo/America/St_Kitts
 #usr/share/zoneinfo/America/St_Lucia
@@ -1565,6 +1666,7 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/Asia/Dushanbe
 #usr/share/zoneinfo/Asia/Gaza
 #usr/share/zoneinfo/Asia/Harbin
+#usr/share/zoneinfo/Asia/Ho_Chi_Minh
 #usr/share/zoneinfo/Asia/Hong_Kong
 #usr/share/zoneinfo/Asia/Hovd
 #usr/share/zoneinfo/Asia/Irkutsk
@@ -1576,7 +1678,9 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/Asia/Kamchatka
 #usr/share/zoneinfo/Asia/Karachi
 #usr/share/zoneinfo/Asia/Kashgar
+#usr/share/zoneinfo/Asia/Kathmandu
 #usr/share/zoneinfo/Asia/Katmandu
+#usr/share/zoneinfo/Asia/Kolkata
 #usr/share/zoneinfo/Asia/Krasnoyarsk
 #usr/share/zoneinfo/Asia/Kuala_Lumpur
 #usr/share/zoneinfo/Asia/Kuching
@@ -1630,6 +1734,7 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/Atlantic/Canary
 #usr/share/zoneinfo/Atlantic/Cape_Verde
 #usr/share/zoneinfo/Atlantic/Faeroe
+#usr/share/zoneinfo/Atlantic/Faroe
 #usr/share/zoneinfo/Atlantic/Jan_Mayen
 #usr/share/zoneinfo/Atlantic/Madeira
 #usr/share/zoneinfo/Atlantic/Reykjavik
@@ -1644,6 +1749,7 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/Australia/Canberra
 #usr/share/zoneinfo/Australia/Currie
 #usr/share/zoneinfo/Australia/Darwin
+#usr/share/zoneinfo/Australia/Eucla
 #usr/share/zoneinfo/Australia/Hobart
 #usr/share/zoneinfo/Australia/LHI
 #usr/share/zoneinfo/Australia/Lindeman
@@ -1736,8 +1842,11 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/Europe/Copenhagen
 #usr/share/zoneinfo/Europe/Dublin
 #usr/share/zoneinfo/Europe/Gibraltar
+#usr/share/zoneinfo/Europe/Guernsey
 #usr/share/zoneinfo/Europe/Helsinki
+#usr/share/zoneinfo/Europe/Isle_of_Man
 #usr/share/zoneinfo/Europe/Istanbul
+#usr/share/zoneinfo/Europe/Jersey
 #usr/share/zoneinfo/Europe/Kaliningrad
 #usr/share/zoneinfo/Europe/Kiev
 #usr/share/zoneinfo/Europe/Lisbon
@@ -1753,6 +1862,7 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/Europe/Nicosia
 #usr/share/zoneinfo/Europe/Oslo
 #usr/share/zoneinfo/Europe/Paris
+#usr/share/zoneinfo/Europe/Podgorica
 #usr/share/zoneinfo/Europe/Prague
 #usr/share/zoneinfo/Europe/Riga
 #usr/share/zoneinfo/Europe/Rome
@@ -1771,6 +1881,7 @@ usr/lib/locale/locale-archive
 #usr/share/zoneinfo/Europe/Vatican
 #usr/share/zoneinfo/Europe/Vienna
 #usr/share/zoneinfo/Europe/Vilnius
+#usr/share/zoneinfo/Europe/Volgograd
 #usr/share/zoneinfo/Europe/Warsaw
 #usr/share/zoneinfo/Europe/Zagreb
 #usr/share/zoneinfo/Europe/Zaporozhye
@@ -1893,6 +2004,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/Africa/Accra
 #usr/share/zoneinfo/posix/Africa/Addis_Ababa
 #usr/share/zoneinfo/posix/Africa/Algiers
+#usr/share/zoneinfo/posix/Africa/Asmara
 #usr/share/zoneinfo/posix/Africa/Asmera
 #usr/share/zoneinfo/posix/Africa/Bamako
 #usr/share/zoneinfo/posix/Africa/Bangui
@@ -1956,16 +2068,20 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/America/Argentina/La_Rioja
 #usr/share/zoneinfo/posix/America/Argentina/Mendoza
 #usr/share/zoneinfo/posix/America/Argentina/Rio_Gallegos
+#usr/share/zoneinfo/posix/America/Argentina/Salta
 #usr/share/zoneinfo/posix/America/Argentina/San_Juan
+#usr/share/zoneinfo/posix/America/Argentina/San_Luis
 #usr/share/zoneinfo/posix/America/Argentina/Tucuman
 #usr/share/zoneinfo/posix/America/Argentina/Ushuaia
 #usr/share/zoneinfo/posix/America/Aruba
 #usr/share/zoneinfo/posix/America/Asuncion
+#usr/share/zoneinfo/posix/America/Atikokan
 #usr/share/zoneinfo/posix/America/Atka
 #usr/share/zoneinfo/posix/America/Bahia
 #usr/share/zoneinfo/posix/America/Barbados
 #usr/share/zoneinfo/posix/America/Belem
 #usr/share/zoneinfo/posix/America/Belize
+#usr/share/zoneinfo/posix/America/Blanc-Sablon
 #usr/share/zoneinfo/posix/America/Boa_Vista
 #usr/share/zoneinfo/posix/America/Bogota
 #usr/share/zoneinfo/posix/America/Boise
@@ -2013,8 +2129,10 @@ usr/share/zoneinfo/posix
 #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/Tell_City
 #usr/share/zoneinfo/posix/America/Indiana/Vevay
 #usr/share/zoneinfo/posix/America/Indiana/Vincennes
+#usr/share/zoneinfo/posix/America/Indiana/Winamac
 #usr/share/zoneinfo/posix/America/Indianapolis
 #usr/share/zoneinfo/posix/America/Inuvik
 #usr/share/zoneinfo/posix/America/Iqaluit
@@ -2032,6 +2150,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/America/Maceio
 #usr/share/zoneinfo/posix/America/Managua
 #usr/share/zoneinfo/posix/America/Manaus
+#usr/share/zoneinfo/posix/America/Marigot
 #usr/share/zoneinfo/posix/America/Martinique
 #usr/share/zoneinfo/posix/America/Mazatlan
 #usr/share/zoneinfo/posix/America/Mendoza
@@ -2051,6 +2170,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/America/Noronha
 #usr/share/zoneinfo/posix/America/North_Dakota
 #usr/share/zoneinfo/posix/America/North_Dakota/Center
+#usr/share/zoneinfo/posix/America/North_Dakota/New_Salem
 #usr/share/zoneinfo/posix/America/Panama
 #usr/share/zoneinfo/posix/America/Pangnirtung
 #usr/share/zoneinfo/posix/America/Paramaribo
@@ -2064,13 +2184,16 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/America/Rankin_Inlet
 #usr/share/zoneinfo/posix/America/Recife
 #usr/share/zoneinfo/posix/America/Regina
+#usr/share/zoneinfo/posix/America/Resolute
 #usr/share/zoneinfo/posix/America/Rio_Branco
 #usr/share/zoneinfo/posix/America/Rosario
+#usr/share/zoneinfo/posix/America/Santarem
 #usr/share/zoneinfo/posix/America/Santiago
 #usr/share/zoneinfo/posix/America/Santo_Domingo
 #usr/share/zoneinfo/posix/America/Sao_Paulo
 #usr/share/zoneinfo/posix/America/Scoresbysund
 #usr/share/zoneinfo/posix/America/Shiprock
+#usr/share/zoneinfo/posix/America/St_Barthelemy
 #usr/share/zoneinfo/posix/America/St_Johns
 #usr/share/zoneinfo/posix/America/St_Kitts
 #usr/share/zoneinfo/posix/America/St_Lucia
@@ -2131,6 +2254,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/Asia/Dushanbe
 #usr/share/zoneinfo/posix/Asia/Gaza
 #usr/share/zoneinfo/posix/Asia/Harbin
+#usr/share/zoneinfo/posix/Asia/Ho_Chi_Minh
 #usr/share/zoneinfo/posix/Asia/Hong_Kong
 #usr/share/zoneinfo/posix/Asia/Hovd
 #usr/share/zoneinfo/posix/Asia/Irkutsk
@@ -2142,7 +2266,9 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/Asia/Kamchatka
 #usr/share/zoneinfo/posix/Asia/Karachi
 #usr/share/zoneinfo/posix/Asia/Kashgar
+#usr/share/zoneinfo/posix/Asia/Kathmandu
 #usr/share/zoneinfo/posix/Asia/Katmandu
+#usr/share/zoneinfo/posix/Asia/Kolkata
 #usr/share/zoneinfo/posix/Asia/Krasnoyarsk
 #usr/share/zoneinfo/posix/Asia/Kuala_Lumpur
 #usr/share/zoneinfo/posix/Asia/Kuching
@@ -2196,6 +2322,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/Atlantic/Canary
 #usr/share/zoneinfo/posix/Atlantic/Cape_Verde
 #usr/share/zoneinfo/posix/Atlantic/Faeroe
+#usr/share/zoneinfo/posix/Atlantic/Faroe
 #usr/share/zoneinfo/posix/Atlantic/Jan_Mayen
 #usr/share/zoneinfo/posix/Atlantic/Madeira
 #usr/share/zoneinfo/posix/Atlantic/Reykjavik
@@ -2210,6 +2337,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/Australia/Canberra
 #usr/share/zoneinfo/posix/Australia/Currie
 #usr/share/zoneinfo/posix/Australia/Darwin
+#usr/share/zoneinfo/posix/Australia/Eucla
 #usr/share/zoneinfo/posix/Australia/Hobart
 #usr/share/zoneinfo/posix/Australia/LHI
 #usr/share/zoneinfo/posix/Australia/Lindeman
@@ -2302,8 +2430,11 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/Europe/Copenhagen
 #usr/share/zoneinfo/posix/Europe/Dublin
 #usr/share/zoneinfo/posix/Europe/Gibraltar
+#usr/share/zoneinfo/posix/Europe/Guernsey
 #usr/share/zoneinfo/posix/Europe/Helsinki
+#usr/share/zoneinfo/posix/Europe/Isle_of_Man
 #usr/share/zoneinfo/posix/Europe/Istanbul
+#usr/share/zoneinfo/posix/Europe/Jersey
 #usr/share/zoneinfo/posix/Europe/Kaliningrad
 #usr/share/zoneinfo/posix/Europe/Kiev
 #usr/share/zoneinfo/posix/Europe/Lisbon
@@ -2319,6 +2450,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/Europe/Nicosia
 #usr/share/zoneinfo/posix/Europe/Oslo
 #usr/share/zoneinfo/posix/Europe/Paris
+#usr/share/zoneinfo/posix/Europe/Podgorica
 #usr/share/zoneinfo/posix/Europe/Prague
 #usr/share/zoneinfo/posix/Europe/Riga
 #usr/share/zoneinfo/posix/Europe/Rome
@@ -2337,6 +2469,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/posix/Europe/Vatican
 #usr/share/zoneinfo/posix/Europe/Vienna
 #usr/share/zoneinfo/posix/Europe/Vilnius
+#usr/share/zoneinfo/posix/Europe/Volgograd
 #usr/share/zoneinfo/posix/Europe/Warsaw
 #usr/share/zoneinfo/posix/Europe/Zagreb
 #usr/share/zoneinfo/posix/Europe/Zaporozhye
@@ -2459,6 +2592,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/Africa/Accra
 #usr/share/zoneinfo/right/Africa/Addis_Ababa
 #usr/share/zoneinfo/right/Africa/Algiers
+#usr/share/zoneinfo/right/Africa/Asmara
 #usr/share/zoneinfo/right/Africa/Asmera
 #usr/share/zoneinfo/right/Africa/Bamako
 #usr/share/zoneinfo/right/Africa/Bangui
@@ -2522,16 +2656,20 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/America/Argentina/La_Rioja
 #usr/share/zoneinfo/right/America/Argentina/Mendoza
 #usr/share/zoneinfo/right/America/Argentina/Rio_Gallegos
+#usr/share/zoneinfo/right/America/Argentina/Salta
 #usr/share/zoneinfo/right/America/Argentina/San_Juan
+#usr/share/zoneinfo/right/America/Argentina/San_Luis
 #usr/share/zoneinfo/right/America/Argentina/Tucuman
 #usr/share/zoneinfo/right/America/Argentina/Ushuaia
 #usr/share/zoneinfo/right/America/Aruba
 #usr/share/zoneinfo/right/America/Asuncion
+#usr/share/zoneinfo/right/America/Atikokan
 #usr/share/zoneinfo/right/America/Atka
 #usr/share/zoneinfo/right/America/Bahia
 #usr/share/zoneinfo/right/America/Barbados
 #usr/share/zoneinfo/right/America/Belem
 #usr/share/zoneinfo/right/America/Belize
+#usr/share/zoneinfo/right/America/Blanc-Sablon
 #usr/share/zoneinfo/right/America/Boa_Vista
 #usr/share/zoneinfo/right/America/Bogota
 #usr/share/zoneinfo/right/America/Boise
@@ -2579,8 +2717,10 @@ usr/share/zoneinfo/posix
 #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/Tell_City
 #usr/share/zoneinfo/right/America/Indiana/Vevay
 #usr/share/zoneinfo/right/America/Indiana/Vincennes
+#usr/share/zoneinfo/right/America/Indiana/Winamac
 #usr/share/zoneinfo/right/America/Indianapolis
 #usr/share/zoneinfo/right/America/Inuvik
 #usr/share/zoneinfo/right/America/Iqaluit
@@ -2598,6 +2738,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/America/Maceio
 #usr/share/zoneinfo/right/America/Managua
 #usr/share/zoneinfo/right/America/Manaus
+#usr/share/zoneinfo/right/America/Marigot
 #usr/share/zoneinfo/right/America/Martinique
 #usr/share/zoneinfo/right/America/Mazatlan
 #usr/share/zoneinfo/right/America/Mendoza
@@ -2617,6 +2758,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/America/Noronha
 #usr/share/zoneinfo/right/America/North_Dakota
 #usr/share/zoneinfo/right/America/North_Dakota/Center
+#usr/share/zoneinfo/right/America/North_Dakota/New_Salem
 #usr/share/zoneinfo/right/America/Panama
 #usr/share/zoneinfo/right/America/Pangnirtung
 #usr/share/zoneinfo/right/America/Paramaribo
@@ -2630,13 +2772,16 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/America/Rankin_Inlet
 #usr/share/zoneinfo/right/America/Recife
 #usr/share/zoneinfo/right/America/Regina
+#usr/share/zoneinfo/right/America/Resolute
 #usr/share/zoneinfo/right/America/Rio_Branco
 #usr/share/zoneinfo/right/America/Rosario
+#usr/share/zoneinfo/right/America/Santarem
 #usr/share/zoneinfo/right/America/Santiago
 #usr/share/zoneinfo/right/America/Santo_Domingo
 #usr/share/zoneinfo/right/America/Sao_Paulo
 #usr/share/zoneinfo/right/America/Scoresbysund
 #usr/share/zoneinfo/right/America/Shiprock
+#usr/share/zoneinfo/right/America/St_Barthelemy
 #usr/share/zoneinfo/right/America/St_Johns
 #usr/share/zoneinfo/right/America/St_Kitts
 #usr/share/zoneinfo/right/America/St_Lucia
@@ -2697,6 +2842,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/Asia/Dushanbe
 #usr/share/zoneinfo/right/Asia/Gaza
 #usr/share/zoneinfo/right/Asia/Harbin
+#usr/share/zoneinfo/right/Asia/Ho_Chi_Minh
 #usr/share/zoneinfo/right/Asia/Hong_Kong
 #usr/share/zoneinfo/right/Asia/Hovd
 #usr/share/zoneinfo/right/Asia/Irkutsk
@@ -2708,7 +2854,9 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/Asia/Kamchatka
 #usr/share/zoneinfo/right/Asia/Karachi
 #usr/share/zoneinfo/right/Asia/Kashgar
+#usr/share/zoneinfo/right/Asia/Kathmandu
 #usr/share/zoneinfo/right/Asia/Katmandu
+#usr/share/zoneinfo/right/Asia/Kolkata
 #usr/share/zoneinfo/right/Asia/Krasnoyarsk
 #usr/share/zoneinfo/right/Asia/Kuala_Lumpur
 #usr/share/zoneinfo/right/Asia/Kuching
@@ -2762,6 +2910,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/Atlantic/Canary
 #usr/share/zoneinfo/right/Atlantic/Cape_Verde
 #usr/share/zoneinfo/right/Atlantic/Faeroe
+#usr/share/zoneinfo/right/Atlantic/Faroe
 #usr/share/zoneinfo/right/Atlantic/Jan_Mayen
 #usr/share/zoneinfo/right/Atlantic/Madeira
 #usr/share/zoneinfo/right/Atlantic/Reykjavik
@@ -2776,6 +2925,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/Australia/Canberra
 #usr/share/zoneinfo/right/Australia/Currie
 #usr/share/zoneinfo/right/Australia/Darwin
+#usr/share/zoneinfo/right/Australia/Eucla
 #usr/share/zoneinfo/right/Australia/Hobart
 #usr/share/zoneinfo/right/Australia/LHI
 #usr/share/zoneinfo/right/Australia/Lindeman
@@ -2868,8 +3018,11 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/Europe/Copenhagen
 #usr/share/zoneinfo/right/Europe/Dublin
 #usr/share/zoneinfo/right/Europe/Gibraltar
+#usr/share/zoneinfo/right/Europe/Guernsey
 #usr/share/zoneinfo/right/Europe/Helsinki
+#usr/share/zoneinfo/right/Europe/Isle_of_Man
 #usr/share/zoneinfo/right/Europe/Istanbul
+#usr/share/zoneinfo/right/Europe/Jersey
 #usr/share/zoneinfo/right/Europe/Kaliningrad
 #usr/share/zoneinfo/right/Europe/Kiev
 #usr/share/zoneinfo/right/Europe/Lisbon
@@ -2885,6 +3038,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/Europe/Nicosia
 #usr/share/zoneinfo/right/Europe/Oslo
 #usr/share/zoneinfo/right/Europe/Paris
+#usr/share/zoneinfo/right/Europe/Podgorica
 #usr/share/zoneinfo/right/Europe/Prague
 #usr/share/zoneinfo/right/Europe/Riga
 #usr/share/zoneinfo/right/Europe/Rome
@@ -2903,6 +3057,7 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/Europe/Vatican
 #usr/share/zoneinfo/right/Europe/Vienna
 #usr/share/zoneinfo/right/Europe/Vilnius
+#usr/share/zoneinfo/right/Europe/Volgograd
 #usr/share/zoneinfo/right/Europe/Warsaw
 #usr/share/zoneinfo/right/Europe/Zagreb
 #usr/share/zoneinfo/right/Europe/Zaporozhye
@@ -3019,3 +3174,5 @@ usr/share/zoneinfo/posix
 #usr/share/zoneinfo/right/WET
 #usr/share/zoneinfo/right/Zulu
 #usr/share/zoneinfo/zone.tab
+#var/cache/ldconfig
+#var/cache/ldconfig/aux-cache
diff --git a/config/rootfiles/common/libsafe b/config/rootfiles/common/libsafe
deleted file mode 100644 (file)
index 8275e4a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/ld.so.preload
-lib/libsafe.so.2
-lib/libsafe.so.2.0.16
-#usr/man/man8/libsafe.8
index 212e864162c73cdcddcb4901164f78e829f0045a..e7f7c3c1bc9c53ce08def7bd288dfb47cf03579c 100644 (file)
 #usr/include/vorbis/vorbisfile.h
 #usr/lib/libvorbis.a
 #usr/lib/libvorbis.la
-usr/lib/libvorbis.so
+#usr/lib/libvorbis.so
 usr/lib/libvorbis.so.0
-usr/lib/libvorbis.so.0.4.3
+usr/lib/libvorbis.so.0.4.6
 #usr/lib/libvorbisenc.a
 #usr/lib/libvorbisenc.la
-usr/lib/libvorbisenc.so
+#usr/lib/libvorbisenc.so
 usr/lib/libvorbisenc.so.2
-usr/lib/libvorbisenc.so.2.0.6
+usr/lib/libvorbisenc.so.2.0.9
 #usr/lib/libvorbisfile.a
 #usr/lib/libvorbisfile.la
-usr/lib/libvorbisfile.so
+#usr/lib/libvorbisfile.so
 usr/lib/libvorbisfile.so.3
-usr/lib/libvorbisfile.so.3.3.2
+usr/lib/libvorbisfile.so.3.3.5
 #usr/lib/pkgconfig/vorbis.pc
 #usr/lib/pkgconfig/vorbisenc.pc
 #usr/lib/pkgconfig/vorbisfile.pc
 #usr/share/aclocal/vorbis.m4
-#usr/share/doc/libvorbis-1.2.3
-#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.cfg
-#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.css
-#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.html
-#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.pdf
-#usr/share/doc/libvorbis-1.2.3/Vorbis_I_spec.tex
-#usr/share/doc/libvorbis-1.2.3/eightphase.png
-#usr/share/doc/libvorbis-1.2.3/evenlsp.png
-#usr/share/doc/libvorbis-1.2.3/fish_xiph_org.png
-#usr/share/doc/libvorbis-1.2.3/floor1_inverse_dB_table.html
-#usr/share/doc/libvorbis-1.2.3/floorval.png
-#usr/share/doc/libvorbis-1.2.3/fourphase.png
-#usr/share/doc/libvorbis-1.2.3/framing.html
-#usr/share/doc/libvorbis-1.2.3/helper.html
-#usr/share/doc/libvorbis-1.2.3/index.html
-#usr/share/doc/libvorbis-1.2.3/lspmap.png
-#usr/share/doc/libvorbis-1.2.3/oddlsp.png
-#usr/share/doc/libvorbis-1.2.3/oggstream.html
-#usr/share/doc/libvorbis-1.2.3/programming.html
-#usr/share/doc/libvorbis-1.2.3/rfc5215.txt
-#usr/share/doc/libvorbis-1.2.3/rfc5215.xml
-#usr/share/doc/libvorbis-1.2.3/squarepolar.png
-#usr/share/doc/libvorbis-1.2.3/stereo.html
-#usr/share/doc/libvorbis-1.2.3/stream.png
-#usr/share/doc/libvorbis-1.2.3/v-comment.html
-#usr/share/doc/libvorbis-1.2.3/vorbis-clip.txt
-#usr/share/doc/libvorbis-1.2.3/vorbis-errors.txt
-#usr/share/doc/libvorbis-1.2.3/vorbis-fidelity.html
-#usr/share/doc/libvorbis-1.2.3/vorbis.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/changes.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/examples.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/index.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/ov_ectl_ratemanage2_arg.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/ov_ectl_ratemanage_arg.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/overview.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/reference.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/style.css
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_ctl.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_init.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_init_vbr.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_setup_init.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_setup_managed.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_encode_setup_vbr.html
-#usr/share/doc/libvorbis-1.2.3/vorbisenc/vorbis_info.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/OggVorbis_File.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/callbacks.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/chaining_example_c.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/chainingexample.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/crosslap.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/datastructures.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/decoding.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/example.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/exampleindex.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/fileinfo.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/index.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/initialization.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_bitrate.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_bitrate_instant.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_callbacks.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_clear.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_comment.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_crosslap.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_fopen.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_info.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_open.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_open_callbacks.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_seek.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_seek_lap.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_seek_page.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_seek_page_lap.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_tell.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_pcm_total.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_raw_seek.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_raw_seek_lap.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_raw_tell.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_raw_total.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_read.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_read_float.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_seekable.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_serialnumber.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_streams.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_test.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_test_callbacks.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_test_open.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_seek.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_seek_lap.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_seek_page.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_seek_page_lap.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_tell.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/ov_time_total.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/overview.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/reference.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/return.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/seekexample.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/seeking.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/seeking_example_c.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/seeking_test_c.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/seekingexample.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/style.css
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/threads.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/vorbis_comment.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/vorbis_info.html
-#usr/share/doc/libvorbis-1.2.3/vorbisfile/vorbisfile_example_c.html
-#usr/share/doc/libvorbis-1.2.3/vorbisword2.png
-#usr/share/doc/libvorbis-1.2.3/wait.png
-#usr/share/doc/libvorbis-1.2.3/white-xifish.png
+#usr/share/doc/libvorbis-1.3.3
+#usr/share/doc/libvorbis-1.3.3/doxygen-build.stamp
+#usr/share/doc/libvorbis-1.3.3/eightphase.png
+#usr/share/doc/libvorbis-1.3.3/evenlsp.png
+#usr/share/doc/libvorbis-1.3.3/fish_xiph_org.png
+#usr/share/doc/libvorbis-1.3.3/floor1_inverse_dB_table.html
+#usr/share/doc/libvorbis-1.3.3/floorval.png
+#usr/share/doc/libvorbis-1.3.3/fourphase.png
+#usr/share/doc/libvorbis-1.3.3/framing.html
+#usr/share/doc/libvorbis-1.3.3/helper.html
+#usr/share/doc/libvorbis-1.3.3/index.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis
+#usr/share/doc/libvorbis-1.3.3/libvorbis/index.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/overview.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/reference.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/return.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/style.css
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_blockout.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_buffer.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_headerout.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_init.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_analysis_wrote.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_bitrate_addblock.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_bitrate_flushpacket.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_block.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_block_clear.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_block_init.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_add.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_add_tag.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_clear.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_init.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_query.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_comment_query_count.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_commentheader_out.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_dsp_clear.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_dsp_state.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_granule_time.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_info.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_info_blocksize.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_info_clear.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_info_init.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_packet_blocksize.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_blockin.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_halfrate.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_halfrate_p.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_headerin.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_idheader.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_init.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_lapout.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_pcmout.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_read.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_restart.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_synthesis_trackonly.html
+#usr/share/doc/libvorbis-1.3.3/libvorbis/vorbis_version_string.html
+#usr/share/doc/libvorbis-1.3.3/lspmap.png
+#usr/share/doc/libvorbis-1.3.3/oddlsp.png
+#usr/share/doc/libvorbis-1.3.3/oggstream.html
+#usr/share/doc/libvorbis-1.3.3/programming.html
+#usr/share/doc/libvorbis-1.3.3/rfc5215.txt
+#usr/share/doc/libvorbis-1.3.3/rfc5215.xml
+#usr/share/doc/libvorbis-1.3.3/squarepolar.png
+#usr/share/doc/libvorbis-1.3.3/stereo.html
+#usr/share/doc/libvorbis-1.3.3/stream.png
+#usr/share/doc/libvorbis-1.3.3/v-comment.html
+#usr/share/doc/libvorbis-1.3.3/vorbis-clip.txt
+#usr/share/doc/libvorbis-1.3.3/vorbis-errors.txt
+#usr/share/doc/libvorbis-1.3.3/vorbis-fidelity.html
+#usr/share/doc/libvorbis-1.3.3/vorbis.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/changes.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/examples.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/index.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/ovectl_ratemanage2_arg.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/ovectl_ratemanage_arg.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/overview.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/reference.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/style.css
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_ctl.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_init.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_init_vbr.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_setup_init.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_setup_managed.html
+#usr/share/doc/libvorbis-1.3.3/vorbisenc/vorbis_encode_setup_vbr.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/OggVorbis_File.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/callbacks.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/chaining_example_c.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/chainingexample.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/crosslap.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/datastructures.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/decoding.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/example.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/exampleindex.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/fileinfo.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/index.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/initialization.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_bitrate.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_bitrate_instant.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_callbacks.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_clear.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_comment.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_crosslap.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_fopen.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_info.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_open.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_open_callbacks.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_seek.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_seek_lap.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_seek_page.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_seek_page_lap.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_tell.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_pcm_total.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_raw_seek.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_raw_seek_lap.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_raw_tell.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_raw_total.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_read.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_read_filter.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_read_float.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_seekable.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_serialnumber.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_streams.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_test.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_test_callbacks.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_test_open.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_seek.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_seek_lap.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_seek_page.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_seek_page_lap.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_tell.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/ov_time_total.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/overview.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/reference.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/seekexample.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/seeking.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/seeking_example_c.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/seeking_test_c.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/seekingexample.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/style.css
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/threads.html
+#usr/share/doc/libvorbis-1.3.3/vorbisfile/vorbisfile_example_c.html
+#usr/share/doc/libvorbis-1.3.3/vorbisword2.png
+#usr/share/doc/libvorbis-1.3.3/wait.png
+#usr/share/doc/libvorbis-1.3.3/white-xifish.png
index 2ff84746e88adc10ae3845e739d1b8639c446a84..c0d857c78786469790e48951ed3ad15e6f4fa275 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.18
+VER        = 2.22
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -71,7 +71,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
+$(DL_FILE)_MD5 = ee0f10756c84979622b992a4a61ea3f5
 
 install : $(TARGET)
 
@@ -102,7 +102,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/binutils-build
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-configure-1.patch
        cd $(DIR_SRC)/binutils-build && MACHINE= $(DIR_APP)/configure $(EXTRA_CONFIG)
 ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/binutils-build && make configure-host MAKEINFO=makeinfo MACHINE=
index 9546c43acbc8967059881e15c39d74fe16b126ae..b82c156e03c9066094e4d33e2276b5bad891413e 100644 (file)
@@ -76,6 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/capiinit && make install
        cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capidyn.c
        cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capi20.c
+       cd $(DIR_APP)/capi20 && sed -i "/include/a #include <stddef.h>" capi20.h
        cd $(DIR_APP)/capi20 && sed -i -e 's/-O2/$(CFLAGS)/' configure
        cd $(DIR_APP)/capi20 && SED=sed ./configure
        cd $(DIR_APP)/capi20 && SED=sed make $(MAKETUNING)
index b7cad8697d143be739ed38ecf1d66c33559ba517..3a8dc6e53573045557fa0b4b38ab19684c29e80a 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.6
+VER        = 3.1.7
 
 THISAPP    = ccache-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 343dc9b642e1d2af1e6bd8e474dde92e
+$(DL_FILE)_MD5 = 82257745eac54826527946e9e3d046f4
 
 install : $(TARGET)
 
@@ -70,8 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/$(THISAPP)-no_compiler_mtime.patch
-       cd $(DIR_APP) && CFLAGS="-O2 -static -DDEFAULT_MAXSIZE=2097152" ./configure --prefix=$(ROOT)/usr/local
+       cd $(DIR_APP) && CFLAGS="-O2 -static -DDEFAULT_MAXSIZE=5242880" ./configure --prefix=$(ROOT)/usr/local
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        ln -sf ccache $(ROOT)/usr/local/bin/gcc
index 306b781c2f97a5952302f6956c374c86692b3148..a200c2b6d5734decb8aa37f318c458f8db529a97 100644 (file)
@@ -67,6 +67,9 @@ ifeq "$(PASS)" "2"
        -strip --strip-unneeded /tools/{,s}bin/*
        rm -rfv /tools/{info,man} /usr/local/man
        chown -R root:root /tools
+
+       # Install CPUID header.
+       install -m 644 -v $(DIR_SRC)/headers/cpuid.h /tools/include
 endif
 ifeq "$(PASS)" "3"
        mv -v /tools/bin/{ld,ld-old}
index 7bdc0ecd380e31fbc9c807e06e8dd4fbf0b23e0f..246cd96b2e078e20d984a5f04f1f4c8a77479cb9 100644 (file)
@@ -86,6 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-rename-tee.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-futimes.patch
 ifeq "$(ROOT)" ""
 ifeq "$(MACHINE)" "i586"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-uname-1.patch
index 818b89ea4058ca9e4137139e076b14a4253e4376..3a431066a10ff2685ac8271392790075d6f30e9a 100644 (file)
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_SRC)/dbus*
        cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dbus-1.0.3-compile-fix-1.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                                     --localstatedir=/var
        cd $(DIR_APP) && make $(MAKETUNING)
index 97b1cfe2205646598417e9dbe56c597a96d506e9..22a1e6133874ce2908152fe8493fbd99518f86a5 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,8 @@
 
 include Config
 
-VER = 2.5
+VER        = 2.12.2
+PORTS_VER  = 2.12.1
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,48 +36,57 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr \
-    --disable-profile --enable-add-ons \
-    --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
+  EXTRA_CONFIG = \
+       --prefix=/usr \
+       --libexecdir=/usr/lib/glibc
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools \
-    --disable-profile --enable-add-ons \
-    --enable-kernel=2.6.0 --with-binutils=/tools/bin \
-    --without-gd --with-headers=/tools/include \
-    --without-selinux
+  EXTRA_CONFIG = \
+       --prefix=/tools \
+       --with-binutils=/tools/bin \
+       --with-headers=/tools/include \
+       --without-gd
   EXTRA_MAKE =
   EXTRA_INSTALL =
 endif
 
 EXTRA_CONFIG += --build=$(BUILDTARGET)
 
+# Enable some extra optimization for the glibc code.
+export CFLAGS := $(subst -O2,-O3,$(CFLAGS))
+
 ifeq "$(MACHINE_TYPE)" "arm"
        # Disable hardware FP for ARM.
        EXTRA_CONFIG += \
                --without-fp
 endif
 
+# Add some general configuration flags
+EXTRA_CONFIG += \
+       --disable-profile \
+       --enable-kernel=2.6.16 \
+       --enable-add-ons \
+       --without-selinux \
+       --enable-experimental-malloc \
+       --enable-bind-now
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-       glibc-libidn-$(VER).tar.bz2
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2
 
-$(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
-glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
+$(DL_FILE)_MD5 = 903fcfa547df2f453476800e0838fe52
 
 # ARM needs glibc-ports
 ifeq "$(MACHINE_TYPE)" "arm"
-       objects += glibc-ports-$(VER).tar.bz2
-       glibc-ports-$(VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(VER).tar.bz2
-       glibc-ports-$(VER).tar.bz2_MD5 = 183f6d46e8fa5e4b2aff240ab1586c2e
+       objects += glibc-ports-$(PORTS_VER).tar.bz2
+       glibc-ports-$(PORTS_VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(PORTS_VER).tar.bz2
+       glibc-ports-$(PORTS_VER).tar.bz2_MD5 = cb01ab976180e98287cef5079e35359e
 endif
 
 install : $(TARGET)
@@ -109,13 +119,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/glibc-build
 ifeq "$(MACHINE_TYPE)" "arm"
-       cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(VER).tar.bz2
-       cd $(DIR_APP) && mv -v glibc-ports-$(VER) ports
-
-       cd $(DIR_APP)/ports && patch -Np1 -i $(DIR_SRC)/src/patches/glibc-ports-avoid-using-asm-procinfo.patch
-
-       # 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
+       cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(PORTS_VER).tar.bz2
+       cd $(DIR_APP) && mv -v glibc-ports-$(PORTS_VER) ports
 endif
 
 ifeq "$(ROOT)" ""
diff --git a/lfs/hddtemp b/lfs/hddtemp
deleted file mode 100644 (file)
index 9533f67..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.3-beta14
-
-THISAPP    = hddtemp-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = bbf8be4539495e18bec54af77511a680
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --with-db-path=/etc/hddtemp.db
-       cd $(DIR_APP) && make $(MAKETUNING) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
index 092211bc8c9b8398fd2ce8f8a3b4a4dca990e0fe..51654c5ad6db6c40025f06cfc6703ff9eff55e02 100644 (file)
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_SRC)/imspector && sed -e "s/^SSL_LIBS.*/& -lcrypto/" -i Makefile
        cd $(DIR_SRC)/imspector && make install
        -mv /usr/etc/imspector /etc/imspector
        -mv /etc/imspector/imspector /etc/imspector
index d1747752eeb3766c1bf53905ef509fc17eac5adf..ea557d9132f5c2b6dace8842d514f715ae4e0cd1 100644 (file)
--- a/lfs/libnl
+++ b/lfs/libnl
@@ -73,6 +73,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libnl-1.1-ULONG_MAX.patch
        cd $(DIR_APP) && ln -s /usr/src/linux/include/linux/if_vlan.h \
                                              include/linux/if_vlan.h
        cd $(DIR_APP) && ln -s /usr/src/linux/include/linux/netfilter/nf_conntrack_common.h \
index bd9c02256e6a7df9c144ba83e46a148b897b7ef0..41a1c7f0cf6b837d549185e57f3dac43a6af86fe 100644 (file)
 
 include Config
 
-VER        = 1.1.4
+VER        = 1.3.0
 
 THISAPP    = libogg-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libogg
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 10200ec22543841d9d1c23e0aed4e5e9
+$(DL_FILE)_MD5 = 84a35715170f2cd4c77a4448772b95d5
 
 install : $(TARGET)
 
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
diff --git a/lfs/libsafe b/lfs/libsafe
deleted file mode 100644 (file)
index 24c398c..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.0-16
-
-THISAPP    = libsafe_$(VER)
-DL_FILE    = $(THISAPP).orig.tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/libsafe-$(VER)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 6b7b6e6df84d4afb469ccc66d04fc24d
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsafe-functioncaching.diff
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsafe-alpha.diff
-       cd $(DIR_APP) && make libsafe $(MAKETUNING)
-       cd $(DIR_APP) && yes | make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
index 3b6d0f9d28558745f25cb2d205afaa59939daa79..8213e3991d95da50d0e89b570bb808b8aaaa1042 100644 (file)
 
 include Config
 
-VER        = 1.2.3
+VER        = 1.3.3
 
 THISAPP    = libvorbis-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libvorbis
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "libogg"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 67beb237faf97d74782ec7071756b2b6
+$(DL_FILE)_MD5 = 71b649d3e08e63ece16649df906ce8b9
 
 install : $(TARGET)
 
@@ -76,11 +76,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-       #cd $(DIR_APP) && sed -i.bak -e 's/-mno-ieee-fp//' lib/Makefile
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && install -v -m644 doc/Vorbis* /usr/share/doc/libvorbis-1.2.3
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
index 7ee4a196b5e71a113aef575673e6f278d840cc78..5af5e47c718b8f672477d792b614bb7f99871dee 100644 (file)
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP)/converter && patch -Np1 < $(DIR_SRC)/src/patches/netpbm-10.26.46-getline.patch
        cp $(DIR_SRC)/config/netpbm/Makefile.config $(DIR_APP)
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make package PKGDIR=/usr/local/netpbm
index 9771ae44108b758fb3bf2eabea658ebeb904c0d7..aca5ed75d5539cc0db2612e084334322a75a7d93 100644 (file)
@@ -36,6 +36,8 @@ PAK_VER    = 2
 
 DEPS       = ""
 
+export CPPFLAGS = -D_GNU_SOURCE
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
index da2ea34ba24421d9c12d52497dd54bd3cfc79c24..d68b97d1e5667a66320706b962c576f742886222 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -78,12 +78,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-       cd $(DIR_APP) && sed -i -e 's|CFLAGS+="-march=i486"|CFLAGS+=""|g' configure
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch
-
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-               --target-list="i386-linux-user i386-softmmu arm-softmmu"
+               --target-list="i386-linux-user i386-softmmu arm-softmmu" \
+               --extra-cflags="$(CFLAGS)"
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
index 0dd83d33afa052e3f854c14d8b17de0755e9b59a..2a548be832f76a448098b0cb4db36d4aeba7f179 100644 (file)
@@ -77,6 +77,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed -i "/include/a #include <sys\/stat.h>" \
+               libxfs/xfs_ialloc.c quota/quot.c mdrestore/xfs_mdrestore.c \
+               rtcp/xfs_rtcp.c
        cd $(DIR_APP) && make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
                                                                                                LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
        cd $(DIR_APP) && make install
diff --git a/make.sh b/make.sh
index 6fd78d998ee0180d090dfc05603b8d66b15a1fc1..a531e4b7483f80b26bb45e87909bcc09cc674ad9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -222,7 +222,7 @@ prepareenv() {
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
-    export CCACHE_HASHDIR=1
+    export CCACHE_COMPILERCHECK="none"
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
     rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
@@ -613,7 +613,6 @@ buildipfire() {
   ipfiremake traceroute
   ipfiremake vlan
   ipfiremake wireless
-  ipfiremake libsafe
   ipfiremake pakfire
   ipfiremake spandsp
   ipfiremake lzo
@@ -629,7 +628,6 @@ buildipfire() {
   ipfiremake wget
   ipfiremake bridge-utils
   ipfiremake screen
-  ipfiremake hddtemp
   ipfiremake smartmontools
   ipfiremake htop
 #  ipfiremake postfix               # unknown system type linux 3.2.x
diff --git a/src/headers/cpuid.h b/src/headers/cpuid.h
new file mode 100644 (file)
index 0000000..b525865
--- /dev/null
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+ *
+ * This file is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 3, or (at your option) any
+ * later version.
+ * 
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * Under Section 7 of GPL version 3, you are granted additional
+ * permissions described in the GCC Runtime Library Exception, version
+ * 3.1, as published by the Free Software Foundation.
+ * 
+ * You should have received a copy of the GNU General Public License and
+ * a copy of the GCC Runtime Library Exception along with this program;
+ * see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+/* %ecx */
+#define bit_SSE3       (1 << 0)
+#define bit_PCLMUL     (1 << 1)
+#define bit_SSSE3      (1 << 9)
+#define bit_FMA                (1 << 12)
+#define bit_CMPXCHG16B (1 << 13)
+#define bit_SSE4_1     (1 << 19)
+#define bit_SSE4_2     (1 << 20)
+#define bit_POPCNT     (1 << 23)
+#define bit_AES                (1 << 25)
+#define bit_XSAVE      (1 << 26)
+#define bit_OSXSAVE    (1 << 27)
+#define bit_AVX                (1 << 28)
+
+/* %edx */
+#define bit_CMPXCHG8B  (1 << 8)
+#define bit_CMOV       (1 << 15)
+#define bit_MMX                (1 << 23)
+#define bit_FXSAVE     (1 << 24)
+#define bit_SSE                (1 << 25)
+#define bit_SSE2       (1 << 26)
+
+/* Extended Features */
+/* %ecx */
+#define bit_LAHF_LM    (1 << 0)
+#define bit_SSE4a      (1 << 6)
+#define bit_SSE5       (1 << 11)
+
+/* %edx */
+#define bit_LM         (1 << 29)
+#define bit_3DNOWP     (1 << 30)
+#define bit_3DNOW      (1 << 31)
+
+
+#if defined(__i386__) && defined(__PIC__)
+/* %ebx may be the PIC register.  */
+#if __GNUC__ >= 3
+#define __cpuid(level, a, b, c, d)                     \
+  __asm__ ("xchg{l}\t{%%}ebx, %1\n\t"                  \
+          "cpuid\n\t"                                  \
+          "xchg{l}\t{%%}ebx, %1\n\t"                   \
+          : "=a" (a), "=r" (b), "=c" (c), "=d" (d)     \
+          : "0" (level))
+
+#define __cpuid_count(level, count, a, b, c, d)                \
+  __asm__ ("xchg{l}\t{%%}ebx, %1\n\t"                  \
+          "cpuid\n\t"                                  \
+          "xchg{l}\t{%%}ebx, %1\n\t"                   \
+          : "=a" (a), "=r" (b), "=c" (c), "=d" (d)     \
+          : "0" (level), "2" (count))
+#else
+/* Host GCCs older than 3.0 weren't supporting Intel asm syntax
+   nor alternatives in i386 code.  */
+#define __cpuid(level, a, b, c, d)                     \
+  __asm__ ("xchgl\t%%ebx, %1\n\t"                      \
+          "cpuid\n\t"                                  \
+          "xchgl\t%%ebx, %1\n\t"                       \
+          : "=a" (a), "=r" (b), "=c" (c), "=d" (d)     \
+          : "0" (level))
+
+#define __cpuid_count(level, count, a, b, c, d)                \
+  __asm__ ("xchgl\t%%ebx, %1\n\t"                      \
+          "cpuid\n\t"                                  \
+          "xchgl\t%%ebx, %1\n\t"                       \
+          : "=a" (a), "=r" (b), "=c" (c), "=d" (d)     \
+          : "0" (level), "2" (count))
+#endif
+#else
+#define __cpuid(level, a, b, c, d)                     \
+  __asm__ ("cpuid\n\t"                                 \
+          : "=a" (a), "=b" (b), "=c" (c), "=d" (d)     \
+          : "0" (level))
+
+#define __cpuid_count(level, count, a, b, c, d)                \
+  __asm__ ("cpuid\n\t"                                 \
+          : "=a" (a), "=b" (b), "=c" (c), "=d" (d)     \
+          : "0" (level), "2" (count))
+#endif
+
+/* Return highest supported input value for cpuid instruction.  ext can
+   be either 0x0 or 0x8000000 to return highest supported value for
+   basic or extended cpuid information.  Function returns 0 if cpuid
+   is not supported or whatever cpuid returns in eax register.  If sig
+   pointer is non-null, then first four bytes of the signature
+   (as found in ebx register) are returned in location pointed by sig.  */
+
+static __inline unsigned int
+__get_cpuid_max (unsigned int __ext, unsigned int *__sig)
+{
+  unsigned int __eax, __ebx, __ecx, __edx;
+
+#ifndef __x86_64__
+#if __GNUC__ >= 3
+  /* See if we can use cpuid.  On AMD64 we always can.  */
+  __asm__ ("pushf{l|d}\n\t"
+          "pushf{l|d}\n\t"
+          "pop{l}\t%0\n\t"
+          "mov{l}\t{%0, %1|%1, %0}\n\t"
+          "xor{l}\t{%2, %0|%0, %2}\n\t"
+          "push{l}\t%0\n\t"
+          "popf{l|d}\n\t"
+          "pushf{l|d}\n\t"
+          "pop{l}\t%0\n\t"
+          "popf{l|d}\n\t"
+          : "=&r" (__eax), "=&r" (__ebx)
+          : "i" (0x00200000));
+#else
+/* Host GCCs older than 3.0 weren't supporting Intel asm syntax
+   nor alternatives in i386 code.  */
+  __asm__ ("pushfl\n\t"
+          "pushfl\n\t"
+          "popl\t%0\n\t"
+          "movl\t%0, %1\n\t"
+          "xorl\t%2, %0\n\t"
+          "pushl\t%0\n\t"
+          "popfl\n\t"
+          "pushfl\n\t"
+          "popl\t%0\n\t"
+          "popfl\n\t"
+          : "=&r" (__eax), "=&r" (__ebx)
+          : "i" (0x00200000));
+#endif
+
+  if (!((__eax ^ __ebx) & 0x00200000))
+    return 0;
+#endif
+
+  /* Host supports cpuid.  Return highest supported cpuid input value.  */
+  __cpuid (__ext, __eax, __ebx, __ecx, __edx);
+
+  if (__sig)
+    *__sig = __ebx;
+
+  return __eax;
+}
+
+/* Return cpuid data for requested cpuid level, as found in returned
+   eax, ebx, ecx and edx registers.  The function checks if cpuid is
+   supported and returns 1 for valid cpuid information or 0 for
+   unsupported cpuid level.  All pointers are required to be non-null.  */
+
+static __inline int
+__get_cpuid (unsigned int __level,
+            unsigned int *__eax, unsigned int *__ebx,
+            unsigned int *__ecx, unsigned int *__edx)
+{
+  unsigned int __ext = __level & 0x80000000;
+
+  if (__get_cpuid_max (__ext, 0) < __level)
+    return 0;
+
+  __cpuid (__level, *__eax, *__ebx, *__ecx, *__edx);
+  return 1;
+}
diff --git a/src/patches/binutils-2.18-configure-1.patch b/src/patches/binutils-2.18-configure-1.patch
deleted file mode 100644 (file)
index ae6aaa3..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-Submitted By: Matt Burgess (matthew at linuxfromscratch dot org)
-Date: 2007-11-19
-Initial Package Version: 2.18
-Origin: Upstream (http://sourceware.org/cgi-bin/cvsweb.cgi/src/configure.diff?r1=1.268&r2=1.268.2.1&cvsroot=src)
-Upstream Status: Applied
-Description: Fixes the configure script to correctly dictate Texinfo > 4.9.
-
-diff -Naur binutils-2.18.orig/configure binutils-2.18/configure
---- binutils-2.18.orig/configure       2007-08-06 20:29:40.000000000 +0000
-+++ binutils-2.18/configure    2007-11-18 22:37:58.000000000 +0000
-@@ -6128,7 +6128,7 @@
-     # For an installed makeinfo, we require it to be from texinfo 4.4 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
diff --git a/src/patches/ccache-3.1.6-no_compiler_mtime.patch b/src/patches/ccache-3.1.6-no_compiler_mtime.patch
deleted file mode 100644 (file)
index fd921cd..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur ccache-3.1.org/ccache.c ccache-3.1/ccache.c
---- ccache-3.1.org/ccache.c    2010-09-16 19:01:09.000000000 +0200
-+++ ccache-3.1/ccache.c        2010-10-21 21:41:08.000000000 +0200
-@@ -805,13 +805,16 @@
-        */
-       compilercheck = getenv("CCACHE_COMPILERCHECK");
-       if (!compilercheck) {
--              compilercheck = "mtime";
-+              compilercheck = "size";
-       }
-       if (str_eq(compilercheck, "none")) {
-               /* Do nothing. */
-       } else if (str_eq(compilercheck, "content")) {
-               hash_delimiter(hash, "cc_content");
-               hash_file(hash, args->argv[0]);
-+      } else if (str_eq(compilercheck, "size")) {
-+              hash_delimiter(hash, "cc_size");
-+              hash_int(hash, st.st_size);
-       } else if (str_eq(compilercheck, "mtime")) {
-               hash_delimiter(hash, "cc_mtime");
-               hash_int(hash, st.st_size);
diff --git a/src/patches/coreutils-5.96-futimes.patch b/src/patches/coreutils-5.96-futimes.patch
new file mode 100644 (file)
index 0000000..e91f1df
--- /dev/null
@@ -0,0 +1,56 @@
+--- coreutils-6.0.orig/lib/utimens.c   2006-06-11 09:14:31.000000000 +0200
++++ coreutils-6.0/lib/utimens.c        2007-07-17 00:41:08.000000000 +0200
+@@ -75,7 +75,7 @@
+    Return 0 on success, -1 (setting errno) on failure.  */
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
++cu_futimens (int fd ATTRIBUTE_UNUSED,
+         char const *file, struct timespec const timespec[2])
+ {
+   /* There's currently no interface to set file timestamps with
+@@ -168,5 +168,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+-  return futimens (-1, file, timespec);
++  return cu_futimens (-1, file, timespec);
+ }
+--- coreutils-6.0.orig/lib/utimens.h   2004-11-23 21:41:51.000000000 +0100
++++ coreutils-6.0/lib/utimens.h        2007-07-17 00:41:31.000000000 +0200
+@@ -1,3 +1,3 @@
+ #include "timespec.h"
+-int futimens (int, char const *, struct timespec const [2]);
++int cu_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);
+--- coreutils-6.0.orig/src/copy.c      2007-07-16 23:18:42.000000000 +0200
++++ coreutils-6.0/src/copy.c   2007-07-17 00:43:10.000000000 +0200
+@@ -648,7 +648,7 @@
+       timespec[0] = get_stat_atime (src_sb);
+       timespec[1] = get_stat_mtime (src_sb);
+-      if (futimens (dest_desc, dst_name, timespec) != 0)
++      if (cu_futimens (dest_desc, dst_name, timespec) != 0)
+       {
+         error (0, errno, _("preserving times for %s"), quote (dst_name));
+         if (x->require_preserve)
+--- coreutils-6.0.orig/src/touch.c     2005-11-02 11:01:07.000000000 +0100
++++ coreutils-6.0/src/touch.c  2007-07-17 00:43:51.000000000 +0200
+@@ -167,7 +167,7 @@
+   if (amtime_now)
+     {
+-      /* Pass NULL to futimens so it will not fail if we have
++      /* Pass NULL to cu_futimens so it will not fail if we have
+        write access to the file, but don't own it.  */
+       t = NULL;
+     }
+@@ -182,7 +182,7 @@
+       t = timespec;
+     }
+-  ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
++  ok = (cu_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
+   if (fd == STDIN_FILENO)
+     {
diff --git a/src/patches/dbus-1.0.3-compile-fix-1.patch b/src/patches/dbus-1.0.3-compile-fix-1.patch
new file mode 100644 (file)
index 0000000..86fd2b3
--- /dev/null
@@ -0,0 +1,11 @@
+--- dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c   2009-01-01 03:50:33.000000000 +0200
++++ dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c   2009-01-01 04:09:24.000000000 +0200
+@@ -992,7 +992,7 @@ 
+   _dbus_verbose ("read credentials byte\n");
+   {
+-#ifdef SO_PEERCRED
++#if defined(SO_PEERCRED) && defined(HAVE_GETPEERUCRED)
+     struct ucred cr;   
+     int cr_len = sizeof (cr);
+    
diff --git a/src/patches/glibc-ports-avoid-using-asm-procinfo.patch b/src/patches/glibc-ports-avoid-using-asm-procinfo.patch
deleted file mode 100644 (file)
index 53a6d1b..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-#
-# Submitted-By: Marc Kleine-Budde, 2006-11-22
-# Committed-By: Marc Kleine-Budde
-#
-# Error:
-#
-# try to compile glibc-ports with sanitized headers
-#
-# arm-v4t-linux-gnueabi-gcc ../ports/sysdeps/arm/eabi/setfpucw.c -c
-#-std=gnu99 -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants
-#-g -Wstrict-prototypes -Wno-uninitialized -D__NO_MATH_INLINES
-#-D__LIBC_INTERNAL_MATH_INLINES -DNO_LONG_DOUBLE
-#-D_Mlong_double_=double -I../include
-#-I/home/mkl/pengutronix/ptxdist/build/OSELAS.Toolchain-trunk-headers/build-target/glibc-2.5-build/math
-#-I/home/mkl/pengutronix/ptxdist/build/OSELAS.Toolchain-trunk-headers/build-target/glibc-2.5-build
-#-I../ports/sysdeps/arm/elf
-#-I../ports/sysdeps/unix/sysv/linux/arm/eabi/nptl
-#-I../ports/sysdeps/unix/sysv/linux/arm/eabi
-#-I../ports/sysdeps/unix/sysv/linux/arm/nptl
-#-I../ports/sysdeps/unix/sysv/linux/arm
-#-I../ports/sysdeps/unix/sysv/linux -I../nptl/sysdeps/unix/sysv/linux
-#-I../nptl/sysdeps/pthread -I../sysdeps/pthread
-#-I../sysdeps/unix/sysv/linux -I../sysdeps/gnu
-#-I../sysdeps/unix/common -I../sysdeps/unix/mman
-#-I../sysdeps/unix/inet -I../ports/sysdeps/unix/sysv
-#-I../nptl/sysdeps/unix/sysv -I../sysdeps/unix/sysv
-#-I../ports/sysdeps/unix/arm -I../ports/sysdeps/unix
-#-I../nptl/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix
-#-I../ports/sysdeps/arm/eabi -I../ports/sysdeps/arm/nptl
-#-I../ports/sysdeps/arm -I../sysdeps/wordsize-32
-#-I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64
-#-I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic
-#-I../ports -I../nptl -I.. -I../libio -I. -nostdinc -isystem
-#/ptx/work/mkl/ptxdist/build/OSELAS.Toolchain-trunk-headers/install/arm-v4t-linux-gnueabi/gcc-4.1.1-glibc-2.5-linux-2.6.19-rc6-s/bin/../lib/gcc/arm-v4t-linux-gnueabi/4.1.1/include
-#-isystem
-#/home/mkl/pengutronix/ptxdist/build/OSELAS.Toolchain-trunk-headers/install/arm-v4t-linux-gnueabi/gcc-4.1.1-glibc-2.5-linux-2.6.19-rc6-s/sysroot-arm-v4t-linux-gnueabi/usr/include
-#-D_LIBC_REENTRANT -include ../include/libc-symbols.h -o
-#/home/mkl/pengutronix/ptxdist/build/OSELAS.Toolchain-trunk-headers/build-target/glibc-2.5-build/math/setfpucw.o
-#-MD -MP -MF
-#/home/mkl/pengutronix/ptxdist/build/OSELAS.Toolchain-trunk-headers/build-target/glibc-2.5-build/math/setfpucw.o.dt
-#-MT
-#/home/mkl/pengutronix/ptxdist/build/OSELAS.Toolchain-trunk-headers/build-target/glibc-2.5-build/math/setfpucw.o
-# ../ports/sysdeps/arm/eabi/setfpucw.c:26:26: error: asm/procinfo.h: No such file or directory
-# ../ports/sysdeps/arm/eabi/setfpucw.c: In function '__setfpucw':
-# ../ports/sysdeps/arm/eabi/setfpucw.c:31: error: 'HWCAP_VFP' undeclared (first use in this function)
-# ../ports/sysdeps/arm/eabi/setfpucw.c:31: error: (Each undeclared identifier is reported only once
-# ../ports/sysdeps/arm/eabi/setfpucw.c:31: error: for each function it appears in.)
-#
-# Description:
-#
-# http://sourceware.org/ml/libc-ports/2006-10/msg00040.html
-#
-# State:
-#
-# added to glibc-ports on 10/31/2006 06:20 PM
-#
-Date: Tue, 24 Oct 2006 19:25:12 +0000 (UTC)
-From: "Joseph S. Myers" <joseph@codesourcery.com>
-To: libc-ports@sourceware.org
-Subject: Avoid using asm/procinfo.h
-
-I previously noted
-<http://sourceware.org/ml/libc-ports/2006-08/msg00023.html> that the
-use of <asm/procinfo.h>, a Linux-specific kernel header, in
-sysdeps/arm/eabi, is an abstraction violation, and that in principle
-all the files in sysdeps/arm/eabi should use sysdep.h not
-asm/procinfo.h for HWCAP_VFP.
-
-The ARM kernel maintainers have now declared that <asm/procinfo.h>
-should not be used outside the kernel at all (and in particular that
-headers_install is correct in not exporting it), and that these
-definitions will move to a different kernel header.  This gives a
-concrete reason for making the change to use glibc's internal
-definitions, which this patch does, thereby allowing glibc to build
-with the exported headers.
-
-2006-10-24  Joseph S. Myers  <joseph@codesourcery.com>
-
-       * sysdeps/arm/eabi/fclrexcpt.c: Include <sysdep.h> instead of
-       <asm/procinfo.h>.  Use HWCAP_ARM_VFP instead of HWCAP_VFP.
-       * sysdeps/arm/eabi/fedisblxcpt.c: Likewise.
-       * sysdeps/arm/eabi/feenablxcpt.c: Likewise.
-       * sysdeps/arm/eabi/fegetenv.c: Likewise.
-       * sysdeps/arm/eabi/fegetexcept.c: Likewise.
-       * sysdeps/arm/eabi/fegetround.c: Likewise.
-       * sysdeps/arm/eabi/feholdexcpt.c: Likewise.
-       * sysdeps/arm/eabi/fesetenv.c: Likewise.
-       * sysdeps/arm/eabi/fesetround.c: Likewise.
-       * sysdeps/arm/eabi/fraiseexcpt.c: Likewise.
-       * sysdeps/arm/eabi/fsetexcptflg.c: Likewise.
-       * sysdeps/arm/eabi/ftestexcept.c: Likewise.
-       * sysdeps/arm/eabi/setfpucw.c: Likewise.
-
-Index: glibc-ports-2.5/sysdeps/arm/eabi/fclrexcpt.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/fclrexcpt.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/fclrexcpt.c
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- __feclearexcept (int excepts)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       unsigned long int temp;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/fedisblxcpt.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/fedisblxcpt.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/fedisblxcpt.c
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- fedisableexcept (int excepts)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       unsigned long int new_exc, old_exc;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/feenablxcpt.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/feenablxcpt.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/feenablxcpt.c
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- feenableexcept (int excepts)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       unsigned long int new_exc, old_exc;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/fegetenv.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/fegetenv.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/fegetenv.c
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- __fegetenv (fenv_t *envp)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       unsigned long int temp;
-       _FPU_GETCW (temp);
-Index: glibc-ports-2.5/sysdeps/arm/eabi/fegetexcept.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/fegetexcept.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/fegetexcept.c
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- fegetexcept (void)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       unsigned long temp;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/fegetround.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/fegetround.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/fegetround.c
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- fegetround (void)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       unsigned int temp;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/feholdexcpt.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/feholdexcpt.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/feholdexcpt.c
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- feholdexcept (fenv_t *envp)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       unsigned long int temp;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/fesetenv.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/fesetenv.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/fesetenv.c
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- __fesetenv (const fenv_t *envp)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       unsigned int temp;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/fesetround.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/fesetround.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/fesetround.c
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- fesetround (int round)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       fpu_control_t temp;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/fraiseexcpt.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/fraiseexcpt.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/fraiseexcpt.c
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- feraiseexcept (int excepts)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       int fpscr;
-       const float fp_zero = 0.0, fp_one = 1.0, fp_max = FLT_MAX,
-Index: glibc-ports-2.5/sysdeps/arm/eabi/fsetexcptflg.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/fsetexcptflg.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/fsetexcptflg.c
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- __fesetexceptflag (const fexcept_t *flagp, int excepts)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       fexcept_t temp;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/ftestexcept.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/ftestexcept.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/ftestexcept.c
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- int
- fetestexcept (int excepts)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       fexcept_t temp;
-Index: glibc-ports-2.5/sysdeps/arm/eabi/setfpucw.c
-===================================================================
---- glibc-ports-2.5.orig/sysdeps/arm/eabi/setfpucw.c
-+++ glibc-ports-2.5/sysdeps/arm/eabi/setfpucw.c
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
- void
- __setfpucw (fpu_control_t set)
- {
--  if (GLRO (dl_hwcap) & HWCAP_VFP)
-+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
-     {
-       fpu_control_t cw;
diff --git a/src/patches/libnl-1.1-ULONG_MAX.patch b/src/patches/libnl-1.1-ULONG_MAX.patch
new file mode 100644 (file)
index 0000000..ca3dd40
--- /dev/null
@@ -0,0 +1,11 @@
+--- libnl-1.1/include/netlink-local.h.orig     2008-06-08 19:09:20.000000000 +0200
++++ libnl-1.1/include/netlink-local.h  2008-06-08 19:09:33.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <inttypes.h>
+ #include <assert.h>
++#include <limits.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+
diff --git a/src/patches/libsafe-alpha.diff b/src/patches/libsafe-alpha.diff
deleted file mode 100644 (file)
index dfeb9f2..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
---- libsafe-2.0-16-orig/src/intercept.c        2003-03-15 16:02:12.000000000 +0100
-+++ libsafe-2.0-16/src/intercept.c     2003-03-15 16:12:22.000000000 +0100
-@@ -165,7 +165,8 @@
-  */
- char *strcpy(char *dest, const char *src)
- {
--    size_t max_size, len;
-+    uint max_size;
-+    size_t len;
-     if (!real_memcpy)
-       real_memcpy = (memcpy_t) getLibraryFunction("memcpy");
-@@ -196,7 +197,8 @@
- char *strncpy(char *dest, const char *src, size_t n)
- {
--    size_t max_size, len;
-+    uint max_size;
-+    size_t len;
-     if (!real_strncpy)
-       real_strncpy = (strncpy_t) getLibraryFunction("strncpy");
-@@ -219,7 +221,8 @@
- char *stpcpy(char *dest, const char *src)
- {
--    size_t max_size, len;
-+    uint max_size;
-+    size_t len;
-     if (!real_memcpy)
-       real_memcpy = (memcpy_t) getLibraryFunction("memcpy");
-@@ -251,7 +254,8 @@
- #ifndef MISSING_WCSNLEN
- wchar_t *wcscpy(wchar_t *dest, const wchar_t *src)
- {
--    size_t max_bytes, max_wchars, len;
-+    size_t max_wchars, len;
-+    uint max_bytes;
-     if (!real_wcscpy)
-       real_wcscpy = (wcscpy_t) getLibraryFunction("wcscpy");
-@@ -291,7 +295,8 @@
- wchar_t *wcpcpy(wchar_t *dest, const wchar_t *src)
- {
--    size_t max_bytes, max_wchars, len;
-+    size_t max_wchars, len;
-+    uint max_bytes;
-     if (!real_wcpcpy)
-       real_wcpcpy = (wcpcpy_t) getLibraryFunction("wcpcpy");
-@@ -333,9 +338,15 @@
- /*
-  * This is needed!  See the strcpy() for the reason. -ab.
-  */
--void *memcpy(void *dest, const void *src, size_t n)
-+void *memcpy(void *dest, const void *src, size_t hack)
- {
--    size_t max_size;
-+    /*
-+     * a size_t IS an unsigned long everywhere, though it sometimes
-+     * doesn't state so, making printf misinterpret it.
-+     */
-+    unsigned long n = hack;
-+    uint max_size;
-+
-     if (!real_memcpy)
-       real_memcpy = (memcpy_t) getLibraryFunction("memcpy");
-@@ -344,11 +355,11 @@
-       return real_memcpy(dest, src, n);
-     if ((max_size = _libsafe_stackVariableP(dest)) == 0) {
--      LOG(5, "memcpy(<heap var> , <src>, %d)\n", n);
-+      LOG(5, "memcpy(<heap var> , <src>, %ld)\n", n);
-       return real_memcpy(dest, src, n);
-     }
--    LOG(4, "memcpy(<stack var> , <src>, %d) stack limit=%d)\n", n, max_size);
-+    LOG(4, "memcpy(<stack var> , <src>, %ld) stack limit=%d)\n", n, max_size);
-     if (n > max_size)
-       _libsafe_die("Overflow caused by memcpy()");
-     return real_memcpy(dest, src, n);
-@@ -357,7 +368,7 @@
- char *strcat(char *dest, const char *src)
- {
--    size_t max_size;
-+    uint max_size;
-     uint dest_len, src_len;
-     if (!real_memcpy)
-@@ -388,7 +399,7 @@
- char *strncat(char *dest, const char *src, size_t n)
- {
--    size_t max_size;
-+    uint max_size;
-     uint dest_len, src_len;
-     if (!real_strncat)
-@@ -1008,12 +1019,31 @@
-           if (is_printf_convspec[(int)*p]) {
-               caddr_t addr;
-               c++;
-+#if 0 
-+              /*
-+               * cannot add va_list (ap here) with a number on alpha.
-+               * this is faster than the other method, and might be
-+               * a good idea to enable this on !alpha arch.
-+               */
-               if (pnum) {
-                   addr = *((caddr_t*)(ap + (atoi(pnum)-1)*sizeof(char*)));
-               }
-               else {
-                   addr = *((caddr_t*)(ap + c*sizeof(char*)));
-               }
-+#else
-+              {
-+                  va_list apc;
-+                  uint nb = c + 1;
-+
-+                  va_copy(apc, ap);
-+                  if (pnum)
-+                      nb = atoi(pnum);
-+                  addr = NULL;
-+                  while (nb--)
-+                      addr = va_arg(apc, caddr_t);
-+              }
-+#endif
-               if (*p == 'n') {
-                   if (_libsafe_raVariableP((void *)(addr))) {
-                       _libsafe_die("printf(\"%%n\")");
-@@ -1172,12 +1202,32 @@
-           if (is_printf_convspec[(int)*p]) {
-               caddr_t addr;
-               c++;
-+#if 0
-+              /*
-+               * cannot add va_list (ap here) with a number on alpha.
-+               * this is faster than the other method, and might be
-+               * a good idea to enable this on !alpha arch.
-+               */
-+
-               if (pnum) {
-                   addr = *((caddr_t*)(ap + (atoi(pnum)-1)*sizeof(char*)));
-               }
-               else {
-                   addr = *((caddr_t*)(ap + c*sizeof(char*)));
-               }
-+#else
-+              {
-+                  va_list apc;
-+                  uint nb = c + 1;
-+
-+                  va_copy(apc, ap);
-+                  if (pnum)
-+                      nb = atoi(pnum);
-+                  addr = NULL;
-+                  while (nb--)
-+                    addr = va_arg(apc, caddr_t);
-+              }
-+#endif
-               if (*p == 'n') {
-                   if (_libsafe_raVariableP((void *)(addr))) {
-                       _libsafe_die("printf(\"%%n\")");
-@@ -1194,7 +1244,7 @@
- int sprintf(char *str, const char *format, ...)
- {
--    size_t max_size;
-+    uint max_size;
-     va_list ap;
-     int res;
-@@ -1242,7 +1292,7 @@
- int snprintf(char *str, size_t size, const char *format, ...)
- {
--    size_t max_size;
-+    uint max_size;
-     va_list ap;
-     int res;
-@@ -1288,7 +1338,7 @@
- int vsprintf(char *str, const char *format, va_list ap)
- {
--    size_t max_size;
-+    uint max_size;
-     int res;
-     if (!real_vsprintf)
-@@ -1325,7 +1375,7 @@
- int vsnprintf(char *str, size_t size, const char *format, va_list ap)
- {
--    size_t max_size;
-+    uint max_size;
-     int res;
-     if (!real_vsnprintf)
-@@ -1360,7 +1410,7 @@
- char *getwd(char *buf)
- {
--    size_t max_size;
-+    uint max_size;
-     char *res;
-     if (!real_getwd)
-@@ -1384,7 +1434,8 @@
- char *gets(char *s)
- {
--    size_t max_size, len;
-+    uint max_size;
-+    size_t len;
-     if (!real_gets)
-       real_gets = (gets_t) getLibraryFunction("gets");
-@@ -1409,7 +1460,8 @@
- char *realpath(char *path, char resolved_path[])
- {
--    size_t max_size, len;
-+    uint max_size;
-+    size_t len;
-     char *res;
-     char buf[MAXPATHLEN + 1];
diff --git a/src/patches/libsafe-functioncaching.diff b/src/patches/libsafe-functioncaching.diff
deleted file mode 100644 (file)
index db003a4..0000000
+++ /dev/null
@@ -1,258 +0,0 @@
-From: Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de>
-Subject: Bug#129345: patch to prevent a loop between libdl and libsafe causing libdl to crash
-To: 129345@bugs.debian.org
-Date: 01 Sep 2002 23:54:35 +0200
-Reply-To: Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de>,
-       129345@bugs.debian.org
-Resent-From: Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de>
-
-
--------
-[D. Coe edited this patch slightly -- moved an unrelated change into the
-Makefile itself [it changed the debugging comments only], and corrected a 
-spelling error and reworded the comments.  The original patch is in the 
-bug tracking system, if you want to see it as submitted by Goswin.]
--------
--------
-D. Coe subsequently modified the patch further, because in some cases
-the initializations did not occur (e.g. when IO_vfscanf or memcpy was
-called from ps or top (likely one of the libraries they use).  maybe
-they do something that disables libsafe's library globals initialization?
-
-
-In any case, I've adopted both strategise in this new patch; the addresses
-are preloaded as Goswin had coded, but they are also individually checked
-each time needed (as was the case before Goswin's patch), and are initialized
-at that point if necessary.  Hopefully this will let ps and top work
-and also continue to work around the libdl problem.
--------
-
-Hi,
-
-if libsafe is invoked from inside libdl (or only inside dlerror()?)
-and a real_XXX function is not yet looked up it will reenter
-libdl. That causes memory corruption resulting in a read from 0x0 and
-thus segfault.
-
-The patch below makes libsafe cache all needed symbols once upon
-init. That not only causes less lookups than before but should prevent
-fatal loops. Failures of the initial lookups might not be reported
-correctly but terminate in some odd way if the functions needed to
-report are not yet looked up.
-
-MfG
-        Goswin
-
-----------------------------------------------------------------------
-diff -Nurd libsafe-2.0-16/src/intercept.c libsafe-2.0-16-mrvn/src/intercept.c
---- libsafe-2.0-16/src/intercept.c     2002-05-31 19:37:34.000000000 +0200
-+++ libsafe-2.0-16-mrvn/src/intercept.c        2002-09-01 23:44:55.000000000 +0200
-@@ -128,14 +128,29 @@
- }
--/* Starting with version 2.0, we keep a single global copy of the pointer to
-- * the real memcpy() function.  This allows us to call
-- * getLibraryFunction("memcpy") just once instead of multiple times, since
-- * memcpy() is needed in four different functions below.
-+/* Starting with Debian version 2.0-16-2, we keep a global copy of the pointer
-+ * to each real functions.  Otherwise a getLibraryFunction might
-+ * be triggered from inside dlsym() and cause memory corruption reulting in a
-+ * segfault.
-  */
--static memcpy_t real_memcpy = NULL;
--
--
-+static memcpy_t      real_memcpy = NULL;
-+static _IO_vfscanf_t real_IO_vfscanf = NULL;
-+static vfprintf_t    real_vfprintf = NULL;
-+static vsnprintf_t   real_vsnprintf = NULL;
-+static vsprintf_t    real_vsprintf = NULL;
-+static gets_t        real_gets = NULL;
-+static getwd_t       real_getwd = NULL;
-+static realpath_t    real_realpath = NULL;
-+static stpcpy_t      real_stpcpy = NULL;
-+static strcat_t      real_strcat = NULL;
-+static strcpy_t      real_strcpy = NULL;
-+static strncat_t     real_strncat = NULL;
-+static strncpy_t     real_strncpy = NULL;
-+static wcscpy_t      real_wcscpy = NULL;
-+static wcpcpy_t      real_wcpcpy = NULL;
-+#ifndef MISSING_WCSNLEN
-+static wcscat_t      real_wcscat = NULL;
-+#endif
- /*
-  * -------------- system library implementations -------------------
-  * Here is the story: if a C source file includes <string.h> and is
-@@ -150,7 +165,6 @@
-  */
- char *strcpy(char *dest, const char *src)
- {
--    static strcpy_t real_strcpy = NULL;
-     size_t max_size, len;
-     if (!real_memcpy)
-@@ -182,7 +196,6 @@
- char *strncpy(char *dest, const char *src, size_t n)
- {
--    static strncpy_t real_strncpy = NULL;
-     size_t max_size, len;
-     if (!real_strncpy)
-@@ -206,7 +219,6 @@
- char *stpcpy(char *dest, const char *src)
- {
--    static stpcpy_t real_stpcpy = NULL;
-     size_t max_size, len;
-     if (!real_memcpy)
-@@ -239,7 +251,6 @@
- #ifndef MISSING_WCSNLEN
- wchar_t *wcscpy(wchar_t *dest, const wchar_t *src)
- {
--    static wcscpy_t real_wcscpy = NULL;
-     size_t max_bytes, max_wchars, len;
-     if (!real_wcscpy)
-@@ -280,7 +291,6 @@
- wchar_t *wcpcpy(wchar_t *dest, const wchar_t *src)
- {
--    static wcpcpy_t real_wcpcpy = NULL;
-     size_t max_bytes, max_wchars, len;
-     if (!real_wcpcpy)
-@@ -347,7 +357,6 @@
- char *strcat(char *dest, const char *src)
- {
--    static strcat_t real_strcat = NULL;
-     size_t max_size;
-     uint dest_len, src_len;
-@@ -379,7 +388,6 @@
- char *strncat(char *dest, const char *src, size_t n)
- {
--    static strncat_t real_strncat = NULL;
-     size_t max_size;
-     uint dest_len, src_len;
-@@ -408,7 +416,6 @@
- #ifndef MISSING_WCSNLEN
- wchar_t *wcscat(wchar_t *dest, const wchar_t *src)
- {
--    static wcscat_t real_wcscat = NULL;
-     size_t max_bytes;
-     uint dest_len, src_len;
-@@ -861,7 +868,6 @@
-  */
- int vfprintf(FILE *fp, const char *format, va_list ap)
- {
--    static vfprintf_t real_vfprintf = NULL;
-     int res;
-     char *p, *pnum;
-     int c = -1;               /* Next var arg to be used */
-@@ -1026,7 +1032,6 @@
-  */
- int _IO_vfprintf(FILE *fp, const char *format, va_list ap)
- {
--    static vfprintf_t real_vfprintf = NULL;
-     int res;
-     char *p, *pnum;
-     int c = -1;               /* Next var arg to be used */
-@@ -1189,8 +1194,6 @@
- int sprintf(char *str, const char *format, ...)
- {
--    static vsprintf_t real_vsprintf = NULL;
--    static vsnprintf_t real_vsnprintf = NULL;
-     size_t max_size;
-     va_list ap;
-     int res;
-@@ -1239,7 +1242,6 @@
- int snprintf(char *str, size_t size, const char *format, ...)
- {
--    static vsnprintf_t real_vsnprintf = NULL;
-     size_t max_size;
-     va_list ap;
-     int res;
-@@ -1286,8 +1288,6 @@
- int vsprintf(char *str, const char *format, va_list ap)
- {
--    static vsprintf_t real_vsprintf = NULL;
--    static vsnprintf_t real_vsnprintf = NULL;
-     size_t max_size;
-     int res;
-@@ -1325,7 +1325,6 @@
- int vsnprintf(char *str, size_t size, const char *format, va_list ap)
- {
--    static vsnprintf_t real_vsnprintf = NULL;
-     size_t max_size;
-     int res;
-@@ -1361,7 +1360,6 @@
- char *getwd(char *buf)
- {
--    static getwd_t real_getwd = NULL;
-     size_t max_size;
-     char *res;
-@@ -1386,7 +1384,6 @@
- char *gets(char *s)
- {
--    static gets_t real_gets = NULL;
-     size_t max_size, len;
-     if (!real_gets)
-@@ -1412,7 +1409,6 @@
- char *realpath(char *path, char resolved_path[])
- {
--    static realpath_t real_realpath = NULL;
-     size_t max_size, len;
-     char *res;
-     char buf[MAXPATHLEN + 1];
-@@ -1445,7 +1441,6 @@
- int _IO_vfscanf (_IO_FILE *s, const char *format, _IO_va_list argptr, int *errp)
- {
--    static _IO_vfscanf_t real_IO_vfscanf = NULL;
-     int res, save_count;
-     caddr_t ra_array[MAXLEVELS], fp_array[MAXLEVELS];
-@@ -1529,6 +1524,25 @@
-       
-       fclose(fp);
-     }
-+
-+    real_memcpy = (memcpy_t) getLibraryFunction("memcpy");
-+    real_IO_vfscanf = (_IO_vfscanf_t) getLibraryFunction("_IO_vfscanf");
-+    real_vfprintf = (vfprintf_t) getLibraryFunction("vfprintf");
-+    real_vsnprintf = (vsnprintf_t) getLibraryFunction("vsnprintf");
-+    real_vsprintf = (vsprintf_t) getLibraryFunction("vsprintf");
-+    real_gets = (gets_t) getLibraryFunction("gets");
-+    real_getwd = (getwd_t) getLibraryFunction("getwd");
-+    real_realpath = (realpath_t) getLibraryFunction("realpath");
-+    real_stpcpy = (stpcpy_t) getLibraryFunction("stpcpy");
-+    real_strcat = (strcat_t) getLibraryFunction("strcat");
-+    real_strcpy = (strcpy_t) getLibraryFunction("strcpy");
-+    real_strncat = (strncat_t) getLibraryFunction("strncat");
-+    real_strncpy = (strncpy_t) getLibraryFunction("strncpy");
-+    real_wcscpy = (wcscpy_t) getLibraryFunction("wcscpy");
-+    real_wcpcpy = (wcpcpy_t) getLibraryFunction("wcpcpy");
-+#ifndef MISSING_WCSNLEN
-+    real_wcscat = (wcscat_t) getLibraryFunction("wcscat");
-+#endif
- }
diff --git a/src/patches/netpbm-10.26.46-getline.patch b/src/patches/netpbm-10.26.46-getline.patch
new file mode 100644 (file)
index 0000000..c5a961b
--- /dev/null
@@ -0,0 +1,202 @@
+The getline function used in a couple of places in netpbm-free is also
+defined by POSIX:2008, and so netpbm-free fails to build with newer
+versions of (e)glibc. Here's a patch to rename it.
+
+  * Rename getline functions to get_line to avoid conflict with POSIX:2008.
+
+--- netpbm-free-10.0.orig/ppm/xvminitoppm.c
++++ netpbm-free-10.0/ppm/xvminitoppm.c
+@@ -14,7 +14,7 @@
+ #include "ppm.h"
+ #define BUFSIZE 256
+-static void getline ARGS((FILE *fp, char *buf));
++static void get_line ARGS((FILE *fp, char *buf));
+ int 
+ main(argc, argv)
+@@ -48,18 +48,18 @@
+                 i++;
+             }
+     
+-    getline(ifp, buf);
++    get_line(ifp, buf);
+     if( strncmp(buf, "P7 332", 6) != 0 )
+         pm_error("bad magic number - not a XV thumbnail picture");
+     while(1) {
+-        getline(ifp, buf);
++        get_line(ifp, buf);
+         if( strncmp(buf, "#END_OF_COMMENTS", 16)==0 )
+             break;
+         if( strncmp(buf, "#BUILTIN", 8)==0 )
+             pm_error("cannot convert builtin XV thumbnail pictures");
+     }
+-    getline(ifp, buf);
++    get_line(ifp, buf);
+     if( sscanf(buf, "%d %d %d", &cols, &rows, &maxval) != 3 ) 
+         pm_error("error parsing dimension info");
+     if( maxval != 255 )
+@@ -85,7 +85,7 @@
+ static void
+-getline(fp, buf)
++get_line(fp, buf)
+     FILE *fp;
+     char *buf;
+ {
+--- netpbm-free-10.0.orig/ppm/xpmtoppm.c
++++ netpbm-free-10.0/ppm/xpmtoppm.c
+@@ -114,7 +114,7 @@
+ static void
+-getline(char * const line, int const size, FILE * const stream) {
++get_line(char * const line, int const size, FILE * const stream) {
+ /*----------------------------------------------------------------------------
+    Read the next line from the input file 'stream', through the one-line
+    buffer lastInputLine[].
+@@ -130,7 +130,7 @@
+    Exit program if the line doesn't fit in the buffer.
+ -----------------------------------------------------------------------------*/
+     if (size > MAX_LINE+1)
+-        pm_error("INTERNAL ERROR: getline() received 'size' parameter "
++        pm_error("INTERNAL ERROR: get_line() received 'size' parameter "
+                  "which is out of bounds");
+     if (backup) {
+@@ -346,7 +346,7 @@
+                int * const transparentP) {
+ /*----------------------------------------------------------------------------
+   Read the header of the XPM file on stream 'stream'.  Assume the
+-  getline() stream is presently positioned to the beginning of the
++  get_line() stream is presently positioned to the beginning of the
+   file and it is a Version 3 XPM file.  Leave the stream positioned
+   after the header.
+@@ -377,25 +377,25 @@
+     *widthP = *heightP = *ncolorsP = *chars_per_pixelP = -1;
+     /* Read the XPM signature comment */
+-    getline(line, sizeof(line), stream);
++    get_line(line, sizeof(line), stream);
+     if (strncmp(line, xpm3_signature, strlen(xpm3_signature)) != 0) 
+         pm_error("Apparent XPM 3 file does not start with '/* XPM */'.  "
+                  "First line is '%s'", xpm3_signature);
+     /* Read the assignment line */
+-    getline(line, sizeof(line), stream);
++    get_line(line, sizeof(line), stream);
+     if (strncmp(line, "static char", 11) != 0)
+         pm_error("Cannot find data structure declaration.  Expected a "
+                  "line starting with 'static char', but found the line "
+                  "'%s'.", line);
+       /* Read the hints line */
+-    getline(line, sizeof(line), stream);
++    get_line(line, sizeof(line), stream);
+     /* skip the comment line if any */
+     if (!strncmp(line, "/*", 2)) {
+         while (!strstr(line, "*/"))
+-            getline(line, sizeof(line), stream);
+-        getline(line, sizeof(line), stream);
++            get_line(line, sizeof(line), stream);
++        get_line(line, sizeof(line), stream);
+     }
+     if (sscanf(line, "\"%d %d %d %d\",", widthP, heightP,
+                ncolorsP, chars_per_pixelP) != 4)
+@@ -427,10 +427,10 @@
+         *transparentP = -1;  /* initial value */
+         for (seqNum = 0; seqNum < *ncolorsP; seqNum++) {
+-            getline(line, sizeof(line), stream);
++            get_line(line, sizeof(line), stream);
+             /* skip the comment line if any */
+             if (!strncmp(line, "/*", 2))
+-                getline(line, sizeof(line), stream);
++                get_line(line, sizeof(line), stream);
+             
+             interpretXpm3ColorTableLine(line, seqNum, *chars_per_pixelP, 
+                                         *colorsP, *ptabP, transparentP);
+@@ -445,7 +445,7 @@
+                pixel ** const colorsP, int ** const ptabP) {
+ /*----------------------------------------------------------------------------
+   Read the header of the XPM file on stream 'stream'.  Assume the
+-  getline() stream is presently positioned to the beginning of the
++  get_line() stream is presently positioned to the beginning of the
+   file and it is a Version 1 XPM file.  Leave the stream positioned
+   after the header.
+   
+@@ -464,7 +464,7 @@
+     /* Read the initial defines. */
+     processedStaticChar = FALSE;
+     while (!processedStaticChar) {
+-        getline(line, sizeof(line), stream);
++        get_line(line, sizeof(line), stream);
+         if (sscanf(line, "#define %s %d", str1, &v) == 2) {
+             char *t1;
+@@ -512,7 +512,7 @@
+     /* If there's a monochrome color table, skip it. */
+     if (!strncmp(t1, "mono", 4)) {
+         for (;;) {
+-            getline(line, sizeof(line), stream);
++            get_line(line, sizeof(line), stream);
+             if (!strncmp(line, "static char", 11))
+                 break;
+         }
+@@ -533,7 +533,7 @@
+     /* Read color table. */
+     for (i = 0; i < *ncolorsP; ++i) {
+-        getline(line, sizeof(line), stream);
++        get_line(line, sizeof(line), stream);
+         if ((t1 = strchr(line, '"')) == NULL)
+             pm_error("D error scanning color table");
+@@ -569,7 +569,7 @@
+        "static char ...").
+     */
+     for (;;) {
+-        getline(line, sizeof(line), stream);
++        get_line(line, sizeof(line), stream);
+         if (strncmp(line, "static char", 11) == 0)
+             break;
+     }
+@@ -660,7 +660,7 @@
+     backup = FALSE;
+     /* Read the header line */
+-    getline(line, sizeof(line), stream);
++    get_line(line, sizeof(line), stream);
+     backup = TRUE;  /* back up so next read reads this line again */
+     
+     rc = sscanf(line, "/* %s */", str1);
+@@ -681,7 +681,7 @@
+         pm_error("Could not get %d bytes of memory for image", totalpixels);
+     cursor = *dataP;
+     maxcursor = *dataP + totalpixels - 1;
+-      getline(line, sizeof(line), stream); 
++      get_line(line, sizeof(line), stream); 
+         /* read next line (first line may not always start with comment) */
+     while (cursor <= maxcursor) {
+         if (strncmp(line, "/*", 2) == 0) {
+@@ -691,7 +691,7 @@
+                              ncolors, ptab, &cursor, maxcursor);
+         }
+         if (cursor <= maxcursor)
+-            getline(line, sizeof(line), stream);
++            get_line(line, sizeof(line), stream);
+     }
+     if (ptab) free(ptab);
+ }
+
+Thanks,
+
+-- 
+Colin Watson                                       [cjwatson@ubuntu.com]
+
+
+
+
index b6e0ff3c3f45f4e3d4f3f97b8757142b9c5bbe2c..5450689396dc8baab5c2f214117c63906fe83928 100644 (file)
@@ -298,7 +298,7 @@ entershell() {
                CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \
                CCACHE_DIR=/usr/src/ccache \
                CCACHE_COMPRESS=1 \
-               CCACHE_HASHDIR=1 \
+               CCACHE_COMPILERCHECK="none" \
                KVER=$KVER \
                BUILDTARGET="$BUILDTARGET" \
                MACHINE="$MACHINE" \
@@ -415,7 +415,8 @@ lfsmake2() {
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+                                               CCACHE_COMPILERCHECK="none" \
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                                MACHINE_TYPE="$MACHINE_TYPE" \
@@ -448,7 +449,8 @@ ipfiremake() {
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+                                               CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+                                               CCACHE_COMPILERCHECK="none" \
                                                KVER=$KVER MAKETUNING=$MAKETUNING \
                                                BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                                MACHINE_TYPE="$MACHINE_TYPE" \
@@ -480,7 +482,8 @@ ipfiredist() {
                                        CONFIG_ROOT=$CONFIG_ROOT \
                                        NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                        CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-                                       CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+                                       CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+                                       CCACHE_COMPILERCHECK="none" \
                                        KVER=$KVER \
                                        BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
                                        MACHINE_TYPE="$MACHINE_TYPE" \