cvs commit: ALFS/profiles/BLFS/chapter06 emacs.xml nano.xml vim.xml

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu May 6 20:39:23 PDT 2004


thomasp     04/05/06 21:39:23

  Modified:    profiles/BLFS general.ent packages.ent system.ent
               profiles/BLFS/chapter05 reiserfsutils.xml xfsprogs.xml
               profiles/BLFS/chapter06 emacs.xml nano.xml vim.xml
  Log:
  updated chapters 5 & 6
  
  Revision  Changes    Path
  1.5       +1 -1      ALFS/profiles/BLFS/general.ent
  
  Index: general.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/general.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- general.ent	29 Dec 2003 20:38:52 -0000	1.4
  +++ general.ent	7 May 2004 03:39:23 -0000	1.5
  @@ -1,5 +1,5 @@
   <!-- directory containing the compressed packages -->
  -<!ENTITY packages_dir  "/var2/packages-BLFS_CVS">
  +<!ENTITY packages_dir  "/mnt/src">
   
   <!-- directory in which the packages will be compiled -->
   <!ENTITY build_dir  "/usr/src">
  
  
  
  1.28      +44 -32    ALFS/profiles/BLFS/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/packages.ent,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- packages.ent	27 Apr 2004 04:00:16 -0000	1.27
  +++ packages.ent	7 May 2004 03:39:23 -0000	1.28
  @@ -1,56 +1,73 @@
  -<!ENTITY lfs-bootscripts-version "2.0.3">
  +<!ENTITY lfs-bootscripts-version "2.0.4">
   <!ENTITY lfs-bootscripts-package "lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
   <!ENTITY lfs-bootscripts-directory "lfs-bootscripts-&lfs-bootscripts-version;">
   
   <!--************* packages for chapter 4 *************-->
   
  +<!ENTITY cracklib-version   "2.7">
  +<!ENTITY cracklib-package   "cracklib,&cracklib-version;.tar.gz">
  +<!ENTITY cracklib-directory "cracklib,&cracklib-version;">
  +<!ENTITY cracklib-wordlist "allwords">
  +<!ENTITY cracklib-blfs-patch "cracklib-&cracklib-version;-blfs-1.patch">
  +
  +
   <!ENTITY linuxpam-version   "0.77">
  -<!ENTITY linuxpam-package   "Linux-PAM-0.77.tar.bz2">
  -<!ENTITY linuxpam-directory "Linux-PAM-0.77">
  +<!ENTITY linuxpam-package   "Linux-PAM-&linuxpam-version;.tar.bz2">
  +<!ENTITY linuxpam-directory "Linux-PAM-&linuxpam-version;">
   
  -<!ENTITY linuxpam-patch     "Linux-PAM-0.77-linkage-1.patch">
  +<!ENTITY linuxpam-linkage-patch "Linux-PAM-&linuxpam-version;-linkage-2.patch">
   
  -<!ENTITY shadow-version   "4.0.3">
  -<!ENTITY shadow-package   "shadow-4.0.3.tar.bz2">
  -<!ENTITY shadow-directory "shadow-4.0.3">
  +<!ENTITY shadow-version   "4.0.4.1">
  +<!ENTITY shadow-package   "shadow-&shadow-version;.tar.bz2">
  +<!ENTITY shadow-directory "shadow-&shadow-version;">
   
  -<!ENTITY shadow-patch     "shadow-4.0.3-pam-2.patch">
  +<!ENTITY shadow-pam-patch     "shadow-&shadow-version;-pam-1.patch">
   
   <!ENTITY iptables-version   "1.2.9">
  -<!ENTITY iptables-package   "iptables-1.2.9.tar.bz2">
  -<!ENTITY iptables-directory "iptables-1.2.9">
  +<!ENTITY iptables-package   "iptables-&iptables-version;.tar.bz2">
  +<!ENTITY iptables-directory "iptables-&iptables-version;">
   
   <!ENTITY gnupg-version      "1.2.4">
  -<!ENTITY gnupg-package      "gnupg-1.2.4.tar.bz2">
  -<!ENTITY gnupg-directory    "gnupg-1.2.4">
  +<!ENTITY gnupg-package      "gnupg-&gnupg-version;.tar.bz2">
  +<!ENTITY gnupg-directory    "gnupg-&gnupg-version;">
  +
  +<!ENTITY tripwire-version "2.3.1-2">
  +<!ENTITY tripwire-package "tripwire-&tripwire-version;.tar.gz">
  +<!ENTITY tripwire-directory "tripwire-&tripwire-version;">
  +
  +<!ENTITY tripwire-gcc-patch "tripwire-&tripwire-version;-gcc3-build-fixes.patch">
  +<!-- the content of the following entity should be the name of your policy file for tripwire -->
  +<!--<!ENTITY tripwire-policy-file "tripwire-policy.txt">-->
  +<!ENTITY tripwire-policy-file "twpol-all.txt">
  +
   
   <!--************* packages for chapter 5 *************-->
   
  -<!ENTITY reiserfsutils-version   "3.6.11">
  -<!ENTITY reiserfsutils-package   "reiserfsprogs-3.6.11.tar.gz">
  -<!ENTITY reiserfsutils-directory "reiserfsprogs-3.6.11">
  -
  -<!ENTITY xfsprogs-version   "2.5.6">
  -<!ENTITY xfsprogs-package   "xfsprogs-2.5.6.src.tar.gz">
  -<!ENTITY xfsprogs-directory "xfsprogs-2.5.6">
  +<!ENTITY reiserfsutils-version   "3.6.14">
  +<!ENTITY reiserfsutils-package   "reiserfsprogs-&reiserfsutils-version;.tar.gz">
  +<!ENTITY reiserfsutils-directory "reiserfsprogs-&reiserfsutils-version;">
  +
  +<!ENTITY xfsprogs-version   "2.6.10">
  +<!ENTITY xfsprogs-package   "xfsprogs-&xfsprogs-version;.src.tar.gz">
  +<!ENTITY xfsprogs-directory "xfsprogs-&xfsprogs-version;">
   
   <!--************* packages for chapter 6 *************-->
   
   <!ENTITY vim-version   "6.2">
  -<!ENTITY vim-package   "vim-6.2.tar.bz2">
  +<!ENTITY vim-package   "vim-&vim-version;.tar.bz2">
   <!ENTITY vim-directory "vim62">
   
   <!ENTITY emacs-version   "21.3">
  -<!ENTITY emacs-package   "emacs-21.3.tar.gz">
  -<!ENTITY emacs-directory "emacs-21.3">
  +<!ENTITY emacs-package   "emacs-&emacs-version;.tar.gz">
  +<!ENTITY emacs-directory "emacs-&emacs-version;">
   
  -<!ENTITY nano-version   "1.2.2">
  -<!ENTITY nano-package   "nano-1.2.2.tar.gz">
  -<!ENTITY nano-directory "nano-1.2.2">
  +<!ENTITY nano-version   "1.2.3">
  +<!ENTITY nano-package   "nano-&nano-version;.tar.gz">
  +<!ENTITY nano-directory "nano-&nano-version;">
   
   <!ENTITY joe-version   "2.9.8">
  -<!ENTITY joe-package   "joe-2.9.8.tar.gz">
  -<!ENTITY joe-directory "joe-2.9.8">
  +<!ENTITY joe-package   "joe-&joe-version;.tar.gz">
  +<!ENTITY joe-directory "joe-&joe-version;">
   
   <!--************* packages for chapter 7 *************-->
   
  @@ -1414,11 +1431,6 @@
   
   <!--************* packages for chapter 99 *************-->
   
  -<!ENTITY cracklib-version   "2.7">
  -<!ENTITY cracklib-package   "cracklib,2.7.tgz">
  -<!ENTITY cracklib-directory "cracklib,2.7">
  -
  -<!ENTITY cracklib-dictionary "allwords">
   
   <!ENTITY t1lib-version   "1.3">
   <!ENTITY t1lib-package   "t1lib-1.3.tar.gz">
  
  
  
  1.20      +2 -1      ALFS/profiles/BLFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/system.ent,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- system.ent	27 Apr 2004 04:00:16 -0000	1.19
  +++ system.ent	7 May 2004 03:39:23 -0000	1.20
  @@ -13,10 +13,12 @@
   
   
   <!-- chapter 4 -->
  +<!ENTITY cracklib  SYSTEM "./chapter04/cracklib.xml">
   <!ENTITY shadow    SYSTEM "./chapter04/shadow.xml">
   <!ENTITY gnupg     SYSTEM "./chapter04/gnupg.xml">
   <!ENTITY iptables  SYSTEM "./chapter04/iptables.xml">
   <!ENTITY linuxpam  SYSTEM "./chapter04/linuxpam.xml">
  +<!ENTITY tripwire  SYSTEM "./chapter04/tripwire.xml">
   
   <!-- chapter 5 -->
   <!ENTITY reiserfsutils SYSTEM "./chapter05/reiserfsutils.xml">
  @@ -396,7 +398,6 @@
   <!ENTITY tex         SYSTEM "./chapter51/tex.xml">
   
   <!-- chapter 99 -->
  -<!ENTITY cracklib  SYSTEM "./chapter99/cracklib.xml">
   <!ENTITY t1lib     SYSTEM "./chapter99/t1lib.xml">
   <!ENTITY bison175  SYSTEM "./chapter99/bison175.xml">
   <!ENTITY libole2   SYSTEM "./chapter99/libole2.xml">
  
  
  
  1.2       +2 -2      ALFS/profiles/BLFS/chapter05/reiserfsutils.xml
  
  Index: reiserfsutils.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter05/reiserfsutils.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- reiserfsutils.xml	29 Sep 2003 18:11:25 -0000	1.1
  +++ reiserfsutils.xml	7 May 2004 03:39:23 -0000	1.2
  @@ -26,13 +26,13 @@
   	<link>
   	        <option>force</option>
   	        <target>reiserfsck</target>
  -		<name>/sbin/fsck.reiserfsck</name>
  +		<name>/sbin/fsck.reiserfs</name>
   	</link>
   
   	<link>
   	        <option>force</option>
   	        <target>mkreiserfs</target>
  -		<name>/sbin/mkfs.resiserfs</name>
  +		<name>/sbin/mkfs.reiserfs</name>
   	</link>
   
       </stage>
  
  
  
  1.3       +8 -4      ALFS/profiles/BLFS/chapter05/xfsprogs.xml
  
  Index: xfsprogs.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter05/xfsprogs.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xfsprogs.xml	18 Nov 2003 23:44:00 -0000	1.2
  +++ xfsprogs.xml	7 May 2004 03:39:23 -0000	1.3
  @@ -7,16 +7,20 @@
   	</unpack>
       </stage>
   
  -    <!-- warning: the XFS patch required to uyse the XFS system
  -         has not been added to the profile yet. -->
  +    <!-- If planning to use xfs filesystems, you should patch your kernel to support XFS prior to running
  +	this profile -->
   
       <stage name="Installing a package.">
           <stageinfo>
   		<base>&build_dir;/&xfsprogs-directory;</base>
   	</stageinfo>
   
  -	<configure />
  -	
  +	<search_replace>
  +		<file>Makefile</file>
  +		<find>autoconf</find>
  +		<replace> </replace>
  +	</search_replace>
  +
   	<make />
   
   	<make>
  
  
  
  1.3       +1 -1      ALFS/profiles/BLFS/chapter06/emacs.xml
  
  Index: emacs.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter06/emacs.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- emacs.xml	18 Nov 2003 23:44:00 -0000	1.2
  +++ emacs.xml	7 May 2004 03:39:23 -0000	1.3
  @@ -4,7 +4,7 @@
           <utilizes><name>xfree86</name></utilizes>
           <utilizes><name>libjpeg</name></utilizes>
           <utilizes><name>libpng</name></utilizes>
  -        <utilizes><name>libtiff6</name></utilizes>
  +        <utilizes><name>libtiff</name></utilizes>
           <utilizes><name>libungif</name></utilizes>
       </packageinfo>
   
  
  
  
  1.3       +12 -13    ALFS/profiles/BLFS/chapter06/nano.xml
  
  Index: nano.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter06/nano.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- nano.xml	18 Nov 2003 23:44:00 -0000	1.2
  +++ nano.xml	7 May 2004 03:39:23 -0000	1.3
  @@ -19,7 +19,6 @@
   
   	<configure>
   	        <param>--prefix=/usr</param>
  -		<param>--prefix=/usr</param>
   		<param>--sysconfdir=/etc</param>
   		<param>--enable-color</param>
   		<param>--enable-multibuffer</param>
  @@ -44,18 +43,18 @@
   	</copy>
   
   	<textdump base="/etc">
  -	<file>nanorc</file>
  -	<content>
  -	=set autoindent
  -	=set const
  -	=set fill 72
  -	=set historylog
  -	=set multibuffer
  -	=set nohelp
  -	=set regexp
  -	=set smooth
  -	=set suspend
  -        </content>
  +		<file>nanorc</file>
  +		<content>
  +		=set autoindent
  +		=set const
  +		=set fill 72
  +		=set historylog
  +		=set multibuffer
  +		=set nohelp
  +		=set regexp
  +		=set smooth
  +		=set suspend
  +        	</content>
   	</textdump>
   	
       </stage>
  
  
  
  1.2       +5 -0      ALFS/profiles/BLFS/chapter06/vim.xml
  
  Index: vim.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter06/vim.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- vim.xml	18 Nov 2003 23:44:00 -0000	1.1
  +++ vim.xml	7 May 2004 03:39:23 -0000	1.2
  @@ -2,8 +2,13 @@
   
       <packageinfo>
           <requires><name>xfree86</name></requires>
  +	<!-- or -->
  +	<!--<requires><name>xorg</name></requires>-->
           <utilizes><name>gtk+2</name></utilizes>
           <utilizes><name>lesstif</name></utilizes>
  +	<utilizes><name>python</name></utilizes>
  +	<utilizes><name>tcl</name></utilizes>
  +	<utilizes><name>ruby</name></utilizes>
       </packageinfo>
   
       <stage name="Unpacking a package.">
  
  
  



More information about the alfs-log mailing list