r2938 - in trunk: BOOK BOOK/connect/dialup BOOK/introduction/welcome patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Mon Nov 15 02:35:23 PST 2004


Author: igor
Date: 2004-11-15 03:35:21 -0700 (Mon, 15 Nov 2004)
New Revision: 2938

Removed:
   trunk/patches/ppp-2.4.2-nobpf-3.patch
Modified:
   trunk/BOOK/connect/dialup/ppp.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to PPP-2.4.3.

Modified: trunk/BOOK/connect/dialup/ppp.xml
===================================================================
--- trunk/BOOK/connect/dialup/ppp.xml	2004-11-14 19:06:11 UTC (rev 2937)
+++ trunk/BOOK/connect/dialup/ppp.xml	2004-11-15 10:35:21 UTC (rev 2938)
@@ -6,8 +6,8 @@
  
   <!ENTITY ppp-download-http "http://ccache.samba.org/ftp/ppp/ppp-&ppp-version;.tar.gz">
   <!ENTITY ppp-download-ftp  "ftp://ftp.samba.org/pub/ppp/ppp-&ppp-version;.tar.gz">
-  <!ENTITY ppp-size          "757 KB">
-  <!ENTITY ppp-buildsize     "7.4 MB">
+  <!ENTITY ppp-size          "672 KB">
+  <!ENTITY ppp-buildsize     "6.2 MB">
   <!ENTITY ppp-time          "0.13 SBU">
 ]>
 
@@ -41,13 +41,6 @@
 &ppp-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink
-url="&patch-root;/ppp-&ppp-version;-nobpf-3.patch"/></para></listitem>
-</itemizedlist>
-</sect3>
-
 <sect3><title><application>ppp</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libpcap"/></para></sect4>
@@ -64,14 +57,23 @@
 <para>Install <application><acronym>PPP</acronym></application> by running the 
 following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../ppp-&ppp-version;-nobpf-3.patch &&
-./configure &&
-make ETCDIR=/etc/ppp &&
-make ETCDIR=/etc/ppp install</command></userinput></screen>
+<screen><userinput><command>./configure --prefix=/usr &&
+make &&
+make install &&
+make install-etcppp</command></userinput></screen>
 
 </sect2>
 
 <sect2>
+<title>Command explanations</title>
+
+<para><command>make install-etcppp</command>: This command puts
+example configuration files in <filename
+class="directory">/etc/ppp</filename>.</para>
+
+</sect2>
+
+<sect2>
 <title>Configuring <application><acronym>PPP</acronym></application></title>
 
 <sect3><title>Config files</title>
@@ -91,10 +93,14 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application><acronym>PPP</acronym></application> package contains 
-the <command>chat</command>,
-<command>pppd</command>, <command>pppdump</command> and
-<command>pppstats</command> programs.</para>
+<para>The <application><acronym>PPP</acronym></application> package
+contains the
+<command>chat</command>,
+<command>pppd</command>,
+<command>pppdump</command>,
+<command>pppoe-discovery</command> and
+<command>pppstats</command>
+programs.</para>
 
 </sect2>
 
@@ -122,4 +128,3 @@
 </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-11-14 19:06:11 UTC (rev 2937)
+++ trunk/BOOK/general.ent	2004-11-15 10:35:21 UTC (rev 2938)
@@ -1,4 +1,4 @@
-<!ENTITY day          "14">
+<!ENTITY day          "15">
 <!ENTITY month        "11">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -153,7 +153,7 @@
 <!-- Part IV -->                     
                                      
 <!-- Chapter 13 -->                  
-<!ENTITY ppp-version                  "2.4.2"> 
+<!ENTITY ppp-version                  "2.4.3"> 
 <!ENTITY wvdial-version               "1.54.0"> 
                                   
 <!-- Chapter 14 -->               

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-11-14 19:06:11 UTC (rev 2937)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-11-15 10:35:21 UTC (rev 2938)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>November 15th, 2004 [igor]: Updated to
+PPP-2.4.3.</para></listitem>
+
 <listitem><para>November 14th, 2004 [randy]: Added MD5 sum, updated 
 dependencies and minor corrections to ScrollKeeper 
 instructions; updated to startup-notification-0.8.</para></listitem>

Deleted: trunk/patches/ppp-2.4.2-nobpf-3.patch
===================================================================
--- trunk/patches/ppp-2.4.2-nobpf-3.patch	2004-11-14 19:06:11 UTC (rev 2937)
+++ trunk/patches/ppp-2.4.2-nobpf-3.patch	2004-11-15 10:35:21 UTC (rev 2938)
@@ -1,96 +0,0 @@
-Submitted By: DJ Lucas (dj_at_lucasit_dot_com)
-Date: 2004-02-23
-Initial Package Version: 2.4.2
-Origin: DJ Lucas (dj_at_lucasit_dot_com)
-Description: Fix build problem in ppp-2.4.2 when compiled against
-             libpcap >= 0.8.1. (net/bpf.h moved to pcap-bpf.h)
-
-$LastChangedBy$
-$Date$
-
-diff -Naur ppp-2.4.2-orig/pppd/demand.c ppp-2.4.2/pppd/demand.c
---- ppp-2.4.2-orig/pppd/demand.c	2003-03-02 23:11:45.000000000 -0600
-+++ ppp-2.4.2/pppd/demand.c	2004-02-22 13:46:45.000000000 -0600
-@@ -50,7 +50,6 @@
- #include <sys/socket.h>
- #ifdef PPP_FILTER
- #include <net/if.h>
--#include <net/bpf.h>
- #include <pcap.h>
- #endif
- 
-diff -Naur ppp-2.4.2-orig/pppd/plugins/rp-pppoe/config.h ppp-2.4.2/pppd/plugins/rp-pppoe/config.h
---- ppp-2.4.2-orig/pppd/plugins/rp-pppoe/config.h	2001-12-13 20:55:20.000000000 -0600
-+++ ppp-2.4.2/pppd/plugins/rp-pppoe/config.h	2004-02-22 13:47:23.000000000 -0600
-@@ -71,8 +71,8 @@
- /* Define if you have the <linux/if_pppox.h> header file.  */
- #define HAVE_LINUX_IF_PPPOX_H 1
- 
--/* Define if you have the <net/bpf.h> header file.  */
--#define HAVE_NET_BPF_H 1
-+/* Define if you have the <pcap-bpf.h> header file.  */
-+#define HAVE_PCAP_BPF_H 1
- 
- /* Define if you have the <net/if_arp.h> header file.  */
- #define HAVE_NET_IF_ARP_H 1
-diff -Naur ppp-2.4.2-orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.2/pppd/plugins/rp-pppoe/if.c
---- ppp-2.4.2-orig/pppd/plugins/rp-pppoe/if.c	2001-12-13 20:55:20.000000000 -0600
-+++ ppp-2.4.2/pppd/plugins/rp-pppoe/if.c	2004-02-22 13:47:30.000000000 -0600
-@@ -67,6 +67,16 @@
- #include <signal.h>
- #include <stropts.h>
- 
-+#ifdef USE_BPF
-+#include <pcap-bpf.h>
-+#include <fcntl.h>
-+                                                                                
-+unsigned char *bpfBuffer;       /* Packet filter buffer */
-+int bpfLength = 0;              /* Packet filter buffer length */
-+int bpfSize = 0;                /* Number of unread bytes in buffer */
-+int bpfOffset = 0;              /* Current offset in bpfBuffer */
-+#endif
-+
- /* function declarations */
- 
- void dlpromisconreq( int fd, u_long  level);
-@@ -91,16 +101,6 @@
- 
- #endif
- 
--#ifdef USE_BPF
--#include <net/bpf.h>
--#include <fcntl.h>
--
--unsigned char *bpfBuffer;	/* Packet filter buffer */
--int bpfLength = 0;		/* Packet filter buffer length */
--int bpfSize = 0;		/* Number of unread bytes in buffer */
--int bpfOffset = 0;		/* Current offset in bpfBuffer */
--#endif
--
- /* Initialize frame types to RFC 2516 values.  Some broken peers apparently
-    use different frame types... sigh... */
- 
-diff -Naur ppp-2.4.2-orig/pppd/plugins/rp-pppoe/pppoe.h ppp-2.4.2/pppd/plugins/rp-pppoe/pppoe.h
---- ppp-2.4.2-orig/pppd/plugins/rp-pppoe/pppoe.h	2001-12-13 20:55:20.000000000 -0600
-+++ ppp-2.4.2/pppd/plugins/rp-pppoe/pppoe.h	2004-02-22 13:47:39.000000000 -0600
-@@ -34,7 +34,7 @@
- #define USE_LINUX_PACKET 1
- #elif defined(HAVE_SYS_DLPI_H)
- #define USE_DLPI
--#elif defined(HAVE_NET_BPF_H)
-+#elif defined(HAVE_PCAP_BPF_H)
- #define USE_BPF 1
- #endif
- 
-diff -Naur ppp-2.4.2-orig/pppd/sys-linux.c ppp-2.4.2/pppd/sys-linux.c
---- ppp-2.4.2-orig/pppd/sys-linux.c	2004-01-12 22:05:20.000000000 -0600
-+++ ppp-2.4.2/pppd/sys-linux.c	2004-02-22 13:46:56.000000000 -0600
-@@ -141,7 +141,7 @@
- #endif /* IPX_CHANGE */
- 
- #ifdef PPP_FILTER
--#include <net/bpf.h>
-+#include <pcap-bpf.h>
- #include <linux/filter.h>
- #endif /* PPP_FILTER */
- 




More information about the blfs-book mailing list