From patchwork Mon Mar 31 21:12:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 335593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id B483E1400D2 for ; Tue, 1 Apr 2014 08:12:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B7D548A121; Mon, 31 Mar 2014 21:12:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aa3n+hKwXVXu; Mon, 31 Mar 2014 21:12:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D192B89E59; Mon, 31 Mar 2014 21:12:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 247411BF992 for ; Mon, 31 Mar 2014 21:12:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1D53689D68 for ; Mon, 31 Mar 2014 21:12:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vMT0QxmW44JE for ; Mon, 31 Mar 2014 21:12:22 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2802D8ACC9 for ; Mon, 31 Mar 2014 21:12:21 +0000 (UTC) Received: from asgard (host107.181-14-143.telecom.net.ar [181.14.143.107]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.8/8.14.8) with ESMTP id s2VLCFuB030029 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 31 Mar 2014 21:12:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1396300340; bh=v926ZihWbqWRO7ly7WjVAXoa5vqKNSusjj8PfOF1Zto=; h=From:To:Cc:Subject:Date; b=JbfBjJDYzzlMbx1anTOeB/PmSalW7oppbbY8svZ0YcuvRM5Ac/8w4394AV2vztS0f yHTBYhxGHhOr8/Ai9e6CHkBlOQeTRwz70WNsaUedO9cd6DWIlMkZvQy7+PxJJZ5d5n FNu9abvxujwbLAz8rGg5iyi1Zz6tEZk1v+AgNWPM= Received: by asgard (sSMTP sendmail emulation); Mon, 31 Mar 2014 18:12:09 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 31 Mar 2014 18:12:09 -0300 Message-Id: <1396300329-12942-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.3.2 X-Virus-Scanned: clamav-milter 0.98.1 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCHv2] pptp-linux: bump to version 1.8.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- .../pptp-linux/pptp-linux-001-susv3-legacy.patch | 43 +++++++++++---------- .../pptp-linux/pptp-linux-002-drop-stropts.patch | 26 ------------- ...tch => pptp-linux-002-fix-parallel-build.patch} | 0 package/pptp-linux/pptp-linux-003-ip-path.patch | 44 ---------------------- package/pptp-linux/pptp-linux.mk | 5 ++- 5 files changed, 27 insertions(+), 91 deletions(-) delete mode 100644 package/pptp-linux/pptp-linux-002-drop-stropts.patch rename package/pptp-linux/{pptp-linux-004-fix-parallel-build.patch => pptp-linux-002-fix-parallel-build.patch} (100%) delete mode 100644 package/pptp-linux/pptp-linux-003-ip-path.patch diff --git a/package/pptp-linux/pptp-linux-001-susv3-legacy.patch b/package/pptp-linux/pptp-linux-001-susv3-legacy.patch index f41b63f..5cc9f57 100644 --- a/package/pptp-linux/pptp-linux-001-susv3-legacy.patch +++ b/package/pptp-linux/pptp-linux-001-susv3-legacy.patch @@ -1,24 +1,29 @@ -diff -rdup pptp-linux-1.7.0/pptp_callmgr.c pptp-linux-1.7.0.orig/pptp_callmgr.c ---- pptp-linux-1.7.0/pptp_callmgr.c 2005-07-28 03:15:11.000000000 +0200 -+++ pptp-linux-1.7.0.orig/pptp_callmgr.c 2007-08-24 09:20:39.000000000 +0200 -@@ -314,7 +314,7 @@ int open_inetsock(struct in_addr inetadd - return s; +bzero is deprecated in POSIX.1-2001 and removed for POSIX.1-2008 so +switch to memset instead. + +Signed-off-by: Gustavo Zacarias + +diff -Nura pptp-1.8.0.orig/pptp_callmgr.c pptp-1.8.0/pptp_callmgr.c +--- pptp-1.8.0.orig/pptp_callmgr.c 2013-10-23 05:10:46.000000000 -0300 ++++ pptp-1.8.0/pptp_callmgr.c 2014-03-31 16:47:42.617643298 -0300 +@@ -340,7 +340,7 @@ } + #endif if (localbind.s_addr != INADDR_NONE) { - bzero(&src, sizeof(src)); -+ memset(&src, 0, sizeof(src)); - src.sin_family = AF_INET; - src.sin_addr = localbind; - if (bind(s, (struct sockaddr *) &src, sizeof(src)) != 0) { -diff -rdup pptp-linux-1.7.0/pptp_gre.c pptp-linux-1.7.0.orig/pptp_gre.c ---- pptp-linux-1.7.0/pptp_gre.c 2005-07-28 03:15:11.000000000 +0200 -+++ pptp-linux-1.7.0.orig/pptp_gre.c 2007-08-24 09:20:56.000000000 +0200 -@@ -81,7 +81,7 @@ int pptp_gre_bind(struct in_addr inetadd - int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO); - if (s < 0) { warn("socket: %s", strerror(errno)); return -1; } ++ memset(&src, 0, sizeof(src)); + src.i.sin_family = AF_INET; + src.i.sin_addr = localbind; + if (bind(s, &src.a, sizeof(src.i)) != 0) { +diff -Nura pptp-1.8.0.orig/pptp_gre.c pptp-1.8.0/pptp_gre.c +--- pptp-1.8.0.orig/pptp_gre.c 2013-10-23 05:10:46.000000000 -0300 ++++ pptp-1.8.0/pptp_gre.c 2014-03-31 16:47:30.745249066 -0300 +@@ -103,7 +103,7 @@ + } + #endif if (localbind.s_addr != INADDR_NONE) { - bzero(&loc_addr, sizeof(loc_addr)); -+ memset(&loc_addr, 0, sizeof(loc_addr)); - loc_addr.sin_family = AF_INET; - loc_addr.sin_addr = localbind; - if (bind(s, (struct sockaddr *) &loc_addr, sizeof(loc_addr)) != 0) { ++ memset(&loc_addr, 0, sizeof(loc_addr)); + loc_addr.i.sin_family = AF_INET; + loc_addr.i.sin_addr = localbind; + if (bind(s, &loc_addr.a, sizeof(loc_addr.i)) != 0) { diff --git a/package/pptp-linux/pptp-linux-002-drop-stropts.patch b/package/pptp-linux/pptp-linux-002-drop-stropts.patch deleted file mode 100644 index bc53cc2..0000000 --- a/package/pptp-linux/pptp-linux-002-drop-stropts.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ae214f5103dfaa92ecb0b1953d4c9dd059e620ca Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 21 Oct 2010 10:59:02 -0300 -Subject: [PATCH] Drop stropts.h, it's deprecated and unneeded - - -Signed-off-by: Gustavo Zacarias ---- - pptp_compat.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/pptp_compat.c b/pptp_compat.c -index 1760a3b..e98cbf0 100644 ---- a/pptp_compat.c -+++ b/pptp_compat.c -@@ -7,7 +7,6 @@ - #include - #include - #include --#include - #include - #include - #include "pptp_compat.h" --- -1.7.2.2 - diff --git a/package/pptp-linux/pptp-linux-004-fix-parallel-build.patch b/package/pptp-linux/pptp-linux-002-fix-parallel-build.patch similarity index 100% rename from package/pptp-linux/pptp-linux-004-fix-parallel-build.patch rename to package/pptp-linux/pptp-linux-002-fix-parallel-build.patch diff --git a/package/pptp-linux/pptp-linux-003-ip-path.patch b/package/pptp-linux/pptp-linux-003-ip-path.patch deleted file mode 100644 index 6d8f3c8..0000000 --- a/package/pptp-linux/pptp-linux-003-ip-path.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 00b9e2615191439a6c7db960d169129479ac633b Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 21 Oct 2010 11:01:25 -0300 -Subject: [PATCH] The ip tool is in /sbin rather that /bin, fix it - - -Signed-off-by: Gustavo Zacarias ---- - routing.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/routing.c b/routing.c -index ab20a03..7fb4277 100644 ---- a/routing.c -+++ b/routing.c -@@ -55,7 +55,7 @@ regardless (not yet implemented). - - void routing_init(char *ip) { - char buf[256]; -- snprintf(buf, 255, "/bin/ip route get %s", ip); -+ snprintf(buf, 255, "/sbin/ip route get %s", ip); - FILE *p = popen(buf, "r"); - fgets(buf, 255, p); - /* TODO: check for failure of fgets */ -@@ -66,14 +66,14 @@ void routing_init(char *ip) { - - void routing_start() { - char buf[256]; -- snprintf(buf, 255, "/bin/ip route replace %s", route); -+ snprintf(buf, 255, "/sbin/ip route replace %s", route); - FILE *p = popen(buf, "r"); - pclose(p); - } - - void routing_end() { - char buf[256]; -- snprintf(buf, 255, "/bin/ip route delete %s", route); -+ snprintf(buf, 255, "/sbin/ip route delete %s", route); - FILE *p = popen(buf, "r"); - pclose(p); - } --- -1.7.2.2 - diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index 7b10886..dc624eb 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -PPTP_LINUX_VERSION = 1.7.2 +PPTP_LINUX_VERSION = 1.8.0 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION) PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz PPTP_LINUX_MAKE = $(MAKE1) @@ -15,7 +15,8 @@ define PPTP_LINUX_BUILD_CMDS $(MAKE) -C $(@D) OPTIMIZE= DEBUG= \ CC="$(TARGET_CC)" \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ + IP=/sbin/ip endef define PPTP_LINUX_INSTALL_TARGET_CMDS