Accepting request 24479 from network

Copy from network/ppp based on submit request 24479 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/24479
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ppp?expand=0&rev=9
This commit is contained in:
OBS User autobuild 2009-11-16 11:54:31 +00:00 committed by Git OBS Bridge
parent 0185b2b962
commit 9df421b61f
7 changed files with 49 additions and 375 deletions

View File

@ -1,8 +1,10 @@
--- ./pppd/sys-linux.c.orig 2004-01-26 13:39:25.078464083 +0000
+++ ./pppd/sys-linux.c 2004-01-26 13:53:34.279569785 +0000
@@ -752,6 +752,24 @@
#ifdef B921600
{ 921600, B921600 },
Index: pppd/sys-linux.c
===================================================================
--- pppd/sys-linux.c.orig
+++ pppd/sys-linux.c
@@ -875,6 +875,24 @@ struct speed {
#ifdef B4000000
{ 4000000, B4000000 },
#endif
+#ifdef B1500000
+ { 1500000, B1500000 },

View File

@ -1,7 +1,9 @@
--- ppp-2.4.2/pppd/Makefile.linux.pie 2004-05-14 13:46:14.188327258 +0200
+++ ppp-2.4.2/pppd/Makefile.linux 2004-05-14 13:46:16.147058249 +0200
@@ -206,7 +206,7 @@
$(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
Index: ppp-2.4.5.git/pppd/Makefile.linux
===================================================================
--- ppp-2.4.5.git.orig/pppd/Makefile.linux
+++ ppp-2.4.5.git/pppd/Makefile.linux
@@ -205,7 +205,7 @@ install: pppd
$(INSTALL) -m 644 pppd.8 $(MANDIR)
pppd: $(PPPDOBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
@ -9,9 +11,11 @@
srp-entry: srp-entry.c
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
--- ppp-2.4.2/chat/Makefile.linux.pie 2004-05-14 13:46:32.699784925 +0200
+++ ppp-2.4.2/chat/Makefile.linux 2004-05-14 13:46:45.071085866 +0200
@@ -14,7 +14,7 @@
Index: ppp-2.4.5.git/chat/Makefile.linux
===================================================================
--- ppp-2.4.5.git.orig/chat/Makefile.linux
+++ ppp-2.4.5.git/chat/Makefile.linux
@@ -18,7 +18,7 @@ INSTALL= install
all: chat
chat: chat.o

View File

@ -1,6 +1,8 @@
--- pppd/plugins/radius/Makefile.linux
Index: pppd/plugins/radius/Makefile.linux
===================================================================
--- pppd/plugins/radius/Makefile.linux.orig
+++ pppd/plugins/radius/Makefile.linux
@@ -36,9 +36,9 @@
@@ -37,9 +37,9 @@ all: $(PLUGIN)
install: all
$(INSTALL) -d -m 755 $(LIBDIR)
@ -13,9 +15,11 @@
$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
--- pppd/plugins/rp-pppoe/Makefile.linux
Index: pppd/plugins/rp-pppoe/Makefile.linux
===================================================================
--- pppd/plugins/rp-pppoe/Makefile.linux.orig
+++ pppd/plugins/rp-pppoe/Makefile.linux
@@ -41,7 +41,7 @@
@@ -45,7 +45,7 @@ install: all
$(INSTALL) -d -m 755 $(LIBDIR)
$(INSTALL) rp-pppoe.so $(LIBDIR)
$(INSTALL) -d -m 755 $(BINDIR)
@ -23,4 +27,4 @@
+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
clean:
rm -f *.o *.so
rm -f *.o *.so pppoe-discovery

View File

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

View File

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

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Nov 3 19:09:38 UTC 2009 - coolo@novell.com
- updated patches to apply with fuzz=0
-------------------------------------------------------------------
Wed Oct 14 12:38:07 UTC 2009 - crrodriguez@opensuse.org
- build with -fno-strict-aliasing, dereferencing pointer 'svc'
does break strict-aliasing rules.
- give the package a more meaningful version number
-------------------------------------------------------------------
Thu Oct 23 09:32:31 CEST 2008 - lnussel@suse.de

362
ppp.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ppp (Version 2.4.5.git)
# spec file for package ppp (Version 2.4.5_git200910141435)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,9 +21,9 @@
Name: ppp
BuildRequires: libpcap-devel linux-atm-devel pam-devel
Url: http://www.samba.org/ppp/
Version: 2.4.5.git
Release: 2
License: BSD 3-Clause; LGPL v2.1 or later
Version: 2.4.5_git200910141435
Release: 1
License: BSD 3-clause (or similar) ; LGPL v2.1 or later
Group: Productivity/Networking/PPP
AutoReqProv: on
Summary: The Point to Point Protocol for Linux
@ -93,7 +93,7 @@ Authors:
Michal Ostrowski <mostrows@styx.uwaterloo.ca>
%package devel
License: BSD 3-Clause; LGPL v2.1 or later
License: BSD 3-clause (or similar) ; LGPL v2.1 or later
Summary: Header Files Required for Developing Plugins for pppd
Group: Development/Libraries/C and C++
Requires: ppp = %version
@ -139,7 +139,7 @@ Authors:
sed -i -e '1s/local\///' scripts/secure-card
%build
export MY_CFLAGS="$RPM_OPT_FLAGS -fPIC $SP"
export MY_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC $SP"
./configure --prefix=/usr
make CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y
@ -190,351 +190,3 @@ rm -rf %{buildroot}
/usr/include/pppd
%changelog
* Thu Oct 23 2008 lnussel@suse.de
- fix wrong permissions of pppol2tp.so
- fix invalid interpreter in secure-card script
* Fri Sep 12 2008 hvogel@suse.de
- update to 2.4.5 (git:07bcc935f7a10bc5d78325fc53a6ac9bdf2aad6a)
* pppd can now operate in a mode where it doesn't request
the peer's IP address, as some peers refuse to supply an IP
address.
* included PPP over L2TP plugin
* Add L2TP support
* Various bug fixes
* Tue Jul 22 2008 hvogel@suse.de
- move the resolv.conf written by pppd to /var/run [bnc#401648]
* Wed May 21 2008 hvogel@suse.de
- add man page of pppoe-discovery [bnc#392784]
* Thu Apr 03 2008 hvogel@suse.de
- move plugin directory to %%_libdir [bnc#358927]
* Thu Aug 23 2007 hvogel@suse.de
- Work around pppoatm MTU problems. [#301678]
* Thu Jul 26 2007 prusnak@suse.cz
- changed libpcap to libpcap-devel in BuildRequires
* Tue Dec 19 2006 meissner@suse.de
- fixed strncat usage in radius plugin.
* Wed Sep 13 2006 hvogel@suse.de
- Argh, really re-enable the patch.
* Thu Sep 07 2006 hvogel@suse.de
- fix and reenable "replace default route" patch
* Mon Aug 21 2006 kukuk@suse.de
- Use include statements in PAM config file
* Mon Aug 07 2006 mskibbe@suse.de
- update to version 2.4.4 which
o fix some bugs
o fix bug #179560 (MTU overwritten by pppoe plugin)
* Tue May 30 2006 meissner@suse.de
- check return code of setuid in winbind plugin. #179660
* Fri Jan 27 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Jan 24 2006 max@suse.de
- Enabled IPv6 support (#145246).
* Sat Jan 14 2006 schwab@suse.de
- Don't strip binaries.
* Fri Jan 13 2006 hvogel@suse.de
- Make use of Stack Protector
* Wed Nov 02 2005 hvogel@suse.de
- expand strict-aliasing patch to the radius plugin
* Mon Oct 17 2005 arvin@suse.de
- fixed pptp peers file
* Wed Oct 12 2005 hvogel@suse.de
- Add -fno-strict-aliasing to pppd cflags. Added
* ppp-2.4.3-no-strict-aliasing.patch
* Wed Oct 05 2005 hvogel@suse.de
- fix too few arguments to a *printf function. modified
* ppp-2.4.2-misc.diff
- make use of optflags everywhere. modified
* ppp-2.4.3-optflags.patch
* Sun Aug 07 2005 kkeil@suse.de
- fix filter stuff for libpcap version 0.9.3 (see #102460)
* Sat Jul 02 2005 hvogel@suse.de
- use optflags also for pppoatm plugin
* Tue Jun 28 2005 kkeil@suse.de
- fix some problems with 2.4.3 (#80468)
* solve not working dial on demand after a connection was shut
down first time
* fix safe_fork to not close needed file descriptors
* Thu Jun 23 2005 ro@suse.de
- build with -fPIC/-pie
* Thu Apr 21 2005 arvin@suse.de
- fixed compilation of pppoatm plugin (bug #79295)
* Fri Mar 18 2005 kkeil@suse.de
- fix filter stuff and DOD (#73663)
* Mon Feb 28 2005 kkeil@suse.de
- undefined fd is a bad idea, incremental fix for #66786
* Mon Feb 28 2005 hvogel@suse.de
- enable device creating if it does not exist (Bug #66786)
* Mon Dec 13 2004 hvogel@suse.de
- get rid of the pppoam patch
* Fri Dec 10 2004 hvogel@suse.de
- update to version 2.4.3 which includes:
o Various fixes and enhancements to the radius and rp-pppoe
plugins have been added.
o There is a new option, child-timeout, which sets the length
of time that pppd will wait for child processes
o There is a new winbind plugin, from Andrew Bartlet of the Samba
team, which provides the ability to authenticate the peer
against an NT domain controller using MS-CHAP or MS-CHAPV2.
o There is a new pppoatm plugin
* Tue Sep 21 2004 kkeil@suse.de
- fix dial on demand; outbound must flagged with 1 not 0xff (#45694)
* Sun Sep 12 2004 kukuk@suse.de
- Don't use __P from glibc
* Wed Aug 25 2004 kkeil@suse.de
- use DLT_PPP_WITHDIRECTION for the filters to be compatible with
kernel 2.6.8
* Tue Jul 20 2004 arvin@suse.de
- added option to rename ppp interface (experimental)
* Mon Jul 19 2004 arvin@suse.de
- allow all names as Ethernet interfaces (bug #43048)
* Tue Jul 13 2004 arvin@suse.de
- removed non-ascii character from option file
* Fri May 28 2004 kkeil@suse.de
- correct fix for the DOD filter rule paket header (see bug #34724)
* Fri Apr 16 2004 mmj@suse.de
- Void functions should be declared as such
* Wed Mar 31 2004 arvin@suse.de
- fixed filter rules for dial on demand (see bug #34724)
* Wed Feb 18 2004 arvin@suse.de
- fixed setting of filter rules (bug #34569)
* Fri Feb 13 2004 arvin@suse.de
- updated pppoatm plugin (bug #34543)
- fixed ctl-c bug
* Fri Feb 13 2004 arvin@suse.de
- updated to version 2.4.2, main features:
- new upstream PPPoE plugin implementation
- new upstream MPPE implementation
- many protocols (CHAP, CBCP, EAP, ECP) added or updated
- build package as non-root user
- build sub-package ppp-devel with header files required for
extra plugins
* Thu Feb 12 2004 arvin@suse.de
- removed outdated samples
- some cleanup
* Thu Feb 12 2004 ro@suse.de
- adapt to change in libpcap: include moved to pcap_bpf.h
* Mon Jan 26 2004 arvin@suse.de
- allow higher serial speeds (see bug #34053)
* Fri Jan 16 2004 kukuk@suse.de
- Add pam-devel to neededforbuild
* Fri Jan 09 2004 kukuk@suse.de
- Fix compiler warnings
* Wed Aug 13 2003 arvin@suse.de
- allow vlan devices for pppoe (bug #28645)
* Mon Jun 30 2003 arvin@suse.de
- fixed closing of pppoatm (bug #27315)
- fixed pppoe on ppc (bug #27575)
* Thu Jun 05 2003 arvin@suse.de
- converted MSCHAPv2-fix patch to unix format as new patch
doesn't like dos anymore
* Tue Jun 03 2003 arvin@suse.de
- added peers file for pptp
* Tue May 27 2003 arvin@suse.de
- adapted neededforbuild to linux-atm changes
* Thu May 22 2003 okir@suse.de
- prevent buffer overflow in MPPE (#27062)
* Wed Mar 12 2003 arvin@suse.de
- activate filter rules per default (bug #25134)
* Sat Jan 18 2003 arvin@suse.de
- added config file with some filter rules
* Fri Jan 10 2003 arvin@suse.de
- Reactivated option noipdefault in default options file since
some providers can't handle a suggested local ip address. Can't
reproduce the wrong behaviour of the pppd mentioned in bug #1751
so the change is ok.
* Thu Dec 12 2002 arvin@suse.de
- removed absolute paths from pam configuration file
* Wed Nov 13 2002 arvin@suse.de
- fixed multi-line string literals
* Thu Oct 24 2002 arvin@suse.de
- fixed callback phone number handling (bug #9659 and #18408)
- activated patches added on Aug. 1st
* Fri Aug 23 2002 arvin@suse.de
- remove a warning message in the log (bug #18254)
- removed obsolete peers file demand
* Tue Aug 06 2002 arvin@suse.de
- added "plain old modem" peers file (related to bug #17341)
* Thu Aug 01 2002 bk@suse.de
- add patches recommeded for pptp which also fix bug 17097
* Thu Jul 25 2002 arvin@suse.de
- disable pppoatm plugin on s390 and s390x
* Mon Jul 08 2002 arvin@suse.de
- removed setuid bits from pppd (bug #16860)
* Thu May 16 2002 arvin@suse.de
- compile with packet filter support
* Wed May 15 2002 arvin@suse.de
- enable more debugging for pppoe if the pppd gets the debug
option
* Mon May 13 2002 ro@suse.de
- fix build on x86_64
* Fri Apr 19 2002 arvin@suse.de
- disable pppoatm plugin on mips (since linux-atm does not build)
* Wed Apr 17 2002 arvin@suse.de
- turn off debugging by default
* Wed Mar 13 2002 arvin@suse.de
- better mtu handling as workaround for broken dsl providers
* Fri Feb 08 2002 arvin@suse.de
- fixed error handling in passwordfd plugin
* Fri Feb 08 2002 okir@suse.de
- applied security fix to zlib
* Tue Feb 05 2002 arvin@suse.de
- more log output without debug option so that the smpppd does
not require the debug option
- removed debug option from peers files
- use %%{_mandir}
* Wed Jan 30 2002 arvin@suse.de
- use buildroot
- compile pppoatm plugin on all archs again
* Fri Jan 11 2002 arvin@suse.de
- added terminating NULL in options list of passwordfd plugin
* Fri Jan 11 2002 arvin@suse.de
- don't compile pppoatm plugin on axp and s390
* Wed Jan 09 2002 arvin@suse.de
- added "modprobe pppoatm" in pppoatm plugin
* Tue Jan 08 2002 arvin@suse.de
- fixed compiling on ia64
* Mon Jan 07 2002 arvin@suse.de
- added atm support
- modified peers files for new network configuration
* Mon Nov 05 2001 arvin@suse.de
- set MTU and MRU to 1492 (to prevent problems for DSL)
* Thu Sep 27 2001 arvin@suse.de
- added rc-pppoe peers file
* Wed Sep 19 2001 arvin@suse.de
- added patch only-eth.dif: makes pppoe plugin only accect eth*
as device and thus prevents kernel from trying to load dozens
of modules (bug #10845)
* Tue Aug 28 2001 arvin@suse.de
- strip plugins
* Mon Aug 13 2001 arvin@suse.de
- updated pppoe patch to ppp-2.4.1-pppoe.patch4
* Thu Aug 09 2001 arvin@suse.de
- added Obsoletes ppp-soho
- added peers file pppoe
* Tue Jul 17 2001 arvin@suse.de
- added directories to file list
* Wed Jul 11 2001 arvin@suse.de
- removed obsolete generation of pap and chap secrets form
wvdial provider list
* Sun Jun 24 2001 arvin@suse.de
- updated to version 2.4.1
- added peers file "demand" (from package pppoed)
* Thu May 10 2001 mfabian@suse.de
- bzip2 sources
* Fri Apr 20 2001 arvin@suse.de
- added options lcp-max-configure 60 and lcp-restart 2
* Fri Mar 30 2001 arvin@suse.de
- added mppe patch
- search for plugins in /usr/lib/pppd/<version> (backport from
pppd 2.4.1)
- moved all plugins to /usr/lib/pppd/<version>
* Wed Feb 28 2001 arvin@suse.de
- moved all plugins to /usr/lib/pppd/plugins
* Thu Feb 15 2001 arvin@suse.de
- included pppoe patch from Michal Ostrowski
* Thu Nov 09 2000 arvin@suse.de
- updated to version 2.4.0
* Mon Sep 11 2000 arvin@suse.de
- Fixed plugin passwordfd for chap.
* Mon Jul 31 2000 arvin@suse.de
- Added (commented) option "maxfail 3" to options. Partly fix
for bug #3637.
* Thu Jul 13 2000 arvin@suse.de
- removed directory /var/state/pppd from spec file. It is not
needed and only got there by accident.
* Tue Jul 11 2000 bk@suse.de
- fixed bug with replacedefaultroute and dial on demand(route was lost)
- fixed Open message of demand patch for ICMP(was displayed as UDP)
* Tue Jul 04 2000 arvin@suse.de
- Support for dial on demand with sync ppp.
- On dial on demand log witch packed caused the connect. Example:
Open UDP 212.185.229.193:2048 -> 216.32.74.51:22926
- Fixed plugin passwordfd for dial on demand.
* Mon Jun 05 2000 arvin@suse.de
- fixed bug in plugin passwordfd
* Fri Jun 02 2000 arvin@suse.de
- added plugin passwordfd to read password via a pipe
- replacedefaultroute option fixed for pppd demand
* Fri Mar 03 2000 ro@suse.de
- manpages ..
* Thu Mar 02 2000 bk@suse.de
- fixed patch path strip count for ppp-2.3.11.dif
- added comment about modem and local options to /etc/ppp/options
* Wed Mar 01 2000 bk@suse.de
- copied ppp-2.3.11.dif from ppp_ssl(fixes MANPATH) and filelist fixed.
* Sat Feb 26 2000 bk@suse.de
- removed priviledged property from (no)replacedefaultroute, this
way wvdial can set it in /etc/ppp/peers/wvdial with call wvdial.
* Fri Feb 25 2000 bk@suse.de
- disabled new replacedefaultroute option per default, can be controlled
thru the replacedefaultroute and noreplacedefaultroute options.
* Fri Feb 25 2000 bk@suse.de
- wrote patch which replaces the old defaut route on successfully
completed IPCP negotiation unless the included noreplacedefaultroute
option is given. Documented in the man page and /etc/ppp/options.
On connection shutdown, the old default route is restored automatically.
Nice feature for many people with laptops which have a default
route set trough their ethernet and want go online with their
modem if not connected to the ethernet. Should reduce support
load in this area dramatically.
* Sun Feb 20 2000 bk@suse.de
- only change tty perms really needed, will avoid the loosing tty
perms bug (bug #1831 and 1361)
- disabled noipdefault in the default options file for static IP addresses
and dial-in. wvdial still passes it to pppd if Force Address is not
set in wvdial.conf, so no problem. (Fix for bug #1751)
* Fri Feb 11 2000 bk@suse.de
- generate pap and chap secrets with callbycall.secrets
- Makefile.Linux merged into the spec file and dropped from diff
* Mon Jan 17 2000 bk@suse.de
- update to ppp-2.3.11
* Fri Oct 29 1999 bk@suse.de
- added logins for german call-by-call providers to the secrets
- removed suse dialin scripts
* Mon Oct 25 1999 olh@suse.de
- add some sample scripts, minor sample changes
* Mon Oct 25 1999 bk@suse.de
- fix for empty files in /usr/doc/packages/ppp (olh: thanks for the report!!)
* Mon Oct 11 1999 bk@suse.de
- update to ppp-2.3.10
- split up diff
- removed not installed ppplogin which also didn't appear in the
file list lately
- removed proxyarp from the default options file
- force pppd use the glibc's logwtmp instead of implementing its own
(patch for ppp-2.3.9, but is preferred for 2.3.10 also)
- added the samples to /usr/doc/packages/ppp
* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Mon Aug 30 1999 kukuk@suse.de
- add pppdump.8
* Thu Aug 19 1999 bk@suse.de
- added documentation
* Thu Jul 29 1999 bs@suse.de
- set /etc/ppp to 750, root.dialout
- use noauth in /etc/ppp/options
* Sat Jul 17 1999 bk@suse.de
- /etc/ppp/option fixed wins-addr, corrected to ms-wins
* Mon Jun 14 1999 kukuk@suse.de
- Enable PAM support, add ppp.pamd
* Sat May 22 1999 bk@suse.de
- update to ppp-2.3.8 using diff from jurix
- added ppp-2.3.8-patch1
- marked /etc/ppp/options as noreplace
* Mon Dec 14 1998 tmg@suse.de
- changed default config
* Thu Dec 10 1998 bs@suse.de
- marked config files as noreplace
* Tue Nov 24 1998 ro@suse.de
- don't pack if_ppp.h (delivered by glibc)
* Tue Oct 06 1998 ro@suse.de
- update to ppp-2.3.5 using diff from jurix
- re-activate ppp_available in sys-linux.c
* Mon Nov 03 1997 ro@suse.de
- install include files in usr/include/net before compilation
* Wed Apr 30 1997 florian@suse.de
- create eror output file with perm 0600
- pppd is only executable for group "dialout"
* Thu Jan 02 1997 florian@suse.de
- add bug-fix
- add ipx support