r1634 - in profiles/BLFS/trunk: chapter13 chapter14 chapter15 config_standard/packages wget

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sun Dec 5 17:33:17 PST 2004


Author: thomasp
Date: 2004-12-05 18:33:17 -0700 (Sun, 05 Dec 2004)
New Revision: 1634

Modified:
   profiles/BLFS/trunk/chapter13/ppp.xml
   profiles/BLFS/trunk/chapter14/dhclient.xml
   profiles/BLFS/trunk/chapter15/rp-pppoe.xml
   profiles/BLFS/trunk/config_standard/packages/ch13.ent
   profiles/BLFS/trunk/config_standard/packages/ch14.ent
   profiles/BLFS/trunk/wget/chapter10.urls
   profiles/BLFS/trunk/wget/chapter13.urls
   profiles/BLFS/trunk/wget/chapter14.urls
Log:
svn-20041205 chap 13-15

Modified: profiles/BLFS/trunk/chapter13/ppp.xml
===================================================================
--- profiles/BLFS/trunk/chapter13/ppp.xml	2004-12-06 01:22:37 UTC (rev 1633)
+++ profiles/BLFS/trunk/chapter13/ppp.xml	2004-12-06 01:33:17 UTC (rev 1634)
@@ -12,33 +12,30 @@
 ]>
 <alfs>
   <package name="ppp" version="&ppp-version;">
+    <packageinfo>
+      <requires>
+	<name>libpcap</name>
+      </requires>
+    </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <archive>&packages_dir;/&ppp-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    <stage name="Patching">
-      <stageinfo>
-        <base>&build_dir;/&ppp-directory;</base>
-      </stageinfo>
-      <patch base="&build_dir;/&ppp-directory;">
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&ppp-patch;</param>
-      </patch>
-    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&ppp-directory;</base>
       </stageinfo>
-      <configure />
+      <configure>
+	<param>--prefix=/usr</param>
+      </configure>
+      <make />
       <make>
-        <param>ETCDIR=/etc/ppp</param>
+        <param>install</param>
       </make>
       <make>
-        <param>ETCDIR=/etc/ppp</param>
-        <param>install</param>
+	<param>install-etcppp</param>
       </make>
     </stage>
     <stage name="Cleanup">

Modified: profiles/BLFS/trunk/chapter14/dhclient.xml
===================================================================
--- profiles/BLFS/trunk/chapter14/dhclient.xml	2004-12-06 01:22:37 UTC (rev 1633)
+++ profiles/BLFS/trunk/chapter14/dhclient.xml	2004-12-06 01:33:17 UTC (rev 1634)
@@ -44,12 +44,12 @@
     </stage>
     <stage name="Configure dhclient">
       <textdump>
-        <file>/etc/sysconfig/network-devices/ifconfig.eth0</file>
+        <file>/etc/sysconfig/network-devices/ifconfig.eth0/dhclient</file>
         <content>
 	  =ONBOOT=yes
-	  =DHCP_START="&dhclient-start-params;"
-	  =DHCP_STOP="&dhclient-stop-params;"
 	  =SERVICE=dhclient"
+	  =DHCP_START="-q &dhclient-start-params;"
+	  =DHCP_STOP="-q -r &dhclient-stop-params;"
 	</content>
       </textdump>
       <textdump>

Modified: profiles/BLFS/trunk/chapter15/rp-pppoe.xml
===================================================================
--- profiles/BLFS/trunk/chapter15/rp-pppoe.xml	2004-12-06 01:22:37 UTC (rev 1633)
+++ profiles/BLFS/trunk/chapter15/rp-pppoe.xml	2004-12-06 01:33:17 UTC (rev 1634)
@@ -19,6 +19,9 @@
       <requires>
         <name>ppp</name>
       </requires>
+      <requires>
+	<name>net-tools</name>
+      </requires>
     </packageinfo>
     <stage name="Unpacking.">
       <unpack>
@@ -48,7 +51,10 @@
     <stage name="Configure rp-pppoe">
       <textdump>
         <file>/etc/sysconfig/network-devices/ifconfig.pppoe</file>
-        <content>=ONBOOT=yes =SERVICE=pppoe</content>
+        <content>
+	  =ONBOOT=yes 
+	  =SERVICE=pppoe
+	</content>
       </textdump>
     </stage>
     &bootscripts-clean;

Modified: profiles/BLFS/trunk/config_standard/packages/ch13.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch13.ent	2004-12-06 01:22:37 UTC (rev 1633)
+++ profiles/BLFS/trunk/config_standard/packages/ch13.ent	2004-12-06 01:33:17 UTC (rev 1634)
@@ -1,11 +1,9 @@
 <!--************* packages for chapter 13 *************-->
 
-<!ENTITY ppp-version   "2.4.2">
+<!ENTITY ppp-version   "2.4.3">
 <!ENTITY ppp-package   "ppp-&ppp-version;.tar.gz">
 <!ENTITY ppp-directory "ppp-&ppp-version;">
 
-<!ENTITY ppp-patch     "ppp-&ppp-version;-nobpf-3.patch">
-
-<!ENTITY wvdial-version   "1.53">
+<!ENTITY wvdial-version   "1.54.0">
 <!ENTITY wvdial-package   "wvdial-&wvdial-version;.tar.gz">
 <!ENTITY wvdial-directory "wvdial-&wvdial-version;">

Modified: profiles/BLFS/trunk/config_standard/packages/ch14.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch14.ent	2004-12-06 01:22:37 UTC (rev 1633)
+++ profiles/BLFS/trunk/config_standard/packages/ch14.ent	2004-12-06 01:33:17 UTC (rev 1634)
@@ -1,6 +1,6 @@
 <!--************* packages for chapter 14 *************-->
 
-<!ENTITY dhclient-version "3.0pl2">
+<!ENTITY dhclient-version "3.0.1">
 <!ENTITY dhclient-package "dhcp-&dhclient-version;.tar.gz">
 <!ENTITY dhclient-directory "dhcp-&dhclient-version;">
 

Modified: profiles/BLFS/trunk/wget/chapter10.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter10.urls	2004-12-06 01:22:37 UTC (rev 1633)
+++ profiles/BLFS/trunk/wget/chapter10.urls	2004-12-06 01:33:17 UTC (rev 1634)
@@ -1,6 +1,6 @@
 ftp://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/svn/bc-1.06-flex_invocation-1.patch
-http://www.linuxfromscratch.org/patches/blfs/svn/bc-1.06-readline-1.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/bc-1.06-flex_invocation-1.patch
+http://www.linuxfromscratch.org/blfs/downloads/svn/bc-1.06-readline-1.patch
 
 http://umn.dl.sourceforge.net/sourceforge/rep-gtk/rep-gtk-0.18.tar.gz
 http://www.linuxfromscratch.org/blfs/downloads/svn/rep-gtk-0.18-gtk2.4-1.patch
@@ -18,7 +18,7 @@
 
 ftp://ftp.gnu.org/pub/gnu/screen/screen-4.0.2.tar.gz
 
-http://tidy.sourceforge.net/src/tidy_src_041005.tgz
+http://tidy.sourceforge.net/src/old/tidy_src_041005.tgz
 http://tidy.sourceforge.net/docs/tidy_docs.tgz
 
-http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-0.9.tar.gz
+http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.9.tar.gz

Modified: profiles/BLFS/trunk/wget/chapter13.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter13.urls	2004-12-06 01:22:37 UTC (rev 1633)
+++ profiles/BLFS/trunk/wget/chapter13.urls	2004-12-06 01:33:17 UTC (rev 1634)
@@ -1,4 +1,3 @@
-ftp://ftp.samba.org/pub/ppp/ppp-2.4.2.tar.gz
-http://www.linuxfromscratch.org/patches/blfs/5.1/ppp-2.4.2-nobpf-3.patch
+ftp://ftp.samba.org/pub/ppp/ppp-2.4.3.tar.gz
 
-ftp://ftp.ing-steen.se/pub/unix/unsort/wvdial-1.53.tar.gz
+ftp://ftp.ing-steen.se/pub/unix/unsort/wvdial-1.54.0.tar.gz

Modified: profiles/BLFS/trunk/wget/chapter14.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter14.urls	2004-12-06 01:22:37 UTC (rev 1633)
+++ profiles/BLFS/trunk/wget/chapter14.urls	2004-12-06 01:33:17 UTC (rev 1634)
@@ -1,4 +1,4 @@
-http://open-systems.ufl.edu/mirrors/ftp.isc.org/isc/dhcp/dhcp-3.0pl2.tar.gz
+ftp://ftp.isc.org/isc/dhcp/dhcp-3.0.1.tar.gz
 
 ftp://ftp.phystech.com/pub/dhcpcd-1.3.22-pl4.tar.gz
 http://www.linuxfromscratch.org/patches/blfs/5.1/dhcpcd-1.3.22-pl4-fhs-1.patch




More information about the alfs-log mailing list