r338 - in x86/trunk/packages: blfs-bootscripts nALFS-profile ncftp

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sun Jul 10 22:34:34 PDT 2005


Author: justin
Date: 2005-07-10 23:34:34 -0600 (Sun, 10 Jul 2005)
New Revision: 338

Added:
   x86/trunk/packages/blfs-bootscripts/blfs-bootscripts-add-autosshd-1.patch
Removed:
   x86/trunk/packages/blfs-bootscripts/blfs-bootscripts-20050619-add-autosshd-1.patch
Modified:
   x86/trunk/packages/blfs-bootscripts/Makefile
   x86/trunk/packages/nALFS-profile/Makefile
   x86/trunk/packages/ncftp/Makefile
Log:
Merged r329, r330, r331, r332, r333 from 6.1 to trunk.

Modified: x86/trunk/packages/blfs-bootscripts/Makefile
===================================================================
--- x86/trunk/packages/blfs-bootscripts/Makefile	2005-07-11 05:17:34 UTC (rev 337)
+++ x86/trunk/packages/blfs-bootscripts/Makefile	2005-07-11 05:34:34 UTC (rev 338)
@@ -2,10 +2,10 @@
 
 # Package versions
 NM= blfs-bootscripts
-VRS= 20050619
+VRS= 20050709
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
-PATCH=$(DIR)-add-autosshd-1.patch
+PATCH=$(NM)-add-autosshd-1.patch
 URL= http://www.linuxfromscratch.org/blfs/downloads/svn/$(FILE)
 
 #RULES

Deleted: x86/trunk/packages/blfs-bootscripts/blfs-bootscripts-20050619-add-autosshd-1.patch
===================================================================
--- x86/trunk/packages/blfs-bootscripts/blfs-bootscripts-20050619-add-autosshd-1.patch	2005-07-11 05:17:34 UTC (rev 337)
+++ x86/trunk/packages/blfs-bootscripts/blfs-bootscripts-20050619-add-autosshd-1.patch	2005-07-11 05:34:34 UTC (rev 338)
@@ -1,62 +0,0 @@
-diff -Naur blfs-bootscripts-20050313-ORIG/blfs/init.d/autosshd blfs-bootscripts-20050313/blfs/init.d/autosshd
---- blfs-bootscripts-20050313-ORIG/blfs/init.d/autosshd	1970-01-01 05:00:00.000000000 +0500
-+++ blfs-bootscripts-20050313/blfs/init.d/autosshd	2005-05-13 09:07:15.000000000 +0600
-@@ -0,0 +1,25 @@
-+#!/bin/sh
-+# Begin $rc_base/init.d/autosshd
-+
-+. /etc/sysconfig/rc
-+. $rc_functions
-+
-+case "$1" in
-+	start)
-+		if [ -f /.autosshd ] ; then
-+			/etc/rc.d/init.d/sshd start
-+		fi
-+		;;
-+	stop)
-+		if statusproc /usr/sbin/sshd | grep -q "Process ID"
-+		then
-+			/etc/rc.d/init.d/sshd stop
-+		fi
-+		;;
-+	*)
-+		echo "Usage: $0 {start|stop}"
-+		exit 1
-+		;;
-+esac
-+
-+# End $rc_base/init.d/autosshd
-diff -Naur blfs-bootscripts-20050313-ORIG/blfs/init.d/sshd blfs-bootscripts-20050313/blfs/init.d/sshd
---- blfs-bootscripts-20050313-ORIG/blfs/init.d/sshd	2004-09-29 10:00:58.000000000 +0600
-+++ blfs-bootscripts-20050313/blfs/init.d/sshd	2005-05-13 09:09:05.000000000 +0600
-@@ -13,6 +13,9 @@
- case "$1" in
- 	start)
- 		echo "Starting SSH Server..."
-+		[ -f /etc/ssh/ssh_host_key ] || ssh-keygen -q -t rsa1 -f /etc/ssh/ssh_host_key -N ""
-+		[ -f /etc/ssh/ssh_host_rsa_key ] || ssh-keygen -q -t rsa -f /etc/ssh/ssh_host_rsa_key -N ""
-+		[ -f /etc/ssh/ssh_host_dsa_key ] || ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -N ""
- 		loadproc /usr/sbin/sshd
- 		;;
- 
-diff -Naur blfs-bootscripts-20050313-ORIG/Makefile blfs-bootscripts-20050313/Makefile
---- blfs-bootscripts-20050313-ORIG/Makefile	2005-03-07 08:48:33.000000000 +0500
-+++ blfs-bootscripts-20050313/Makefile	2005-05-13 09:07:03.000000000 +0600
-@@ -54,6 +54,16 @@
- 	install -m $(CONFMODE) blfs/sysconfig/autofs.conf $(EXTDIR)/sysconfig/
- 	ln -sf  ../init.d/autofs $(EXTDIR)/rc.d/rcsysinit.d/S45autofs
- 
-+install-autosshd: create-dirs
-+	install -m ${MODE} blfs/init.d/autosshd       ${EXTDIR}/rc.d/init.d/
-+	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc0.d/K40autosshd
-+	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc1.d/K40autosshd
-+	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc2.d/K40autosshd
-+	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc3.d/S40autosshd
-+	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc4.d/S40autosshd
-+	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc5.d/S40autosshd
-+	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc6.d/K40autosshd
-+
- install-bind: create-dirs
- 	install -m ${MODE} blfs/init.d/bind       ${EXTDIR}/rc.d/init.d/
- 	ln -sf  ../init.d/bind ${EXTDIR}/rc.d/rc0.d/K49bind

Added: x86/trunk/packages/blfs-bootscripts/blfs-bootscripts-add-autosshd-1.patch
===================================================================
--- x86/trunk/packages/blfs-bootscripts/blfs-bootscripts-add-autosshd-1.patch	2005-07-11 05:17:34 UTC (rev 337)
+++ x86/trunk/packages/blfs-bootscripts/blfs-bootscripts-add-autosshd-1.patch	2005-07-11 05:34:34 UTC (rev 338)
@@ -0,0 +1,62 @@
+diff -Naur blfs-bootscripts-20050313-ORIG/blfs/init.d/autosshd blfs-bootscripts-20050313/blfs/init.d/autosshd
+--- blfs-bootscripts-20050313-ORIG/blfs/init.d/autosshd	1970-01-01 05:00:00.000000000 +0500
++++ blfs-bootscripts-20050313/blfs/init.d/autosshd	2005-05-13 09:07:15.000000000 +0600
+@@ -0,0 +1,25 @@
++#!/bin/sh
++# Begin $rc_base/init.d/autosshd
++
++. /etc/sysconfig/rc
++. $rc_functions
++
++case "$1" in
++	start)
++		if [ -f /.autosshd ] ; then
++			/etc/rc.d/init.d/sshd start
++		fi
++		;;
++	stop)
++		if statusproc /usr/sbin/sshd | grep -q "Process ID"
++		then
++			/etc/rc.d/init.d/sshd stop
++		fi
++		;;
++	*)
++		echo "Usage: $0 {start|stop}"
++		exit 1
++		;;
++esac
++
++# End $rc_base/init.d/autosshd
+diff -Naur blfs-bootscripts-20050313-ORIG/blfs/init.d/sshd blfs-bootscripts-20050313/blfs/init.d/sshd
+--- blfs-bootscripts-20050313-ORIG/blfs/init.d/sshd	2004-09-29 10:00:58.000000000 +0600
++++ blfs-bootscripts-20050313/blfs/init.d/sshd	2005-05-13 09:09:05.000000000 +0600
+@@ -13,6 +13,9 @@
+ case "$1" in
+ 	start)
+ 		boot_mesg "Starting SSH Server..."
++		[ -f /etc/ssh/ssh_host_key ] || ssh-keygen -q -t rsa1 -f /etc/ssh/ssh_host_key -N ""
++		[ -f /etc/ssh/ssh_host_rsa_key ] || ssh-keygen -q -t rsa -f /etc/ssh/ssh_host_rsa_key -N ""
++		[ -f /etc/ssh/ssh_host_dsa_key ] || ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -N ""
+ 		loadproc /usr/sbin/sshd
+ 		;;
+ 
+diff -Naur blfs-bootscripts-20050313-ORIG/Makefile blfs-bootscripts-20050313/Makefile
+--- blfs-bootscripts-20050313-ORIG/Makefile	2005-03-07 08:48:33.000000000 +0500
++++ blfs-bootscripts-20050313/Makefile	2005-05-13 09:07:03.000000000 +0600
+@@ -54,6 +54,16 @@
+ 	install -m $(CONFMODE) blfs/sysconfig/autofs.conf $(EXTDIR)/sysconfig/
+ 	ln -sf  ../init.d/autofs $(EXTDIR)/rc.d/rcsysinit.d/S45autofs
+ 
++install-autosshd: create-dirs
++	install -m ${MODE} blfs/init.d/autosshd       ${EXTDIR}/rc.d/init.d/
++	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc0.d/K40autosshd
++	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc1.d/K40autosshd
++	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc2.d/K40autosshd
++	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc3.d/S40autosshd
++	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc4.d/S40autosshd
++	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc5.d/S40autosshd
++	ln -sf  ../init.d/autosshd ${EXTDIR}/rc.d/rc6.d/K40autosshd
++
+ install-bind: create-dirs
+ 	install -m ${MODE} blfs/init.d/bind       ${EXTDIR}/rc.d/init.d/
+ 	ln -sf  ../init.d/bind ${EXTDIR}/rc.d/rc0.d/K49bind

Modified: x86/trunk/packages/nALFS-profile/Makefile
===================================================================
--- x86/trunk/packages/nALFS-profile/Makefile	2005-07-11 05:17:34 UTC (rev 337)
+++ x86/trunk/packages/nALFS-profile/Makefile	2005-07-11 05:34:34 UTC (rev 338)
@@ -4,8 +4,8 @@
 NM= profile
 VRS= LFS-6.1
 DIR= $(VRS)
-FILE= $(DIR).tar.bz2
-URL= http://www.linuxfromscratch.org/alfs/downloads/profiles/stable/$(NM)/$(FILE)
+FILE= $(NM)-$(DIR).tar.bz2
+URL= http://www.linuxfromscratch.org/alfs/downloads/profiles/stable/$(FILE)
 
 # RULES
 
@@ -18,8 +18,8 @@
 	@echo ""
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	@if [ ! -d /root/$(DIR) ] ; then unpack $(SRC)/$(FILE) && \
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -d /root/$(DIR) ] ; then unpack $(FILE) && \
 	 sed -i 's@/your/$(DIR)/packages@/sources at g' $(DIR)/config/general.ent && \
 	 cp -ra $(DIR) /root/nALFS-profile-$(DIR) ; fi
 	@make clean

Modified: x86/trunk/packages/ncftp/Makefile
===================================================================
--- x86/trunk/packages/ncftp/Makefile	2005-07-11 05:17:34 UTC (rev 337)
+++ x86/trunk/packages/ncftp/Makefile	2005-07-11 05:34:34 UTC (rev 338)
@@ -5,7 +5,8 @@
 VRS= 3.1.9
 DIR= $(NM)-$(VRS)
 FILE= $(DIR)-src.tar.bz2
-URL= http://ftp.rge.com/pub/networking/$(NM)/$(FILE)
+#URL= http://ftp.rge.com/pub/networking/$(NM)/$(FILE)
+URL= http://ftp.lfs-matrix.de/pub/BLFS/SVN/M-P/$(FILE)
 
 #RULES
 




More information about the livecd mailing list