rpms/ppp/F-12 ppp-2.4.5-manpg.patch,NONE,1.1 ppp.spec,1.58,1.59

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/ppp/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8146

Modified Files:
	ppp.spec 
Added Files:
	ppp-2.4.5-manpg.patch 
Log Message:
* Wed Apr 07 2010 Jiri Skala <jskala at redhat.com> 2.4.5-8
- added man page of pppoe-discovery


ppp-2.4.5-manpg.patch:
 Makefile.linux    |    2 +
 pppoe-discovery.8 |   86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)

--- NEW FILE ppp-2.4.5-manpg.patch ---
diff -up ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux.manpg ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux
--- ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux.manpg	2010-04-07 14:47:48.211413928 +0200
+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux	2010-04-07 14:47:48.281414608 +0200
@@ -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 -up ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.8.manpg ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.8
--- ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.8.manpg	2010-04-07 14:49:31.059416743 +0200
+++ ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.8	2010-04-07 14:50:11.008416347 +0200
@@ -0,0 +1,86 @@
+.\" pppoe-discovery.8 written by
+.\" Ben Hutchings <ben at 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 at linux.it>,
+based on \fBpppoe\fR by David F. Skoll <dfs at roaringpenguin.com>.
+.SH SEE ALSO
+pppoe(8), pppoe-sniff(8)


Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ppp.spec	15 Mar 2010 13:13:12 -0000	1.58
+++ ppp.spec	7 Apr 2010 12:55:59 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -25,6 +25,7 @@ Patch23: ppp-2.4.2-dontwriteetc.patch
 Patch24: ppp-2.4.4-fd_leak.patch
 Patch25: ppp-2.4.5-var_run_ppp.patch
 Patch26: ppp-2.4.5-instroot.patch
+Patch27: ppp-2.4.5-manpg.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: pam-devel, libpcap-devel
@@ -66,6 +67,7 @@ This package contains the header files f
 %patch24 -p1 -b .fd_leak
 %patch25 -p1 -b .var_run_ppp
 %patch26 -p1 -b .instroot
+%patch27 -p1 -b .manpg
 
 rm -f scripts/*.local
 rm -f scripts/*.change_resolv_conf
@@ -113,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/pppd-radattr.8*
 %{_mandir}/man8/pppd-radius.8*
 %{_mandir}/man8/pppstats.8*
+%{_mandir}/man8/pppoe-discovery.8*
 %{_libdir}/pppd
 %dir /etc/ppp
 %dir /var/run/ppp
@@ -130,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Wed Apr 07 2010 Jiri Skala <jskala at redhat.com> 2.4.5-8
+- added man page of pppoe-discovery
+
 * Mon Mar 15 2010 Jiri Skala <jskala at redhat.com> 2.4.5-7
 - fixes #572174 - pppol2tp plugins not installed
 - merged resolv.conf patches