In next patch is changes from chapters 8,13-20 stable book BLFS 6.1.
Filip Bartmann
diff -Naur BLFS_6.1/chapter08/g-wrap.xml BLFS_6.1_ch/chapter08/g-wrap.xml
--- BLFS_6.1/chapter08/g-wrap.xml 2005-10-04 12:42:42.000000000 +0200
+++ BLFS_6.1_ch/chapter08/g-wrap.xml 2005-10-04 14:00:00.000000000 +0200
@@ -14,7 +14,7 @@
<package name="g-wrap" version="&g-wrap-version;">
<packageinfo>
<requires>
- <name>slib</name>
+ <name>guile</name>
</requires>
<utilizes>
<name>glib</name>
diff -Naur BLFS_6.1/chapter15/rp-pppoe.xml BLFS_6.1_ch/chapter15/rp-pppoe.xml
--- BLFS_6.1/chapter15/rp-pppoe.xml 2005-10-04 12:42:34.000000000 +0200
+++ BLFS_6.1_ch/chapter15/rp-pppoe.xml 2005-10-04 14:27:12.000000000 +0200
@@ -37,6 +37,13 @@
<stageinfo>
<base>&build_dir;/&rp-pppoe-directory;/src</base>
</stageinfo>
+ <search_replace>
+ <file>scripts/adsl-connect.in</file>
+ <file>scripts/adsl-setup.in</file>
+ <file>scripts/adsl.stop.in</file>
+ <find>/usr/bin/logger</find>
+ <replace>/bin/logger</replace>
+ </search_replace>
<configure />
<make />
<make>
diff -Naur BLFS_6.1/chapter16/libpcap.xml BLFS_6.1_ch/chapter16/libpcap.xml
--- BLFS_6.1/chapter16/libpcap.xml 2005-10-04 12:42:34.000000000 +0200
+++ BLFS_6.1_ch/chapter16/libpcap.xml 2005-10-04 14:43:15.000000000 +0200
@@ -35,6 +35,15 @@
<make>
<param>install</param>
</make>
+ <mkdir>
+ <option>parents</option>
+ <name>/usr/share/doc/libpcap-&libpcap-version;</name>
+ </mkdir>
+ <copy>
+ <source>doc/*html</source>
+ <source>doc/*.txt</source>
+ <destination>/usr/share/doc/libpcap-&libpcap-version;</destination>
+ </copy>
</stage>
<stage name="Cleanup">
<remove>&build_dir;/&libpcap-directory;</remove>
diff -Naur BLFS_6.1/chapter16/wvstreams.xml BLFS_6.1_ch/chapter16/wvstreams.xml
--- BLFS_6.1/chapter16/wvstreams.xml 2005-10-04 12:42:34.000000000 +0200
+++ BLFS_6.1_ch/chapter16/wvstreams.xml 2005-10-04 14:39:15.000000000 +0200
@@ -26,12 +26,6 @@
<name>db</name>
</utilizes>
<utilizes>
- <name>gdbm</name>
- </utilizes>
- <utilizes>
- <name>libogg</name>
- </utilizes>
- <utilizes>
<name>linuxpam</name>
</utilizes>
<utilizes>
@@ -99,9 +93,22 @@
<param>--localstatedir=/var</param>
</configure>
<make />
+ <!-- Uncomment this,if you have installed Doxygen and you want install API docs
+ <make>
+ <param>doxygen</param>
+ </make> -->
<make>
<param>install</param>
</make>
+ <!-- Uncomment this,if you have installed Doxygen and you want install API docs
+ <mkdir>
+ <option>parents</option>
+ <name>/usr/share/doc/wvstreams-&wvstreams-version;doxy-html</name>
+ </mkdir>
+ <copy>
+ <source>Docs/doxy-html/*</source>
+ <destination>/usr/share/doc/wvstreams-&wvstreams-version;doxy-html</destination>
+ </copy> -->
&ldconfig;
</stage>
<stage name="Cleanup">
diff -Naur BLFS_6.1/chapter17/links.xml BLFS_6.1_ch/chapter17/links.xml
--- BLFS_6.1/chapter17/links.xml 2005-10-04 12:42:34.000000000 +0200
+++ BLFS_6.1_ch/chapter17/links.xml 2005-10-04 14:48:17.000000000 +0200
@@ -29,6 +29,9 @@
<name>libtiff</name>
</utilizes>
<utilizes>
+ <name>sdl</name>
+ </utilizes>
+ <utilizes>
<name>svgalib</name>
</utilizes>
<utilizes>
@@ -51,6 +54,8 @@
</stageinfo>
<configure>
<param>--prefix=/usr</param>
+ <!-- Uncomment this,if you want use links in graphic mode.You nead at least framebuffer and gpm installed.
+ <param>--enable-graphics</param> -->
</configure>
<make />
<make>
diff -Naur BLFS_6.1/chapter17/w3m.xml BLFS_6.1_ch/chapter17/w3m.xml
--- BLFS_6.1/chapter17/w3m.xml 2005-10-04 12:42:34.000000000 +0200
+++ BLFS_6.1_ch/chapter17/w3m.xml 2005-10-04 14:55:14.000000000 +0200
@@ -69,6 +69,21 @@
<source>doc/menu.default</source>
<destination>/etc/w3m/menu</destination>
</copy>
+ <mkdir>
+ <option>parents</option>
+ <name>/usr/share/doc/w3m-&w3m-version;/html</name>
+ </mkdir>
+ <copy>
+ <source>doc/HISTORY</source>
+ <source>doc/READM*</source>
+ <source>doc/keymap.*</source>
+ <source>doc/menu.*</source>
+ <destination>/usr/share/doc/w3m-&w3m-version;</destination>
+ </copy>
+ <copy>
+ <source>doc/*.html</source>
+ <destination>/usr/share/doc/w3m-&w3m-version;/html</destination>
+ </copy>
</stage>
<stage name="Cleanup">
<remove>&build_dir;/&w3m-directory;</remove>
diff -Naur BLFS_6.1/chapter18/cvs.xml BLFS_6.1_ch/chapter18/cvs.xml
--- BLFS_6.1/chapter18/cvs.xml 2005-10-04 12:42:35.000000000 +0200
+++ BLFS_6.1_ch/chapter18/cvs.xml 2005-10-04 17:14:48.000000000 +0200
@@ -17,6 +17,9 @@
<name>gdbm</name>
</utilizes>
<utilizes>
+ <name>tcsh</name>
+ </utilizes>
+ <utilizes>
<name>krb4</name>
</utilizes>
<utilizes>
@@ -28,9 +31,6 @@
<utilizes>
<name>&mta-impl;</name>
</utilizes>
- <utilizes>
- <name>vim</name>
- </utilizes>
</packageinfo>
<stage name="Unpacking">
<unpack>
@@ -60,6 +60,15 @@
<make>
<param>install</param>
</make>
+ <mkdir>
+ <option>parents</option>
+ <name>/usr/share/doc/cvs-&cvs-version;</name>
+ </mkdir>
+ <copy>
+ <source>doc/cvs.ps</source>
+ <source>doc/cvsclient.ps</source>
+ <destination>/usr/share/doc/cvs-&cvs-version;</destination>
+ </copy>
</stage>
<stage name="Cleanup">
<remove>&build_dir;/&cvs-directory;</remove>
diff -Naur BLFS_6.1/chapter18/ntp.xml BLFS_6.1_ch/chapter18/ntp.xml
--- BLFS_6.1/chapter18/ntp.xml 2005-10-04 12:42:35.000000000 +0200
+++ BLFS_6.1_ch/chapter18/ntp.xml 2005-10-04 17:25:08.000000000 +0200
@@ -64,6 +64,15 @@
<make>
<param>install-ntp</param>
</make>
+ <!-- Comment out this section,if you want set hardware clock to system time at reboot and shutdown
+ <link type="symbolic">
+ <target>../init.d/setclock</target>
+ <name>/etc/rc.d/rc0.d/K46setclock</name>
+ </link>
+ <link type="symbolic">
+ <target>../init.d/setclock</target>
+ <name>/etc/rc.d/rc6.d/K46setclock</name>
+ </link> -->
</stage>
&bootscripts-clean;
<stage name="Cleanup">
diff -Naur BLFS_6.1/chapter18/samba.xml BLFS_6.1_ch/chapter18/samba.xml
--- BLFS_6.1/chapter18/samba.xml 2005-10-04 12:42:35.000000000 +0200
+++ BLFS_6.1_ch/chapter18/samba.xml 2005-10-04 18:06:26.000000000 +0200
@@ -87,7 +87,6 @@
</link>
<permissions mode="644">
<name>/usr/include/libsmbclient.h</name>
- <name>/usr/lib/samba/libsmbclient.a</name>
</permissions>
<!-- uncomment if linking with pam -->
<!--
@@ -119,6 +118,21 @@
<source>examples/smb.conf.default</source>
<destination>/etc/samba</destination>
</copy>
+ <copy>
+ <source>../docs/*.pdf</source>
+ <destination>/usr/share/samba</destination>
+ </copy>
+ <!-- Comment this out,if you want use smbmnt and smbumount as normal user.
+ <permissions mode="4755">
+ <name>/usr/bin/smbmnt</name>
+ <name>/usr/bin/smbumount</name>
+ </permissions> -->
+ <!-- Comment this out,if you want print on printers from smb share.
+ <link type="symbolic">
+ <option>force</option>
+ <target>/usr/bin/smbspool</target>
+ <name>/usr/lib/cups/backend/smb</name>
+ </link> -->
</stage>
<stage name="Cleanup">
<remove>&build_dir;/&samba-directory;</remove>
diff -Naur BLFS_6.1/chapter18/subversion.xml BLFS_6.1_ch/chapter18/subversion.xml
--- BLFS_6.1/chapter18/subversion.xml 2005-10-04 12:42:35.000000000 +0200
+++ BLFS_6.1_ch/chapter18/subversion.xml 2005-10-04 18:54:35.000000000 +0200
@@ -17,52 +17,49 @@
<name>libxml2</name>
</requires>
<utilizes>
- <name>expat</name>
- </utilizes>
- <utilizes>
- <name>pkg-config</name>
+ <name>python</name>
</utilizes>
<utilizes>
- <name>db</name>
+ <name>apache</name>
</utilizes>
<utilizes>
- <name>gdbm</name>
+ <name>openssh</name>
</utilizes>
<utilizes>
- <name>python</name>
+ <name>neon</name>
</utilizes>
<utilizes>
- <name>apache</name>
+ <name>&jdk;</name>
</utilizes>
<utilizes>
- <name>&jdk;</name>
+ <name>junit</name>
</utilizes>
<utilizes>
- <name>openssl</name>
+ <name>dante</name>
</utilizes>
<utilizes>
- <name>openssh</name>
+ <name>jikes</name>
</utilizes>
<utilizes>
- <name>&krb-impl;</name>
+ <name>xinetd</name>
</utilizes>
<utilizes>
- <name>swig</name>
+ <name>pkg-config</name>
</utilizes>
<utilizes>
- <name>neon</name>
+ <name>openssl</name>
</utilizes>
<utilizes>
- <name>junit</name>
+ <name>&krb-impl;</name>
</utilizes>
<utilizes>
- <name>dante</name>
+ <name>expat</name>
</utilizes>
<utilizes>
- <name>jikes</name>
+ <name>gdbm</name>
</utilizes>
<utilizes>
- <name>xinetd</name>
+ <name>swig</name>
</utilizes>
</packageinfo>
<stage name="Unpacking.">
@@ -78,8 +75,24 @@
</stageinfo>
<configure>
<param>--prefix=/usr</param>
+ <!-- Comment this out,if you want build Java subversion bingdings.
+ <param>--enable-javahl</param> -->
+ <!-- Comment this out,if you want build SWIG Perl and Python Subversion bindings.
+ <param>--with-swig</param>
+ <param>--enable-swig-bindings</param> -->
</configure>
<make />
+ <!-- Comment this out,if you want build Java subversion bingdings.
+ <make>
+ <param>javahl</param>
+ </make> -->
+ <!-- Comment this out,if you want build SWIG Perl and Python Subversion bindings.
+ <make>
+ <param>swig-pl</param>
+ </make>
+ <make>
+ <param>swig-py</param>
+ </make> -->
<make>
<param>install</param>
</make>
@@ -95,6 +108,23 @@
<source>doc/*</source>
<destination>/usr/share/doc/subversion-&subversion-version;</destination>
</copy>
+ <!-- Comment this out,if you want build Java subversion bingdings.
+ <make>
+ <param>install-javahl</param>
+ </make> -->
+ <!-- Comment this out,if you want build SWIG Perl and Python Subversion bindings.
+ <make>
+ <param>install-swig-pl</param>
+ </make>
+ <make>
+ <param>install-swig-py</param>
+ </make>
+ <textdump>
+ <file>/usr/lib/python2.4/site-packages/subversion.pth</file>
+ <content>
+ =/usr/lib/svn-python
+ </content>
+ </textdump> -->
</stage>
<stage name="Cleanup.">
<remove>&build_dir;/&subversion-directory;</remove>
diff -Naur BLFS_6.1/chapter19/ethereal.xml BLFS_6.1_ch/chapter19/ethereal.xml
--- BLFS_6.1/chapter19/ethereal.xml 2005-10-04 12:42:35.000000000 +0200
+++ BLFS_6.1_ch/chapter19/ethereal.xml 2005-10-04 18:41:07.000000000 +0200
@@ -23,6 +23,9 @@
<name>pkg-config</name>
</utilizes>
<utilizes>
+ <name>gtk+</name>
+ </utilizes>
+ <utilizes>
<name>gtk+2</name>
</utilizes>
<utilizes>
diff -Naur BLFS_6.1/chapter19/traceroute.xml BLFS_6.1_ch/chapter19/traceroute.xml
--- BLFS_6.1/chapter19/traceroute.xml 2005-10-04 12:42:35.000000000 +0200
+++ BLFS_6.1_ch/chapter19/traceroute.xml 2005-10-04 18:36:30.000000000 +0200
@@ -43,6 +43,14 @@
<make>
<param>install-man</param>
</make>
+ <!-- Comment out this section,if you want execute traceroute only as root.
+ <permissions mode="0755">
+ <name>/usr/sbin/traceroute</name>
+ </permissions> -->
+ <move>
+ <source>/usr/sbin/traceroute</source>
+ <destination>/usr/bin</destination>
+ </move>
</stage>
<stage name="Cleanup">
<remove>&build_dir;/&traceroute-directory;</remove>
diff -Naur BLFS_6.1/chapter20/mutt.xml BLFS_6.1_ch/chapter20/mutt.xml
--- BLFS_6.1/chapter20/mutt.xml 2005-10-04 12:42:39.000000000 +0200
+++ BLFS_6.1_ch/chapter20/mutt.xml 2005-10-04 18:49:25.000000000 +0200
@@ -16,6 +16,24 @@
<utilizes>
<name>gnupg</name>
</utilizes>
+ <utilizes>
+ <name>ispell</name>
+ </utilizes>
+ <utilizes>
+ <name>&krb-impl;</name>
+ </utilizes>
+ <utilizes>
+ <name>cyrus-sasl</name>
+ </utilizes>
+ <utilizes>
+ <name>openssl</name>
+ </utilizes>
+ <utilizes>
+ <name>slang</name>
+ </utilizes>
+ <utilizes>
+ <name>gdb</name>
+ </utilizes>
</packageinfo>
<stage name="Unpacking">
<unpack>
@@ -43,6 +61,8 @@
<configure>
<param>--prefix=/usr</param>
<param>--sysconfdir=/etc</param>
+ <param>--enable-pop</param>
+ <param>--enable-imap</param>
</configure>
<make />
<make>
diff -Naur BLFS_6.1/chapter37/alsa-tools.xml BLFS_6.1_ch/chapter37/alsa-tools.xml
--- BLFS_6.1/chapter37/alsa-tools.xml 2005-10-04 12:42:35.000000000 +0200
+++ BLFS_6.1_ch/chapter37/alsa-tools.xml 2005-10-04 18:56:28.000000000 +0200
@@ -64,7 +64,7 @@
<base>&build_dir;/&alsa-tools-directory;/echomixer</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make />
<make>
@@ -79,7 +79,7 @@
<base>&build_dir;/&alsa-tools-directory;/envy24control</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make />
<make>
@@ -94,7 +94,7 @@
<base>&build_dir;/&alsa-tools-directory;/hdspconf</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make/>
<make>
@@ -121,7 +121,7 @@
<base>&build_dir;/&alsa-tools-directory;/hdspmixer</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make/>
<make>
@@ -197,7 +197,7 @@
<base>&build_dir;/&alsa-tools-directory;/rmedigicontrol</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make/>
<make>
@@ -212,7 +212,7 @@
<base>&build_dir;/&alsa-tools-directory;/qlo10k1</base>
</stageinfo>
<configure>
- <param>--prefix=/usr</param>
+ <param>--prefix=/usr</param>
</configure>
<make/>
<make>
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
