From 1a0a7952df6ad011a24955077b435ed6f65478e1fe698f1e039b65374c41ab50 Mon Sep 17 00:00:00 2001
From: OBS User mrdocs <null@suse.de>
Date: Sun, 11 Jun 2017 23:15:09 +0000
Subject: [PATCH] Accepting request 502808 from home:msmeissn:branches:network

- ppp-2.4.2-pie.patch: also enable PIE for /usr/sbin/pppstats

OBS-URL: https://build.opensuse.org/request/show/502808
OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=40
---
 ppp-2.4.2-pie.patch | 33 +++++++++++++++++++++++++--------
 ppp.changes         |  5 +++++
 ppp.spec            |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/ppp-2.4.2-pie.patch b/ppp-2.4.2-pie.patch
index b4e9b3f..d660818 100644
--- a/ppp-2.4.2-pie.patch
+++ b/ppp-2.4.2-pie.patch
@@ -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 @@ Index: ppp-2.4.5.git/pppd/Makefile.linux
 +	$(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 @@ Index: ppp-2.4.5.git/chat/Makefile.linux
  
  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
diff --git a/ppp.changes b/ppp.changes
index 77bccf7..c134b3d 100644
--- a/ppp.changes
+++ b/ppp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jun 10 15:20:12 UTC 2017 - meissner@suse.com
+
+- ppp-2.4.2-pie.patch: also enable PIE for /usr/sbin/pppstats
+
 -------------------------------------------------------------------
 Fri Dec  9 15:11:25 UTC 2016 - max@suse.com
 
diff --git a/ppp.spec b/ppp.spec
index a5bb4cb..6a46046 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -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