diff --git a/ppp-2.4.2-pie.patch b/ppp-2.4.2-pie.patch new file mode 100644 index 0000000..ed79397 --- /dev/null +++ b/ppp-2.4.2-pie.patch @@ -0,0 +1,22 @@ +--- ppp-2.4.2/pppd/Makefile.linux.pie 2004-05-14 13:46:14.188327258 +0200 ++++ ppp-2.4.2/pppd/Makefile.linux 2004-05-14 13:46:16.147058249 +0200 +@@ -206,7 +206,7 @@ + $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8 + + pppd: $(PPPDOBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) ++ $(CC) $(CFLAGS) -pie $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS) + + srp-entry: srp-entry.c + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS) +--- ppp-2.4.2/chat/Makefile.linux.pie 2004-05-14 13:46:32.699784925 +0200 ++++ ppp-2.4.2/chat/Makefile.linux 2004-05-14 13:46:45.071085866 +0200 +@@ -14,7 +14,7 @@ + all: chat + + chat: chat.o +- $(CC) -o chat chat.o ++ $(CC) -pie -o chat chat.o + + chat.o: chat.c + $(CC) -c $(CFLAGS) -o chat.o chat.c diff --git a/ppp.spec b/ppp.spec index eb660e8..53be42a 100644 --- a/ppp.spec +++ b/ppp.spec @@ -1,7 +1,7 @@ Summary: The PPP (Point-to-Point Protocol) daemon. Name: ppp Version: 2.4.2 -Release: 2.1 +Release: 2.2 License: distributable Group: System Environment/Daemons Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz @@ -14,6 +14,7 @@ Patch3: ppp-2.4.1-varargs.patch Patch4: ppp-2.4.2-lib64.patch Patch5: ppp-2.4.2-bpf.patch Patch6: ppp-2.4.2-dontwriteetc.patch +Patch7: ppp-2.4.2-pie.patch BuildRoot: %{_tmppath}/%{name}-root BuildPrereq: pam-devel, libpcap @@ -37,11 +38,12 @@ organization over a modem and phone line. %patch4 -p1 -b .lib64 %patch5 -p1 -b .bpf %patch6 -p1 -b .dontwriteetc +%patch7 -p1 -b .pie find . -type f -name "*.sample" | xargs rm -f %build ./configure -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" +make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC" %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -90,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %doc FAQ PLUGINS README README.cbcp README.linux README.MPPE README.MSCHAP80 README.MSCHAP81 README.pwfd README.pppoe scripts sample %changelog +* Fri May 14 2004 Thomas Woerner 2.4.2-2.2 +- compiled pppd and chat PIE + * Thu May 13 2004 Thomas Woerner 2.4.2-2.1 - added 'missingok' to ppp.logrotate (#122911)