Waldemar Brodkorb 3 месяцев назад
Родитель
Сommit
d318443856
2 измененных файлов с 4 добавлено и 19 удалено
  1. 4 5
      package/pptpd/Makefile
  2. 0 14
      package/pptpd/patches/patch-ctrlpacket_c

+ 4 - 5
package/pptpd/Makefile

@@ -4,15 +4,14 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		pptpd
-PKG_VERSION:=		1.3.4
-PKG_RELEASE:=		2
-PKG_HASH:=		c23a9bdd219a0a36ae7ca20e7c9749f2efdcdbf108aabeeeb5066ba442ec88b6
+PKG_VERSION:=		1.5.0
+PKG_RELEASE:=		1
+PKG_HASH:=		6a724284b1ce00ea23f7d7608d081843a10c8a8d87d951cb2ea86e70aa1b4e77
 PKG_DESCR:=		point-to-point tunneling protocol server
 PKG_SECTION:=		net/ppp
 PKG_DEPENDS:=		ppp
 PKG_KDEPENDS:=		ppp ppp-mppe net-ipgre
-PKG_URL:=		http://www.poptop.org/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=poptop/}
+PKG_SITES:=		https://sourceforge.net/projects/poptop/files/pptpd/$(PKG_NAME)-$(PKG_VERSION)/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 

+ 0 - 14
package/pptpd/patches/patch-ctrlpacket_c

@@ -1,14 +0,0 @@
---- pptpd-1.3.4.orig/ctrlpacket.c	2005-08-03 11:10:59.000000000 +0200
-+++ 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);
--	bzero(start_ctrl_conn_rply.hostname, MAX_HOSTNAME_SIZE);
-+	memset(start_ctrl_conn_rply.hostname, 0, 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((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");