]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blobdiff - ppp/patches/0007-build-sys-don-t-strip-binaries-during-installation.patch
ppp: Update to 2.4.6.
[people/ms/ipfire-3.x.git] / ppp / patches / 0007-build-sys-don-t-strip-binaries-during-installation.patch
diff --git a/ppp/patches/0007-build-sys-don-t-strip-binaries-during-installation.patch b/ppp/patches/0007-build-sys-don-t-strip-binaries-during-installation.patch
new file mode 100644 (file)
index 0000000..e4881ef
--- /dev/null
@@ -0,0 +1,111 @@
+From b9fb631a493c5f1b490c8e9645eb6ebab4b25cc8 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Fri, 4 Apr 2014 18:37:00 +0200
+Subject: [PATCH 07/25] build-sys: don't strip binaries during installation
+
+We don't want that when building rpms. rpmbuild does final stripping of binaries
+for us and generetes debuginfo rpm.
+---
+ chat/Makefile.linux                  | 2 +-
+ pppd/Makefile.linux                  | 4 ++--
+ pppd/plugins/radius/Makefile.linux   | 6 +++---
+ pppd/plugins/rp-pppoe/Makefile.linux | 4 ++--
+ pppdump/Makefile.linux               | 2 +-
+ pppstats/Makefile.linux              | 2 +-
+ 6 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/chat/Makefile.linux b/chat/Makefile.linux
+index 848cd8d..2445637 100644
+--- a/chat/Makefile.linux
++++ b/chat/Makefile.linux
+@@ -25,7 +25,7 @@ chat.o:      chat.c
+ install: chat
+       mkdir -p $(BINDIR) $(MANDIR)
+-      $(INSTALL) -s -c chat $(BINDIR)
++      $(INSTALL) -c chat $(BINDIR)
+       $(INSTALL) -c -m 644 chat.8 $(MANDIR)
+ clean:
+diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
+index 8ed56c1..4f27100 100644
+--- a/pppd/Makefile.linux
++++ b/pppd/Makefile.linux
+@@ -102,7 +102,7 @@ ifdef USE_SRP
+ 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
+@@ -208,7 +208,7 @@ all: $(TARGETS)
+ 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)
+diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
+index 179d0b7..707326b 100644
+--- a/pppd/plugins/radius/Makefile.linux
++++ b/pppd/plugins/radius/Makefile.linux
+@@ -36,9 +36,9 @@ all: $(PLUGIN)
+ install: all
+       $(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)
+       $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
+diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
+index 1305ed8..3cd9101 100644
+--- a/pppd/plugins/rp-pppoe/Makefile.linux
++++ b/pppd/plugins/rp-pppoe/Makefile.linux
+@@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o
+ install: all
+       $(INSTALL) -d -m 755 $(LIBDIR)
+-      $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
++      $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
+       $(INSTALL) -d -m 755 $(BINDIR)
+-      $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
++      $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
+ clean:
+       rm -f *.o *.so pppoe-discovery
+diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
+index d0a5032..95c6805 100644
+--- a/pppdump/Makefile.linux
++++ b/pppdump/Makefile.linux
+@@ -17,5 +17,5 @@ clean:
+ install:
+       mkdir -p $(BINDIR) $(MANDIR)
+-      $(INSTALL) -s -c pppdump $(BINDIR)
++      $(INSTALL) -c pppdump $(BINDIR)
+       $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
+diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
+index 42aba73..c5ba3b1 100644
+--- a/pppstats/Makefile.linux
++++ b/pppstats/Makefile.linux
+@@ -22,7 +22,7 @@ all: pppstats
+ install: pppstats
+       -mkdir -p $(MANDIR)
+-      $(INSTALL) -s -c pppstats $(BINDIR)
++      $(INSTALL) -c pppstats $(BINDIR)
+       $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
+ pppstats: $(PPPSTATSRCS)
+-- 
+1.8.3.1
+