diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
commit | 15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch) | |
tree | 727d3fd768a1abe75521190b90833b3a68cce4c6 /package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux | |
parent | 0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff) |
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking,
but this is required to successfully link libraries or
executables with SSP
- pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux')
-rw-r--r-- | package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux index bee2a80cf..d01aeb86c 100644 --- a/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_radius_Makefile_linux @@ -1,16 +1,28 @@ ---- ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux 2006-06-04 07:04:14.000000000 +0200 -+++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux 2009-06-05 19:12:00.000000000 +0200 -@@ -12,7 +12,8 @@ VERSION = $(shell awk -F '"' '/VERSION/ - INSTALL = install +--- ppp-2.4.5.orig/pppd/plugins/radius/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2011-01-16 21:35:47.000000000 +0100 +@@ -1,18 +1,14 @@ + # Makefile for RADIUS plugin + # + # Copyright 2002 Roaring Penguin Software Inc. +-# + +-DESTDIR = $(INSTROOT)@DESTDIR@ +-MANDIR = $(DESTDIR)/share/man/man8 +-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++include ../../../makedefs.linux + +-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ++CPPFLAGS+=-I. -I../.. -I../../../include -DRC_LOG_FACILITY=LOG_DAEMON + +-INSTALL = install ++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) PLUGIN=radius.so radattr.so radrealms.so -CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -+COPTS = -O2 -+CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON # Uncomment the next line to include support for Microsoft's # MS-CHAP authentication protocol. -@@ -36,9 +37,9 @@ all: $(PLUGIN) +@@ -36,25 +32,26 @@ all: $(PLUGIN) install: all $(INSTALL) -d -m 755 $(LIBDIR) @@ -23,9 +35,21 @@ $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) -@@ -54,7 +55,7 @@ radrealms.so: radrealms.o + radius.so: radius.o libradiusclient.a +- $(CC) -o radius.so -shared radius.o libradiusclient.a ++ $(CC) $(LDFLAGS) -o radius.so radius.o libradiusclient.a + + radattr.so: radattr.o +- $(CC) -o radattr.so -shared radattr.o ++ $(CC) $(LDFLAGS) -o radattr.so radattr.o + + radrealms.so: radrealms.o +- $(CC) -o radrealms.so -shared radrealms.o ++ $(CC) $(LDFLAGS) -o radrealms.so radrealms.o + CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ clientid.o sendserver.o lock.o util.o md5.o ++ libradiusclient.a: $(CLIENTOBJS) - $(AR) rv $@ $? + $(TARGET_AR) rcsv $@ $? |