From 725cab8d64963b336a51caa55b51b5357898ba70a2ee0036632b99a736706c60 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 21 Aug 2014 12:17:10 +0000 Subject: [PATCH 1/3] - 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. OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=24 --- ppp-2.4.6.tar.gz | 3 --- ppp-2.4.7.tar.gz | 3 +++ ppp.changes | 11 +++++++++++ ppp.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 ppp-2.4.6.tar.gz create mode 100644 ppp-2.4.7.tar.gz diff --git a/ppp-2.4.6.tar.gz b/ppp-2.4.6.tar.gz deleted file mode 100644 index 05038e3..0000000 --- a/ppp-2.4.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d -size 687744 diff --git a/ppp-2.4.7.tar.gz b/ppp-2.4.7.tar.gz new file mode 100644 index 0000000..0760705 --- /dev/null +++ b/ppp-2.4.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 +size 688117 diff --git a/ppp.changes b/ppp.changes index 64724f6..c6fd7ea 100644 --- a/ppp.changes +++ b/ppp.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Aug 21 12:15:41 UTC 2014 - max@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. + ------------------------------------------------------------------- Thu Mar 20 15:07:22 UTC 2014 - aj@ajaissle.de diff --git a/ppp.spec b/ppp.spec index 4b445e6..3261f9f 100644 --- a/ppp.spec +++ b/ppp.spec @@ -21,7 +21,7 @@ BuildRequires: libpcap-devel 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+ From 0ef11af2d662f50c10fe4cf4bda359f66b9813299b10a7043d8324d581b2d9c2 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 21 Aug 2014 13:20:57 +0000 Subject: [PATCH 2/3] rediff Patch2 OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=25 --- ppp-2.4.2-cifdefroute.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ppp-2.4.2-cifdefroute.diff b/ppp-2.4.2-cifdefroute.diff index 4e3406d..53928f4 100644 --- a/ppp-2.4.2-cifdefroute.diff +++ b/ppp-2.4.2-cifdefroute.diff @@ -169,8 +169,8 @@ --- pppd/sys-linux.c +++ pppd/sys-linux.c @@ -206,6 +206,8 @@ - static int if_is_up; /* Interface has been marked up */ + static int if6_is_up; /* Interface has been marked up for IPv6, to help differentiate */ static int have_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 */ From b31f727da6018227fcaa88c222a2f9cce7701c46e685965798a2c80750a35658 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 21 Aug 2014 13:25:59 +0000 Subject: [PATCH 3/3] Delete .orig files OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=26 --- ppp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ppp.spec b/ppp.spec index 3261f9f..2d852ae 100644 --- a/ppp.spec +++ b/ppp.spec @@ -109,6 +109,7 @@ plugins for the pppd. %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