r2166 - in trunk: . packages packages/autoconf packages/automake packages/bash packages/binutils packages/bzip2 packages/coreutils packages/db packages/e2fsprogs packages/expect packages/file packages/findutils packages/flex packages/gawk packages/gcc packages/gettext packages/glibc packages/gmp packages/grep packages/grub packages/gzip packages/iana-etc packages/inetutils packages/iproute2 packages/kbd packages/less packages/libtool packages/linux-headers packages/m4 packages/man-db packages/man-pages packages/module-init-tools packages/mpfr packages/ncurses packages/perl packages/procps packages/psmisc packages/readline packages/shadow packages/sysklogd packages/sysvinit packages/tar packages/tcl packages/texinfo packages/udev packages/util-linux-ng packages/vim packages/wget packages/which packages/zisofs-tools packages/zlib

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Nov 29 12:41:38 PST 2008


Author: jhuntwork
Date: 2008-11-29 13:41:37 -0700 (Sat, 29 Nov 2008)
New Revision: 2166

Added:
   trunk/packages/gmp/
   trunk/packages/mpfr/
   trunk/packages/mpfr/Makefile
   trunk/packages/util-linux-ng/
Removed:
   trunk/packages/util-linux/
Modified:
   trunk/Makefile
   trunk/packages/autoconf/Makefile
   trunk/packages/automake/Makefile
   trunk/packages/bash/Makefile
   trunk/packages/binutils/Makefile
   trunk/packages/bzip2/Makefile
   trunk/packages/coreutils/Makefile
   trunk/packages/db/Makefile
   trunk/packages/e2fsprogs/Makefile
   trunk/packages/expect/Makefile
   trunk/packages/file/Makefile
   trunk/packages/findutils/Makefile
   trunk/packages/flex/Makefile
   trunk/packages/gawk/Makefile
   trunk/packages/gcc/Makefile
   trunk/packages/gettext/Makefile
   trunk/packages/glibc/Makefile
   trunk/packages/gmp/Makefile
   trunk/packages/grep/Makefile
   trunk/packages/grub/Makefile
   trunk/packages/gzip/Makefile
   trunk/packages/iana-etc/Makefile
   trunk/packages/inetutils/Makefile
   trunk/packages/iproute2/Makefile
   trunk/packages/kbd/Makefile
   trunk/packages/less/Makefile
   trunk/packages/libtool/Makefile
   trunk/packages/linux-headers/Makefile
   trunk/packages/m4/Makefile
   trunk/packages/man-db/Makefile
   trunk/packages/man-pages/Makefile
   trunk/packages/module-init-tools/Makefile
   trunk/packages/ncurses/Makefile
   trunk/packages/perl/Makefile
   trunk/packages/procps/Makefile
   trunk/packages/psmisc/Makefile
   trunk/packages/readline/Makefile
   trunk/packages/shadow/Makefile
   trunk/packages/sysklogd/Makefile
   trunk/packages/sysvinit/Makefile
   trunk/packages/tar/Makefile
   trunk/packages/tcl/Makefile
   trunk/packages/texinfo/Makefile
   trunk/packages/udev/Makefile
   trunk/packages/util-linux-ng/Makefile
   trunk/packages/vim/Makefile
   trunk/packages/wget/Makefile
   trunk/packages/which/Makefile
   trunk/packages/zisofs-tools/Makefile
   trunk/packages/zlib/Makefile
Log:
Brought the base system up to speed with LFS 6.4. All modifications that were in conflict with LFS build instructions were also removed, as the CD will aim to be a living example of LFS

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -32,12 +32,10 @@
 #==============================================================================
 
 export CD_ARCH := $(shell uname -m | sed 's|i[3456]|x|')
-export VERSION ?= $(CD_ARCH)-6.3
-export CFLAGS ?= -O2 -pipe -s -fno-strict-aliasing
+export VERSION ?= $(CD_ARCH)-6.4
 
 ifeq ($(CD_ARCH),x86)
 export LFS_TARGET ?= i486-pc-linux-gnu
-export CFLAGS := $(CFLAGS) -mtune=i686
 export LINKER := ld-linux.so.2
 endif
 
@@ -47,8 +45,6 @@
 export LINKER := ld-linux-x86-64.so.2
 endif
 
-export CXXFLAGS ?= $(CFLAGS)
-
 # Default timezone
 export timezone ?= GMT
 # Default paper size for groff.
@@ -56,7 +52,7 @@
 
 # HTTP:     Default http server for the lfs-base packages
 # HTTPBLFS: Default http server for the BLFS packages
-export HTTP ?= http://ftp.lfs-matrix.net/pub/lfs/conglomeration
+export HTTP ?= http://kerrek.linuxfromscratch.org/pub/lfs/conglomeration
 export HTTPBLFS ?= http://ftp.lfs-matrix.net/pub/blfs/conglomeration
 
 #==============================================================================
@@ -70,20 +66,19 @@
 export PKG := packages
 
 export MKTREE := $(MP)$(ROOT)
-export CONFIG_SITE := $(ROOT)/scripts/config.site
 
 # Environment Variables
 # The following lines need to be all on one line - no newlines.
 #===============================================================================
-export lfsenv := exec env -i HOME=$$HOME CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' LFS=$(MP) LC_ALL=POSIX PATH=$(WD)/bin:/bin:/usr/bin /bin/bash -c
+export lfsenv := exec env -i HOME=$$HOME LFS=$(MP) LC_ALL=POSIX PATH=$(WD)/bin:/bin:/usr/bin /bin/bash -c
 
-export chenv-pre-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c
+export chenv-pre-bash := $(WD)/bin/env -i HOME=/root TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin $(WD)/bin/bash -c
 
-export chenv-post-bash := $(WD)/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c
+export chenv-post-bash := $(WD)/bin/env -i HOME=/root TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin:$(WD)/bin /bin/bash -c
 
 export lfsbash := set +h && umask 022 && cd $(MKTREE)
 
-export chenv-blfs := /usr/bin/env -i HOME=/root CFLAGS='$(CFLAGS)' TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin INPUTRC=/etc/inputrc XML_CATALOG_FILES="/usr/share/xml/docbook/xsl-stylesheets-1.69.1/catalog.xml /etc/xml/catalog" /bin/bash -c
+export chenv-blfs := /usr/bin/env -i HOME=/root TERM=$(TERM) PS1='\u:\w\$$ ' PATH=/bin:/usr/bin:/sbin:/usr/sbin INPUTRC=/etc/inputrc XML_CATALOG_FILES="/usr/share/xml/docbook/xsl-stylesheets-1.69.1/catalog.xml /etc/xml/catalog" /bin/bash -c
 
 # More Environment Variables
 #==============================================================================
@@ -143,25 +138,19 @@
 	-mkdir -p $(MP)/{proc,sys,dev/shm,dev/pts}
 	-mount -t proc proc $(MP)/proc
 	-mount -t sysfs sysfs $(MP)/sys
-	-mount -t tmpfs tmpfs $(MP)/dev/shm
-	-mount -t devpts -o gid=4,mode=620 devpts $(MP)/dev/pts
-	-install -d $(MP)/{bin,etc/opt,home,lib,mnt}
-	-install -d $(MP)/{sbin,srv,usr/local,var,opt}
-	-install -d $(MP)/root -m 0750
-	-install -d $(MP)/tmp $(MP)/var/tmp -m 1777
-	-install -d $(MP)/media/{floppy,cdrom}
-	-install -d $(MP)/usr/{bin,include,lib,sbin,share,src}
-	-install -d $(MP)/usr/share/{doc,info,locale,man}
-	-install -d $(MP)/usr/share/{misc,terminfo,zoneinfo}
-	-install -d $(MP)/usr/share/man/man{1,2,3,4,5,6,7,8}
-	-install -d $(MP)/usr/local/{bin,etc,include,lib,sbin,share,src}
-	-install -d $(MP)/usr/local/share/{doc,info,locale,man}
-	-install -d $(MP)/usr/local/share/{misc,terminfo,zoneinfo}
-	-install -d $(MP)/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-	-install -d $(MP)/var/{lock,log,mail,run,spool}
-	-install -d $(MP)/var/{opt,cache,lib/{misc,locate},local}
-	-install -d $(MP)/opt/{bin,doc,include,info}
-	-install -d $(MP)/opt/{lib,man/man{1,2,3,4,5,6,7,8}}
+	-mount -t tmpfs shm $(MP)/dev/shm
+	-mount -t devpts devpts $(MP)/dev/pts
+	-mkdir -pv $(MP)/{bin,boot,etc/opt,home,lib,mnt,opt}
+	-mkdir -pv $(MP)/{media/{floppy,cdrom},sbin,srv,var}
+	-install -d -m 0750 $(MP)/root
+	-install -d -m 1777 $(MP)/tmp $(MP)/var/tmp
+	-mkdir -pv $(MP)/usr/{,local/}{bin,include,lib,sbin,src}
+	-mkdir -pv $(MP)/usr/{,local/}share/{doc,info,locale,man}
+	-mkdir -v  $(MP)/usr/{,local/}share/{misc,terminfo,zoneinfo}
+	-mkdir -pv $(MP)/usr/{,local/}share/man/man{1..8}
+	-for dir in $(MP)/usr $(MP)/usr/local; do ln -sv share/{man,doc,info} $$dir ; done
+	-mkdir -v $(MP)/var/{lock,log,mail,run,spool}
+	-mkdir -pv $(MP)/var/{opt,cache,lib/{misc,locate},local}
 	-mknod -m 600 $(MP)/dev/console c 5 1
 	-mknod -m 666 $(MP)/dev/null c 1 3
 	-mknod -m 666 $(MP)/dev/zero c 1 5
@@ -198,9 +187,6 @@
 	 make post-bash $(chbash-post-bash)'
 	@-ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
 
-stop-here:
-	exit 1
-
 extend-lfs: $(MKTREE)
 	@cp $(WD)/bin/which $(MP)/usr/bin
 	@cp $(ROOT)/scripts/unpack $(MP)/bin
@@ -235,25 +221,25 @@
 	lfs-linux-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \
 	lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2 \
 	lfs-binutils-pass2 lfs-ncurses-scpt lfs-bash-scpt lfs-bzip2-scpt \
-	lfs-coreutils-scpt lfs-diffutils-scpt lfs-findutils-scpt \
-	lfs-gawk-scpt lfs-gettext-scpt lfs-grep-scpt lfs-gzip-scpt \
+	lfs-coreutils-scpt lfs-diffutils-scpt lfs-e2fsprogs-scpt lfs-findutils-scpt \
+	lfs-gawk-scpt lfs-gettext-scpt lfs-grep-scpt lfs-gzip-scpt lfs-m4-scpt \
 	lfs-make-scpt lfs-patch-scpt lfs-perl-scpt lfs-sed-scpt \
-	lfs-tar-scpt lfs-texinfo-scpt lfs-util-linux-scpt lfs-wget-scpt \
-	lfs-cdrtools-scpt lfs-zlib-scpt lfs-zisofs-tools-scpt lfs-grub-scpt
+	lfs-tar-scpt lfs-texinfo-scpt lfs-util-linux-ng-scpt lfs-wget-scpt \
+	lfs-cdrtools-scpt lfs-zlib-scpt lfs-zisofs-tools-scpt
 	@cp /etc/resolv.conf $(WD)/etc
 	@touch $@
 
 pre-bash: createfiles ch-linux-headers ch-man-pages \
-	ch-glibc re-adjust-toolchain ch-binutils ch-gcc ch-db ch-sed \
-	ch-e2fsprogs ch-coreutils ch-iana-etc ch-m4 ch-bison ch-gpm \
-	ch-ncurses ch-procps ch-libtool ch-perl ch-readline ch-zlib \
+	ch-glibc re-adjust-toolchain ch-binutils ch-gmp ch-mpfr ch-gcc ch-db \
+	ch-sed ch-e2fsprogs ch-coreutils ch-iana-etc ch-m4 ch-bison \
+	ch-ncurses ch-procps ch-libtool ch-zlib ch-perl ch-readline \
 	ch-autoconf ch-automake ch-bash
 
-post-bash: ch-bzip2 ch-diffutils ch-file ch-findutils ch-flex \
-	ch-gawk ch-gettext ch-grep ch-groff ch-gzip ch-inetutils \
-	ch-iproute2 ch-kbd ch-less ch-make ch-man-db ch-mktemp \
+post-bash: ch-bzip2 ch-diffutils ch-file ch-gawk ch-findutils \
+	ch-flex ch-gettext ch-grep ch-groff ch-gzip ch-inetutils \
+	ch-iproute2 ch-kbd ch-less ch-make ch-man-db \
 	ch-module-init-tools ch-patch ch-psmisc ch-shadow ch-sysklogd \
-	ch-sysvinit ch-tar ch-texinfo ch-udev ch-util-linux ch-vim \
+	ch-sysvinit ch-tar ch-texinfo ch-udev ch-util-linux-ng ch-vim \
 	final-environment
 
 blfs:   ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-jfsutils ch-nano ch-joe \
@@ -351,6 +337,8 @@
 	@chgrp utmp /var/run/utmp /var/log/lastlog
 	@chmod 664 /var/run/utmp /var/log/lastlog
 	@cp $(WD)/etc/resolv.conf /etc
+	@-cp $(ROOT)/etc/hosts /etc
+	@touch $@
 
 # Do not call the targets below manually! They are used internally and must be
 # called by other targets.
@@ -381,7 +369,6 @@
 	@-cp $(ROOT)/etc/bashrc /etc
 	@-cp $(ROOT)/etc/profile /etc
 	@-dircolors -p > /etc/dircolors
-	@-cp $(ROOT)/etc/hosts /etc
 	@-cp $(ROOT)/etc/fstab /etc
 
 update-caches:
@@ -485,6 +472,6 @@
 
 .PHONY: mount unmount clean_sources scrub clean iso chroot-gvim update-caches \
 	final-environment re-adjust-toolchain ch-% ch-glibc-32 lfs-adjust-toolchain \
-	lfs-%-scpt lfs-%-scpt-32 lfs-%-pass1 lfs-%-pass2 createfiles \
+	lfs-%-scpt lfs-%-scpt-32 lfs-%-pass1 lfs-%-pass2 \
 	gvim %-only-ch lfs-%-only lfs-%-only-pass1 lfs-%-only-pass2 lfs-wget \
 	lfs-rm-wget blfs post-bash pre-bash tools pre-which zeroes

Modified: trunk/packages/autoconf/Makefile
===================================================================
--- trunk/packages/autoconf/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/autoconf/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Autoconf Makefile
 
 NM= autoconf
-VRS= 2.61
+VRS= 2.63
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= cc4b2f1a3e41f5542594b089ecdf7974890b3190
+SHA-$(FILE)= f15e14aa34acf871b47f659ef99a2e6707db4a18
 
 # Targets
 

Modified: trunk/packages/automake/Makefile
===================================================================
--- trunk/packages/automake/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/automake/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,13 +1,17 @@
 # Automake Makefile
 
 NM= automake
-VRS= 1.10
+VRS= 1.10.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 966008107cc1fdb099f65de6496147ef05522fec
+SHA-$(FILE)= cd2e0f7054d4edc75cbf87cd8a92962b3b417b74
 
+PATCH= $(DIR)-test_fix-1.patch
+URL-$(PATCH) = $(HTTP)/$(NM)/$(PATCH)
+SHA-$(PATCH) = 78c9367ef53046e3a12bd09f61e2b76f6da30f76
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -16,11 +20,12 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(PATCH)
 	$(std_build)
 
 compile-stage2:
-	./configure --prefix=/usr
+	patch -Np1 -i ../$(PATCH)
+	./configure --prefix=/usr --docdir=/usr/share/doc/automake-1.10.1
 	make
 	make install
 

Modified: trunk/packages/bash/Makefile
===================================================================
--- trunk/packages/bash/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/bash/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -8,9 +8,9 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= fe6466c7ee98061e044dae0347ca5d1a8eab4a0d
 
-PATCH1= $(DIR)-fixes-5.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1)
-SHA-$(PATCH1)= b85f303e6317fe50b6f5d0c204e2e68824010a88
+PATCH1= $(DIR)-fixes-8.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= b7366d418e292b64ac089f99056e59043d7decde
 
 FILE1 = $(NM)-doc-$(VRS).tar.gz
 URL-$(FILE1)= $(HTTP)/$(NM)/$(FILE1)
@@ -25,7 +25,7 @@
 
 compile-stage1:
 	patch -Np1 -i ../$(PATCH1)
-	./configure --prefix=$(WD) --without-bash-malloc
+	./configure --prefix=$(WD) --without-bash-malloc ac_cv_func_working_mktime=yes
 	make
 	make install
 	ln -sv bash $(WD)/bin/sh
@@ -43,7 +43,7 @@
 	 Makefile.in
 	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=/usr --bindir=/bin --without-bash-malloc \
-	 --with-installed-readline
+	 --with-installed-readline ac_cv_func_working_mktime=yes
 	make
 	make install
 

Modified: trunk/packages/binutils/Makefile
===================================================================
--- trunk/packages/binutils/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/binutils/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,29 +1,37 @@
 # Binutils Makefile
 
 NM= binutils
-VRS= 2.17
+VRS= 2.18
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= a557686eef68362ea31a3aa41ce274e3eeae1ef0
+SHA-$(FILE)= fdec92e9dfc6c32155869f3910f47041c78e2277
 
+PATCH1= $(DIR)-configure-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= a2de70f2e80656a70c6fb0f70f6f4d6fb82835d5
+
+PATCH2= $(DIR)-GCC43-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= d3e5cf0d5cd4e53a20f4996dc1be3a1c72eb329b
+
 # Targets
 
 include $(ROOT)/scripts/functions
 
 export LFS_USE_TARGET := yes
 
-pass1: $(FILE)
+pass1: $(FILE) $(PATCH1)
 	$(sep_dir_build)
 
 compile-pass1:
-# --disable-shared overrides unsuitable default from config.site
-	unset CFLAGS ; CC="gcc -B/usr/bin/" ../$(DIR)/configure \
-	    --prefix=$(WD) --disable-nls --disable-shared --disable-werror
-	unset CFLAGS ; make
-	unset CFLAGS ; make install
-	unset CFLAGS ; make -C ld clean
-	unset CFLAGS ; make -C ld LIB_PATH=$(WD)/lib
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+	CC="gcc -B/usr/bin/" ../$(DIR)/configure \
+	    --prefix=$(WD) --disable-nls --disable-werror
+	make
+	make install
+	make -C ld clean
+	make -C ld LIB_PATH=$(WD)/lib
 	cp -v ld/ld-new $(WD)/bin
 ifdef 64bit
 	ln -s lib $(WD)/lib64
@@ -34,21 +42,21 @@
 	mv -v $(WD)/$$(gcc -dumpmachine)/bin/{ld,ld-old}
 	mv -v $(WD)/bin/{ld-new,ld}
 	ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld
-	gcc -dumpspecs | sed 's@/lib[64]*/$(LINKER)@/tools&@g' \
+	gcc -dumpspecs | sed 's@/lib[64]*/$(LINKER)@$(WD)&@g' \
 	  > `dirname $$(gcc -print-libgcc-file-name)`/specs
-	GCC_INCLUDEDIR=`dirname $$(gcc -print-libgcc-file-name)`/include && \
-	find $${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; && \
-	rm -vf `grep -l "DO NOT EDIT THIS FILE" $${GCC_INCLUDEDIR}/*` && \
-	unset GCC_INCLUDEDIR
+	GCC_FIXED=`dirname $$(gcc -print-libgcc-file-name)`/include-fixed && \
+	find $${GCC_FIXED}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; && \
+	rm -vf `grep -l "DO NOT EDIT THIS FILE" $${GCC_FIXED}/*` && \
+	unset GCC_FIXED
 	touch $@
 
-pass2: $(FILE) 
+pass2: $(FILE) $(PATCH1)
 	$(sep_dir_build)
 
 compile-pass2:
-# --disable-shared overrides unsuitable default from config.site
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
 	../$(DIR)/configure --prefix=$(WD) --disable-nls \
-	 --with-lib-path=$(WD)/lib --disable-shared
+	 --with-lib-path=$(WD)/lib
 	make
 	make install
 	make -C ld clean
@@ -64,7 +72,7 @@
 	mv -v $(WD)/$$(gcc -dumpmachine)/bin/{ld,ld-old}
 	mv -v $(WD)/bin/{ld-new,ld}
 	ln -sv $(WD)/bin/ld $(WD)/$$(gcc -dumpmachine)/bin/ld
-	gcc -dumpspecs | sed -e 's@/tools@@g' \
+	gcc -dumpspecs | sed -e 's@$(WD)@@g' \
 	    -e '/\*startfile_prefix_spec:/{n;s at .*@/usr/lib/ @}' \
 	    -e '/\*cpp:/{n;s@$$@ -isystem /usr/include@}' > \
 	     `dirname $$(gcc --print-libgcc-file-name)`/specs
@@ -74,13 +82,17 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: $(FILE)
+stage2: $(FILE) $(PATCH1) $(PATCH2)
 	$(sep_dir_build)
 
 compile-stage2:
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2)
+	cd ../$(DIR) ; rm -fv etc/standards.info
+	cd ../$(DIR) ; sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in
 	../$(DIR)/configure --prefix=/usr --enable-shared
 	make tooldir=/usr
-	-make CFLAGS= -k check
+	-make -k check
 	make tooldir=/usr install
 	cp ../$(DIR)/include/libiberty.h /usr/include
 

Modified: trunk/packages/bzip2/Makefile
===================================================================
--- trunk/packages/bzip2/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/bzip2/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,15 +1,15 @@
 # Bzip2 Makefile
 
 NM= bzip2
-VRS= 1.0.4
+VRS= 1.0.5
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= http://www.bzip.org/$(VRS)/$(FILE)
-SHA-$(FILE)= f2388ec8f2c506e02aa89e67577b3c6331cbaa4c
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 8b02713ea0c8eb501cc8bdac4432d7f29700f767
 
 PATCH1= $(DIR)-install_docs-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1)
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 86fa168b260bb12651ebfa6d47939e926e067036
 
 # Targets
@@ -32,7 +32,6 @@
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH1)
-	sed -i 's,X)/man,X)/share/man,g' Makefile
 	make -f Makefile-libbz2_so
 	make clean
 	make

Modified: trunk/packages/coreutils/Makefile
===================================================================
--- trunk/packages/coreutils/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/coreutils/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,36 +1,38 @@
 # Coreutils Makefile
 
 NM= coreutils
-VRS= 6.9
+VRS= 6.12
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://ftp.gnu.org/gnu/coreutils/$(FILE)
-SHA-$(FILE)= 10310a78c4e1d9f742f3815ac28e9bf1086a5885
+FILE= $(DIR).tar.gz
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 1bb297fdf8b38ca19ab5252c6179b1b2aecd020e
 
-PATCH1= $(DIR)-uname-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1)
-SHA-$(PATCH1)= 42cc795e56b96994a4dc9e8f2a8dd72b6a25665f
+PATCH1= $(DIR)-old_build_kernel-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= ecddf5bafede04807f44c82ca5421b8a59e2ce06
 
-PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch
-URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH2)
-SHA-$(PATCH2)= e1e783efd515639b78627c37025b96168594f408
+PATCH2= $(DIR)-uname-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 42cc795e56b96994a4dc9e8f2a8dd72b6a25665f
 
-PATCH3= $(DIR)-i18n-1.patch
-URL-$(PATCH3)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH3)
-SHA-$(PATCH3)= 5db7b7919910ccda018d01f2fc1b65e1c1da954d
+PATCH3= $(DIR)-i18n-2.patch
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
+SHA-$(PATCH3)= 49d537e71bc4b0c50c13c2a850c369fca1b177de
 
 # Targets
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE)
+stage1: $(FILE) $(PATCH1)
 	$(std_build)
 
 compile-stage1:
-	./configure --prefix=$(WD)
+	patch -Np1 -i ../$(PATCH1)
+	./configure --prefix=$(WD) --enable-install-program=hostname
 	make
 	make install
+	cp -v src/su $(WD)/bin/su-tools
 
 chroot:
 	chroot "$(MP)" $(chenv-pre-bash) \
@@ -43,12 +45,11 @@
 	patch -Np1 -i ../$(PATCH1)
 	patch -Np1 -i ../$(PATCH2)
 	patch -Np1 -i ../$(PATCH3)
-	chmod +x tests/sort/sort-mb-tests
-	./configure --prefix=/usr
+	./configure --prefix=/usr --enable-install-program=hostname --enable-no-install-program=kill,uptime
 	make
 	make install
 	$(WD)/bin/mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
-	$(WD)/bin/mv -v /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
+	$(WD)/bin/mv -v /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} /bin
 	mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
 	mv -v /usr/bin/chroot /usr/sbin
 	mv -v /usr/bin/{head,sleep,nice} /bin

Modified: trunk/packages/db/Makefile
===================================================================
--- trunk/packages/db/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/db/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,16 +1,16 @@
 # DB Makefile
 
 NM= db
-VRS= 4.5.20
+VRS= 4.7.25
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 0e5a6c152c5d7089899481d9de689d1f7e77bde1
+SHA-$(FILE)= 957c10358df1211e1dc37ea997aadef42117d6a5
 
-PATCH1= $(DIR)-fixes-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1)
-SHA-$(PATCH1)= adf217ef8606f25b6fd4e7c9a0c1ea9f01c4f250
+PATCH1= $(DIR)-upstream_fixes-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 737f11c8f7f9b7bd2523f6c19460bd0aacd6799f
 
 # Targets
 

Modified: trunk/packages/e2fsprogs/Makefile
===================================================================
--- trunk/packages/e2fsprogs/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/e2fsprogs/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,17 +1,28 @@
 # E2fsprogs Makefile
 
 NM= e2fsprogs
-VRS= 1.40.2
+VRS= 1.41.3
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/e2fsprogs/$(FILE)
-SHA-$(FILE)= 65519d66bd15550d0bcd32ec72481ff0dbe737e2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= d85f05b7bcef1adf8306a789f3ac0325c3c67e8d
 
 # Targets
 
 include $(ROOT)/scripts/functions
 
+stage1: $(FILE)
+	$(std_build)
+
+compile-stage1:
+	mkdir -v build
+	cd build
+	./configure --prefix=$(WD)
+	make
+	make install-libs
+	chmod -v u+w $(WD)/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a
+
 chroot:
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
@@ -27,8 +38,15 @@
 	cd build ; make
 	cd build ; make install
 	cd build ; make install-libs
+	chmod -v u+w /usr/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a
+	gunzip -v /usr/share/info/libext2fs.info.gz
+	install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info
+	cd build ; makeinfo -o doc/com_err.info ../lib/et/com_err.texinfo
+	cd build ; install -v -m644 doc/com_err.info /usr/share/info
+	install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info
+	cd build ; install -v -m644 -D ../doc/libblkid.txt /usr/share/doc/e2fsprogs-1.41.3/libblkid.txt
 
 clean:
 	-rm -rf $(DIR)
 
-.PHONY: clean chroot compile-stage2
+.PHONY: clean compile-stage1 chroot compile-stage2

Modified: trunk/packages/expect/Makefile
===================================================================
--- trunk/packages/expect/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/expect/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -12,15 +12,20 @@
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= ba903a7d04b4faa13c8b9db75e1537f55f28e82b
 
+PATCH2= $(NM)-$(VRS)-tcl_8.5.5_fix-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 268c90379acd02d365f525e9d83017a75f62aa98
+
 # Targets
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE) $(PATCH1)
+stage1: $(FILE) $(PATCH1) $(PATCH2)
 	$(std_build)
 
 compile-stage1:
 	patch -Np1 -i ../$(PATCH1)
+	patch -Np1 -i ../$(PATCH2)
 	cp configure{,.bak}
 	sed 's:/usr/local/bin:/bin:' configure.bak > configure
 	./configure --prefix=$(WD) --with-tcl=$(WD)/lib \

Modified: trunk/packages/file/Makefile
===================================================================
--- trunk/packages/file/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/file/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # File Makefile
 
 NM= file
-VRS= 4.21
+VRS= 4.26
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= ftp://ftp.gw.com/mirrors/pub/unix/file/$(FILE)
-SHA-$(FILE)= 4a919572fed1896212c2d7f41f841845efc1287a
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 412cdac5cd778d867e2d91a01b09858be1998ec3
 
 # Targets
 
@@ -20,6 +20,7 @@
 	$(std_build)
 
 compile-stage2:
+	sed -i -e '197,+1d' -e '189,+1d' -e 's/token$$/tokens/' doc/file.man
 	./configure --prefix=/usr
 	make
 	make install

Modified: trunk/packages/findutils/Makefile
===================================================================
--- trunk/packages/findutils/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/findutils/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Findutils Makefile
 
 NM= findutils
-VRS= 4.2.31
+VRS= 4.4.0
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= http://ftp.gnu.org/gnu/findutils/$(FILE)
-SHA-$(FILE)= e031ddb4f50c8a053d3f216d10f92621c1fa21ba
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 25e3d4dec40cec0165ffeff50acc4d4523ec3e07
 
 # Targets
 

Modified: trunk/packages/flex/Makefile
===================================================================
--- trunk/packages/flex/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/flex/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Flex Makefile
 
 NM= flex
-VRS= 2.5.33
+VRS= 2.5.35
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= acdb8fff6455967ad1a5bfc71855dbcc1253ee56
+SHA-$(FILE)= c507095833aaeef2d6502e12638e54bf7ad2f24a
 
 # Targets
 
@@ -31,6 +31,8 @@
 	echo "" >> /usr/bin/lex
 	echo "# End /usr/bin/lex" >> /usr/bin/lex
 	chmod 755 /usr/bin/lex
+	mkdir -v /usr/share/doc/$(DIR)
+	cp -v doc/flex.pdf /usr/share/doc/$(DIR)
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/gawk/Makefile
===================================================================
--- trunk/packages/gawk/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/gawk/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,28 +1,22 @@
 # Gawk Makefile
 
 NM= gawk
-VRS= 3.1.5
+VRS= 3.1.6
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 0d5694461f1c32f1eae41a1c0d7ba0939b47e369
+SHA-$(FILE)= fb45bded207af6a8e46cd63fcbb6fb064ecee607
 
-PATCH1= $(DIR)-segfault_fix-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 8dde8415d03b1897f50d5b12b6c876feda15e0be
-
 # Targets
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE) $(PATCH1)
+stage1: $(FILE)
 	$(std_build)
 
 compile-stage1:
-	./configure --prefix=$(WD)
-	echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
-	echo "#define HAVE_LC_MESSAGES 1" >> config.h
+	./configure --prefix=$(WD) ac_cv_func_working_mktime=yes
 	make
 	make install
 
@@ -30,16 +24,15 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
-	./configure --prefix=/usr --libexecdir=/usr/lib
-	echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
-	echo "#define HAVE_LC_MESSAGES 1" >> config.h
+	./configure --prefix=/usr --libexecdir=/usr/lib ac_cv_func_working_mktime=yes
 	make
 	make install
+	mkdir -v /usr/share/doc/$(DIR)
+	cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/$(DIR)
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/gcc/Makefile
===================================================================
--- trunk/packages/gcc/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/gcc/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,36 +1,44 @@
 # Gcc Makefile
 
 NM= gcc
-VRS= 4.1.2
+VRS= 4.3.2
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 7981b8d1b58b10ddfd7d5142eab16352d9206f3b
+SHA-$(FILE)= 787b566ad4f386a9896e2d5703e6ff5e7ccaca58
 
-PATCH1= $(DIR)-specs-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 1bdfbb49437642d3e450f0e3ba25a3e30e25e857
+FILE1= mpfr-2.3.2.tar.bz2
+URL-$(FILE1)= $(HTTP)/mpfr/$(FILE1)
+SHA-$(FILE1)= 37dbd478e1c136f37cf4c68eb1522e86e2307288
 
+FILE2= gmp-4.2.4.tar.bz2
+URL-$(FILE2)= $(HTTP)/gmp/$(FILE2)
+SHA-$(FILE2)= bb721f94fbeeb8c609104540b408da6707c370ec
+
 # Targets
 
 include $(ROOT)/scripts/functions
 
 export LFS_USE_TARGET := yes
 
-pass1: $(FILE)
+pass1: $(FILE) $(FILE1) $(FILE2)
 	$(sep_dir_build)
 
 compile-pass1:
-# --enable-static overrides the unsuitable default in config.site
-	unset CFLAGS ; CC="gcc -B/usr/bin/" ../$(DIR)/configure --prefix=$(WD) \
-	 --with-local-prefix=$(WD) --disable-nls --enable-shared \
-	 --enable-languages=c --enable-static --disable-multilib
-	unset CFLAGS ; make bootstrap
-	unset CFLAGS ; make install
+	cd ../$(DIR) ; unpack ../$(FILE1)
+	cd ../$(DIR) ; mv mpfr-2.3.2 mpfr
+	cd ../$(DIR) ; unpack ../$(FILE2)
+	cd ../$(DIR) ; mv gmp-4.2.4 gmp	
+	CC="gcc -B/usr/bin/" ../$(DIR)/configure --prefix=$(WD) \
+	 --with-local-prefix=$(WD) --disable-nls --disable-shared \
+	 --enable-languages=c --disable-libssp --disable-multilib
+	make
+	make install
+	ln -vs libgcc.a `gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/'`
 	ln -vs gcc $(WD)/bin/cc
 
-pass2: $(FILE) $(PATCH1)
+pass2: $(FILE) $(FILE1) $(FILE2)
 	$(sep_dir_build)
 
 compile-pass2:
@@ -39,17 +47,28 @@
 	cd ../$(DIR) ; cp -v gcc/Makefile.in{,.tmp} && \
 	 sed 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
 	 > gcc/Makefile.in
-	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+	cd ../$(DIR) ; for file in $$(find gcc/config -name linux64.h -o -name linux.h) ; \
+	do \
+	cp -uv $$file{,.orig} && \
+	sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' -e 's@/usr@/tools at g' $$file.orig > $$file && \
+	echo " " >> $$file && \
+	echo "#undef STANDARD_INCLUDE_DIR" >> $$file && \
+	echo "#define STANDARD_INCLUDE_DIR 0" >> $$file && \
+	touch $$file.orig ; \
+	done
 ifdef 64bit
 	cd ../$(DIR) ; cp -v gcc/config/i386/t-linux64{,.tmp} && \
 	 sed '/MULTILIB_OSDIRNAMES/d' gcc/config/i386/t-linux64.tmp \
 	 > gcc/config/i386/t-linux64
 endif
-# --enable-static overrides the unsuitable default in config.site
+	cd ../$(DIR) ; unpack ../$(FILE1)
+	cd ../$(DIR) ; mv mpfr-2.3.2 mpfr
+	cd ../$(DIR) ; unpack ../$(FILE2)
+	cd ../$(DIR) ; mv gmp-4.2.4 gmp
 	../$(DIR)/configure --prefix=$(WD) \
 	 --with-local-prefix=$(WD) --enable-clocale=gnu --enable-shared \
 	 --enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ \
-	 --disable-libstdcxx-pch --enable-static --disable-multilib
+	 --disable-libstdcxx-pch --disable-bootstrap --disable-multilib
 	make
 	make install
 
@@ -57,7 +76,7 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: $(FILE) $(PATCH1)
+stage2: $(FILE)
 	$(sep_dir_build)
 
 compile-stage2:
@@ -66,11 +85,9 @@
 	cd ../$(DIR) ; sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' \
 	 gcc/Makefile.in
 	cd ../$(DIR) ; sed -i 's@\./fixinc\.sh at -c true@' gcc/Makefile.in
-	cd ../$(DIR) ; sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in
-# --enable-static overrides the unsuitable default in config.site
 	../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \
 	 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-	 --enable-clocale=gnu --enable-languages=c,c++ --enable-static \
+	 --enable-clocale=gnu --enable-languages=c,c++ --disable-bootstrap \
 	 --disable-multilib
 	make
 	-make -k check

Modified: trunk/packages/gettext/Makefile
===================================================================
--- trunk/packages/gettext/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/gettext/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Gettext Makefile
 
 NM= gettext
-VRS= 0.16.1
+VRS= 0.17
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= http://ftp.gnu.org/gnu/gettext/$(FILE)
-SHA-$(FILE)= 8642f4346dfd6a18ecd883329e150bfe9e0886c3
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= c51803d9f745f6ace36bd09c0486d5735ce399cf
 
 # Targets
 
@@ -29,7 +29,7 @@
 	$(std_build)
 
 compile-stage2:
-	./configure --prefix=/usr
+	./configure --prefix=/usr --docdir=/usr/share/doc/$(DIR)
 	make
 	make install
 

Modified: trunk/packages/glibc/Makefile
===================================================================
--- trunk/packages/glibc/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/glibc/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,31 +1,34 @@
 # Glibc Makefile
 
 NM= glibc
-VRS= 2.5.1
+VRS= 2.8-20080929
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://ftp.gnu.org/gnu/glibc/$(FILE)
-SHA-$(FILE)= 2b7da136df025bb8c787be3351cba58374226d9c
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 9f2ad5f67bd484d390b33593ce4b613da8c260bd
 
-FILE2= $(NM)-libidn-$(VRS).tar.gz
-URL-$(FILE2)= http://ftp.gnu.org/gnu/glibc/$(FILE2)
-SHA-$(FILE2)= 816f410835a8d4ecbccdfed2d86ccc6284c2fa92
+PATCH1= $(DIR)-iconv_tests-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 90ad8b8d76f3eaa02f789d50df50d1e7d3520a48
 
-PATCH50= $(DIR)-supported_locales-1.patch
+PATCH2= $(DIR)-ildoubl_test-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 038597c7001fed849863b467f25499058baa7191
 
 # Targets
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE) $(FILE2)
+stage1: $(FILE)
 	$(sep_dir_build)
 
 compile-stage1:
-# --enable-static overrides the unsuitable default in config.site
+	cd ../$(DIR) ; sed -i 's@/etc/ld.so.preload@/tools/etc/ld.so.preload@' elf/rtld.c
+	echo "CFLAGS += -march=i486 -mtune=native" > configparms
 	../$(DIR)/configure --prefix=$(WD) --disable-profile \
 	 --enable-add-ons --enable-kernel=2.6.0 --with-binutils=$(WD)/bin \
-	 --without-gd --with-headers=$(WD)/include --without-selinux --enable-static
+	 --without-gd --with-headers=$(WD)/include --without-selinux
 	make
 	# LFS says:
 	# mkdir -v /tools/etc
@@ -37,23 +40,20 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: $(FILE) $(FILE2)
+stage2: $(FILE) $(PATCH1) $(PATCH2)
 	$(sep_dir_build)
 	touch $@
 
 compile-stage2:
-	cd ../$(DIR) ; unpack ../$(FILE2) ; mv glibc-libidn-$(VRS) libidn
-	sed -i \
-	's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/$(LINKER) -o|' \
-	        ../$(DIR)/scripts/test-installation.pl
-# LiveCD specific locale additions
-	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH50)
-# --enable-static overrides the unsuitable default in config.site
-	sed -i 's|@BASH@|/bin/bash|' ../$(DIR)/elf/ldd.bash.in
+	cd ../$(DIR) ; sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+	cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2)
+	cd ../$(DIR) ; sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in 
+	echo "CFLAGS += -march=i486 -mtune=native" > configparms
 	../$(DIR)/configure --prefix=/usr --disable-profile \
-	 --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc \
-	 --enable-static
+	 --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
 	make
+	cp -v ../$(DIR)/iconvdata/gconv-modules iconvdata
 	-make -k check
 	touch /etc/ld.so.conf
 	make install

Copied: trunk/packages/gmp (from rev 2165, trunk/packages/template)

Modified: trunk/packages/gmp/Makefile
===================================================================
--- trunk/packages/template/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/gmp/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,61 +1,33 @@
-# [package-name] Makefile (This is a template for package Makefiles)
+# gmp Makefile
 
-NM= [package-name]
-VRS= [version-number]
+NM= gmp
+VRS= 4.2.4
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.bz2 # Use bz2 files wherever possible, especially for lfs-base
+FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= [sha1sum of $(FILE)]
+SHA-$(FILE)= bb721f94fbeeb8c609104540b408da6707c370ec
 
-PATCH1= $(DIR)-some-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= [sha1sum of $(PATCH1)]
-
 # Targets
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE)
-	$(std_build) # See the scripts/functions file for functions like this
-
-compile-stage1:
-	./configure --prefix=$(WD)
-	make
-	make install
-
-# The following target is for use with packages that must be built in chroot
-# and which you want to build one at a time. Mostly for troubleshooting.
-# For use with packages built in chroot but before the chroot installation of
-# Bash.
-# NOTE: You would never call the 'chroot' targets directly, they would be
-# referenced by other targets in the root Makefile.
 chroot:
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-# Below is a variation of the above target. This would be used with packages
-# built in chroot after Bash, but before BLFS-type packages.
-#chroot:
-#	chroot "$(MP)" $(chenv-post-bash) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+stage2: $(FILE)
+	$(std_build)
 
-# Below is the final variation of the above two. For use with packages built
-# in chroot but after the lfs-base is done. BLFS-type packages.
-#chroot:
-#	chroot "$(MP)" $(chenv-blfs) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-
-stage2: Makefile $(FILE) $(PATCH1)
-	$(sep_dir_build) # Simple function to create a separate build directory
-
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
-	./configure --prefix=/usr
+	./configure --prefix=/usr --enable-cxx --enable-mpbsd
 	make
+	-make -k check
 	make install
+	mkdir -v /usr/share/doc/$(DIR)
+	cp -v doc/{isa_abi_headache,configuration} doc/*.html /usr/share/doc/$(DIR)
 
 clean:
 	-rm -rf $(DIR)
 
-.PHONY: compile-stage1 clean chroot compile-stage2
+.PHONY: clean chroot compile-stage2

Modified: trunk/packages/grep/Makefile
===================================================================
--- trunk/packages/grep/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/grep/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,29 +1,30 @@
 # Grep Makefile
 
-# Do not update this package before RedHat! Some of the fixes are scheduled
-# for grep-2.5.3, not 2.5.2
-
 NM= grep
-VRS= 2.5.1a
+VRS= 2.5.3
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 2cd082775d30be463c0ac674a00595eb56fda22e
+SHA-$(FILE)= 53227ca9a01d5548448372f9b2e9111adf159f3b
 
-PATCH1= $(DIR)-redhat_fixes-2.patch
+PATCH1= $(DIR)-debian_fixes-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 6f7f1623d1909f07dc08a8a16a24cbce6be8dfc5
+SHA-$(PATCH1)= 77b5967bc0aa25fa827f892cd0f4625e18d0361f
 
+PATCH2= $(DIR)-upstream_fixes-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 464e42df7bb8aa1f170705cf7a98e0fdc7669709
+
 # Targets
 
 include $(ROOT)/scripts/functions
 
 stage1: $(FILE)
-	$(std_build) # See the scripts/functions file for functions like this
+	$(std_build)
 
 compile-stage1:
-	./configure --prefix=$(WD) --disable-perl-regexp
+	./configure --prefix=$(WD) --disable-perl-regexp --without-included-regex
 	make
 	make install
 
@@ -31,13 +32,13 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
 	$(std_build)
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH1)
-	chmod +x tests/fmbtest.sh
-	./configure --prefix=/usr --bindir=/bin
+	patch -Np1 -i ../$(PATCH2)
+	./configure --prefix=/usr --bindir=/bin --without-included-regex
 	make
 	make install
 

Modified: trunk/packages/grub/Makefile
===================================================================
--- trunk/packages/grub/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/grub/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -16,9 +16,6 @@
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE) $(PATCH1)
-	@echo GRUB downloaded
-
 chroot:
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'

Modified: trunk/packages/gzip/Makefile
===================================================================
--- trunk/packages/gzip/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/gzip/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -5,7 +5,7 @@
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= http://ftp.gnu.org/gnu/gzip/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= 264e82876f201d9576626fbb1e0e9fe458efe9b9
 
 # Targets
@@ -16,6 +16,10 @@
 	$(std_build) 
 
 compile-stage1:
+	for file in gzip.c lib/utimens.{c,h} ; do \
+	  cp -v $$file{,.orig} && \
+	  sed 's/futimens/gl_&/' $$file.orig > $$file ; \
+	done
 	./configure --prefix=$(WD)
 	make
 	make install
@@ -28,6 +32,7 @@
 	$(std_build)
 
 compile-stage2:
+	sed -i 's/futimens/gl_&/' gzip.c lib/utimens.{c,h}
 	./configure --prefix=/usr --bindir=/bin
 	make
 	make install

Modified: trunk/packages/iana-etc/Makefile
===================================================================
--- trunk/packages/iana-etc/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/iana-etc/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Iana-etc Makefile
 
 NM= iana-etc
-VRS= 2.20
+VRS= 2.30
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 88a5f57df1ee5f5f2a020abfd346df15cec4f573
+SHA-$(FILE)= 218593bcb9264014c4e397d838b2c218eac9df06
 
 # Targets
 

Modified: trunk/packages/inetutils/Makefile
===================================================================
--- trunk/packages/inetutils/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/inetutils/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -5,7 +5,7 @@
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= http://ftp.gnu.org/gnu/inetutils/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= 825834b94cd387b2d088ef1cfe727de824b9589e
 
 PATCH1= $(DIR)-no_server_man_pages-2.patch
@@ -25,6 +25,8 @@
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH1)
+	sed -i 's@<sys/types.h>@<sys/types.h>\n#include <stdlib.h>@' \
+	 libicmp/icmp_timestamp.c
 	./configure --prefix=/usr --libexecdir=/usr/sbin \
 	--sysconfdir=/etc --localstatedir=/var --disable-ifconfig \
 	--disable-logger --disable-syslogd \

Modified: trunk/packages/iproute2/Makefile
===================================================================
--- trunk/packages/iproute2/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/iproute2/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,13 +1,12 @@
 # Iproute2 Makefile
 
-NM= iproute
-VRS= 2.6.20
-DATE= 070313
-DIR= $(NM)-$(VRS)-$(DATE)
+NM= iproute2
+VRS= 2.6.26
+DIR= $(NM)-$(VRS)
 
-FILE= $(NM)2-$(VRS)-$(DATE).tar.gz
-URL-$(FILE)= http://developer.osdl.org/dev/iproute2/download/$(FILE)
-SHA-$(FILE)= 6c46d381a9840c94a12faf3b2d64577c4e74323d
+FILE= $(NM)-$(VRS).tar.bz2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 95e0f528066eae7304b5d7c610348b522628c92f
 
 # Targets
 
@@ -21,9 +20,9 @@
 	$(std_build) 
 
 compile-stage2:
-	sed -i -e '/tc-bfifo.8/d' -e '/tc-pfifo.8/s/pbfifo/bfifo/' Makefile
-	make SBINDIR=/sbin
-	make SBINDIR=/sbin install
+	make DESTDIR= SBINDIR=/sbin
+	make DESTDIR= SBINDIR=/sbin MANDIR=/usr/share/man \
+	 DOCDIR=/usr/share/doc/$(DIR) install
 	mv -v /sbin/arpd /usr/sbin
 
 clean:

Modified: trunk/packages/kbd/Makefile
===================================================================
--- trunk/packages/kbd/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/kbd/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,31 +1,17 @@
 # Kbd Makefile
 
 NM= kbd
-VRS= 1.12
+VRS= 1.14.1
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.bz2
+FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 65eaae4d98fca3f7ae7dfc9d9cb7c5a432c6475f
+SHA-$(FILE)= 12d91613096d1a724fc780e2d7974a0a1b308dce
 
-BELARUSIAN_FILE= belarusian-0.3.tar.gz
-URL-$(BELARUSIAN_FILE)= http://www.mova.org/bellinux/$(BELARUSIAN_FILE)
-SHA-$(BELARUSIAN_FILE)= c0026a915fff58cdc3b68bb57de4eec35a220c43
-
-THAI_FILE= thai-console-data_cvs20051001.tar.bz2
-URL-$(THAI_FILE)= http://www.linuxfromscratch.org/~alexander/$(THAI_FILE)
-SHA-$(THAI_FILE)= 2d5e8f4d6cf488987600d455078fe8f5d4199217
-
 PATCH1= $(DIR)-backspace-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 39e332e42d5145dfc47786dba5eff63cda91d0ba
+SHA-$(PATCH1)= 66a421533f6c8e5c38db57c1e25f1842db7b82ae
 
-PATCH3= $(DIR)-gcc4_fixes-1.patch
-URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
-SHA-$(PATCH3)= 93ec9885a79ff79088f1533ec52f1a87dae69500
-
-STAGE2-DEPS = $(FILE) $(BELARUSIAN_FILE) $(THAI_FILE) $(PATCH1) $(PATCH3)
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -34,35 +20,24 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(STAGE2-DEPS)
+stage2: Makefile $(FILE) $(PATCH1)
 	$(std_build)
 
 compile-stage2:
-	cd .. ; unpack $(BELARUSIAN_FILE) ; unpack $(THAI_FILE)
-	zcat ../bellinux/console/keymaps/by2_win.kmap.gz > data/keymaps/i386/qwerty/by2_win.map
-	sed -i -e 's/\(50 = 0x.\)A/\1C/' data/keymaps/i386/qwerty/by2_win.map
 	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH3)
-	./configure --datadir=/lib/kbd
+	sed -i -e '1i KEYCODES_PROGS = @KEYCODES_PROGS@' \
+	 -e '1i RESIZECONS_PROGS = @RESIZECONS_PROGS@' src/Makefile.in
+	var=OPTIONAL_PROGS
+	sed -i "s/ifdef $$var/ifeq (\$$($$var),yes)/" man/Makefile.in
+	unset var
+	./configure --prefix=/usr --datadir=/lib/kbd
 	make
 	make install
-	mv /usr/bin/{setfont,kbd_mode,openvt} /bin
-	# Turkish fixup
-	cp /lib/kbd/consoletrans/cp857_to_uni.trans /lib/kbd/unimaps/cp857.uni
-	# Thai fonts and keymaps
-	gzip ../thai-console-data/consolefonts/*.psf
-	install -m644 ../thai-console-data/consolefonts/*.psf.gz /lib/kbd/consolefonts
-	install -m644 ../thai-console-data/consoletrans/tis620.acm /lib/kbd/consoletrans/tis620_to_uni.trans
-	for a in ../thai-console-data/keymaps/*.kmap \
-	 ../thai-console-data/keymaps/experimental/*.kmap ; do \
-	    mv $${a} $${a%kmap}map ; done
-	sed -i 's,\+U,U,g' ../thai-console-data/keymaps/experimental/*.map
-	gzip ../thai-console-data/keymaps/*.map ../thai-console-data/keymaps/experimental/*.map
-	install -m644 ../thai-console-data/keymaps/*.map.gz ../thai-console-data/keymaps/experimental/*uni*.map.gz /lib/kbd/keymaps/i386/qwerty
+	mv /usr/bin/{kbd_mode,loadkeys,openvt,setfont} /bin
+	mkdir -v /usr/share/doc/$(DIR)
+	cp -R -v doc/* /usr/share/doc/$(DIR)
 
 clean:
 	-rm -rf $(DIR)
-	-rm -rf bellinux
-	-rm -rf thai-console-data
 
 .PHONY: clean chroot compile-stage2

Modified: trunk/packages/less/Makefile
===================================================================
--- trunk/packages/less/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/less/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Less Makefile 
 
 NM= less
-VRS= 406
+VRS= 418
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 7aeab848682c3ac7cd9ba54e4c96199f9fdf25e5
+SHA-$(FILE)= ec4fb48680878a7ac3499c46564c47c448b0aa22
 
 # Targets
 

Modified: trunk/packages/libtool/Makefile
===================================================================
--- trunk/packages/libtool/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/libtool/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Libtool Makefile
 
 NM= libtool
-VRS= 1.5.24
-DIR= $(NM)-$(VRS)
+VRS= 2.2.6a
+DIR= $(NM)-2.2.6
 
-FILE= $(DIR).tar.gz
-URL-$(FILE)= http://ftp.gnu.org/gnu/libtool/$(FILE)
-SHA-$(FILE)= b4c994f1bf4a76d2b0c1d0a6f54d16598c15f3db
+FILE= $(DIR)a.tar.gz
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 7b547877b1b78b547343e4678a531aece8949904
 
 # Targets
 

Modified: trunk/packages/linux-headers/Makefile
===================================================================
--- trunk/packages/linux-headers/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/linux-headers/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Linux-headers Makefile
 
 NM= linux
-VRS= 2.6.22.5
+VRS= 2.6.27.4
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-SHA-$(FILE)= a04e4efb32884ab95fe0ec38d60552cf3e0c49b8
+SHA-$(FILE)= 45c4b7c25d473306b2082671a3b95fba8e873c81
 
 # Targets
 
@@ -29,7 +29,6 @@
 	$(std_build)
 
 compile-stage2:
-	sed -i '/scsi/d' include/Kbuild
 	make mrproper
 	make headers_check
 	make INSTALL_HDR_PATH=dest headers_install

Modified: trunk/packages/m4/Makefile
===================================================================
--- trunk/packages/m4/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/m4/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,17 +1,25 @@
 # M4 Makefile
 
 NM= m4
-VRS= 1.4.10
+VRS= 1.4.12
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://ftp.gnu.org/gnu/m4/$(FILE)
-SHA-$(FILE)= df46910c7e711aef1a654b077ef48d86a6a0cc6b
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 445da514bd9012690e2cf60170b16962787d2256
 
 # Targets
 
 include $(ROOT)/scripts/functions
 
+stage1: $(FILE)
+	$(std_build)
+
+compile-stage1:
+	./configure --prefix=$(WD)
+	make
+	make install
+
 chroot:
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
@@ -20,7 +28,7 @@
 	$(std_build)
 
 compile-stage2:
-	./configure --prefix=/usr
+	./configure --prefix=/usr --enable-threads
 	make
 	make install
 

Modified: trunk/packages/man-db/Makefile
===================================================================
--- trunk/packages/man-db/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/man-db/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,17 +1,13 @@
 # man-db Makefile
 
 NM= man-db
-VRS= 2.4.4
+VRS= 2.5.2
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= http://savannah.nongnu.org/download/man-db/$(FILE)
-SHA-$(FILE)= 5c6ba8eb287a69f14433feb34e720b066536d163
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= b82b7ff0b13693cecbdc053b4d4381b2063017d1
 
-PATCH1= $(DIR)-fixes-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1)
-SHA-$(PATCH1)= 5ac2a79c2e471991503173982728e65f60f3e071
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -20,22 +16,16 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
-	mv man/de{_DE.88591,}
-	mv man/es{_ES.88591,}
-	mv man/it{_IT.88591,}
-	mv man/ja{_JP.eucJP,}
-	sed -i 's,\*_\*,??,'  man/Makefile.in
 	sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in
-	echo '#define WEB_BROWSER "exec /usr/bin/lynx"' >>include/manconfig.h.in
-	echo '#define COL "/usr/bin/col"' >>include/manconfig.h.in
-	echo '#define VGRIND "/usr/bin/vgrind"' >>include/manconfig.h.in
-	echo '#define GRAP "/usr/bin/grap"' >>include/manconfig.h.in
-	patch -Np1 -i ../$(PATCH1)
-	./configure --prefix=/usr --enable-mb-groff --disable-setuid
+	./configure --prefix=/usr --libexecdir=/usr/lib \
+	 --sysconfdir=/etc --disable-setuid \
+	 --enable-mb-groff --with-browser=/usr/bin/lynx \
+	 --with-col=/usr/bin/col --with-vgrind=/usr/bin/vgrind \
+	 --with-grap=/usr/bin/grap
 	make
 	make install
 	install -m755 ../convert-mans /usr/bin

Modified: trunk/packages/man-pages/Makefile
===================================================================
--- trunk/packages/man-pages/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/man-pages/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Man-pages Makefile
 
 NM= man-pages
-VRS= 2.63
+VRS= 3.11
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://www.kernel.org/pub/linux/docs/manpages/Archive/$(FILE)
-SHA-$(FILE)= 025d341ad9d197bd16108cbe80182c1c23369f58
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= b2d278fe261fcf5a86f425ed4cce13dea6d78ffc
 
 # Targets
 

Modified: trunk/packages/module-init-tools/Makefile
===================================================================
--- trunk/packages/module-init-tools/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/module-init-tools/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,16 +1,16 @@
 # Module-Init-Tools Makefile
 
 NM= module-init-tools
-VRS= 3.2.2
+VRS= 3.4.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= b51e8ac170be23a1f2e301a1dddd47a47ec2186a
+SHA-$(FILE)= cb957cccbbeb4d4c0bbd3f2be4d9848bcfb61102
 
-PATCH1= $(DIR)-modprobe-1.patch
+PATCH1= $(DIR)-manpages-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 0caecb2078cc47c97e496e2e4717b8b82a52eb01
+SHA-$(PATCH1)= 3b3a0a6a56d0f50168f1a3447a0afc103a63d828
 
 # Targets
 
@@ -25,7 +25,7 @@
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH1)
-	./configure --prefix=/ --mandir=/usr/share/man --enable-zlib
+	./configure --prefix=/ --enable-zlib --mandir=/usr/share/man
 	make
 	make INSTALL=install install
 	install -m644 $(ROOT)/etc/modprobe.conf /etc/modprobe.conf

Added: trunk/packages/mpfr/Makefile
===================================================================
--- trunk/packages/mpfr/Makefile	                        (rev 0)
+++ trunk/packages/mpfr/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -0,0 +1,31 @@
+# mpfr Makefile
+
+NM= mpfr
+VRS= 2.3.2
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 37dbd478e1c136f37cf4c68eb1522e86e2307288
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-pre-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+
+stage2: $(FILE)
+	$(std_build)
+
+compile-stage2:
+	./configure --prefix=/usr --enable-thread-safe
+	make
+	-make -k check
+	make install
+
+clean:
+	-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: trunk/packages/ncurses/Makefile
===================================================================
--- trunk/packages/ncurses/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/ncurses/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -9,7 +9,7 @@
 SHA-$(FILE)= 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d
 
 PATCH1=$(DIR)-coverity_fixes-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1)
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= ad7a49ad6e35e61d975700226279594106842f59
 
 # Targets
@@ -20,8 +20,8 @@
 	$(std_build)
 
 compile-stage1:
-	./configure --prefix=$(WD) --with-shared --without-normal \
-	 --without-debug --without-ada --enable-overwrite --without-cxx-binding
+	./configure --prefix=$(WD) --with-shared \
+	 --without-debug --without-ada --enable-overwrite
 	make
 	make install
 
@@ -32,21 +32,27 @@
 stage2: Makefile $(FILE) $(PATCH1)
 	$(std_build)
 
-# The non-wide library is for commercial software only => not for the Live CD
-# And nothing on the CD uses the C++ binding
 compile-stage2:
 	patch -Np1 -i ../$(PATCH1)
-	./configure --prefix=/usr --with-shared --without-normal \
-	    --without-debug --enable-widec --without-cxx-binding
+	./configure --prefix=/usr --with-shared --without-debug --enable-widec
 	make
 	make install
+	chmod -v 644 /usr/lib/libncurses++w.a
 	mv /usr/lib/libncursesw.so.5* /lib
 	ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
 	for lib in curses ncurses form panel menu ; do \
+	  rm -vf /usr/lib/lib$${lib}.so ; \
 	  echo "INPUT(-l$${lib}w)" >/usr/lib/lib$${lib}.so ; \
-	 done
+	  ln -sfv lib$${lib}w.a /usr/lib/lib$${lib}.a ; \
+	done
+	ln -sfv libncurses++w.a /usr/lib/libncurses++.a
+	rm -vf /usr/lib/libcursesw.so
 	echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so
 	ln -svf libncurses.so /usr/lib/libcurses.so
+	ln -sfv libncursesw.a /usr/lib/libcursesw.a
+	ln -sfv libncurses.a /usr/lib/libcurses.a
+	mkdir -v /usr/share/doc/$(DIR)
+	cp -v -R doc/* /usr/share/doc/$(DIR)
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/perl/Makefile
===================================================================
--- trunk/packages/perl/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/perl/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,16 +1,16 @@
 # Perl Makefile
 
 NM= perl
-VRS= 5.8.8
+VRS= 5.10.0
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.bz2
+FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 4aab490040727ca4419098720eca2ba4367df539
+SHA-$(FILE)= adf73606dd5248af7ccdd735bcaa0e628ea75b3c
 
-PATCH1= $(DIR)-libc-2.patch
+PATCH1= $(DIR)-consolidated-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= b72468149c5eee6faefde7f32bb05bda6e2a1c9d
+SHA-$(PATCH1)= b3647660b80408eb281c333fba82432cf400fc01
 
 # Targets
 
@@ -21,10 +21,9 @@
 
 compile-stage1:
 	patch -Np1 -i ../$(PATCH1)
-	./configure.gnu --prefix=$(WD) \
-	 -Dstatic_ext='Data/Dumper Digest/MD5 Fcntl IO POSIX' \
-	 -Darchname=$${LFS_TARGET%%-*}-linux
-	make perl utilities
+	sh Configure -des -Dprefix=$(WD) \
+	 -Dstatic_ext='Data/Dumper Digest/MD5 Fcntl IO POSIX'
+	make perl utilities ext/Errno/pm_to_blib
 	cp -v perl pod/pod2man $(WD)/bin
 	mkdir -pv $(WD)/lib/perl5/$(VRS)
 	cp -Rv lib/* $(WD)/lib/perl5/$(VRS)
@@ -37,12 +36,19 @@
 	$(std_build)
 
 compile-stage2:
-	./configure.gnu --prefix=/usr \
-	    -Dman1dir=/usr/share/man/man1 \
-	    -Dman3dir=/usr/share/man/man3 \
-	    -Dpager="/usr/bin/less -isR" \
-	    -Duseshrplib=true \
-	    -Darchname=$${LFS_TARGET%%-*}-linux
+	# LFS has:
+	# echo "127.0.0.1 localhost $(hostname)" > /etc/hosts
+	# this is already taken care of by the createfiles target
+	patch -Np1 -i ../$(PATCH1)
+	sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|" \
+	 -e "s|INCLUDE\s*= ./zlib-src|INCLUDE    = /usr/include|" \
+	 -e "s|LIB\s*= ./zlib-src|LIB        = /usr/lib|" \
+	 ext/Compress/Raw/Zlib/config.in
+	sh Configure -des -Dprefix=/usr \
+	 -Dvendorprefix=/usr           \
+	 -Dman1dir=/usr/share/man/man1 \
+	 -Dman3dir=/usr/share/man/man3 \
+	 -Dpager="/usr/bin/less -isR"
 	make
 	make install
 

Modified: trunk/packages/procps/Makefile
===================================================================
--- trunk/packages/procps/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/procps/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -8,6 +8,10 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= b60567cc6263167fa1a4ff6a5bea26db86022c10
 
+PATCH= $(DIR)-watch_unicode-1.patch
+URL-$(PATCH)= $(HTTP)/$(NM)/$(PATCH)
+SHA-$(PATCH)= cb3e542c7786d44f8d77d949972dab2cd0d432a9
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -16,10 +20,11 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH)
 	$(std_build)
 
 compile-stage2:
+	patch -Np1 -i ../$(PATCH)
 	make
 	make install
 

Modified: trunk/packages/psmisc/Makefile
===================================================================
--- trunk/packages/psmisc/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/psmisc/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Psmisc Makefile
 
 NM= psmisc
-VRS= 22.5
+VRS= 22.6
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/psmisc/$(FILE)
-SHA-$(FILE)= 0fd6c52dd0dad464a9be7baa79fb810caf43c923
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= cb15c23e9cfe618e9de5f066525bce7dc7b77421
 
 # Targets
 

Modified: trunk/packages/readline/Makefile
===================================================================
--- trunk/packages/readline/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/readline/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -8,9 +8,9 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= 18f3412c73068509d5f491b7b4535aeaf9522834
 
-PATCH1= $(DIR)-fixes-3.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1)
-SHA-$(PATCH1)= de765322d083e26685469f84d75de7465a866cfa
+PATCH1= $(DIR)-fixes-5.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 7e7a133f964b7f82d755ee7f7bcb35613e7289f9
 
 # Targets
 
@@ -30,9 +30,13 @@
 	./configure --prefix=/usr --libdir=/lib
 	make SHLIB_LIBS=-lncurses
 	make install
+	mv -v /lib/lib{readline,history}.a /usr/lib
 	rm -v /lib/lib{readline,history}.so
 	ln -sfv ../../lib/libreadline.so.5 /usr/lib/libreadline.so
 	ln -sfv ../../lib/libhistory.so.5 /usr/lib/libhistory.so
+	mkdir -v /usr/share/doc/$(DIR)
+	install -v -m644 doc/*.{ps,pdf,html,dvi} \
+	 /usr/share/doc/$(DIR)
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/shadow/Makefile
===================================================================
--- trunk/packages/shadow/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/shadow/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,17 +1,13 @@
 # Shadow Makefile
 
 NM= shadow
-VRS= 4.0.18.1
+VRS= 4.1.2.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 1a30458e9db05560bfc82529048bd5d60b45cf9b
+SHA-$(FILE)= a007e90d844d25d67a49699d508613ccea54e068
 
-PATCH1= $(DIR)-useradd_fix-2.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 08618217ae8ce554f7d7171b7a920cb7c31254c0
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -20,37 +16,28 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
-	./configure --libdir=/lib --sysconfdir=/etc --enable-shared --without-selinux
-	sed -i 's/groups$$(EXEEXT) //' src/Makefile
-	find man -name Makefile -exec sed -i 's/groups\.1 / /' {} \;
-	sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile
+	sed -i 's/groups$$(EXEEXT) //' src/Makefile.in
+	find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;
+	sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in
 	for i in de es fi fr id it pt_BR; do \
 	    convert-mans UTF-8 ISO-8859-1 man/$$i/*.? ; \
-	done
-	
+	done	
 	for i in cs hu pl; do \
 	    convert-mans UTF-8 ISO-8859-2 man/$$i/*.? ; \
 	done
-	
 	convert-mans UTF-8 EUC-JP man/ja/*.?
 	convert-mans UTF-8 KOI8-R man/ru/*.?
 	convert-mans UTF-8 ISO-8859-9 man/tr/*.?
+	sed -i -e 's@#ENCRYPT_METHOD DES at ENCRYPT_METHOD MD5@' \
+	 -e 's@/var/spool/mail@/var/mail@' etc/login.defs
+	./configure --sysconfdir=/etc
 	make
 	make install
-	cp etc/{limits,login.access} /etc
-	sed -e 's@#MD5_CRYPT_ENAB.no at MD5_CRYPT_ENAB yes@' \
-	     -e 's@/var/spool/mail@/var/mail@' \
-	     -e 's at MAIL_CHECK_ENAB..yes@MAIL_CHECK_ENAB no@' \
-	     etc/login.defs > /etc/login.defs
 	mv -v /usr/bin/passwd /bin
-	mv -v /lib/libshadow.*a /usr/lib
-	rm -v /lib/libshadow.so
-	ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so
 	mkdir -pv /etc/default
 	pwconv
 	grpconv

Modified: trunk/packages/sysklogd/Makefile
===================================================================
--- trunk/packages/sysklogd/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/sysklogd/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,21 +1,13 @@
 # Sysklogd Makefile
 
 NM= sysklogd
-VRS= 1.4.1
+VRS= 1.5
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 093775da0e429d0768cf195ceb20fdd6d96aeeea
+SHA-$(FILE)= 070cce745b023f2ce7ca7d9888af434d6d61c236
 
-PATCH1= $(DIR)-fixes-2.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 905d17574d6972f494b8ec4cb62bfad1c9f3ff62
-
-PATCH2= $(DIR)-8bit-1.patch
-URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= edc01eceb4ae7af3d6a02e23a4dace8fee50f3eb
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -24,12 +16,10 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH2)
 	make
 	make install
 	install -m644 $(ROOT)/etc/syslog.conf /etc

Modified: trunk/packages/sysvinit/Makefile
===================================================================
--- trunk/packages/sysvinit/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/sysvinit/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -8,8 +8,6 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= 3e78df609a2ff0fea6304cb662a7f10298d03667
 
-PATCH1= $(DIR)-reexec06-1.patch
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -18,12 +16,13 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
-	sed -i 's at Sending processes@& started by init at g' src/init.c
+	sed -i 's at Sending processes@& configured via /etc/inittab at g' src/init.c
+	sed -i -e 's/utmpdump wall/utmpdump/' \
+	 -e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile
 	ROOT="" make -C src
 	ROOT="" make -C src install
 	cp $(ROOT)/etc/inittab /etc

Modified: trunk/packages/tar/Makefile
===================================================================
--- trunk/packages/tar/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/tar/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Tar Makefile
 
 NM= tar
-VRS= 1.18
+VRS= 1.20
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://ftp.gnu.org/gnu/tar/$(FILE)
-SHA-$(FILE)= 5b5078cb291492ffeb4fb134179fc6ffd2121c66
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 4d4cda2ce857b5ea77b39dc718260ab09c145335
 
 # Targets
 

Modified: trunk/packages/tcl/Makefile
===================================================================
--- trunk/packages/tcl/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/tcl/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # Tcl Makefile
 
 NM= tcl
-VRS= 8.4.15
+VRS= 8.5.5
 DIR= $(NM)$(VRS)
 
 FILE= $(DIR)-src.tar.gz
 URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/tcl/$(FILE)
-SHA-$(FILE)= fbfae3ca68633a10b3fe870018588ade0944caed
+SHA-$(FILE)= af0433feaa7be1da945a1f414c4b10485ffbd386
 
 # Targets
 
@@ -19,8 +19,9 @@
 	cd unix ; ./configure --prefix=$(WD)
 	cd unix ; make
 	cd unix ; make install
+	chmod -v u+w $(WD)/lib/libtcl8.5.so
 	cd unix ; make install-private-headers
-	ln -s tclsh8.4 $(WD)/bin/tclsh
+	ln -s tclsh8.5 $(WD)/bin/tclsh
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/texinfo/Makefile
===================================================================
--- trunk/packages/texinfo/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/texinfo/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,21 +1,13 @@
 # Texinfo Makefile
 
 NM= texinfo
-VRS= 4.9
-DIR= $(NM)-$(VRS)
+VRS= 4.13a
+DIR= $(NM)-4.13
 
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://ftp.gnu.org/gnu/texinfo/$(FILE)
-SHA-$(FILE)= 19a0cc0b56cbfcfe610925bef31e0bdf749492c9
+FILE= $(DIR)a.tar.gz
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= a1533cf8e03ea4fa6c443b73f4c85e4da04dead0
 
-PATCH1= $(DIR)-tempfile_fix-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1)
-SHA-$(PATCH1)= 2ead28cb8e2679cdb53e1e4908209f0a31397dfe
-
-PATCH2= $(DIR)-multibyte-1.patch
-URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH2)
-SHA-$(PATCH2)= b97ae3468c03f8389dbf5c9b6eed64f996f9ed5c
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -32,12 +24,10 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH2)
 	./configure --prefix=/usr
 	make
 	make install

Modified: trunk/packages/udev/Makefile
===================================================================
--- trunk/packages/udev/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/udev/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,18 +1,18 @@
 # Udev Makefile
 
 NM= udev
-VRS= 113
-CONFVRS= 6.3
+VRS= 130
+CONFVRS= 20081015
 DIR= $(NM)-$(VRS)
 CONFDIR=$(NM)-config-$(CONFVRS)
 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://www.kernel.org/pub/linux/utils/kernel/hotplug/$(FILE)
-SHA-$(FILE)= 55bea7ec61026b2ecc9d2013da0ef4eed76de948
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= da55d4064bd89d4cc3672a3ec304d82a12f0e39c
 
 FILE1= $(CONFDIR).tar.bz2
-URL-$(FILE1)= http://www.linuxfromscratch.org/lfs/downloads/6.3/$(FILE1)
-SHA-$(FILE1)= c21ade3df7c121694dd56668b0fdc2f3995e2779
+URL-$(FILE1)= http://www.linuxfromscratch.org/lfs/downloads/6.4/$(FILE1)
+SHA-$(FILE1)= 39818c2cc16744977ecac1bf96b9f99531d956b8
 
 # Targets
 
@@ -29,21 +29,25 @@
 	tar xf ../$(FILE1)
 	install -dv /lib/{firmware,udev/devices/{pts,shm}}
 	mknod -m0666 /lib/udev/devices/null c 1 3 || true
+	mknod -m0600 /lib/udev/devices/kmsg c 1 11
 	ln -nsfv /proc/self/fd /lib/udev/devices/fd
 	ln -nsfv /proc/self/fd/0 /lib/udev/devices/stdin
 	ln -nsfv /proc/self/fd/1 /lib/udev/devices/stdout
 	ln -nsfv /proc/self/fd/2 /lib/udev/devices/stderr
 	ln -nsfv /proc/kcore /lib/udev/devices/core
-	make EXTRAS="`echo extras/*/`"
-	make DESTDIR=/ EXTRAS="`echo extras/*/`" install
-	cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/
-	sed -i "s/ -M 0640//" $(CONFDIR)/25-lfs.rules
+	./configure --prefix=/usr --exec-prefix= --sysconfdir=/etc
+	make
+	make install
+	install -m644 -v rules/packages/64-*.rules /lib/udev/rules.d/
+	install -m644 -v rules/packages/40-pilot-links.rules /lib/udev/rules.d/
 	cd $(CONFDIR) ; make install install-doc install-extra-doc
-	install -m755 ../dhcp-helper /lib/udev
-	install -m644 ../76-network.rules /etc/udev/rules.d/
-	echo 'SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '\''while read id; do /sbin/modprobe pnp:d$$$$id; done < /sys$$devpath/id'\''"' >>/etc/udev/rules.d/26-modprobe.rules
 	install -m644 -D docs/writing_udev_rules/index.html \
 	 /usr/share/doc/$(DIR)/index.html
+	#cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/
+	#sed -i "s/ -M 0640//" $(CONFDIR)/25-lfs.rules
+	#install -m755 ../dhcp-helper /lib/udev
+	#install -m644 ../76-network.rules /etc/udev/rules.d/
+	#echo 'SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '\''while read id; do /sbin/modprobe pnp:d$$$$id; done < /sys$$devpath/id'\''"' >>/etc/udev/rules.d/26-modprobe.rules
 
 clean:
 	-rm -rf $(DIR)

Copied: trunk/packages/util-linux-ng (from rev 2165, trunk/packages/util-linux)

Modified: trunk/packages/util-linux-ng/Makefile
===================================================================
--- trunk/packages/util-linux/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/util-linux-ng/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,36 +1,23 @@
-# Util-Linux Makefile
+# Util-Linux-NG Makefile
 
-NM= util-linux
-VRS= 2.12r
+NM= util-linux-ng
+VRS= 2.14.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4
+SHA-$(FILE)= 4b738db04b27278329af216b15e96752e5af8cc3
 
-PATCH1= $(DIR)-cramfs-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 00f5192493b939c2c996df9c1f3f769abfa3fa8c
-
-PATCH2= $(DIR)-lseek-1.patch
-URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= 5cebb93628a644b9e2b72944bdcb244f0b67374b
-
-STAGE1_DEPS = $(FILE)
-STAGE2_DEPS = $(FILE) $(PATCH1) $(PATCH2)
-
 # Targets
 
 include $(ROOT)/scripts/functions
 
-stage1: $(STAGE1_DEPS)
+stage1: $(FILE)
 	$(std_build)
 
 compile-stage1:
-	sed -i 's@/usr/include@$(WD)/include at g' configure
-	./configure
-	make -C lib
-	make -C mount mount umount
+	./configure --prefix=$(WD)
+	make BLKID_LIBS="-lblkid -luuid" -C mount mount umount
 	make -C text-utils more
 	cp mount/{,u}mount text-utils/more $(WD)/bin
 
@@ -38,17 +25,16 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(STAGE2_DEPS)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
-	sed -i 's at etc/adjtime at var/lib/hwclock/adjtime at g' hwclock/hwclock.c
+	sed -e 's at etc/adjtime at var/lib/hwclock/adjtime at g' \
+	 -i $$(grep -rl '/etc/adjtime' .)
 	mkdir -pv /var/lib/hwclock
-	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH2)
-	./configure
-	make HAVE_KILL=yes HAVE_SLN=yes
-	make HAVE_KILL=yes HAVE_SLN=yes install
+	./configure --enable-arch --enable-partx --enable-write
+	make
+	make install
 
 clean:
 	-rm -rf $(DIR)

Modified: trunk/packages/vim/Makefile
===================================================================
--- trunk/packages/vim/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/vim/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,25 +1,21 @@
 # Vim Makefile
 
 NM= vim
-VRS= 7.1
-DIR= $(NM)71
+VRS= 7.2
+DIR= $(NM)72
 
 FILE= $(NM)-$(VRS).tar.bz2
-URL-$(FILE)= http://ftp.vim.org/pub/vim/unix/$(FILE)
-SHA-$(FILE)= 981e1acecc4d8f15680b6e160de84aed038d857d
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= a4b6641ca528fada71ea77c998a441495ed4984c
 
 FILE2= $(NM)-$(VRS)-lang.tar.gz
-URL-$(FILE2)= http://ftp.vim.org/pub/vim/extra/$(FILE2)
-SHA-$(FILE2)= 7c1e2f498e1f8304879e73b88562f9036801c7ee
+URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
+SHA-$(FILE2)= 970e0dda7e5b2308cf33488be1ea33d593d951cb
 
-PATCH1= $(NM)-$(VRS)-fixes-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1)
-SHA-$(PATCH1)= 6005e12fc31ce07a4da2806ea4c503cb569f235e
+PATCH1= $(NM)-$(VRS)-fixes-3.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= ba16e6b8749d686dd21672017f76ef0671922d22
 
-PATCH2= $(NM)-$(VRS)-mandir-1.patch
-URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH2)
-SHA-$(PATCH2)= 182f46dfacefdd3bf6f821dea71f90547d414230
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -32,20 +28,19 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make chroot-gvim $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2)
+stage2: Makefile $(FILE) $(FILE2) $(PATCH1)
 	$(std_build)
 
 compile-stage2:
 	unpack ../$(FILE2) --strip-components=1
 	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH2)
 	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 	./configure --prefix=/usr --enable-multibyte
 	make
 	make install
 	ln -sfv vim /usr/bin/vi
-	for L in "" fr it pl ru ; do \
-	    ln -sfv vim.1 /usr/share/man/$L/man1/vi.1 ; done
+	for L in /usr/share/man/{,*/}man1/vim.1 ; do \
+	    ln -sfv vim.1 $$(dirname $$L)/vi.1 ; done
 	ln -sfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS)
 	cp $(ROOT)/etc/vimrc /etc
 

Modified: trunk/packages/wget/Makefile
===================================================================
--- trunk/packages/wget/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/wget/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,11 +1,11 @@
 # Wget Makefile
 
 NM= wget
-VRS= 1.10.2
+VRS= 1.11.4
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.gz
 URL-$(FILE)= http://ftp.gnu.org/gnu/$(NM)/$(FILE)
-SHA-$(FILE)= a258357297959964fd42fed6afa1a4cce9069980
+SHA-$(FILE)= a78a3b71fd59504df3ff3dbc0a2195a1410e9eac
 
 # Targets
 

Modified: trunk/packages/which/Makefile
===================================================================
--- trunk/packages/which/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/which/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # which Makefile
 
 NM= which
-VRS= 2.16
+VRS= 2.20
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
-SHA-$(FILE)= 0c416609d098a704ea880fce349f458ea163c453
+SHA-$(FILE)= 3bcd6d87aa5231917ba7123319eedcae90cfa0fd
 
 # Targets
 

Modified: trunk/packages/zisofs-tools/Makefile
===================================================================
--- trunk/packages/zisofs-tools/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/zisofs-tools/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -1,12 +1,12 @@
 # zisofs-tools Makefile
 
 NM= zisofs-tools
-VRS= 1.0.6
+VRS= 1.0.8
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.kernel.org/pub/linux/utils/fs/zisofs/$(FILE)
-SHA-$(FILE)= a95dc42c6e03bdce68acdb803861c9957cb0b8de
+SHA-$(FILE)= 9ac33b37dcbe00c6adf51d171156cae87e0b7f22
 
 # Targets
 
@@ -16,7 +16,7 @@
 	$(std_build)
 
 compile-stage1:
-	./configure --prefix=/tools CFLAGS="-I/tools/zlib/include" LDFLAGS="-L/tools/zlib/lib"
+	./configure --prefix=$(WD) CFLAGS="-I$(WD)/zlib/include" LDFLAGS="-L$(WD)/zlib/lib"
 	make
 	make install
 

Modified: trunk/packages/zlib/Makefile
===================================================================
--- trunk/packages/zlib/Makefile	2008-03-12 12:11:36 UTC (rev 2165)
+++ trunk/packages/zlib/Makefile	2008-11-29 20:41:37 UTC (rev 2166)
@@ -4,9 +4,9 @@
 VRS= 1.2.3
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.gz
+FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902
+SHA-$(FILE)= 967e280f284d02284b0cd8872a8e2e04bfdc7283
 
 # Targets
 
@@ -28,14 +28,14 @@
 	make install
 
 compile-stage2:
-	unset CFLAGS ; ./configure --prefix=/usr --shared --libdir=/lib
-	unset CFLAGS ; make
+	./configure --prefix=/usr --shared --libdir=/lib
+	make
 	make install
-	rm /lib/libz.so
-	ln -sf ../../lib/libz.so.$(VRS) /usr/lib/libz.so
+	rm -v /lib/libz.so
+	ln -sfv ../../lib/libz.so.$(VRS) /usr/lib/libz.so
 	make clean
-	unset CFLAGS ; ./configure --prefix=/usr
-	unset CFLAGS ; make
+	./configure --prefix=/usr
+	make
 	make install
 	chmod 644 /usr/lib/libz.a
 




More information about the livecd mailing list