commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2020-10-29 09:22:04
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new.3463 (New)
Package is "ppp"
Thu Oct 29 09:22:04 2020 rev:44 rq:844105 version:2.4.8
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2020-08-06 17:31:06.121080078
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new.3463/ppp.changes2020-10-29
09:22:14.406683949 +0100
@@ -1,0 +2,6 @@
+Fri Oct 9 11:15:53 UTC 2020 - Dominique Leuenberger
+
+- Fix build with RPM 4.16: error: bare words are no longer
+ supported, please use "...": lib64 == lib64.
+
+---
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.GCmTnD/_old 2020-10-29 09:22:15.722685211 +0100
+++ /var/tmp/diff_new_pack.GCmTnD/_new 2020-10-29 09:22:15.730685218 +0100
@@ -133,7 +133,7 @@
%patch14
%patch17
%patch18
-%if %{_lib} == lib64
+%if "%{_lib}" == "lib64"
%patch21
%endif
%patch22
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2020-08-06 17:30:40
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new.3399 (New)
Package is "ppp"
Thu Aug 6 17:30:40 2020 rev:43 rq:824334 version:2.4.8
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2020-05-26 17:14:28.903347043
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new.3399/ppp.changes2020-08-06
17:31:06.121080078 +0200
@@ -1,0 +2,45 @@
+Mon Aug 3 14:52:55 UTC 2020 - Reinhard Max
+
+- New version 2.4.8.
+ * New pppd options have been added:
+* ifname, to set the name for the PPP interface device
+* defaultroute-metric, to set the metric for the default route
+* defaultroute6, to add an IPv6 default route (with
+ nodefaultroute6 to prevent adding an IPv6 default route).
+* up_sdnotify, to have pppd notify systemd when the link is up.
+
+ * The rp-pppoe plugin has new options:
+* host-uniq, to set the Host-Uniq value to send
+* pppoe-padi-timeout, to set the timeout for discovery packets
+* pppoe-padi-attempts, to set the number of discovery attempts.
+
+ * Added the CLASS attribute in radius packets.
+
+ * Fixed warnings and issues found by static analysis.
+
+- Obsoleted patches:
+ * ppp-2.4.3-pppoatm.diff
+ * ppp-2.4.4-strncatfix.patch
+ * ppp-2.4.6-ifname.diff
+ * ppp-2.4.7-DES-openssl.patch
+ * ppp-2.4.7.tar.gz.asc
+ * ppp-send-padt.patch
+
+- Patches that got renamed, because they needed rediffing:
+ * ppp-2.4.1-higher-speeds.diff -> ppp-higher-speeds.patch
+ * ppp-2.4.1-higher-speeds.diff -> ppp-higher-speeds.patch
+ * ppp-2.4.2-__P.diff -> ppp-__P.patch
+ * ppp-2.4.2-cifdefroute.diff -> ppp-cifdefroute.patch
+ * ppp-2.4.2-pie.patch -> ppp-pie.patch
+ * ppp-2.4.2-smpppd.diff -> ppp-smpppd.patch
+ * ppp-2.4.3-filter.diff -> ppp-filter.patch
+ * ppp-2.4.3-fork-fix.diff -> ppp-fork-fix.patch
+ * ppp-2.4.4-var_run_resolv_conf.patch -> ppp-var_run_resolv_conf.patch
+ * ppp-2.4.6-lib64.patch -> ppp-lib64.patch
+ * ppp-2.4.6-make.diff -> ppp-make.patch
+ * ppp-2.4.6-misc.diff -> ppp-misc.patch
+ * ppp-2.4.7-fix-bashisms.patch -> ppp-fix-bashisms.patch
+
+- bsc#1172916: Fix an outdated comment for lcp-echo-interval.
+
+---
Old:
ppp-2.4.1-higher-speeds.diff
ppp-2.4.2-__P.diff
ppp-2.4.2-cifdefroute.diff
ppp-2.4.2-pie.patch
ppp-2.4.2-smpppd.diff
ppp-2.4.3-filter.diff
ppp-2.4.3-fork-fix.diff
ppp-2.4.3-pppoatm.diff
ppp-2.4.4-strncatfix.patch
ppp-2.4.4-var_run_resolv_conf.patch
ppp-2.4.6-ifname.diff
ppp-2.4.6-lib64.patch
ppp-2.4.6-make.diff
ppp-2.4.6-misc.diff
ppp-2.4.7-DES-openssl.patch
ppp-2.4.7-fix-bashisms.patch
ppp-2.4.7.tar.gz
ppp-2.4.7.tar.gz.asc
ppp-send-padt.patch
New:
ppp-2.4.8.tar.gz
ppp-2.4.8.tar.gz.asc
ppp-__P.patch
ppp-cifdefroute.patch
ppp-filter.patch
ppp-fix-bashisms.patch
ppp-fork-fix.patch
ppp-higher-speeds.patch
ppp-lib64.patch
ppp-make.patch
ppp-misc.patch
ppp-pie.patch
ppp-smpppd.patch
ppp-var_run_resolv_conf.patch
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.32mDe6/_old 2020-08-06 17:31:08.089080539 +0200
+++ /var/tmp/diff_new_pack.32mDe6/_new 2020-08-06 17:31:08.097080541 +0200
@@ -18,7 +18,7 @@
%define _group dialout
Name: ppp
-Version:2.4.7
+Version:2.4.8
Release:0
Summary:The Point to Point Protocol for Linux
License:BSD-3-Clause AND LGPL-2.1-or-later AND GPL-2.0-or-later
@@ -49,35 +49,29 @@
Source17: %{name}.keyring
Source18:
https://download.samba.org/pub/%{name}/%{name}-%{version}.tar.gz.asc
# Makefile changes
-Patch0: ppp-2.4.6-make.diff
+Patch0: ppp-make.patch
# replacedefaultroute option
-Patch2: ppp-2.4.2-cifdefroute.diff
+Patch2: ppp-cifdefroute.patch
# misc tiny stuff
-Patch3: ppp-2.4.6-misc.diff
+Patch3: ppp-misc.patch
# more log output for smpppd
-Patch4: ppp-2.4.2-smpppd.diff
+Patch4: ppp-smpppd.patch
# allow higher serial speeds
-Patch5: ppp-2.4.1-higher-speeds.diff
+Patch5: ppp-higher-speeds.patch
# fixed use of libpcap including dial on demand
-Patch6: ppp-2.4.3-filter.diff
-# option to rename ppp interface
-Patch8: ppp-2.4.6-ifname.diff
+Patch6: ppp-filter.patch
# Don't use __P from glibc (pppd uses it wrong)
-Patch9: ppp-2.4.2-__P.diff
-Patch10:ppp-2.4.3-pppoatm.diff
-Patch11:ppp-2.4.7-fix-bashisms.patch
-Patch12:ppp-2.4.2-pie.patch
-Patch14:ppp-2.4.3-fork-fix.diff
+Patch9: ppp-__P.patch
+Patch11:
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2020-05-26 17:14:10
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new.2738 (New)
Package is "ppp"
Tue May 26 17:14:10 2020 rev:42 rq:807561 version:2.4.7
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2020-04-29 20:42:07.807603185
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new.2738/ppp.changes2020-05-26
17:14:28.903347043 +0200
@@ -1,0 +2,11 @@
+Tue May 19 15:40:26 UTC 2020 - Dominique Leuenberger
+
+- Fixup previous fix: use the defined macro %_unitdir for the
+ systemd unit.
+
+---
+Thu May 7 07:42:50 UTC 2020 - pgaj...@suse.com
+
+- /usr/lib/systemd instead %{_libexecdir}/systemd
+
+---
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.0aVbWV/_old 2020-05-26 17:14:30.171349792 +0200
+++ /var/tmp/diff_new_pack.0aVbWV/_new 2020-05-26 17:14:30.175349800 +0200
@@ -184,7 +184,7 @@
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/ppp
install -m 644 %{SOURCE13} %{buildroot}%{_mandir}/man8/pppoe-discovery.8.gz
install -Dm 644 %{SOURCE14}
%{buildroot}%{_sysconfdir}/ppp/chatscripts/modem.chat
-install -Dm 644 %{SOURCE15}
%{buildroot}%{_libexecdir}/systemd/system/modem@.service
+install -Dm 644 %{SOURCE15} %{buildroot}%{_unitdir}/modem@.service
install -Dm 644 %{SOURCE16} %{buildroot}%{_udevrulesdir}/90-modem.rules
%if 0%{?suse_version} < 1330
@@ -220,8 +220,7 @@
%config(noreplace) %{_sysconfdir}/ppp/peers/modem
%dir %{_sysconfdir}/ppp/chatscripts
%config(noreplace) %{_sysconfdir}/ppp/chatscripts/modem.chat
-%dir %{_libexecdir}/systemd/system
-%{_libexecdir}/systemd/system/modem@.service
+%{_unitdir}/modem@.service
%dir %{_udevrulesdir}
%{_udevrulesdir}/90-modem.rules
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2020-04-29 20:41:15
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new.2738 (New)
Package is "ppp"
Wed Apr 29 20:41:15 2020 rev:41 rq:798108 version:2.4.7
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2020-03-14 09:53:49.439043349
+0100
+++ /work/SRC/openSUSE:Factory/.ppp.new.2738/ppp.changes2020-04-29
20:42:07.807603185 +0200
@@ -1,0 +2,5 @@
+Sun Apr 26 21:10:15 UTC 2020 - Andreas Stieger
+
+- add upstream signing keyring and verify source signature
+
+---
New:
ppp-2.4.7.tar.gz.asc
ppp.keyring
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.xAdtQ7/_old 2020-04-29 20:42:09.151606690 +0200
+++ /var/tmp/diff_new_pack.xAdtQ7/_new 2020-04-29 20:42:09.151606690 +0200
@@ -45,6 +45,9 @@
Source14: modem.chat
Source15: modem@.service
Source16: modem.rules
+# https://www.kernel.org/doc/wot/paulus.html
+Source17: %{name}.keyring
+Source18:
https://download.samba.org/pub/%{name}/%{name}-%{version}.tar.gz.asc
# Makefile changes
Patch0: ppp-2.4.6-make.diff
# replacedefaultroute option
commit ppp for openSUSE:Factory
Hello community, here is the log from the commit of package ppp for openSUSE:Factory checked in at 2020-03-14 09:53:48 Comparing /work/SRC/openSUSE:Factory/ppp (Old) and /work/SRC/openSUSE:Factory/.ppp.new.3160 (New) Package is "ppp" Sat Mar 14 09:53:48 2020 rev:40 rq:783453 version:2.4.7 Changes: --- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2020-02-15 22:23:40.567253142 +0100 +++ /work/SRC/openSUSE:Factory/.ppp.new.3160/ppp.changes2020-03-14 09:53:49.439043349 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 14:44:11 UTC 2020 - Reinhard Max + +- Add pam_keyinit to /etc/pam.d/ppp (bsc#1144055). + +--- Other differences: -- ++ ppp.pamd ++ --- /var/tmp/diff_new_pack.r5ooFA/_old 2020-03-14 09:53:50.947044456 +0100 +++ /var/tmp/diff_new_pack.r5ooFA/_new 2020-03-14 09:53:50.947044456 +0100 @@ -3,4 +3,5 @@ authincludecommon-auth account include common-account password include common-password +session optional pam_keyinit.so revoke session includecommon-session
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2020-02-15 22:23:36
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new.26092 (New)
Package is "ppp"
Sat Feb 15 22:23:36 2020 rev:39 rq:772130 version:2.4.7
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2018-10-12 13:09:17.419419666
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new.26092/ppp.changes 2020-02-15
22:23:40.567253142 +0100
@@ -1,0 +2,6 @@
+Fri Feb 7 14:30:35 UTC 2020 - Reinhard Max
+
+- CVE-2020-8597, bsc#1162610, ppp-CVE-2020-8597.patch: rhostname
+ buffer overflow in the eap_request and eap_response functions.
+
+---
New:
ppp-CVE-2020-8597.patch
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.BE6pyL/_old 2020-02-15 22:23:41.323253551 +0100
+++ /var/tmp/diff_new_pack.BE6pyL/_new 2020-02-15 22:23:41.327253553 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ppp
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -75,6 +75,7 @@
Patch24:ppp-CVE-2015-3310.patch
Patch25:fix-header-conflict.patch
Patch26:ppp-2.4.7-DES-openssl.patch
+Patch27:ppp-CVE-2020-8597.patch
BuildRequires: libpcap-devel
BuildRequires: linux-atm-devel
BuildRequires: openssl-devel
@@ -146,6 +147,7 @@
%patch24
%patch25 -p1
%patch26 -p1
+%patch27
sed -i -e '1s/local\///' scripts/secure-card
find scripts -type f | xargs chmod a-x
find -type f -name '*.orig' | xargs rm -f
++ ppp-CVE-2020-8597.patch ++
>From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001
From: Paul Mackerras
Date: Mon, 3 Feb 2020 15:53:28 +1100
Subject: [PATCH] pppd: Fix bounds check in EAP code
Given that we have just checked vallen < len, it can never be the case
that vallen >= len + sizeof(rhostname). This fixes the check so we
actually avoid overflowing the rhostname array.
Reported-by: Ilja Van Sprundel
Signed-off-by: Paul Mackerras
---
pppd/eap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- pppd/eap.c.orig
+++ pppd/eap.c
@@ -1421,7 +1421,7 @@ int len;
}
/* Not so likely to happen. */
- if (vallen >= len + sizeof (rhostname)) {
+ if (len - vallen >= sizeof (rhostname)) {
dbglog("EAP: trimming really long peer name down");
BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
rhostname[sizeof (rhostname) - 1] = '\0';
@@ -1847,7 +1847,7 @@ int len;
}
/* Not so likely to happen. */
- if (vallen >= len + sizeof (rhostname)) {
+ if (len - vallen >= sizeof (rhostname)) {
dbglog("EAP: trimming really long peer name down");
BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
rhostname[sizeof (rhostname) - 1] = '\0';
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2018-10-12 13:09:12
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new (New)
Package is "ppp"
Fri Oct 12 13:09:12 2018 rev:38 rq:640619 version:2.4.7
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2017-12-04 09:59:47.154056481
+0100
+++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2018-10-12
13:09:17.419419666 +0200
@@ -1,0 +2,5 @@
+Thu Oct 4 15:18:10 UTC 2018 - sch...@suse.de
+
+- ppp-2.4.7-DES-openssl.patch: Use openssl instead of libcrypt for DES
+
+---
New:
ppp-2.4.7-DES-openssl.patch
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.s9mu1K/_old 2018-10-12 13:09:18.987417431 +0200
+++ /var/tmp/diff_new_pack.s9mu1K/_new 2018-10-12 13:09:18.987417431 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ppp
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,15 +12,16 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%define _group dialout
Name: ppp
Version:2.4.7
Release:0
Summary:The Point to Point Protocol for Linux
-License:BSD-3-Clause AND LGPL-2.1+ AND GPL-2.0+
+License:BSD-3-Clause AND LGPL-2.1-or-later AND GPL-2.0-or-later
Group: Productivity/Networking/PPP
URL:https://ppp.samba.org
Source0:
https://download.samba.org/pub/%{name}/%{name}-%{version}.tar.gz
@@ -73,8 +74,10 @@
# PATCH-FIX-UPSTREAM -- Patch for CVE-2015-3310
Patch24:ppp-CVE-2015-3310.patch
Patch25:fix-header-conflict.patch
+Patch26:ppp-2.4.7-DES-openssl.patch
BuildRequires: libpcap-devel
BuildRequires: linux-atm-devel
+BuildRequires: openssl-devel
BuildRequires: pam-devel
%if 0%{?suse_version} >= 1330
Requires: group(%{_group})
@@ -103,9 +106,9 @@
%package modem
Summary:Automatic redial for any USB modem supported by the kernel
Group: System/Kernel
-Requires: group(dialout)
Requires: ppp
Requires: udev
+Requires: group(dialout)
BuildArch: noarch
%description modem
@@ -142,6 +145,7 @@
%patch23 -p1
%patch24
%patch25 -p1
+%patch26 -p1
sed -i -e '1s/local\///' scripts/secure-card
find scripts -type f | xargs chmod a-x
find -type f -name '*.orig' | xargs rm -f
@@ -153,7 +157,7 @@
%build
export MY_CFLAGS="%{optflags} -fno-strict-aliasing -fPIC $SP"
%configure
-make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y
FILTER=y HAVE_INET6=y HAVE_LOGWTMP=y
+make %{?_smp_mflags} CHAPMS=y CBCP=y HAS_SHADOW=y USE_PAM=y FILTER=y
HAVE_INET6=y HAVE_LOGWTMP=y
%install
make install DESTDIR=%{buildroot}%{_prefix}
++ ppp-2.4.7-DES-openssl.patch ++
Index: ppp-2.4.7/pppd/Makefile.linux
===
--- ppp-2.4.7.orig/pppd/Makefile.linux
+++ ppp-2.4.7/pppd/Makefile.linux
@@ -39,7 +39,7 @@ LIBS = -lutil
# Uncomment the next 2 lines to include support for Microsoft's
# MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
CHAPMS=y
-USE_CRYPT=y
+#USE_CRYPT=y
# Don't use MSLANMAN unless you really know what you're doing.
#MSLANMAN=y
# Uncomment the next line to include support for MPPE. CHAPMS (above) must
@@ -133,7 +133,8 @@ endif
ifdef NEEDDES
ifndef USE_CRYPT
-LIBS += -ldes $(LIBS)
+CFLAGS += -I/usr/include/openssl
+LIBS += -lcrypto
else
CFLAGS += -DUSE_CRYPT=1
endif
Index: ppp-2.4.7/pppd/pppcrypt.c
===
--- ppp-2.4.7.orig/pppd/pppcrypt.c
+++ ppp-2.4.7/pppd/pppcrypt.c
@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key w
des_key[7] = Get7Bits(key, 49);
#ifndef USE_CRYPT
- des_set_odd_parity((des_cblock *)des_key);
+ DES_set_odd_parity((DES_cblock *)des_key);
#endif
}
@@ -158,25 +158,25 @@ u_char *clear;/* OUT 8 octets */
}
#else /* USE_CRYPT */
-static des_key_schedulekey_schedule;
+static DES_key_schedulekey_schedule;
bool
DesSetkey(key)
u_char *key;
{
- des_cblock des_key;
+ DES_cblock des_key;
MakeKey(key, des_key);
- des_set_key(_key, key_schedule);
+
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2017-12-04 09:59:46
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new (New)
Package is "ppp"
Mon Dec 4 09:59:46 2017 rev:37 rq:547370 version:2.4.7
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2017-11-29 10:50:08.002149900
+0100
+++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2017-12-04
09:59:47.154056481 +0100
@@ -1,0 +2,6 @@
+Fri Nov 24 19:18:37 UTC 2017 - i...@ilya.pp.ua
+
+- Refresh spec-file via spec-cleaner.
+- Add ppp-modem package for automatic redial to mobile provider.
+
+---
New:
modem-peers
modem.chat
modem.rules
modem@.service
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.RDQYOI/_old 2017-12-04 09:59:48.142020622 +0100
+++ /var/tmp/diff_new_pack.RDQYOI/_new 2017-12-04 09:59:48.146020477 +0100
@@ -12,22 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org
#
%define _group dialout
Name: ppp
-BuildRequires: libpcap-devel
-BuildRequires: linux-atm-devel
-BuildRequires: pam-devel
-Url:http://ppp.samba.org/
Version:2.4.7
Release:0
Summary:The Point to Point Protocol for Linux
-License:BSD-3-Clause and LGPL-2.1+ and GPL-2.0+
+License:BSD-3-Clause AND LGPL-2.1+ AND GPL-2.0+
Group: Productivity/Networking/PPP
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0:ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
+URL:https://ppp.samba.org
+Source0:
https://download.samba.org/pub/%{name}/%{name}-%{version}.tar.gz
# config for pam
Source1:ppp.pamd
# templates for secrets
@@ -37,12 +33,17 @@
Source5:options
Source6:filters
# several peers file
+Source7:modem-peers
Source8:pppoe-peers
Source9:pppoe-rp-peers
Source10: pppoatm-peers
Source11: ppp-peers
Source12: pptp-peers
Source13: pppoe-discovery.8.gz
+# modem files
+Source14: modem.chat
+Source15: modem@.service
+Source16: modem.rules
# Makefile changes
Patch0: ppp-2.4.6-make.diff
# replacedefaultroute option
@@ -72,6 +73,9 @@
# PATCH-FIX-UPSTREAM -- Patch for CVE-2015-3310
Patch24:ppp-CVE-2015-3310.patch
Patch25:fix-header-conflict.patch
+BuildRequires: libpcap-devel
+BuildRequires: linux-atm-devel
+BuildRequires: pam-devel
%if 0%{?suse_version} >= 1330
Requires: group(%{_group})
Requires(pre): group(%{_group})
@@ -90,12 +94,30 @@
%package devel
Summary:Header Files Required for Developing Plugins for pppd
Group: Development/Libraries/C and C++
-Requires: ppp = %version
+Requires: ppp = %{version}
%description devel
The package ppp-devel contains C header files required for developing
plugins for the pppd.
+%package modem
+Summary:Automatic redial for any USB modem supported by the kernel
+Group: System/Kernel
+Requires: group(dialout)
+Requires: ppp
+Requires: udev
+BuildArch: noarch
+
+%description modem
+This package contains peer, chat script, systemd unit and udev rule for
+automatic redial when connecting any USB modem supported by the kernel.
+For disable automatic redial (by default enabled for all), run
+sudo systemctl mask modem@0.service
+For enable again automatic redial, run
+sudo systemctl unmask modem@0.service
+"0" after "@" is the serial number of the modem, if you have more than one,
+you can disable unnecessary or disable everything.
+
%prep
%setup -q
%patch0
@@ -113,7 +135,7 @@
%patch17
%patch18
%patch19 -p1
-%if %_lib == lib64
+%if %{_lib} == lib64
%patch21
%endif
%patch22
@@ -129,30 +151,32 @@
sed -i '/#HAVE_LIBATM/s/#//' pppd/plugins/pppoatm/Makefile.linux
%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"
-./configure --prefix=/usr
+export MY_CFLAGS="%{optflags} -fno-strict-aliasing -fPIC $SP"
+%configure
make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y
FILTER=y HAVE_INET6=y HAVE_LOGWTMP=y
%install
-make install DESTDIR=%{buildroot}%_prefix
-install -d -m 750 %{buildroot}%{_sysconfdir}/ppp
-install -m 644 %{S:5} %{buildroot}%{_sysconfdir}/ppp/options
-install -m 644 %{S:6}
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2017-11-29 10:50:05
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new (New)
Package is "ppp"
Wed Nov 29 10:50:05 2017 rev:36 rq:545185 version:2.4.7
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2017-06-23 09:13:37.366637327
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2017-11-29
10:50:08.002149900 +0100
@@ -1,0 +2,5 @@
+Thu Nov 23 14:47:28 UTC 2017 - i...@ilya.pp.ua
+
+- Add Requires group(dialout) (boo#1067511).
+
+---
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.QetvF7/_old 2017-11-29 10:50:11.138036136 +0100
+++ /var/tmp/diff_new_pack.QetvF7/_new 2017-11-29 10:50:11.138036136 +0100
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
+%define _group dialout
Name: ppp
BuildRequires: libpcap-devel
BuildRequires: linux-atm-devel
@@ -72,6 +72,12 @@
# PATCH-FIX-UPSTREAM -- Patch for CVE-2015-3310
Patch24:ppp-CVE-2015-3310.patch
Patch25:fix-header-conflict.patch
+%if 0%{?suse_version} >= 1330
+Requires: group(%{_group})
+Requires(pre): group(%{_group})
+%else
+Requires(pre): shadow
+%endif
%description
The ppp package contains the PPP (Point-to-Point Protocol) daemon,
@@ -148,6 +154,11 @@
install -m 644 %{S:1} %{buildroot}%{_sysconfdir}/pam.d/ppp
install -m 644 %{S:13} %{buildroot}%{_mandir}/man8/pppoe-discovery.8.gz
+%if 0%{?suse_version} < 1330
+%pre
+getent group %{_group} >/dev/null || %{_sbindir}/groupadd -r %{_group}
+%endif
+
%files
%defattr (-, root, root)
%attr(750, root, root) %dir %{_sysconfdir}/ppp
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2017-06-23 09:13:36
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new (New)
Package is "ppp"
Fri Jun 23 09:13:36 2017 rev:35 rq:503394 version:2.4.7
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2016-12-13 19:32:23.347048658
+0100
+++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2017-06-23
09:13:37.366637327 +0200
@@ -1,0 +2,11 @@
+Tue Jun 13 13:43:05 UTC 2017 - ku...@suse.com
+
+- Add /etc/ppp, this directory is no longer part of filesystem.
+ Most likely requiring sysconfig would be necessary.
+
+---
+Sat Jun 10 15:20:12 UTC 2017 - meiss...@suse.com
+
+- ppp-2.4.2-pie.patch: also enable PIE for /usr/sbin/pppstats
+
+---
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.23as3y/_old 2017-06-23 09:13:39.282366651 +0200
+++ /var/tmp/diff_new_pack.23as3y/_new 2017-06-23 09:13:39.286366086 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ppp
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -150,6 +150,7 @@
%files
%defattr (-, root, root)
+%attr(750, root, root) %dir %{_sysconfdir}/ppp
%dir %{_sysconfdir}/ppp/peers
%config(noreplace) %{_sysconfdir}/ppp/options
%config(noreplace) %{_sysconfdir}/ppp/filters
++ ppp-2.4.2-pie.patch ++
--- /var/tmp/diff_new_pack.23as3y/_old 2017-06-23 09:13:39.374353653 +0200
+++ /var/tmp/diff_new_pack.23as3y/_new 2017-06-23 09:13:39.374353653 +0200
@@ -1,8 +1,8 @@
-Index: ppp-2.4.5.git/pppd/Makefile.linux
+Index: ppp-2.4.7/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
+--- ppp-2.4.7.orig/pppd/Makefile.linux
ppp-2.4.7/pppd/Makefile.linux
+@@ -213,10 +213,10 @@ install: pppd
$(INSTALL) -m 644 pppd.8 $(MANDIR)
pppd: $(PPPDOBJS)
@@ -10,11 +10,15 @@
+ $(CC) $(CFLAGS) -pie $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
srp-entry:srp-entry.c
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
-Index: ppp-2.4.5.git/chat/Makefile.linux
+- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
++ $(CC) $(CFLAGS) -pie -fPIE $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
+
+ install-devel:
+ mkdir -p $(INCDIR)/pppd
+Index: ppp-2.4.7/chat/Makefile.linux
===
ppp-2.4.5.git.orig/chat/Makefile.linux
-+++ ppp-2.4.5.git/chat/Makefile.linux
+--- ppp-2.4.7.orig/chat/Makefile.linux
ppp-2.4.7/chat/Makefile.linux
@@ -18,7 +18,7 @@ INSTALL= install
all: chat
@@ -24,3 +28,16 @@
chat.o: chat.c
$(CC) -c $(CFLAGS) -o chat.o chat.c
+Index: ppp-2.4.7/pppstats/Makefile.linux
+===
+--- ppp-2.4.7.orig/pppstats/Makefile.linux
ppp-2.4.7/pppstats/Makefile.linux
+@@ -26,7 +26,7 @@ install: pppstats
+ $(INSTALL) -m 444 pppstats.8 $(MANDIR)
+
+ pppstats: $(PPPSTATSRCS)
+- $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
++ $(CC) $(CFLAGS) -pie -fPIE -o pppstats pppstats.c $(LIBS)
+
+ clean:
+ rm -f pppstats *~ #* core
commit ppp for openSUSE:Factory
Hello community, here is the log from the commit of package ppp for openSUSE:Factory checked in at 2016-11-04 20:48:45 Comparing /work/SRC/openSUSE:Factory/ppp (Old) and /work/SRC/openSUSE:Factory/.ppp.new (New) Package is "ppp" Changes: --- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2015-11-18 22:31:19.0 +0100 +++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2016-11-04 20:48:46.0 +0100 @@ -1,0 +2,5 @@ +Mon Oct 17 10:26:16 UTC 2016 - sch...@suse.de + +- fix-header-conflict.patch: avoid conflict with kernel headers + +--- New: fix-header-conflict.patch Other differences: -- ++ ppp.spec ++ --- /var/tmp/diff_new_pack.f9veNE/_old 2016-11-04 20:48:48.0 +0100 +++ /var/tmp/diff_new_pack.f9veNE/_new 2016-11-04 20:48:48.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package ppp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -71,6 +71,7 @@ Patch23:ppp-send-padt.patch # PATCH-FIX-UPSTREAM -- Patch for CVE-2015-3310 Patch24:ppp-CVE-2015-3310.patch +Patch25:fix-header-conflict.patch %description The ppp package contains the PPP (Point-to-Point Protocol) daemon, @@ -112,6 +113,7 @@ %patch22 %patch23 -p1 %patch24 +%patch25 -p1 sed -i -e '1s/local\///' scripts/secure-card find scripts -type f | xargs chmod a-x find -type f -name '*.orig' | xargs rm -f ++ fix-header-conflict.patch ++ Index: ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c === --- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c +++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c @@ -49,6 +49,8 @@ static char const RCSID[] = #include #include #include +#define _LINUX_IN_H /* block from being included */ +#define _LINUX_IN6_H /* block from being included */ #include #ifndef _ROOT_PATH
commit ppp for openSUSE:Factory
Hello community, here is the log from the commit of package ppp for openSUSE:Factory checked in at 2015-11-18 22:31:18 Comparing /work/SRC/openSUSE:Factory/ppp (Old) and /work/SRC/openSUSE:Factory/.ppp.new (New) Package is "ppp" Changes: --- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2014-11-26 10:35:32.0 +0100 +++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2015-11-18 22:31:19.0 +0100 @@ -1,0 +2,7 @@ +Fri Nov 13 15:26:03 UTC 2015 - m...@suse.com + +- Added ppp-CVE-2015-3310.patch: + Fix for bnc#927841, CVE-2015-3310: Fix buffer overflow in radius + plug-in's rc_mksid(). + +--- New: ppp-CVE-2015-3310.patch Other differences: -- ++ ppp.spec ++ --- /var/tmp/diff_new_pack.9p4v1a/_old 2015-11-18 22:31:21.0 +0100 +++ /var/tmp/diff_new_pack.9p4v1a/_new 2015-11-18 22:31:21.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package ppp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -69,6 +69,8 @@ Patch21:ppp-2.4.6-lib64.patch Patch22:ppp-2.4.4-var_run_resolv_conf.patch Patch23:ppp-send-padt.patch +# PATCH-FIX-UPSTREAM -- Patch for CVE-2015-3310 +Patch24:ppp-CVE-2015-3310.patch %description The ppp package contains the PPP (Point-to-Point Protocol) daemon, @@ -109,6 +111,7 @@ %endif %patch22 %patch23 -p1 +%patch24 sed -i -e '1s/local\///' scripts/secure-card find scripts -type f | xargs chmod a-x find -type f -name '*.orig' | xargs rm -f ++ ppp-CVE-2015-3310.patch ++ --- pppd/plugins/radius/util.c +++ pppd/plugins/radius/util.c @@ -77,7 +77,7 @@ rc_mksid (void) static unsigned short int cnt = 0; sprintf (buf, "%08lX%04X%02hX", (unsigned long int) time (NULL), - (unsigned int) getpid (), + (unsigned int) getpid () % 65535, cnt & 0xFF); cnt++; return buf;
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2014-11-26 10:35:23
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new (New)
Package is ppp
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2014-08-25 11:03:31.0
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2014-11-26
10:35:32.0 +0100
@@ -1,0 +2,7 @@
+Wed Nov 19 03:11:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashisms in redialer script
+- add patches:
+ * ppp-2.4.7-fix-bashisms.patch
+
+---
New:
ppp-2.4.7-fix-bashisms.patch
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.vipPep/_old 2014-11-26 10:35:34.0 +0100
+++ /var/tmp/diff_new_pack.vipPep/_new 2014-11-26 10:35:34.0 +0100
@@ -60,6 +60,7 @@
# Don't use __P from glibc (pppd uses it wrong)
Patch9: ppp-2.4.2-__P.diff
Patch10:ppp-2.4.3-pppoatm.diff
+Patch11:ppp-2.4.7-fix-bashisms.patch
Patch12:ppp-2.4.2-pie.patch
Patch14:ppp-2.4.3-fork-fix.diff
Patch17:ppp-2.4.3-strip.diff
@@ -97,6 +98,7 @@
%patch8
%patch9
%patch10 -p1
+%patch11 -p1
%patch12 -p1
%patch14
%patch17
++ ppp-2.4.7-fix-bashisms.patch ++
diff -Ndur ppp-2.4.7/scripts/redialer ppp-2.4.7-fix-bashisms/scripts/redialer
--- ppp-2.4.7/scripts/redialer 2014-08-09 15:31:39.0 +0300
+++ ppp-2.4.7-fix-bashisms/scripts/redialer 2014-11-19 05:09:46.168864978
+0200
@@ -31,7 +31,7 @@
# Function to initialize the modem and ensure that it is in command
# state. This may not be needed, but it doesn't hurt.
#
-function initialize
+initialize()
{
chat -v TIMEOUT 3 '' AT 'OK-+++\c-OK'
return
@@ -41,7 +41,7 @@
#
# Script to dial a telephone
#
-function callnumber
+callnumber()
{
chat -v\
ABORT '\nBUSY\r' \
@@ -66,7 +66,7 @@
#
# Script to dial any telephone number
#
-function callall
+callall()
{
# echo dialing attempt number: $1 /dev/console
callnumber $PHONE1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2014-08-25 11:03:05
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new (New)
Package is ppp
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2014-03-23 22:29:37.0
+0100
+++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2014-08-25
11:03:31.0 +0200
@@ -1,0 +2,11 @@
+Thu Aug 21 12:15:41 UTC 2014 - m...@suse.com
+
+- Update to 2.4.7:
+ * Fixed a potential security issue in parsing option files
+(CVE-2014-3158, bnc#891489).
+ * There is a new stop-bits option, which takes an argument of
+1 or 2, indicating the number of stop bits to use for async serial
+ports.
+ * Various bug fixes.
+
+---
Old:
ppp-2.4.6.tar.gz
New:
ppp-2.4.7.tar.gz
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.zxc19r/_old 2014-08-25 11:03:32.0 +0200
+++ /var/tmp/diff_new_pack.zxc19r/_new 2014-08-25 11:03:32.0 +0200
@@ -21,7 +21,7 @@
BuildRequires: linux-atm-devel
BuildRequires: pam-devel
Url:http://ppp.samba.org/
-Version:2.4.6
+Version:2.4.7
Release:0
Summary:The Point to Point Protocol for Linux
License:BSD-3-Clause and LGPL-2.1+ and GPL-2.0+
@@ -109,6 +109,7 @@
%patch23 -p1
sed -i -e '1s/local\///' scripts/secure-card
find scripts -type f | xargs chmod a-x
+find -type f -name '*.orig' | xargs rm -f
%build
# Remove local copy that is out of sync and use the one from linux-header
++ ppp-2.4.2-cifdefroute.diff ++
--- /var/tmp/diff_new_pack.zxc19r/_old 2014-08-25 11:03:32.0 +0200
+++ /var/tmp/diff_new_pack.zxc19r/_new 2014-08-25 11:03:32.0 +0200
@@ -169,8 +169,8 @@
--- pppd/sys-linux.c
+++ pppd/sys-linux.c
@@ -206,6 +206,8 @@
-
static intif_is_up; /* Interface has been marked up */
+ static intif6_is_up; /* Interface has been marked up for IPv6, to
help differentiate */
static inthave_default_route; /* Gateway for default route added */
+static struct rtentry old_def_rt; /* Old default route */
+static int default_rt_repl_rest; /* replace and restore old default rt
*/
++ ppp-2.4.6.tar.gz - ppp-2.4.7.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ppp-2.4.6/README new/ppp-2.4.7/README
--- old/ppp-2.4.6/README2014-01-02 05:42:08.0 +0100
+++ new/ppp-2.4.7/README2014-08-09 14:31:39.0 +0200
@@ -61,9 +61,20 @@
authenticating itself to you, of course.)
-What's new in ppp-2.4.6.
+What's new in ppp-2.4.7.
+* Fixed a potential security issue in parsing option files (CVE-2014-3158).
+
+* There is a new stop-bits option, which takes an argument of 1 or 2,
+ indicating the number of stop bits to use for async serial ports.
+
+* Various bug fixes.
+
+
+What was new in ppp-2.4.6.
+**
+
* Man page updates.
* Several bug fixes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ppp-2.4.6/pppd/chap_ms.c new/ppp-2.4.7/pppd/chap_ms.c
--- old/ppp-2.4.6/pppd/chap_ms.c2014-01-02 05:42:08.0 +0100
+++ new/ppp-2.4.7/pppd/chap_ms.c2014-08-09 14:31:39.0 +0200
@@ -382,7 +382,7 @@
unsigned char *private)
{
const struct chapms2_response_cache_entry *cache_entry;
- unsigned char auth_response[MS_AUTH_RESPONSE_LENGTH];
+ unsigned char auth_response[MS_AUTH_RESPONSE_LENGTH+1];
challenge++;/* skip length, should be 16 */
*response++ = MS_CHAP2_RESPONSE_LEN;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ppp-2.4.6/pppd/ipv6cp.c new/ppp-2.4.7/pppd/ipv6cp.c
--- old/ppp-2.4.6/pppd/ipv6cp.c 2014-01-02 05:42:08.0 +0100
+++ new/ppp-2.4.7/pppd/ipv6cp.c 2014-08-09 14:31:39.0 +0200
@@ -249,10 +249,8 @@
{ ipv6cp-use-ipaddr, o_bool, ipv6cp_allowoptions[0].use_ip,
Use (default) IPv4 address as interface identifier, 1 },
-#if defined(SOL2) || defined(__linux__)
{ ipv6cp-use-persistent, o_bool, ipv6cp_wantoptions[0].use_persistent,
Use uniquely-available persistent value for link local address, 1 },
-#endif /* defined(SOL2) */
{ ipv6cp-restart, o_int, ipv6cp_fsm[0].timeouttime,
Set timeout for IPv6CP, OPT_PRIO },
@@ -1088,7 +1086,6 @@
if (!ipv6cp_protent.enabled_flag)
return;
-#if defined(SOL2) || defined(__linux__)
/*
* Persistent link-local id is only used when user has not
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2014-03-23 22:29:36
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new (New)
Package is ppp
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2013-09-04 14:02:57.0
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2014-03-23
22:29:37.0 +0100
@@ -1,0 +2,30 @@
+Thu Mar 20 15:07:22 UTC 2014 - a...@ajaissle.de
+
+- Update to 2.4.6
+ + Man page updates.
+ + Several bug fixes.
+ + Options files can now set and unset environment variables for
+scripts.
+ + The timeout for chat scripts can now be taken from an environment
+variable.
+ + There is a new option, master_detach, which allows pppd to detach
+from the controlling terminal when it is the multilink bundle master
+but its own link has terminated, even if the nodetach option has
+been given.
+
+- Removed the following patches;
+ - ppp-2.4.2-logwtmp.diff -- now checks for HAVE_LOGWTMP
+ - ppp-2.4.3-demand-fix.diff -- using 'status'
+ - ppp-terminate-correct.patch -- upstream inclusion
+
+- Rebased the following patches:
+ * ppp-2.4.3-make.diff as ppp-2.4.6-make.diff
+ * ppp-2.4.2-misc.diff as ppp-2.4.6-misc.diff
+ * ppp-2.4.2-ifname.diff as ppp-2.4.6-ifname.diff
+ * ppp-2.4.4-lib64.patch as ppp-2.4.6-lib64.patch
+
+- Url changed to ppp.samba.org
+- Use macros in spec file
+- We dont need to cleanup the buildroot
+
+---
Old:
ppp-2.4.2-ifname.diff
ppp-2.4.2-logwtmp.diff
ppp-2.4.2-misc.diff
ppp-2.4.3-demand-fix.diff
ppp-2.4.3-make.diff
ppp-2.4.4-lib64.patch
ppp-2.4.5.tar.bz2
ppp-terminate-correct.patch
New:
ppp-2.4.6-ifname.diff
ppp-2.4.6-lib64.patch
ppp-2.4.6-make.diff
ppp-2.4.6-misc.diff
ppp-2.4.6.tar.gz
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.bQ3O1h/_old 2014-03-23 22:29:38.0 +0100
+++ /var/tmp/diff_new_pack.bQ3O1h/_new 2014-03-23 22:29:38.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ppp
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -20,14 +20,14 @@
BuildRequires: libpcap-devel
BuildRequires: linux-atm-devel
BuildRequires: pam-devel
-Url:http://www.samba.org/ppp/
-Version:2.4.5
+Url:http://ppp.samba.org/
+Version:2.4.6
Release:0
Summary:The Point to Point Protocol for Linux
License:BSD-3-Clause and LGPL-2.1+ and GPL-2.0+
Group: Productivity/Networking/PPP
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0:ftp://ftp.samba.org:/pub/ppp/ppp-%{version}.tar.bz2
+Source0:ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
# config for pam
Source1:ppp.pamd
# templates for secrets
@@ -44,13 +44,11 @@
Source12: pptp-peers
Source13: pppoe-discovery.8.gz
# Makefile changes
-Patch0: ppp-2.4.3-make.diff
-# force pppd use the glibc's logwtmp instead of implementing its own
-Patch1: ppp-2.4.2-logwtmp.diff
+Patch0: ppp-2.4.6-make.diff
# replacedefaultroute option
Patch2: ppp-2.4.2-cifdefroute.diff
# misc tiny stuff
-Patch3: ppp-2.4.2-misc.diff
+Patch3: ppp-2.4.6-misc.diff
# more log output for smpppd
Patch4: ppp-2.4.2-smpppd.diff
# allow higher serial speeds
@@ -58,20 +56,18 @@
# fixed use of libpcap including dial on demand
Patch6: ppp-2.4.3-filter.diff
# option to rename ppp interface
-Patch8: ppp-2.4.2-ifname.diff
+Patch8: ppp-2.4.6-ifname.diff
# Don't use __P from glibc (pppd uses it wrong)
Patch9: ppp-2.4.2-__P.diff
Patch10:ppp-2.4.3-pppoatm.diff
Patch12:ppp-2.4.2-pie.patch
-Patch13:ppp-2.4.3-demand-fix.diff
Patch14:ppp-2.4.3-fork-fix.diff
Patch17:ppp-2.4.3-strip.diff
Patch18:ppp-2.4.3-winbind-setuidfix.patch
Patch19:ppp-2.4.4-strncatfix.patch
-Patch21:ppp-2.4.4-lib64.patch
+Patch21:ppp-2.4.6-lib64.patch
Patch22:ppp-2.4.4-var_run_resolv_conf.patch
Patch23:ppp-send-padt.patch
-Patch24:ppp-terminate-correct.patch
%description
The ppp package contains the PPP (Point-to-Point Protocol) daemon,
@@ -93,7 +89,6 @@
%prep
%setup -q
%patch0
-%patch1
%patch2
%patch3
%patch4
@@ -103,7 +98,6 @@
%patch9
%patch10 -p1
%patch12 -p1
-%patch13
%patch14
%patch17
%patch18
@@ -113,7 +107,6 @@
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2013-09-04 14:02:56
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new (New)
Package is ppp
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2013-08-01 17:14:06.0
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2013-09-04
14:02:57.0 +0200
@@ -1,0 +2,6 @@
+Mon Sep 2 14:41:21 UTC 2013 - m...@suse.com
+
+- Add ppp-terminate-correct.patch, fix the pppd's hang after exit
+ (bnc#693469).
+
+---
New:
ppp-terminate-correct.patch
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.C9Bz4i/_old 2013-09-04 14:02:58.0 +0200
+++ /var/tmp/diff_new_pack.C9Bz4i/_new 2013-09-04 14:02:58.0 +0200
@@ -71,6 +71,7 @@
Patch21:ppp-2.4.4-lib64.patch
Patch22:ppp-2.4.4-var_run_resolv_conf.patch
Patch23:ppp-send-padt.patch
+Patch24:ppp-terminate-correct.patch
%description
The ppp package contains the PPP (Point-to-Point Protocol) daemon,
@@ -112,6 +113,7 @@
%endif
%patch22
%patch23 -p1
+%patch24 -p1
sed -i -e '1s/local\///' scripts/secure-card
find scripts -type f | xargs chmod a-x
++ ppp-terminate-correct.patch ++
From 3eb9e810cfa515543655659b72dde30c54fea0a5 Mon Sep 17 00:00:00 2001
From: Paul Mackerras pau...@samba.org
Date: Sun, 7 Mar 2010 15:21:38 +1100
Subject: [PATCH 1/1] pppd: Terminate correctly if lcp_lowerup delayed calling
fsm_lowerup
Cameron Hutchison noticed that if pppd gets asked to terminate the
link in the period between when lcp_lowerup() is called and when
fsm_lowerup() is called from lcp_delayed_up() (i.e. when listen_time
is non-zero), pppd never exits.
The reason is that lcp_close() doesn't handle the delayed-up case
properly. Since the FSM is still in STOPPED state, we don't call
lcp_finished() and therefore never exit the main event loop.
This fixes it by handling the delayed-up case in lcp_close() as if
we had done the lowerup but the OPT_SILENT bit was set. We use the
silent case because we don't want to actually send a configure-request
at this point.
Signed-off-by: Paul Mackerras pau...@samba.org
---
pppd/lcp.c | 28 +++-
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/pppd/lcp.c b/pppd/lcp.c
index 5c77490..8ed2778 100644
--- a/pppd/lcp.c
+++ b/pppd/lcp.c
@@ -397,21 +397,29 @@ lcp_close(unit, reason)
char *reason;
{
fsm *f = lcp_fsm[unit];
+int oldstate;
if (phase != PHASE_DEAD phase != PHASE_MASTER)
new_phase(PHASE_TERMINATE);
-if (f-state == STOPPED f-flags (OPT_PASSIVE|OPT_SILENT)) {
+
+if (f-flags DELAYED_UP) {
+ untimeout(lcp_delayed_up, f);
+ f-state = STOPPED;
+}
+oldstate = f-state;
+
+fsm_close(f, reason);
+if (oldstate == STOPPED f-flags (OPT_PASSIVE|OPT_SILENT|DELAYED_UP))
{
/*
* This action is not strictly according to the FSM in RFC1548,
* but it does mean that the program terminates if you do a
-* lcp_close() in passive/silent mode when a connection hasn't
-* been established.
+* lcp_close() when a connection hasn't been established
+* because we are in passive/silent mode or because we have
+* delayed the fsm_lowerup() call and it hasn't happened yet.
*/
- f-state = CLOSED;
+ f-flags = ~DELAYED_UP;
lcp_finished(f);
-
-} else
- fsm_close(f, reason);
+}
}
@@ -453,9 +461,10 @@ lcp_lowerdown(unit)
{
fsm *f = lcp_fsm[unit];
-if (f-flags DELAYED_UP)
+if (f-flags DELAYED_UP) {
f-flags = ~DELAYED_UP;
-else
+ untimeout(lcp_delayed_up, f);
+} else
fsm_lowerdown(lcp_fsm[unit]);
}
@@ -489,6 +498,7 @@ lcp_input(unit, p, len)
if (f-flags DELAYED_UP) {
f-flags = ~DELAYED_UP;
+ untimeout(lcp_delayed_up, f);
fsm_lowerup(f);
}
fsm_input(f, p, len);
--
1.7.1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ppp for openSUSE:Factory
Hello community, here is the log from the commit of package ppp for openSUSE:Factory checked in at 2013-08-01 17:14:05 Comparing /work/SRC/openSUSE:Factory/ppp (Old) and /work/SRC/openSUSE:Factory/.ppp.new (New) Package is ppp Changes: --- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2013-03-05 15:20:08.0 +0100 +++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2013-08-01 17:14:06.0 +0200 @@ -1,0 +2,5 @@ +Wed Jul 24 12:54:01 UTC 2013 - m...@suse.com + +- ppp-send-padt.patch: Send PADT at the end of a PPPoE session. + +--- New: ppp-send-padt.patch Other differences: -- ++ ppp.spec ++ --- /var/tmp/diff_new_pack.EweRRe/_old 2013-08-01 17:14:07.0 +0200 +++ /var/tmp/diff_new_pack.EweRRe/_new 2013-08-01 17:14:07.0 +0200 @@ -70,6 +70,7 @@ Patch19:ppp-2.4.4-strncatfix.patch Patch21:ppp-2.4.4-lib64.patch Patch22:ppp-2.4.4-var_run_resolv_conf.patch +Patch23:ppp-send-padt.patch %description The ppp package contains the PPP (Point-to-Point Protocol) daemon, @@ -110,6 +111,7 @@ %patch21 %endif %patch22 +%patch23 -p1 sed -i -e '1s/local\///' scripts/secure-card find scripts -type f | xargs chmod a-x ++ ppp-send-padt.patch ++ Index: ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c === --- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/plugin.c 2009-11-16 23:26:07.0 +0100 +++ ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c2013-07-24 12:36:08.433729757 +0200 @@ -242,7 +242,7 @@ sizeof(struct sockaddr_pppox)) 0) error(Failed to disconnect PPPoE socket: %d %m, errno); close(conn-sessionSocket); -/* don't send PADT?? */ +sendPADT(conn, NULL); if (conn-discoverySocket = 0) close(conn-discoverySocket); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ppp for openSUSE:Factory
Hello community,
here is the log from the commit of package ppp for openSUSE:Factory checked in
at 2013-03-05 15:20:06
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
and /work/SRC/openSUSE:Factory/.ppp.new (New)
Package is ppp, Maintainer is b...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes 2011-09-23 12:41:49.0
+0200
+++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2013-03-05
15:20:08.0 +0100
@@ -1,0 +2,11 @@
+Fri Mar 1 14:59:29 UTC 2013 - cfarr...@suse.com
+
+- license update: BSD-3-Clause and LGPL-2.1+ and GPL-2.0+
+ GPL-2.0 matches found in ppp-2.4.5/include/linux/if_pppol2tp.h
+
+---
+Wed Feb 27 06:18:39 UTC 2013 - co...@suse.com
+
+- update license to new format
+
+---
Other differences:
--
++ ppp.spec ++
--- /var/tmp/diff_new_pack.AopLr4/_old 2013-03-05 15:20:11.0 +0100
+++ /var/tmp/diff_new_pack.AopLr4/_new 2013-03-05 15:20:11.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ppp
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -15,18 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: ppp
-BuildRequires: libpcap-devel linux-atm-devel pam-devel
+BuildRequires: libpcap-devel
+BuildRequires: linux-atm-devel
+BuildRequires: pam-devel
Url:http://www.samba.org/ppp/
Version:2.4.5
-Release:8
-License:BSD-3-Clause ; LGPL-2.1+
-Group: Productivity/Networking/PPP
-AutoReqProv:on
+Release:0
Summary:The Point to Point Protocol for Linux
+License:BSD-3-Clause and LGPL-2.1+ and GPL-2.0+
+Group: Productivity/Networking/PPP
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:ftp://ftp.samba.org:/pub/ppp/ppp-%{version}.tar.bz2
# config for pam
@@ -81,7 +80,6 @@
interface and performing the PPP negotiations.
%package devel
-License:BSD-3-Clause ; LGPL-2.1+
Summary:Header Files Required for Developing Plugins for pppd
Group: Development/Libraries/C and C++
Requires: ppp = %version
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ppp for openSUSE:Factory
Hello community, here is the log from the commit of package ppp for openSUSE:Factory checked in at 2011-12-06 18:53:01 Comparing /work/SRC/openSUSE:Factory/ppp (Old) and /work/SRC/openSUSE:Factory/.ppp.new (New) Package is ppp, Maintainer is b...@suse.com Changes: Other differences: -- ++ ppp.spec ++ --- /var/tmp/diff_new_pack.0TZ56G/_old 2011-12-06 19:26:23.0 +0100 +++ /var/tmp/diff_new_pack.0TZ56G/_new 2011-12-06 19:26:23.0 +0100 @@ -23,7 +23,7 @@ Url:http://www.samba.org/ppp/ Version:2.4.5 Release:8 -License:BSD3c(or similar) ; LGPLv2.1+ +License:BSD-3-Clause ; LGPL-2.1+ Group: Productivity/Networking/PPP AutoReqProv:on Summary:The Point to Point Protocol for Linux @@ -81,7 +81,7 @@ interface and performing the PPP negotiations. %package devel -License:BSD3c(or similar) ; LGPLv2.1+ +License:BSD-3-Clause ; LGPL-2.1+ Summary:Header Files Required for Developing Plugins for pppd Group: Development/Libraries/C and C++ Requires: ppp = %version -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ppp for openSUSE:Factory
Hello community, here is the log from the commit of package ppp for openSUSE:Factory checked in at Tue Aug 23 10:54:11 CEST 2011. --- ppp/ppp.changes 2011-01-05 11:17:37.0 +0100 +++ /mounts/work_src_done/STABLE/ppp/ppp.changes2011-08-12 17:44:51.0 +0200 @@ -1,0 +2,5 @@ +Fri Aug 12 15:40:58 UTC 2011 - co...@novell.com + +- remove extra dependencies from doc files + +--- calling whatdependson for head-i586 Other differences: -- ++ ppp.spec ++ --- /var/tmp/diff_new_pack.MArWei/_old 2011-08-23 10:50:46.0 +0200 +++ /var/tmp/diff_new_pack.MArWei/_new 2011-08-23 10:50:46.0 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ppp (Version 2.4.5) +# spec file for package ppp # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ BuildRequires: libpcap-devel linux-atm-devel pam-devel Url:http://www.samba.org/ppp/ Version:2.4.5 -Release:1 +Release:8 License:BSD3c(or similar) ; LGPLv2.1+ Group: Productivity/Networking/PPP AutoReqProv:on @@ -113,6 +113,7 @@ %endif %patch22 sed -i -e '1s/local\///' scripts/secure-card +find scripts -type f | xargs chmod a-x %build # Remove local copy that is out of sync and use the one from linux-header Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
