r1372 - in trunk/packages: man-pages perl psmisc shadow

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Jan 23 15:46:59 PST 2006


Author: justin
Date: 2006-01-23 16:46:58 -0700 (Mon, 23 Jan 2006)
New Revision: 1372

Modified:
   trunk/packages/man-pages/Makefile
   trunk/packages/perl/Makefile
   trunk/packages/psmisc/Makefile
   trunk/packages/shadow/Makefile
Log:
[trunk] Change perl patch URLs to HTTP variable, upgraded psmisc to 22.1, shadow to 4.0.14 and man-pages to 2.21.

Modified: trunk/packages/man-pages/Makefile
===================================================================
--- trunk/packages/man-pages/Makefile	2006-01-21 16:39:19 UTC (rev 1371)
+++ trunk/packages/man-pages/Makefile	2006-01-23 23:46:58 UTC (rev 1372)
@@ -1,12 +1,12 @@
 # Man-pages Makefile
 
 NM= man-pages
-VRS= 2.18
+VRS= 2.21
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 8f3de81d0c5108ca5e3cf6b732fe5176c31a1457
+SHA-$(FILE)= 36e50c9058d30244afa70e6622baea32ded258a2
 
 # Targets
 

Modified: trunk/packages/perl/Makefile
===================================================================
--- trunk/packages/perl/Makefile	2006-01-21 16:39:19 UTC (rev 1371)
+++ trunk/packages/perl/Makefile	2006-01-23 23:46:58 UTC (rev 1372)
@@ -13,11 +13,11 @@
 SHA-$(PATCH1)= e515154714acdbb1dbdbeb71727649895e26f50d
 
 PATCH2= $(DIR)-update_db_file-1.patch
-URL-$(PATCH2)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH2)
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
 SHA-$(PATCH2)= e5f94cf06a6fa9ed1339e6e6fbfb3e972a83f849
 
 PATCH3= $(DIR)-sprintf_vulnerability-1.patch
-URL-$(PATCH3)= http://www.linuxfromscratch.org/patches/downloads/perl/$(PATCH3)
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
 SHA-$(PATCH3)= dda2881adffd5407881778f8daa6a959ec2ad589
 
 PATCH40= $(DIR)-Configure_multilib-1.patch

Modified: trunk/packages/psmisc/Makefile
===================================================================
--- trunk/packages/psmisc/Makefile	2006-01-21 16:39:19 UTC (rev 1371)
+++ trunk/packages/psmisc/Makefile	2006-01-23 23:46:58 UTC (rev 1372)
@@ -1,12 +1,12 @@
 # Psmisc Makefile
 
 NM= psmisc
-VRS= 21.9
+VRS= 22.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= de7b74d7fee5b46cefa0c3bca025ce075e2075ed
+SHA-$(FILE)= f654685c7c300d9681131465f8c5d5ae5a3f8ace
 
 # Targets
 

Modified: trunk/packages/shadow/Makefile
===================================================================
--- trunk/packages/shadow/Makefile	2006-01-21 16:39:19 UTC (rev 1371)
+++ trunk/packages/shadow/Makefile	2006-01-23 23:46:58 UTC (rev 1372)
@@ -1,17 +1,13 @@
 # Shadow Makefile
 
 NM= shadow
-VRS= 4.0.13
+VRS= 4.0.14
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 0f605460c7826d7974089faf793ee2a973c9a176
+SHA-$(FILE)= 7d8c504ae03421f9a75cfef3b97b9713782a6e91
 
-PATCH1= $(DIR)-configure_fix-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= e1bebfb21e574985db2433cbf2606ea13cd6972f
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -20,12 +16,11 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build)
-	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+	cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
 ifndef CROSS
 	./configure --libdir=/lib --enable-shared
 else




More information about the livecd mailing list