r314 - in x86/branches/6.1/packages: findutils gawk shadow zlib

justin at linuxfromscratch.org justin at linuxfromscratch.org
Fri Jul 8 13:41:08 PDT 2005


Author: justin
Date: 2005-07-08 14:41:07 -0600 (Fri, 08 Jul 2005)
New Revision: 314

Modified:
   x86/branches/6.1/packages/findutils/Makefile
   x86/branches/6.1/packages/gawk/Makefile
   x86/branches/6.1/packages/shadow/Makefile
   x86/branches/6.1/packages/zlib/Makefile
Log:
Merged r309, r310, r311, r312 and r313 (zlib,gawk,shadow,findutils upgrades to 6.1 book) from trunk to 6.1 branch.

Modified: x86/branches/6.1/packages/findutils/Makefile
===================================================================
--- x86/branches/6.1/packages/findutils/Makefile	2005-07-08 20:19:20 UTC (rev 313)
+++ x86/branches/6.1/packages/findutils/Makefile	2005-07-08 20:41:07 UTC (rev 314)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= findutils
-VRS= 4.2.20
+VRS= 4.2.23
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 URL= $(HTTP)/$(NM)/$(FILE)

Modified: x86/branches/6.1/packages/gawk/Makefile
===================================================================
--- x86/branches/6.1/packages/gawk/Makefile	2005-07-08 20:19:20 UTC (rev 313)
+++ x86/branches/6.1/packages/gawk/Makefile	2005-07-08 20:41:07 UTC (rev 314)
@@ -18,7 +18,9 @@
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f $(WD)/bin/gawk ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure --prefix=$(WD) && make -j3 && make install ; fi
+	sed -i 's,ISO-8859-8,ISO-8859-1,' po/it.po && \
+	 ./configure --prefix=$(WD) --libexecdir=$(WD)/lib && make -j3 && \
+	make -C po update-gmo && make install ; fi
 	@make clean
 
 chroot:

Modified: x86/branches/6.1/packages/shadow/Makefile
===================================================================
--- x86/branches/6.1/packages/shadow/Makefile	2005-07-08 20:19:20 UTC (rev 313)
+++ x86/branches/6.1/packages/shadow/Makefile	2005-07-08 20:41:07 UTC (rev 314)
@@ -2,12 +2,10 @@
 
 # Package versions
 NM= shadow
-VRS= 4.0.7
+VRS= 4.0.9
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
-PATCH=${DIR}-fix_lastlog-1.patch
 URL= $(HTTP)/$(NM)/$(FILE)
-URL1=$(HTTP)/$(NM)/$(PATCH)
 
 # RULES
 
@@ -22,10 +20,7 @@
 	@echo ""
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
-	 mv $(PATCH) $(SRC) ; fi
 	@if [ ! -d /etc/default ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && \
 	 ./configure --libdir=/lib --enable-shared && \
 	 sed -i 's/groups$$(EXEEXT) //' src/Makefile && \
 	 sed -i '/groups/d' man/Makefile && \

Modified: x86/branches/6.1/packages/zlib/Makefile
===================================================================
--- x86/branches/6.1/packages/zlib/Makefile	2005-07-08 20:19:20 UTC (rev 313)
+++ x86/branches/6.1/packages/zlib/Makefile	2005-07-08 20:41:07 UTC (rev 314)
@@ -7,7 +7,8 @@
 FILE= $(DIR).tar.bz2
 PATCH1= $(DIR)-security_fix-1.patch
 URL= $(HTTP)/$(NM)/$(FILE)
-URL1= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
+URL1= $(HTTP)/$(NM)/$(PATCH1)
+
 # RULES
 
 .PHONY: chroot stage2 clean
@@ -22,9 +23,9 @@
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
-	 mv $(PATCH1) $(SRC) ; fi
+         mv $(PATCH1) $(SRC) ; fi
 	@if [ ! -f /usr/lib/libz.so ] ; then unpack $(SRC)/$(FILE) && \
-	 cd $(DIR) && patch -Np1 -i $(SRC)/$(PATCH1) &&\
+	 cd $(DIR) && patch -Np1 -i $(SRC)/$(PATCH1) && \
 	 ./configure --prefix=/usr --shared && \
 	 make -j3 && make install && make clean && ./configure --prefix=/usr && \
 	 make -j3 && make install && chmod 644 /usr/lib/libz.a && \




More information about the livecd mailing list