r1825 - in profiles/BLFS/trunk: . chapter18 chapter22 config_standard/packages

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sat Mar 26 14:40:24 PST 2005


Author: thomasp
Date: 2005-03-26 15:40:22 -0700 (Sat, 26 Mar 2005)
New Revision: 1825

Modified:
   profiles/BLFS/trunk/BLFS.xml
   profiles/BLFS/trunk/chapter18/openssh.xml
   profiles/BLFS/trunk/chapter18/rsync.xml
   profiles/BLFS/trunk/chapter22/openssh.xml
   profiles/BLFS/trunk/chapter22/rsync.xml
   profiles/BLFS/trunk/config_standard/packages/ch18.ent
   profiles/BLFS/trunk/config_standard/packages/ch22.ent
Log:
better client/server instruction split for rsync and openssh, server specific instructions are now done in chapter 22 while client is done in chapter 18

Modified: profiles/BLFS/trunk/BLFS.xml
===================================================================
--- profiles/BLFS/trunk/BLFS.xml	2005-03-26 22:03:54 UTC (rev 1824)
+++ profiles/BLFS/trunk/BLFS.xml	2005-03-26 22:40:22 UTC (rev 1825)
@@ -189,6 +189,8 @@
     </stage>
     <stage name="Chapter 18 (Basic Networking Programs)">
       <xi:include href="chapter18/ncftp.xml" />
+      <xi:include href="chapter18/openssh.xml" />
+      <xi:include href="chapter18/rsync.xml" />
       <xi:include href="chapter18/cvs.xml" />
       <xi:include href="chapter18/subversion.xml" />
       <xi:include href="chapter18/wget.xml" />

Modified: profiles/BLFS/trunk/chapter18/openssh.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/openssh.xml	2005-03-26 22:03:54 UTC (rev 1824)
+++ profiles/BLFS/trunk/chapter18/openssh.xml	2005-03-26 22:40:22 UTC (rev 1825)
@@ -2,7 +2,7 @@
 <!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
 [
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch22.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
 
 %general_entities;
@@ -58,13 +58,6 @@
       <stageinfo>
         <base>&build_dir;/&openssh-directory;</base>
       </stageinfo>
-      <mkdir>
-        <option>parents</option>
-        <name>/var/empty</name>
-      </mkdir>
-      <ownership user="root" group="sys">
-        <name>/var/empty</name>
-      </ownership>
       <configure>
         <param>--prefix=/usr</param>
         <param>--sysconfdir=/etc/ssh</param>

Modified: profiles/BLFS/trunk/chapter18/rsync.xml
===================================================================
--- profiles/BLFS/trunk/chapter18/rsync.xml	2005-03-26 22:03:54 UTC (rev 1824)
+++ profiles/BLFS/trunk/chapter18/rsync.xml	2005-03-26 22:40:22 UTC (rev 1825)
@@ -2,40 +2,27 @@
 <!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
 [
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch22.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
-<!ENTITY % files SYSTEM "../config/files.ent">
 
 %general_entities;
 %package_entities;
 %config_entities;
-%files;
 
-<!ENTITY bootscripts-get SYSTEM "../config/bootscripts_get.ent">
-<!ENTITY bootscripts-clean SYSTEM "../config/bootscripts_clean.ent">
-
 ]>
 <alfs>
   <package name="rsync" version="&rsync-version;">
+    <packageinfo>
+      <utilizes>
+	<name>popt</name>
+      </utilizes>
+    </packageinfo>
     <stage name="Unpacking">
       <unpack>
         <archive>&packages_dir;/&rsync-package;</archive>
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    &bootscripts-get;
-    <stage name="Creating user and group">
-      <execute command="getent group rsyncd > /dev/null || groupadd">
-        <param>rsyncd</param>
-      </execute>
-      <execute command="getent passwd rsyncd > /dev/null || useradd">
-        <param>-c rsyncd</param>
-        <param>-d /home/rsync</param>
-        <param>-g rsyncd</param>
-        <param>-s /bin/false</param>
-        <param>rsyncd</param>
-      </execute>
-    </stage>
     <stage name="Installing">
       <stageinfo>
         <base>&build_dir;/&rsync-directory;</base>
@@ -47,20 +34,7 @@
       <make>
         <param>install</param>
       </make>
-      <copy base="&blfs-config;/etc">
-	<source>rsyncd.conf</source>
-	<destination>/etc</destination>
-      </copy>
     </stage>
-    <stage name="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-rsyncd</param>
-      </make>
-    </stage>    
-    &bootscripts-clean;
     <stage name="Cleanup">
       <remove>&build_dir;/&rsync-directory;</remove>
     </stage>

Modified: profiles/BLFS/trunk/chapter22/openssh.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/openssh.xml	2005-03-26 22:03:54 UTC (rev 1824)
+++ profiles/BLFS/trunk/chapter22/openssh.xml	2005-03-26 22:40:22 UTC (rev 1825)
@@ -2,7 +2,7 @@
 <!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
 [
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch22.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
 
 %general_entities;
@@ -14,38 +14,22 @@
 
 ]>
 <alfs>
-  <package name="openssh" version="&openssh-version;">
+  <stage name="OpenSSH Server">
+  <package name="openssh-server" version="&openssh-version;">
     <packageinfo>
       <requires>
-        <name>openssl</name>
+	<name>openssh</name>
       </requires>
-      <utilizes>
-        <name>linuxpam</name>
-      </utilizes>
-      <utilizes>
-	<name>tcpwrappers</name>
-      </utilizes>
-      <utilizes>
-	<name>&ximpl;</name>
-      </utilizes>
-      <utilizes>
-	<name>&krb-impl;</name>
-      </utilizes>
-      <utilizes>
-	<name>&j2sdk;</name>
-      </utilizes>
-      <utilizes>
-	<name>net-tools</name>
-      </utilizes>
     </packageinfo>
-    <stage name="Unpacking">
-      <unpack>
-        <archive>&packages_dir;/&openssh-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
     &bootscripts-get;
     <stage name="Creating user and group">
+      <mkdir>
+        <option>parents</option>
+        <name>/var/empty</name>
+      </mkdir>
+      <ownership user="root" group="sys">
+        <name>/var/empty</name>
+      </ownership>
       <execute command="getent group sshd > /dev/null || groupadd">
         <param>sshd</param>
       </execute>
@@ -57,55 +41,21 @@
         <param>sshd</param>
       </execute>
     </stage>
-    <stage name="Patching">
+    <stage name="Installing bootscript and configuration">
       <stageinfo>
-        <base>&build_dir;/&openssh-directory;</base>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
       </stageinfo>
-      <search_replace>
-        <file>configure</file>
-        <find>-lcrypto</find>
-        <replace>/usr/lib/libcrypto.a</replace>
-      </search_replace>
-    </stage>
-    <stage name="Installing">
-      <stageinfo>
-        <base>&build_dir;/&openssh-directory;</base>
-      </stageinfo>
-      <mkdir>
-        <option>parents</option>
-        <name>/var/empty</name>
-      </mkdir>
-      <ownership user="root" group="sys">
-        <name>/var/empty</name>
-      </ownership>
-      <configure>
-        <param>--prefix=/usr</param>
-        <param>--sysconfdir=/etc/ssh</param>
-        <param>--libexecdir=/usr/sbin</param>
-        <param>--with-md5-passwords</param>
-      </configure>
-      <make />
       <make>
-        <param>install</param>
+        <param>install-sshd</param>
       </make>
       <textdump mode="append">
-      	<file>/etc/ssh/sshd_config</file>
+	<file>/etc/ssh/sshd_config</file>
 	<content>
 	  =PermitRootLogin no
 	</content>
       </textdump>
     </stage>
-    <stage name="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-sshd</param>
-      </make>
-    </stage>
     &bootscripts-clean;
-    <stage name="Cleanup">
-      <remove>&build_dir;/&openssh-directory;</remove>
-    </stage>
   </package>
+  </stage>
 </alfs>

Modified: profiles/BLFS/trunk/chapter22/rsync.xml
===================================================================
--- profiles/BLFS/trunk/chapter22/rsync.xml	2005-03-26 22:03:54 UTC (rev 1824)
+++ profiles/BLFS/trunk/chapter22/rsync.xml	2005-03-26 22:40:22 UTC (rev 1825)
@@ -2,7 +2,7 @@
 <!DOCTYPE alfs SYSTEM "../DTD/ALFS.dtd"
 [
 <!ENTITY % general_entities SYSTEM "../config/general.ent">
-<!ENTITY % package_entities SYSTEM "../config/packages/ch22.ent">
+<!ENTITY % package_entities SYSTEM "../config/packages/ch18.ent">
 <!ENTITY % config_entities SYSTEM  "../config/config.ent">
 <!ENTITY % files SYSTEM "../config/files.ent">
 
@@ -16,13 +16,13 @@
 
 ]>
 <alfs>
-  <package name="rsync" version="&rsync-version;">
-    <stage name="Unpacking">
-      <unpack>
-        <archive>&packages_dir;/&rsync-package;</archive>
-        <destination>&build_dir;</destination>
-      </unpack>
-    </stage>
+  <stage name="Rsync Server">
+  <package name="rsync-server" version="&rsync-version;">
+    <packageinfo>
+      <requires>
+	<name>rsync</name>
+      </requires>
+    </packageinfo>
     &bootscripts-get;
     <stage name="Creating user and group">
       <execute command="getent group rsyncd > /dev/null || groupadd">
@@ -36,33 +36,19 @@
         <param>rsyncd</param>
       </execute>
     </stage>
-    <stage name="Installing">
+    <stage name="Installing bootscript and configuration">
       <stageinfo>
-        <base>&build_dir;/&rsync-directory;</base>
+        <base>&build_dir;/&blfs-bootscripts-directory;</base>
       </stageinfo>
-      <configure>
-        <param>--prefix=/usr</param>
-      </configure>
-      <make />
       <make>
-        <param>install</param>
+        <param>install-rsyncd</param>
       </make>
       <copy base="&blfs-config;/etc">
 	<source>rsyncd.conf</source>
 	<destination>/etc</destination>
       </copy>
-    </stage>
-    <stage name="Installing bootscript and configuration">
-      <stageinfo>
-        <base>&build_dir;/&blfs-bootscripts-directory;</base>
-      </stageinfo>
-      <make>
-        <param>install-rsyncd</param>
-      </make>
     </stage>    
     &bootscripts-clean;
-    <stage name="Cleanup">
-      <remove>&build_dir;/&rsync-directory;</remove>
-    </stage>
   </package>
+  </stage>
 </alfs>

Modified: profiles/BLFS/trunk/config_standard/packages/ch18.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch18.ent	2005-03-26 22:03:54 UTC (rev 1824)
+++ profiles/BLFS/trunk/config_standard/packages/ch18.ent	2005-03-26 22:40:22 UTC (rev 1825)
@@ -4,6 +4,14 @@
 <!ENTITY ncftp-package   "ncftp-&ncftp-version;-src.tar.bz2">
 <!ENTITY ncftp-directory "ncftp-&ncftp-version;">
 
+<!ENTITY openssh-version   "3.9p1">
+<!ENTITY openssh-package   "openssh-&openssh-version;.tar.gz">
+<!ENTITY openssh-directory "openssh-&openssh-version;">
+
+<!ENTITY rsync-version   "2.6.3">
+<!ENTITY rsync-package   "rsync-&rsync-version;.tar.gz">
+<!ENTITY rsync-directory "rsync-&rsync-version;">
+
 <!ENTITY cvs-version    "1.11.18">
 <!ENTITY cvs-package    "cvs-&cvs-version;.tar.bz2">
 <!ENTITY cvs-directory  "cvs-&cvs-version;">
@@ -17,10 +25,10 @@
 <!ENTITY wget-package   "wget-&wget-version;.tar.bz2">
 <!ENTITY wget-directory "wget-&wget-version;">
 
-<!ENTITY tcpwrappers-version                     "7.6">
-<!ENTITY tcpwrappers-package                     "tcp_wrappers_&tcpwrappers-version;.tar.bz2">
-<!ENTITY tcpwrappers-directory                   "tcp_wrappers_&tcpwrappers-version;">
-<!ENTITY tcpwrappers-gcc34-patch                 "tcp_wrappers-&tcpwrappers-version;-gcc34-1.patch">
+<!ENTITY tcpwrappers-version  "7.6">
+<!ENTITY tcpwrappers-package  "tcp_wrappers_&tcpwrappers-version;.tar.bz2">
+<!ENTITY tcpwrappers-directory "tcp_wrappers_&tcpwrappers-version;">
+<!ENTITY tcpwrappers-gcc34-patch "tcp_wrappers-&tcpwrappers-version;-gcc34-1.patch">
 <!ENTITY tcpwrappers-shared-libs-plus-plus-patch "tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch">
 
 <!ENTITY portmap-version                 "5beta">

Modified: profiles/BLFS/trunk/config_standard/packages/ch22.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch22.ent	2005-03-26 22:03:54 UTC (rev 1824)
+++ profiles/BLFS/trunk/config_standard/packages/ch22.ent	2005-03-26 22:40:22 UTC (rev 1825)
@@ -14,14 +14,6 @@
 <!ENTITY leafnode-package   "leafnode-&leafnode-version;.rel.tar.bz2">
 <!ENTITY leafnode-directory "leafnode-&leafnode-version;.rel">
 
-<!ENTITY openssh-version   "3.9p1">
-<!ENTITY openssh-package   "openssh-&openssh-version;.tar.gz">
-<!ENTITY openssh-directory "openssh-&openssh-version;">
-
-<!ENTITY rsync-version   "2.6.3">
-<!ENTITY rsync-package   "rsync-&rsync-version;.tar.gz">
-<!ENTITY rsync-directory "rsync-&rsync-version;">
-
 <!ENTITY openldap-version   "2.2.20">
 <!ENTITY openldap-package   "openldap-&openldap-version;.tgz">
 <!ENTITY openldap-directory "openldap-&openldap-version;">




More information about the alfs-log mailing list