r1892 - in trunk/packages: LFS-BOOK iproute2 man-pages shadow udev vim

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Mon May 28 22:43:17 PDT 2007


Author: alexander
Date: 2007-05-28 23:43:17 -0600 (Mon, 28 May 2007)
New Revision: 1892

Modified:
   trunk/packages/LFS-BOOK/Makefile
   trunk/packages/iproute2/Makefile
   trunk/packages/man-pages/Makefile
   trunk/packages/shadow/Makefile
   trunk/packages/udev/Makefile
   trunk/packages/vim/Makefile
Log:
Updated LFS packages

Modified: trunk/packages/LFS-BOOK/Makefile
===================================================================
--- trunk/packages/LFS-BOOK/Makefile	2007-05-12 12:10:58 UTC (rev 1891)
+++ trunk/packages/LFS-BOOK/Makefile	2007-05-29 05:43:17 UTC (rev 1892)
@@ -10,7 +10,7 @@
 #URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE)
 #SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052
 
-REV= 8119
+REV= 8144
 REVPARM= -r $(REV)
 
 URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK

Modified: trunk/packages/iproute2/Makefile
===================================================================
--- trunk/packages/iproute2/Makefile	2007-05-12 12:10:58 UTC (rev 1891)
+++ trunk/packages/iproute2/Makefile	2007-05-29 05:43:17 UTC (rev 1892)
@@ -21,6 +21,7 @@
 	$(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
 	mv -v /sbin/arpd /usr/sbin

Modified: trunk/packages/man-pages/Makefile
===================================================================
--- trunk/packages/man-pages/Makefile	2007-05-12 12:10:58 UTC (rev 1891)
+++ trunk/packages/man-pages/Makefile	2007-05-29 05:43:17 UTC (rev 1892)
@@ -1,12 +1,12 @@
 # Man-pages Makefile
 
 NM= man-pages
-VRS= 2.46
+VRS= 2.48
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.kernel.org/pub/linux/docs/manpages/$(FILE)
-SHA-$(FILE)= 424e0b0b02b238338888b01fe8cfb8f249aa1c40
+SHA-$(FILE)= f630d2443380443515e05bbdb2f547dee8138343
 
 # Targets
 

Modified: trunk/packages/shadow/Makefile
===================================================================
--- trunk/packages/shadow/Makefile	2007-05-12 12:10:58 UTC (rev 1891)
+++ trunk/packages/shadow/Makefile	2007-05-29 05:43:17 UTC (rev 1892)
@@ -27,7 +27,7 @@
 	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 '/groups/d' {} \;
+	find man -name Makefile -exec sed -i 's/groups\.1 / /' {} \;
 	sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile
 	for i in de es fi fr id it pt_BR; do \
 	    convert-mans UTF-8 ISO-8859-1 man/$$i/*.? ; \

Modified: trunk/packages/udev/Makefile
===================================================================
--- trunk/packages/udev/Makefile	2007-05-12 12:10:58 UTC (rev 1891)
+++ trunk/packages/udev/Makefile	2007-05-29 05:43:17 UTC (rev 1892)
@@ -1,14 +1,14 @@
 # Udev Makefile
 
 NM= udev
-VRS= 110
+VRS= 111
 CONFVRS= 20070304
 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)= 29014f65eb0d42b1836928fa4114a2ebbf58ec0b
+SHA-$(FILE)= 910e8f31835528ec45cd59ba4a00f88c7f93670e
 
 FILE1= $(CONFDIR).tar.bz2
 URL-$(FILE1)= http://www.linuxfromscratch.org/lfs/downloads/development/$(FILE1)

Modified: trunk/packages/vim/Makefile
===================================================================
--- trunk/packages/vim/Makefile	2007-05-12 12:10:58 UTC (rev 1891)
+++ trunk/packages/vim/Makefile	2007-05-29 05:43:17 UTC (rev 1892)
@@ -1,23 +1,23 @@
 # Vim Makefile
 
 NM= vim
-VRS= 7.0
-DIR= $(NM)70
+VRS= 7.1
+DIR= $(NM)71
 
 FILE= $(NM)-$(VRS).tar.bz2
-URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 38ef48cabf942d0dc804a794dcc6f002b9457fc8
+URL-$(FILE)= http://ftp.vim.org/pub/vim/unix/$(FILE)
+SHA-$(FILE)= 981e1acecc4d8f15680b6e160de84aed038d857d
 
 FILE2= $(NM)-$(VRS)-lang.tar.gz
-URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
-SHA-$(FILE2)= 3db6b0004d213490cc00d361835e7a7c685adb52
+URL-$(FILE2)= http://ftp.vim.org/pub/vim/extra/$(FILE2)
+SHA-$(FILE2)= 7c1e2f498e1f8304879e73b88562f9036801c7ee
 
-PATCH1= $(NM)-$(VRS)-fixes-16.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1)
-SHA-$(PATCH1)= 548bfc2931fe34d4f9c52cf6a357607f524b38a6
+#PATCH1= $(NM)-$(VRS)-fixes-16.patch
+#URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1)
+#SHA-$(PATCH1)= 548bfc2931fe34d4f9c52cf6a357607f524b38a6
 
 PATCH2= $(NM)-$(VRS)-mandir-1.patch
-URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+URL-$(PATCH2)= http://www.linuxfromscratch.org/lfs/downloads/development/$(PATCH2)
 SHA-$(PATCH2)= 182f46dfacefdd3bf6f821dea71f90547d414230
 
 # Targets
@@ -37,7 +37,7 @@
 
 compile-stage2:
 	unpack ../$(FILE2) --strip-components=1
-	patch -Np1 -i ../$(PATCH1)
+	#patch -Np1 -i ../$(PATCH1)
 	patch -Np1 -i ../$(PATCH2)
 	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 	./configure --prefix=/usr --enable-multibyte
@@ -49,7 +49,7 @@
 	ln -sfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS)
 	cp $(ROOT)/etc/vimrc /etc
 
-stage3: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3)
+stage3: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2)
 	$(std_build)
 
 compile-stage3:




More information about the livecd mailing list