r1793 - in profiles/BLFS/trunk: chapter04 chapter12 chapter18 config_standard config_standard/packages wget

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Tue Mar 1 11:34:19 PST 2005


Author: thomasp
Date: 2005-03-01 12:34:17 -0700 (Tue, 01 Mar 2005)
New Revision: 1793

Modified:
   profiles/BLFS/trunk/chapter04/cracklib.xml
   profiles/BLFS/trunk/chapter04/cyrus-sasl.xml
   profiles/BLFS/trunk/chapter04/linuxpam.xml
   profiles/BLFS/trunk/chapter12/gcc-33.xml
   profiles/BLFS/trunk/chapter18/tcpwrappers.xml
   profiles/BLFS/trunk/config_standard/general.ent
   profiles/BLFS/trunk/config_standard/packages/ch22.ent
   profiles/BLFS/trunk/wget/bootscripts.urls
   profiles/BLFS/trunk/wget/chapter22.urls
Log:
Update to r3509:

* Package updates:
 -leafnode-1.10.8
 -samba-3.0.11
 -blfs-bootscripts-20041227

* Updated linux-pam and cracklib to create .so symlinks in /usr/lib only
* Removed gcc-3.4 patch in favor of sed(search_replace) in tcp-wrappers
* Added dejagnu as option dependency to gcc-3.3
* Update documentation install in cyrus-sasl to include version number



Modified: profiles/BLFS/trunk/chapter04/cracklib.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/cracklib.xml	2005-03-01 15:41:30 UTC (rev 1792)
+++ profiles/BLFS/trunk/chapter04/cracklib.xml	2005-03-01 19:34:17 UTC (rev 1793)
@@ -64,6 +64,12 @@
       <make>
         <param>install</param>
       </make>
+      <remove>/lib/libcrack.so</remove>
+      <link>
+	<option>force</option>
+	<target>../../lib/libcrack.so.&cracklib-version;</target>
+	<name>/usr/lib/libcrack.so</name>
+      </link>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&cracklib-directory;</remove>

Modified: profiles/BLFS/trunk/chapter04/cyrus-sasl.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/cyrus-sasl.xml	2005-03-01 15:41:30 UTC (rev 1792)
+++ profiles/BLFS/trunk/chapter04/cyrus-sasl.xml	2005-03-01 19:34:17 UTC (rev 1793)
@@ -74,7 +74,7 @@
     </copy>
     <mkdir>
       <option>parents</option>
-      <name>/usr/share/doc/sasl</name>
+      <name>/usr/share/doc/sasl-&cyrus-sasl-version;</name>
     </mkdir>
     <copy>
       <source>doc/*.html</source>
@@ -83,11 +83,11 @@
       <source>doc/ONEWS</source>
       <source>doc/TODO</source>
       <source>saslauthd/LDAP_SASLAUTHD</source>
-      <destination>/usr/share/doc/sasl</destination>
+      <destination>/usr/share/doc/sasl-&cyrus-sasl-version;</destination>
     </copy>
     <permissions mode="644">
       <name>/usr/share/man/man8/saslauthd.8</name>
-      <name>/usr/share/doc/sasl/*</name>
+      <name>/usr/share/doc/sasl-&cyrus-sasl-version;/*</name>
     </permissions>
     <mkdir>
       <option>parents</option>

Modified: profiles/BLFS/trunk/chapter04/linuxpam.xml
===================================================================
--- profiles/BLFS/trunk/chapter04/linuxpam.xml	2005-03-01 15:41:30 UTC (rev 1792)
+++ profiles/BLFS/trunk/chapter04/linuxpam.xml	2005-03-01 19:34:17 UTC (rev 1793)
@@ -57,6 +57,9 @@
         <source>libpamc.a</source>
         <destination>/usr/lib</destination>
       </move>
+      <remove>/lib/libpam.so</remove>
+      <remove>/lib/libpamc.so</remove>
+      <remove>/lib/libpam_misc.so</remove>
       <link>
         <option>force</option>
         <target>../../lib/libpam.so.&linuxpam-version;</target>

Modified: profiles/BLFS/trunk/chapter12/gcc-33.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/gcc-33.xml	2005-03-01 15:41:30 UTC (rev 1792)
+++ profiles/BLFS/trunk/chapter12/gcc-33.xml	2005-03-01 19:34:17 UTC (rev 1793)
@@ -12,6 +12,11 @@
 ]>
 <alfs>
   <package name="gcc-3.3" version="&gcc-33-version;">
+    <packageinfo>
+      <utilizes>
+	<name>dejagnu</name>
+      </utilizes>
+    </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <archive>&packages_dir;/&gcc-33-package;</archive>

Modified: profiles/BLFS/trunk/chapter18/tcpwrappers.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/tcpwrappers.xml	2005-03-01 15:41:30 UTC (rev 1792)
+++ profiles/BLFS/trunk/chapter18/tcpwrappers.xml	2005-03-01 19:34:17 UTC (rev 1793)
@@ -27,16 +27,16 @@
         <param>-p1</param>
         <param>-i &packages_dir;/&tcpwrappers-shared-libs-plus-plus-patch;</param>
       </patch>
-      <patch>
-        <param>-N</param>
-        <param>-p1</param>
-        <param>-i &packages_dir;/&tcpwrappers-gcc34-patch;</param>
-      </patch>
     </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&tcpwrappers-directory;</base>
       </stageinfo>
+      <search_replace>
+	<file>scaffold.c</file>
+	<find>extern char *malloc();</find>
+	<replace>/* extern char *malloc(); */</replace>
+      </search_replace>
       <make>
         <param>REAL_DAEMON_DIR=/usr/sbin</param>
         <param>STYLE=-DPROCESS_OPTIONS</param>

Modified: profiles/BLFS/trunk/config_standard/general.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/general.ent	2005-03-01 15:41:30 UTC (rev 1792)
+++ profiles/BLFS/trunk/config_standard/general.ent	2005-03-01 19:34:17 UTC (rev 1793)
@@ -55,6 +55,6 @@
 
 <!ENTITY ldconfig "<execute command='/sbin/ldconfig' />">
 
-<!ENTITY blfs-bootscripts-version "20041203">
+<!ENTITY blfs-bootscripts-version "20041227">
 <!ENTITY blfs-bootscripts-package "blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 <!ENTITY blfs-bootscripts-directory "blfs-bootscripts-&blfs-bootscripts-version;">

Modified: profiles/BLFS/trunk/config_standard/packages/ch22.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch22.ent	2005-03-01 15:41:30 UTC (rev 1792)
+++ profiles/BLFS/trunk/config_standard/packages/ch22.ent	2005-03-01 19:34:17 UTC (rev 1793)
@@ -10,7 +10,7 @@
 <!ENTITY dhcp-directory "dhcp-&dhcp-version;">
 <!ENTITY dhcp-iproute2-patch "dhcp-&dhcp-version;-iproute2-1.patch">
 
-<!ENTITY leafnode-version   "1.10.0">
+<!ENTITY leafnode-version   "1.10.8">
 <!ENTITY leafnode-package   "leafnode-&leafnode-version;.rel.tar.bz2">
 <!ENTITY leafnode-directory "leafnode-&leafnode-version;.rel">
 
@@ -26,8 +26,8 @@
 <!ENTITY openldap-package   "openldap-&openldap-version;.tgz">
 <!ENTITY openldap-directory "openldap-&openldap-version;">
 
-<!ENTITY samba-version "3.0.9">
-<!ENTITY samba-package "samba-&samba-version;.tar.bz2">
+<!ENTITY samba-version "3.0.11">
+<!ENTITY samba-package "samba-&samba-version;.tar.gz">
 <!ENTITY samba-directory "samba-&samba-version;">
 
 <!ENTITY xinetd-version   "2.3.13">

Modified: profiles/BLFS/trunk/wget/bootscripts.urls
===================================================================
--- profiles/BLFS/trunk/wget/bootscripts.urls	2005-03-01 15:41:30 UTC (rev 1792)
+++ profiles/BLFS/trunk/wget/bootscripts.urls	2005-03-01 19:34:17 UTC (rev 1793)
@@ -1 +1 @@
-http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-20041203.tar.bz2
+http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-20041227.tar.bz2

Modified: profiles/BLFS/trunk/wget/chapter22.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter22.urls	2005-03-01 15:41:30 UTC (rev 1792)
+++ profiles/BLFS/trunk/wget/chapter22.urls	2005-03-01 19:34:17 UTC (rev 1793)
@@ -4,7 +4,7 @@
 ftp://ftp.isc.org/isc/dhcp/dhcp-3.0.1.tar.gz
 http://www.linuxfromscratch.org/blfs/downloads/svn/dhcp-3.0.1-iproute2-1.patch
 
-http://unc.dl.sourceforge.net/sourceforge/leafnode/leafnode-1.10.0.rel.tar.bz2
+http://unc.dl.sourceforge.net/sourceforge/leafnode/leafnode-1.10.8.rel.tar.bz2
 
 ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-3.9p1.tar.gz
 
@@ -12,6 +12,6 @@
 
 ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.2.20.tgz
 
-ftp://ftp.samba.org/pub/samba/stable/samba-3.0.9.tar.gz
+ftp://ftp.samba.org/pub/samba/stable/samba-3.0.11.tar.gz
 
 ftp://gd.tuwien.ac.at/infosys/servers/xinetd/xinetd-2.3.13.tar.gz




More information about the alfs-log mailing list