r306 - in x86/branches/utf8: . packages/zlib

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Fri Jul 8 00:44:21 PDT 2005


Author: alexander
Date: 2005-07-08 01:44:19 -0600 (Fri, 08 Jul 2005)
New Revision: 306

Modified:
   x86/branches/utf8/Makefile
   x86/branches/utf8/packages/zlib/Makefile
Log:
Applied zlib security fix. Moved "stop-here" target before findutils.


Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-07-08 07:34:19 UTC (rev 305)
+++ x86/branches/utf8/Makefile	2005-07-08 07:44:19 UTC (rev 306)
@@ -170,7 +170,7 @@
 	@-mount -f -t devpts -o gid=4,mode=620 devpts $(MP)/dev/pts
 
 pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages ch-glibc ch-re-adjust-toolchain \
-	ch-binutils ch-gcc ch-redhat-patches ch-coreutils stop-here ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
+	ch-binutils ch-gcc ch-redhat-patches ch-coreutils ch-zlib ch-mktemp ch-iana-etc stop-here ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
 	ch-readline ch-vim ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex ch-gettext ch-inetutils \
 	ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash
 

Modified: x86/branches/utf8/packages/zlib/Makefile
===================================================================
--- x86/branches/utf8/packages/zlib/Makefile	2005-07-08 07:34:19 UTC (rev 305)
+++ x86/branches/utf8/packages/zlib/Makefile	2005-07-08 07:44:19 UTC (rev 306)
@@ -5,8 +5,9 @@
 VRS= 1.2.2
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
+PATCH1= $(DIR)-security_fix-1.patch
 URL= $(HTTP)/$(NM)/$(FILE)
-
+URL1= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
 # RULES
 
 .PHONY: chroot stage2 clean
@@ -20,7 +21,10 @@
 	@echo ""
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f /usr/lib/libz.so ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
+	@if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
+	 mv $(PATCH1) $(SRC) ; fi
+	@if [ ! -f /usr/lib/libz.so ] ; then unpack $(SRC)/$(FILE) && \
+	 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