diff --git a/ppp-2.4.2-no_strip.patch b/ppp-2.4.2-no_strip.patch index ee413de..62eec1f 100644 --- a/ppp-2.4.2-no_strip.patch +++ b/ppp-2.4.2-no_strip.patch @@ -1,23 +1,3 @@ ---- ppp-2.4.2/pppd/Makefile.linux.make.no_strip 2003-11-27 22:55:19.000000000 +0100 -+++ ppp-2.4.2/pppd/Makefile.linux.make 2004-09-16 12:00:08.641944353 +0200 -@@ -98,7 +98,7 @@ - CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include - LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto - TARGETS += srp-entry --EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry -+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry - MANPAGES += srp-entry.8 - EXTRACLEAN += srp-entry.o - NEEDDES=y -@@ -199,7 +199,7 @@ - install: pppd - mkdir -p $(BINDIR) $(MANDIR) - $(EXTRAINSTALL) -- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd -+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd - if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ - chmod o-rx,u+s $(BINDIR)/pppd; fi - $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8 --- ppp-2.4.2/pppd/Makefile.linux.no_strip 2004-09-16 12:00:08.550956895 +0200 +++ ppp-2.4.2/pppd/Makefile.linux 2004-09-16 12:00:08.651942974 +0200 @@ -99,7 +99,7 @@ @@ -38,21 +18,6 @@ if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ chmod o-rx,u+s $(BINDIR)/pppd; fi $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8 ---- ppp-2.4.2/pppd/plugins/radius/Makefile.linux.make.no_strip 2002-11-09 12:24:42.000000000 +0100 -+++ ppp-2.4.2/pppd/plugins/radius/Makefile.linux.make 2004-09-16 12:00:08.642944215 +0200 -@@ -30,9 +30,9 @@ - install: all - $(MAKE) $(MFLAGS) -C radiusclient install - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radius.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radattr.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR) - $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)/man8 - $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)/man8 - --- ppp-2.4.2/pppd/plugins/radius/Makefile.linux.no_strip 2004-09-16 12:00:08.518961306 +0200 +++ ppp-2.4.2/pppd/plugins/radius/Makefile.linux 2004-09-16 12:00:08.643944077 +0200 @@ -30,9 +30,9 @@ @@ -68,17 +33,6 @@ $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)/man8 $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)/man8 ---- ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.make.no_strip 2004-01-13 04:57:55.000000000 +0100 -+++ ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.make 2004-09-16 12:00:08.650943112 +0200 -@@ -25,7 +25,7 @@ - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) -+ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR) - - clean: - rm -f *.o *.so --- ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.no_strip 2004-09-16 12:00:08.518961306 +0200 +++ ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux 2004-09-16 12:00:08.650943112 +0200 @@ -25,7 +25,7 @@ @@ -130,15 +84,6 @@ if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ chmod o-rx,u+s $(BINDIR)/pppd; fi $(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8 ---- ppp-2.4.2/pppdump/Makefile.linux.make.no_strip 1999-07-26 13:09:29.000000000 +0200 -+++ ppp-2.4.2/pppdump/Makefile.linux.make 2004-09-16 12:00:08.652942836 +0200 -@@ -13,5 +13,5 @@ - - install: - mkdir -p $(BINDIR) $(MANDIR)/man8 -- $(INSTALL) -s -c pppdump $(BINDIR) -+ $(INSTALL) -c pppdump $(BINDIR) - $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)/man8 --- ppp-2.4.2/pppdump/Makefile.linux.no_strip 2004-09-16 12:00:08.516961582 +0200 +++ ppp-2.4.2/pppdump/Makefile.linux 2004-09-16 12:00:08.653942699 +0200 @@ -13,5 +13,5 @@ @@ -148,17 +93,6 @@ - $(INSTALL) -s -c pppdump $(BINDIR) + $(INSTALL) -c pppdump $(BINDIR) $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)/man8 ---- ppp-2.4.2/pppstats/Makefile.linux.make.no_strip 2002-11-09 12:24:43.000000000 +0100 -+++ ppp-2.4.2/pppstats/Makefile.linux.make 2004-09-16 12:00:08.654942561 +0200 -@@ -19,7 +19,7 @@ - - install: pppstats - -mkdir -p $(MANDIR)/man8 -- $(INSTALL) -s -c pppstats $(BINDIR)/pppstats -+ $(INSTALL) -c pppstats $(BINDIR)/pppstats - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)/man8/pppstats.8 - - pppstats: $(PPPSTATSRCS) --- ppp-2.4.2/pppstats/Makefile.linux.no_strip 2004-09-16 12:00:08.517961444 +0200 +++ ppp-2.4.2/pppstats/Makefile.linux 2004-09-16 12:00:08.654942561 +0200 @@ -19,7 +19,7 @@ diff --git a/ppp.spec b/ppp.spec index c753e7a..6682df4 100644 --- a/ppp.spec +++ b/ppp.spec @@ -1,9 +1,10 @@ Summary: The PPP (Point-to-Point Protocol) daemon. Name: ppp Version: 2.4.4 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD and LGPLv2+ and GPLv2+ and Public Domain Group: System Environment/Daemons +URL: http://www.samba.org/ppp Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz Source1: ppp-2.3.5-pamd.conf Source2: ppp.logrotate @@ -136,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT %doc PLUGINS %changelog +* Thu Oct 08 2009 Jiri Skala - 2.4.4-14 +- fixed #519042 - ppp package is missing URL in spec +- fixed #524575 - ppp: no_strip patch modifies backup files created by previous patches + * Wed Sep 16 2009 Tomas Mraz 2.4.4-13 - use password-auth common PAM configuration instead of system-auth