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.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ppp.new/ppp.changes 2016-11-04 20:48:46.000000000 +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.000000000 +0100 +++ /var/tmp/diff_new_pack.f9veNE/_new 2016-11-04 20:48:48.000000000 +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 <net/ethernet.h> #include <net/if_arp.h> #include <linux/ppp_defs.h> +#define _LINUX_IN_H /* block <linux/in.h> from being included */ +#define _LINUX_IN6_H /* block <linux/in6.h> from being included */ #include <linux/if_pppox.h> #ifndef _ROOT_PATH
