pool/ppp
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 57142 from network

Browse Source 
Accepted submit request 57142 from user coolo

OBS-URL: https://build.opensuse.org/request/show/57142
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ppp?expand=0&rev=15
This commit is contained in:
Berthold Gunreben 2011-01-05 14:57:44 +00:00 committed by Git OBS Bridge
commit 0fe8211f2f
6 changed files with 68 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
ppp-2.4.4-lib64.patch
View File

@ -1,6 +1,8 @@
--- PLUGINS Index: PLUGINS
+++ PLUGINS ===================================================================
@@ -14,7 +14,7 @@ --- PLUGINS.orig 2009-11-16 23:26:07.000000000 +0100
+++ PLUGINS 2011-01-05 11:03:50.806314592 +0100
@@ -14,7 +14,7 @@ plugin support only under Linux and Sola
Plugins are loaded into pppd using the `plugin' option, which takes Plugins are loaded into pppd using the `plugin' option, which takes
one argument, the name of a shared object file. The plugin option is one argument, the name of a shared object file. The plugin option is
a privileged option. If the name given does not contain a slash, pppd a privileged option. If the name given does not contain a slash, pppd
@ -9,9 +11,11 @@
<version> is the version number of pppd, for example, 2.4.2. I <version> is the version number of pppd, for example, 2.4.2. I
suggest that you either give the full path name of the shared object suggest that you either give the full path name of the shared object
file or just the base name; if you don't, it may be possible for file or just the base name; if you don't, it may be possible for
--- README Index: README
+++ README ===================================================================
@@ -200,8 +200,8 @@ --- README.orig 2009-11-16 23:26:07.000000000 +0100
+++ README 2011-01-05 11:03:50.806314592 +0100
@@ -207,8 +207,8 @@ What was new in ppp-2.4.1.
per-tty options file are parsed correctly, and don't override values per-tty options file are parsed correctly, and don't override values
from the command line in most cases. from the command line in most cases.
@ -22,8 +26,10 @@
there is no slash in the plugin name. there is no slash in the plugin name.
* When loading a plugin, pppd will now check the version of pppd for * When loading a plugin, pppd will now check the version of pppd for
--- pppd/pathnames.h Index: pppd/pathnames.h
+++ pppd/pathnames.h ===================================================================
--- pppd/pathnames.h.orig 2009-11-16 23:26:07.000000000 +0100
+++ pppd/pathnames.h 2011-01-05 11:03:53.888316500 +0100
@@ -57,9 +57,9 @@ @@ -57,9 +57,9 @@
#ifdef PLUGIN #ifdef PLUGIN
@ -36,9 +42,11 @@
#endif /* __STDC__ */ #endif /* __STDC__ */
#endif /* PLUGIN */ #endif /* PLUGIN */
--- pppd/plugins/Makefile.linux Index: pppd/plugins/Makefile.linux
+++ pppd/plugins/Makefile.linux ===================================================================
@@ -7,7 +7,7 @@ --- pppd/plugins/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100
+++ pppd/plugins/Makefile.linux 2011-01-05 11:03:50.821313579 +0100
@@ -7,7 +7,7 @@ INSTALL = install
DESTDIR = $(INSTROOT)@DESTDIR@ DESTDIR = $(INSTROOT)@DESTDIR@
BINDIR = $(DESTDIR)/sbin BINDIR = $(DESTDIR)/sbin
MANDIR = $(DESTDIR)/share/man/man8 MANDIR = $(DESTDIR)/share/man/man8
@ -47,9 +55,11 @@
SUBDIRS := rp-pppoe pppoatm pppol2tp SUBDIRS := rp-pppoe pppoatm pppol2tp
# Uncomment the next line to include the radius authentication plugin # Uncomment the next line to include the radius authentication plugin
--- pppd/plugins/pppoatm/Makefile.linux Index: pppd/plugins/pppoatm/Makefile.linux
+++ pppd/plugins/pppoatm/Makefile.linux ===================================================================
@@ -7,7 +7,7 @@ --- pppd/plugins/pppoatm/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100
+++ pppd/plugins/pppoatm/Makefile.linux 2011-01-05 11:03:50.829313471 +0100
@@ -7,7 +7,7 @@ INSTALL = install
#*********************************************************************** #***********************************************************************
DESTDIR = $(INSTROOT)@DESTDIR@ DESTDIR = $(INSTROOT)@DESTDIR@
@ -58,9 +68,11 @@
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
--- pppd/plugins/pppol2tp/Makefile.linux Index: pppd/plugins/pppol2tp/Makefile.linux
+++ pppd/plugins/pppol2tp/Makefile.linux ===================================================================
@@ -7,7 +7,7 @@ --- pppd/plugins/pppol2tp/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100
+++ pppd/plugins/pppol2tp/Makefile.linux 2011-01-05 11:03:50.829313471 +0100
@@ -7,7 +7,7 @@ INSTALL = install
#*********************************************************************** #***********************************************************************
DESTDIR = @DESTDIR@ DESTDIR = @DESTDIR@
@ -69,8 +81,10 @@
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
--- pppd/plugins/radius/Makefile.linux Index: pppd/plugins/radius/Makefile.linux
+++ pppd/plugins/radius/Makefile.linux ===================================================================
--- pppd/plugins/radius/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100
+++ pppd/plugins/radius/Makefile.linux 2011-01-05 11:03:50.830314899 +0100
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
DESTDIR = $(INSTROOT)@DESTDIR@ DESTDIR = $(INSTROOT)@DESTDIR@
@ -80,8 +94,10 @@
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
--- pppd/plugins/rp-pppoe/Makefile.linux Index: pppd/plugins/rp-pppoe/Makefile.linux
+++ pppd/plugins/rp-pppoe/Makefile.linux ===================================================================
--- pppd/plugins/rp-pppoe/Makefile.linux.orig 2011-01-05 11:03:50.000000000 +0100
+++ pppd/plugins/rp-pppoe/Makefile.linux 2011-01-05 11:03:50.838313490 +0100
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
DESTDIR = $(INSTROOT)@DESTDIR@ DESTDIR = $(INSTROOT)@DESTDIR@
@ -91,9 +107,11 @@
PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
--- pppd/pppd.8 Index: pppd/pppd.8
+++ pppd/pppd.8 ===================================================================
@@ -911,7 +911,7 @@ --- pppd/pppd.8.orig 2011-01-05 11:03:50.000000000 +0100
+++ pppd/pppd.8 2011-01-05 11:03:53.888316500 +0100
@@ -911,7 +911,7 @@ persistent connections.
.B plugin \fIfilename .B plugin \fIfilename
Load the shared library object file \fIfilename\fR as a plugin. This Load the shared library object file \fIfilename\fR as a plugin. This
is a privileged option. If \fIfilename\fR does not contain a slash is a privileged option. If \fIfilename\fR does not contain a slash

3
ppp-2.4.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b2fdfcde2e3bfdc490245527cd3e3d55165a0fe70c86ad7476d300535248ed2c
size 556115

3
ppp-2.4.5_git200910141435.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0691c1aea76a98138961d4e17aa1146a91db0864523a9c9f561d5174c474308
size 556457

19
ppp-makedevice.patch
View File

@ -1,19 +0,0 @@
--- pppd/sys-linux.c
+++ pppd/sys-linux.c
@@ -2104,8 +2104,7 @@
sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch);
kernel_version = KVERSION(osmaj, osmin, ospatch);
fd = open("/dev/ppp", O_RDWR);
-#if 0
if (fd < 0 && errno == ENOENT) {
/* try making it and see if that helps. */
if (mknod("/dev/ppp", S_IFCHR | S_IRUSR | S_IWUSR,
@@ -2119,7 +2117,6 @@
fd = open("/dev/ppp", O_RDWR);
}
}
-#endif /* 0 */
if (fd >= 0) {
new_style_driver = 1;

20
ppp.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Wed Jan 5 10:17:28 UTC 2011 - coolo@novell.com
- refresh patch
-------------------------------------------------------------------
Wed Jan 5 09:17:19 UTC 2011 - aj@suse.de
- Fix build of pppol2tp - remove local copy of if_pppol2tp.h
that is out of sync with kernel definition.
- Remove ppp-makedevice.patch, it is obsolete.
-------------------------------------------------------------------
Wed Jan 5 09:03:05 UTC 2011 - aj@suse.de
- Update to final 2.4.5 version with these changes:
* Pppd now works better with 3G modems that do strange things such as
sending IPCP Configure-Naks with the same values over and over again.
* Bugfixes
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 6 05:40:20 UTC 2010 - coolo@novell.com Tue Apr 6 05:40:20 UTC 2010 - coolo@novell.com

28
ppp.spec
View File

@ -21,7 +21,7 @@
Name: ppp Name: ppp
BuildRequires: libpcap-devel linux-atm-devel pam-devel BuildRequires: libpcap-devel linux-atm-devel pam-devel
Url: http://www.samba.org/ppp/ Url: http://www.samba.org/ppp/
Version: 2.4.5_git200910141435 Version: 2.4.5
Release: 3 Release: 3
License: BSD3c(or similar) ; LGPLv2.1+ License: BSD3c(or similar) ; LGPLv2.1+
Group: Productivity/Networking/PPP Group: Productivity/Networking/PPP
@ -63,7 +63,6 @@ Patch8: ppp-2.4.2-ifname.diff
# Don't use __P from glibc (pppd uses it wrong) # Don't use __P from glibc (pppd uses it wrong)
Patch9: ppp-2.4.2-__P.diff Patch9: ppp-2.4.2-__P.diff
Patch10: ppp-2.4.3-pppoatm.diff Patch10: ppp-2.4.3-pppoatm.diff
Patch11: ppp-makedevice.patch
Patch12: ppp-2.4.2-pie.patch Patch12: ppp-2.4.2-pie.patch
Patch13: ppp-2.4.3-demand-fix.diff Patch13: ppp-2.4.3-demand-fix.diff
Patch14: ppp-2.4.3-fork-fix.diff Patch14: ppp-2.4.3-fork-fix.diff
@ -81,17 +80,6 @@ point-to-point links, for example over a modem. The PPP daemon handles
the details of setting up a PPP link including configuring the network the details of setting up a PPP link including configuring the network
interface and performing the PPP negotiations. interface and performing the PPP negotiations.
Authors:
--------
Paul Mackerras <paul.mackerras@cs.anu.edu.au>
Michael Callahan <callahan@maths.ox.ac.uk>
Al Longyear <longyear@netcom.com>
Brad Parker <brad@faster.fcr.com>
Greg Christy <gmc@premises1.Qutoron.COM>
Michal Ostrowski <mostrows@styx.uwaterloo.ca>
%package devel %package devel
License: BSD3c(or similar) ; LGPLv2.1+ License: BSD3c(or similar) ; LGPLv2.1+
Summary: Header Files Required for Developing Plugins for pppd Summary: Header Files Required for Developing Plugins for pppd
@ -102,17 +90,6 @@ Requires: ppp = %version
The package ppp-devel contains C header files required for developing The package ppp-devel contains C header files required for developing
plugins for the pppd. plugins for the pppd.
Authors:
--------
Paul Mackerras <paul.mackerras@cs.anu.edu.au>
Michael Callahan <callahan@maths.ox.ac.uk>
Al Longyear <longyear@netcom.com>
Brad Parker <brad@faster.fcr.com>
Greg Christy <gmc@premises1.Qutoron.COM>
Michal Ostrowski <mostrows@styx.uwaterloo.ca>
%prep %prep
%setup -q %setup -q
%patch0 %patch0
@ -125,7 +102,6 @@ Authors:
%patch8 %patch8
%patch9 %patch9
%patch10 -p1 %patch10 -p1
# %patch11
%patch12 -p1 %patch12 -p1
%patch13 %patch13
%patch14 %patch14
@ -139,6 +115,8 @@ Authors:
sed -i -e '1s/local\///' scripts/secure-card sed -i -e '1s/local\///' scripts/secure-card
%build %build
# Remove local copy that is out of sync and use the one from linux-header
rm -f include/linux/if_pppol2tp.h
export MY_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC $SP" export MY_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC $SP"
./configure --prefix=/usr ./configure --prefix=/usr
make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y