diff options
Diffstat (limited to 'package/pptpd')
| -rw-r--r-- | package/pptpd/Makefile | 2 | ||||
| -rw-r--r-- | package/pptpd/patches/patch-Makefile_in | 4 | ||||
| -rw-r--r-- | package/pptpd/patches/patch-ctrlpacket_c | 4 | ||||
| -rw-r--r-- | package/pptpd/patches/patch-plugins_Makefile | 11 |
4 files changed, 15 insertions, 6 deletions
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 13ea21a66..fdd823144 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PPTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= -DSBINDIR=\\\"/usr/sbin\\\" +TCFLAGS+= -fPIC -DSBINDIR='\\\"/usr/sbin\\\"' FAKE_FLAGS+= INSTALL="install" post-install: diff --git a/package/pptpd/patches/patch-Makefile_in b/package/pptpd/patches/patch-Makefile_in index 23a5b8420..c7a39c493 100644 --- a/package/pptpd/patches/patch-Makefile_in +++ b/package/pptpd/patches/patch-Makefile_in @@ -1,11 +1,11 @@ --- pptpd-1.3.4.orig/Makefile.in 2007-04-16 03:10:27.000000000 +0200 -+++ pptpd-1.3.4/Makefile.in 2010-05-29 18:48:12.250000000 +0200 ++++ pptpd-1.3.4/Makefile.in 2010-06-10 10:55:01.421440719 +0200 @@ -104,7 +104,7 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -+CFLAGS = -Wall -DSBINDIR='"$(sbindir)"' ++CFLAGS ?= -Wall -DSBINDIR='"$(sbindir)"' CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff --git a/package/pptpd/patches/patch-ctrlpacket_c b/package/pptpd/patches/patch-ctrlpacket_c index bd4e3dfea..4cfb5a3b1 100644 --- a/package/pptpd/patches/patch-ctrlpacket_c +++ b/package/pptpd/patches/patch-ctrlpacket_c @@ -1,6 +1,6 @@ --- pptpd-1.3.4.orig/ctrlpacket.c 2005-08-03 11:10:59.000000000 +0200 -+++ pptpd-1.3.4/ctrlpacket.c 2010-05-30 00:33:57.437500000 +0200 -@@ -377,9 +377,9 @@ void deal_start_ctrl_conn(unsigned char ++++ pptpd-1.3.4/ctrlpacket.c 2010-06-03 14:37:05.610979335 +0200 +@@ -377,9 +377,9 @@ void deal_start_ctrl_conn(unsigned char start_ctrl_conn_rply.bearer_cap = htons(OUR_BEARER); start_ctrl_conn_rply.max_channels = htons(MAX_CHANNELS); start_ctrl_conn_rply.firmware_rev = htons(PPTP_FIRMWARE_VERSION); diff --git a/package/pptpd/patches/patch-plugins_Makefile b/package/pptpd/patches/patch-plugins_Makefile index cb32dd4ce..937e62ddf 100644 --- a/package/pptpd/patches/patch-plugins_Makefile +++ b/package/pptpd/patches/patch-plugins_Makefile @@ -1,5 +1,5 @@ --- pptpd-1.3.4.orig/plugins/Makefile 2006-08-03 04:02:01.000000000 +0200 -+++ pptpd-1.3.4/plugins/Makefile 2010-05-30 00:31:31.390625000 +0200 ++++ pptpd-1.3.4/plugins/Makefile 2010-06-03 14:39:12.120974815 +0200 @@ -1,6 +1,6 @@ -CC = gcc +CC ?= gcc @@ -9,3 +9,12 @@ LDFLAGS = -shared LDADD = -lutil INSTALL = install -o root +@@ -18,7 +18,7 @@ all: $(PLUGINS) + %.so: %.c + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD) + +-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd ++LIBDIR = $(DESTDIR)$(prefix)/lib/pptpd + + install: $(PLUGINS) + $(INSTALL) -d $(LIBDIR) |