summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-06-03 17:58:25 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-03 17:58:25 +0200
commit2e2eee9052d2c487d7114818ca446c370dba7f49 (patch)
tree2952c3f4bc00a5d5a6c6e03c5d3592ca04b81f03
parent91bf2231a22d817d9ec663d9a76464c220adb88f (diff)
parentb9d987583aa7e4f168654d4f6e26beeeefbc7c61 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/pptpd/patches/patch-ctrlpacket_c4
-rw-r--r--package/pptpd/patches/patch-plugins_Makefile11
2 files changed, 12 insertions, 3 deletions
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)