From 7027e2c318e1f47e914015fc0f13992a4dcbb32a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:18:33 +0200 Subject: update to latest upstream and fix cross-compile on Cygwin --- package/pptpd/patches/patch-ctrlpacket_c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'package/pptpd/patches/patch-ctrlpacket_c') diff --git a/package/pptpd/patches/patch-ctrlpacket_c b/package/pptpd/patches/patch-ctrlpacket_c index f1a456de0..bd4e3dfea 100644 --- a/package/pptpd/patches/patch-ctrlpacket_c +++ b/package/pptpd/patches/patch-ctrlpacket_c @@ -1,15 +1,14 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- pptpd-1.3.0.orig/ctrlpacket.c 2004-04-29 08:58:45.000000000 +0200 -+++ pptpd-1.3.0/ctrlpacket.c 2008-10-14 13:43:14.000000000 +0200 -@@ -376,9 +376,9 @@ void deal_start_ctrl_conn(unsigned char +--- 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 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); - bzero(start_ctrl_conn_rply.hostname, MAX_HOSTNAME_SIZE); + memset(start_ctrl_conn_rply.hostname, 0, MAX_HOSTNAME_SIZE); - strncpy(start_ctrl_conn_rply.hostname, PPTP_HOSTNAME, MAX_HOSTNAME_SIZE); + strncpy((char *)start_ctrl_conn_rply.hostname, PPTP_HOSTNAME, MAX_HOSTNAME_SIZE); - bzero(start_ctrl_conn_rply.vendor, MAX_VENDOR_SIZE); + memset(start_ctrl_conn_rply.vendor, 0, MAX_VENDOR_SIZE); - strncpy(start_ctrl_conn_rply.vendor, PPTP_VENDOR, MAX_VENDOR_SIZE); + strncpy((char *)start_ctrl_conn_rply.vendor, PPTP_VENDOR, MAX_VENDOR_SIZE); COPY_CTRL_PACKET(start_ctrl_conn_rply, rply_packet, rply_size); DEBUG_PACKET("START CTRL CONN RPLY"); -- cgit v1.2.3 From e21c5f005ad02185bebbf0782b3e7245879ca19a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Jun 2010 14:40:20 +0200 Subject: fix package build --- package/pptpd/patches/patch-ctrlpacket_c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pptpd/patches/patch-ctrlpacket_c') 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); -- cgit v1.2.3