ppp: Update to 2.4.6.

[ipfire-3.x.git] / ppp / patches / 0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch

diff --git a/ppp/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch b/ppp/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
new file mode 100644 (file)
index 0000000..af89fc8
--- /dev/null
+++ b/ppp/patches/0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
@@ -0,0 +1,126 @@
+From a30efa2cc99a5b6ab220de04cbcc7db38888a17a Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Mon, 7 Apr 2014 14:29:45 +0200
+Subject: [PATCH 16/25] rp-pppoe: add manpage for pppoe-discovery
+
+---
+ pppd/plugins/rp-pppoe/Makefile.linux    |  2 +
+ pppd/plugins/rp-pppoe/pppoe-discovery.8 | 86 +++++++++++++++++++++++++++++++++
+ 2 files changed, 88 insertions(+)
+ create mode 100644 pppd/plugins/rp-pppoe/pppoe-discovery.8
+
+diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
+index 3cd9101..9918091 100644
+--- a/pppd/plugins/rp-pppoe/Makefile.linux
++++ b/pppd/plugins/rp-pppoe/Makefile.linux
+@@ -16,6 +16,7 @@
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
++MANDIR = $(DESTDIR)/share/man/man8
+ LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(PPPDVERSION)
+ 
+ PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+@@ -46,6 +47,7 @@ install: all
+       $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
+       $(INSTALL) -d -m 755 $(BINDIR)
+       $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
++      $(INSTALL) -c -m 444 pppoe-discovery.8 $(MANDIR)
+ 
+ clean:
+       rm -f *.o *.so pppoe-discovery
+diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.8 b/pppd/plugins/rp-pppoe/pppoe-discovery.8
+new file mode 100644
+index 0000000..d0a93db
+--- /dev/null
++++ b/pppd/plugins/rp-pppoe/pppoe-discovery.8
+@@ -0,0 +1,86 @@
++.\" pppoe-discovery.8 written by
++.\" Ben Hutchings <ben@decadentplace.org.uk>, based on pppoe.8.
++.\" Licenced under the GPL version 2 or later.
++.TH PPPOE-DISCOVERY 8
++.SH NAME
++pppoe\-discovery \- perform PPPoE discovery
++.SH SYNOPSIS
++.B pppoe\-discovery
++[
++.I options
++]
++.br
++.BR pppoe\-discovery " { " \-V " | " \-h " }"
++.SH DESCRIPTION
++.LP
++\fBpppoe\-discovery\fR performs the same discovery process as
++\fBpppoe\fR, but does not initiate a session.
++It sends a PADI packet and then prints the names of access
++concentrators in each PADO packet it receives.
++.SH OPTIONS
++.TP
++.BI \-I " interface"
++.RS
++The \fB\-I\fR option specifies the Ethernet interface to use.
++Under Linux, it is typically eth0 or eth1.
++The interface should be \(lqup\(rq before you start
++\fBpppoe\-discovery\fR, but should \fInot\fR be configured to have an
++IP address.
++The default interface is eth0.
++.RE
++.TP
++.BI \-D " file_name"
++.RS
++The \fB\-D\fR option causes every packet to be dumped to the specified
++\fIfile_name\fR.
++This is intended for debugging only.
++.RE
++.TP
++.B \-U
++.RS
++Causes \fBpppoe\-discovery\fR to use the Host-Uniq tag in its discovery
++packets.
++This lets you run multiple instances of \fBpppoe\-discovery\fR and/or
++\fBpppoe\fR without having their discovery packets interfere with one
++another.
++You must supply this option to \fIall\fR instances that you intend to
++run simultaneously.
++.RE
++.TP
++.BI \-S " service_name"
++.RS
++Specifies the desired service name.
++\fBpppoe\-discovery\fR will only accept access concentrators which can
++provide the specified service.
++In most cases, you should \fInot\fR specify this option.
++Use it only if you know that there are multiple access concentrators
++or know that you need a specific service name.
++.RE
++.TP
++.BI \-C " ac_name"
++.RS
++Specifies the desired access concentrator name.
++\fBpppoe\-discovery\fR will only accept the specified access
++concentrator.
++In most cases, you should \fInot\fR specify this option.
++Use it only if you know that there are multiple access concentrators.
++If both the \fB\-S\fR and \fB\-C\fR options are specified, they must
++\fIboth\fR match.
++.RE
++.TP
++.B \-A
++.RS
++This option is accepted for compatibility with \fBpppoe\fR, but has no
++effect.
++.RE
++.TP
++.BR \-V " | " \-h
++.RS
++Either of these options causes \fBpppoe\-discovery\fR to print its
++version number and usage information, then exit.
++.RE
++.SH AUTHORS
++\fBpppoe\-discovery\fR was written by Marco d'Itri <md@linux.it>,
++based on \fBpppoe\fR by David F. Skoll <dfs@roaringpenguin.com>.
++.SH SEE ALSO
++pppoe(8), pppoe-sniff(8)
+-- 
+1.8.3.1
+