cvs commit: ALFS/profiles/BLFS/chapter18 ntp.xml cvs.xml inetutils.xml portmap.xml tcpwrappers.xml

vdzuba at linuxfromscratch.org vdzuba at linuxfromscratch.org
Mon Nov 24 11:20:20 PST 2003


vdzuba      03/11/24 12:20:20

  Modified:    profiles/BLFS BLFS.xml packages.ent system.ent
               profiles/BLFS/chapter18 cvs.xml inetutils.xml portmap.xml
                        tcpwrappers.xml
  Added:       profiles/BLFS/chapter18 ntp.xml
  Log:
  updating chapter 18
  
  Revision  Changes    Path
  1.12      +2 -0      ALFS/profiles/BLFS/BLFS.xml
  
  Index: BLFS.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/BLFS.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BLFS.xml	22 Nov 2003 12:42:01 -0000	1.11
  +++ BLFS.xml	24 Nov 2003 19:20:20 -0000	1.12
  @@ -185,6 +185,7 @@
       &dhcpcd;
   
   </stage>
  +
   <stage name="Chapter 15 (Networking - other)">
   
       <!-- &isdn; -->
  @@ -218,6 +219,7 @@
       &tcpwrappers;
       &portmap;
       &inetutils;
  +    &ntp;
   
   </stage>
   
  
  
  
  1.16      +12 -9     ALFS/profiles/BLFS/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/packages.ent,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- packages.ent	22 Nov 2003 20:31:07 -0000	1.15
  +++ packages.ent	24 Nov 2003 19:20:20 -0000	1.16
  @@ -422,9 +422,9 @@
   <!ENTITY ncftp-package   "ncftp-3.1.6-src.tar.bz2">
   <!ENTITY ncftp-directory "ncftp-3.1.6">
   
  -<!ENTITY cvs-version   "1.11.5">
  -<!ENTITY cvs-package   "cvs-1.11.5.tar.gz">
  -<!ENTITY cvs-directory "cvs-1.11.5">
  +<!ENTITY cvs-version   "1.11.6">
  +<!ENTITY cvs-package   "cvs-1.11.6.tar.bz2">
  +<!ENTITY cvs-directory "cvs-1.11.6">
   
   <!ENTITY cvs-ppatch    "cvs-1.11.2-zlib.patch.bz2">
   <!ENTITY cvs-patch     "cvs-1.11.2-zlib.patch">
  @@ -437,19 +437,22 @@
   <!ENTITY tcpwrappers-package   "tcp_wrappers_7.6.tar.gz">
   <!ENTITY tcpwrappers-directory "tcp_wrappers_7.6">
   
  -<!ENTITY tcpwrappers-ppatch    "tcp_wrappers_7.6.diff.gz">
  -<!ENTITY tcpwrappers-patch     "tcp_wrappers_7.6.diff">
  +<!ENTITY tcpwrappers-patch     "tcp_wrappers-7.6-shared-lib-plus-plus.patch">
   
  -<!ENTITY portmap-version   "5">
  -<!ENTITY portmap-package   "portmap_5.orig.tar.gz">
  +<!ENTITY portmap-version   "5beta">
  +<!ENTITY portmap-package   "portmap_5beta.tar.gz">
   <!ENTITY portmap-directory "portmap_5beta">
   
  -<!ENTITY portmap-ppatch    "portmap_5-1.diff.gz">
  -<!ENTITY portmap-patch     "portmap_5-1.diff">
  +<!ENTITY portmap-patch1    "portmap-5beta-compilation-fixes-2.patch">
  +<!ENTITY portmap-patch2    "portmap-5beta-glibc-errno-fix.patch">
   
   <!ENTITY inetutils-version   "1.4.2">
   <!ENTITY inetutils-package   "inetutils-1.4.2.tar.gz">
   <!ENTITY inetutils-directory "inetutils-1.4.2">
  +
  +<!ENTITY ntp-version   "4.1.2">
  +<!ENTITY ntp-package   "ntp-4.1.2.tar.gz">
  +<!ENTITY ntp-directory "ntp-4.1.2">
   
   <!--************* packages for chapter 19 *************-->
   
  
  
  
  1.11      +6 -5      ALFS/profiles/BLFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/system.ent,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- system.ent	22 Nov 2003 12:42:01 -0000	1.10
  +++ system.ent	24 Nov 2003 19:20:20 -0000	1.11
  @@ -114,12 +114,13 @@
   <!ENTITY w3m        SYSTEM "./chapter17/w3m.xml">
   
   <!-- chapter 18 -->
  -<!ENTITY ncftp      SYSTEM "./chapter18/ncftp.xml">
  -<!ENTITY cvs        SYSTEM "./chapter18/cvs.xml">
  -<!ENTITY wget       SYSTEM "./chapter18/wget.xml">
  +<!ENTITY ncftp       SYSTEM "./chapter18/ncftp.xml">
  +<!ENTITY cvs         SYSTEM "./chapter18/cvs.xml">
  +<!ENTITY wget        SYSTEM "./chapter18/wget.xml">
   <!ENTITY tcpwrappers SYSTEM "./chapter18/tcpwrappers.xml">
  -<!ENTITY portmap    SYSTEM "./chapter18/portmap.xml">
  -<!ENTITY inetutils  SYSTEM "./chapter18/inetutils.xml">
  +<!ENTITY portmap     SYSTEM "./chapter18/portmap.xml">
  +<!ENTITY inetutils   SYSTEM "./chapter18/inetutils.xml">
  +<!ENTITY ntp         SYSTEM "./chapter18/ntp.xml">
   
   <!-- chapter 19 -->
   <!ENTITY traceroute SYSTEM "./chapter19/traceroute.xml">
  
  
  
  1.2       +0 -14     ALFS/profiles/BLFS/chapter18/cvs.xml
  
  Index: cvs.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter18/cvs.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cvs.xml	29 Sep 2003 18:11:27 -0000	1.1
  +++ cvs.xml	24 Nov 2003 19:20:20 -0000	1.2
  @@ -5,11 +5,6 @@
   			<archive>&packages_dir;/&cvs-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<unpack>
  -		        <archive>&packages_dir;/&cvs-ppatch;</archive>
  -			<destination>&build_dir;</destination>
  -		</unpack>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -17,12 +12,6 @@
   			<base>&build_dir;/&cvs-directory;</base>
   		</stageinfo>
   
  -		<patch>
  -			<param>-N</param>
  -			<param>-p1</param>
  -			<param>-i ../&cvs-patch;</param>
  -		</patch>
  -
   		<configure>
   			<param>--prefix=/usr</param>
   		</configure>
  @@ -32,12 +21,9 @@
   		<make>
   			<param>install</param>
   		</make>
  -		
   	</stage>
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&cvs-directory;</remove>
  -		<remove>&build_dir;/&cvs-patch;</remove>
   	</stage>
  -
   </package>
  
  
  
  1.2       +7 -1      ALFS/profiles/BLFS/chapter18/inetutils.xml
  
  Index: inetutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter18/inetutils.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- inetutils.xml	29 Sep 2003 18:11:27 -0000	1.1
  +++ inetutils.xml	24 Nov 2003 19:20:20 -0000	1.2
  @@ -17,6 +17,8 @@
   			 <param>--disable-syslogd</param>
   			 <param>--libexecdir=/usr/sbin</param>
   			 <param>--infodir=/usr/share/info</param>
  +			 <param>--sysconfdir=/etc</param>
  +			 <param>--localstatedir=/var</param>
   			 <param>--mandir=/usr/share/man</param>
   			 <param>--with-wrap</param>
   			 <param>--with-pam</param>
  @@ -27,7 +29,11 @@
   		<make>
   			<param>install</param>
   		</make>
  -		
  +
  +		<move>
  +		        <source>/usr/bin/ping</source>
  +			<destination>/bin</destination>
  +		</move>
   	</stage>
   
   	<stage name="Clean-up.">
  
  
  
  1.2       +21 -12    ALFS/profiles/BLFS/chapter18/portmap.xml
  
  Index: portmap.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter18/portmap.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- portmap.xml	29 Sep 2003 18:11:27 -0000	1.1
  +++ portmap.xml	24 Nov 2003 19:20:20 -0000	1.2
  @@ -2,18 +2,25 @@
   
   <package name="portmap" version="&portmap-version;">
   
  +        <packageinfo>
  +                <requires><name>tcpwrappers</name></requires>
  +        </packageinfo>
  +
   	<stage name="Unpacking a package.">
   		<unpack>
   			<archive>&packages_dir;/&portmap-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
   
  -		<unpack>
  -			<archive>&packages_dir;/&portmap-ppatch;</archive>
  +		<copy>
  +			<source>&packages_dir;/&portmap-patch1;</source>
   			<destination>&build_dir;</destination>
  -		</unpack>
  -
  +		</copy>
   
  +		<copy>
  +			<source>&packages_dir;/&portmap-patch2;</source>
  +			<destination>&build_dir;</destination>
  +		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -24,14 +31,14 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&portmap-patch;</param>
  +			<param>-i ../&portmap-patch1;</param>
   		</patch>
   
  -		<remove>/usr/share/doc/portmap</remove>
  -		<mkdir base="/usr/share/doc">
  -		        <option>parents</option>
  -		        <name>portmap</name>
  -		</mkdir>
  +		<patch>
  +			<param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&portmap-patch2;</param>
  +		</patch>
   
   		<make/>
   
  @@ -43,9 +50,11 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&portmap-directory;</remove>
  -		<remove>&build_dir;/&portmap-patch;</remove>
  +		<remove>&build_dir;/&portmap-patch1;</remove>
  +		<remove>&build_dir;/&portmap-patch2;</remove>
   	</stage>
  -        <stage name="Create the portmap boot scripts">
  +
  +      <stage name="Create the portmap boot scripts">
   
         <textdump base="/etc/rc.d/init.d/">
   	<file>portmap</file>
  
  
  
  1.2       +7 -24     ALFS/profiles/BLFS/chapter18/tcpwrappers.xml
  
  Index: tcpwrappers.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter18/tcpwrappers.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tcpwrappers.xml	29 Sep 2003 18:11:27 -0000	1.1
  +++ tcpwrappers.xml	24 Nov 2003 19:20:20 -0000	1.2
  @@ -6,12 +6,10 @@
   			<destination>&build_dir;</destination>
   		</unpack>
   
  -		<unpack>
  -			<archive>&packages_dir;/&tcpwrappers-ppatch;</archive>
  +		<copy>
  +			<source>&packages_dir;/&tcpwrappers-patch;</source>
   			<destination>&build_dir;</destination>
  -		</unpack>
  -
  -
  +		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -27,32 +25,17 @@
   
   		<make>
   		         <param>REAL_DAEMON_DIR=/usr/sbin</param>
  +		         <param>STYLE=-DPROCESS_OPTIONS</param>
   			 <param>linux</param>
   		</make>
   
  -		<copy>
  -                         <source>libwrap.a</source>
  -			 <destination>/usr/lib</destination>
  -		</copy>
  -		
  -		<copy>
  -                         <source>tcpd.h</source>
  -			 <destination>/usr/include</destination>
  -		</copy>
  -
  -		<copy>
  -                         <source>safe_finger</source>
  -                         <source>tcpd</source>
  -                         <source>tcpdchk</source>
  -                         <source>tcpdmatch</source>
  -                         <source>try-from</source>
  -			 <destination>/usr/sbin</destination>
  -		</copy>
  +		<make>
  +		         <param>install</param>
  +		</make>
   	</stage>
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&tcpwrappers-directory;</remove>
   		<remove>&build_dir;/&tcpwrappers-patch;</remove>
   	</stage>
  -
   </package>
  
  
  
  1.1                  ALFS/profiles/BLFS/chapter18/ntp.xml
  
  Index: ntp.xml
  ===================================================================
  <package name="ntp" version="&ntp-version;">
  
  	<stage name="Unpacking a package.">
  		<unpack>
  			<archive>&packages_dir;/&ntp-package;</archive>
  			<destination>&build_dir;</destination>
  		</unpack>
  	</stage>
  
  	<stage name="Installing a package.">
  		<stageinfo>
  			<base>&build_dir;/&ntp-directory;</base>
  		</stageinfo>
  
  		<configure>
  		         <param>--prefix=/usr</param>
  		</configure>
  
  		<make/>
  
  		<make>
  			<param>install</param>
  		</make>
  
  		<textdump base="/etc">
  		<file>ntp.conf</file>
  		<content>
  		=server time-a.nist.gov prefer
  		=server time-b.nist.gov
  		=server tick.usno.navy.mil
  		=driftfile /var/cache/ntp.drift
  		</content>
  		</textdump>
  	</stage>
  
  	<stage name="Clean-up.">
  		<remove>&build_dir;/&ntp-directory;</remove>
  	</stage>
  </package>
  
  
  



More information about the alfs-log mailing list