pool/ppp
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 503394 from network

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/503394
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ppp?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger
2017-06-23 07:13:36 +00:00
committed by Git OBS Bridge
parent c5ac1bae88 0187af40de
commit 67d6d587b8
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ppp-2.4.2-pie.patch
View File

@@ -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

11
ppp.changes
View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Jun 13 13:43:05 UTC 2017 - kukuk@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 - 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

3
ppp.spec
View File

@@ -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 @@ install -m 644 %{S:13} %{buildroot}%{_mandir}/man8/pppoe-discovery.8.gz
%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