r696 - x86/trunk/packages/bzip2

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Sep 18 19:26:22 PDT 2005


Author: jhuntwork
Date: 2005-09-18 20:26:20 -0600 (Sun, 18 Sep 2005)
New Revision: 696

Modified:
   x86/trunk/packages/bzip2/Makefile
Log:
Updated bzip2: install-docs and bzgrep-security patches

Modified: x86/trunk/packages/bzip2/Makefile
===================================================================
--- x86/trunk/packages/bzip2/Makefile	2005-09-19 02:20:57 UTC (rev 695)
+++ x86/trunk/packages/bzip2/Makefile	2005-09-19 02:26:20 UTC (rev 696)
@@ -9,6 +9,14 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= 8726fce88aeeb11923f2a83225beac37b9a42dab
 
+PATCH1= $(DIR)-install_docs-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= ead85296356efe99db45529cf7aeb9f61dd33daa
+
+PATCH2= $(DIR)-bzgrep_security-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 56a29bf1278f21bc30c72d19e5766bfda5c74e5b
+
 # Targets
 # =============================================================================
 
@@ -42,14 +50,17 @@
 	@chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
 	@$(std_build)
+	@cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/
 
 compile-stage2:
 	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@patch -Np1 -i ../$(PATCH2)
 	@make $(PM) -f Makefile-libbz2_so >>../$(DIR)-$@.log 2>&1
 	@make clean
 	@make $(PM) >>../$(DIR)-$@.log 2>&1




More information about the livecd mailing list