From owner-svn-ports-all@FreeBSD.ORG Wed May 13 16:14:49 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 005B5E89; Wed, 13 May 2015 16:14:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D615012AF; Wed, 13 May 2015 16:14:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DGEm95065535; Wed, 13 May 2015 16:14:48 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DGEkQ7065528; Wed, 13 May 2015 16:14:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201505131614.t4DGEkQ7065528@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 13 May 2015 16:14:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386226 - in head/net/hanstunnel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2015 16:14:49 -0000 Author: jbeich Date: Wed May 13 16:14:46 2015 New Revision: 386226 URL: https://svnweb.freebsd.org/changeset/ports/386226 Log: net/hanstunnel: update to 0.4.4 [1] and improve - Revert r326014 as nothing to substitute in pkg-message [1] - Clarify server works only on Linux [1] - Unbreak build on DragonFly [2] - Drop poorly maintained CLANG option [3] - Simplify patching via MAKE_ARGS - Respect LOCALBASE != PREFIX - Pet portlint (makepatch) - Clarify LICENSE PR: 195313 Reported by: DPorts [2] Requested by: many [3] Submitted by: vsityz@gmail.com (maintainer [1], based on) Reviewed by: marino [2] Approved by: maintainer timeout (~3 weeks) Added: head/net/hanstunnel/files/patch-src_echo.cpp - copied, changed from r386224, head/net/hanstunnel/files/patch-echo.cpp head/net/hanstunnel/files/patch-src_tun.cpp - copied, changed from r384558, head/net/hanstunnel/files/patch-tun.cpp head/net/hanstunnel/files/patch-src_tun__dev__freebsd.c (contents, props changed) head/net/hanstunnel/pkg-message - copied unchanged from r326013, head/net/hanstunnel/pkg-message Deleted: head/net/hanstunnel/files/patch-Makefile head/net/hanstunnel/files/patch-client.cpp head/net/hanstunnel/files/patch-echo.cpp head/net/hanstunnel/files/patch-main.cpp head/net/hanstunnel/files/patch-tun.cpp head/net/hanstunnel/files/patch-utility.cpp head/net/hanstunnel/files/pkg-message.in Modified: head/net/hanstunnel/Makefile head/net/hanstunnel/distinfo head/net/hanstunnel/pkg-descr Modified: head/net/hanstunnel/Makefile ============================================================================== --- head/net/hanstunnel/Makefile Wed May 13 15:40:41 2015 (r386225) +++ head/net/hanstunnel/Makefile Wed May 13 16:14:46 2015 (r386226) @@ -2,42 +2,30 @@ # $FreeBSD$ PORTNAME= hans -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.4.4 CATEGORIES= net security MASTER_SITES= SF/hanstunnel/source MAINTAINER= vsityz@gmail.com COMMENT= Hans makes it possible to tunnel IPv4 through ICMP -LICENSE= GPLv3 - -OPTIONS_DEFINE= CLANG - -CLANG_DESC= Build with Clang instead of GCC - -OPTIONS_DEFAULT= CLANG - +LICENSE= FPL GPLv3 # or any later version +LICENSE_COMB= multi +LICENSE_NAME_FPL=Freeware Public License +LICENSE_FILE_FPL=${WRKSRC}/src/sha1_license.txt +LICENSE_PERMS_FPL=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +USES= dos2unix +DOS2UNIX_FILES= ${LICENSE_FILE_FPL} +MAKE_ARGS= GCC="${CC}" GPP="${CXX}" \ + CFLAGS="${CFLAGS} -c" LDFLAGS="${LDFLAGS}" \ + TUN_DEV_FILE="src/tun_dev_freebsd.c" PLIST_FILES= bin/hans -SUB_FILES= pkg-message - -.include - -.if ${PORT_OPTIONS:MCLANG} -.if ${OSVERSION} >= 900033 && exists(/usr/bin/clang) -CC= clang -CXX= clang++ -.else -BUILD_DEPENDS+= clang33:${PORTSDIR}/lang/clang33 -CC= clang33 -CXX= clang++33 -.endif -.else -USE_GCC= any -.endif +# Remove CRs before ask-license to fix formatting in dialog(1) +post-extract: dos2unix do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hans ${STAGEDIR}${LOCALBASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/hans ${STAGEDIR}${PREFIX}/bin .include Modified: head/net/hanstunnel/distinfo ============================================================================== --- head/net/hanstunnel/distinfo Wed May 13 15:40:41 2015 (r386225) +++ head/net/hanstunnel/distinfo Wed May 13 16:14:46 2015 (r386226) @@ -1,2 +1,2 @@ -SHA256 (hans-0.4.1.tar.gz) = 8e4df005bcf6a877ffd0810cc9b31aa3ae04f23d798bea6cc2893a3f26cac29c -SIZE (hans-0.4.1.tar.gz) = 32860 +SHA256 (hans-0.4.4.tar.gz) = 81378258b8c9510ac01ad4d69f191e2927b9304daae033ee097f6ba4d39f6bb3 +SIZE (hans-0.4.4.tar.gz) = 33992 Copied and modified: head/net/hanstunnel/files/patch-src_echo.cpp (from r386224, head/net/hanstunnel/files/patch-echo.cpp) ============================================================================== --- head/net/hanstunnel/files/patch-echo.cpp Wed May 13 15:21:12 2015 (r386224, copy source) +++ head/net/hanstunnel/files/patch-src_echo.cpp Wed May 13 16:14:46 2015 (r386226) @@ -1,9 +1,10 @@ ---- echo.cpp.orig 2014-08-06 10:11:40.000000000 -0400 -+++ echo.cpp 2014-08-06 10:11:56.000000000 -0400 -@@ -20,6 +20,7 @@ +--- src/echo.cpp.orig 2014-02-07 03:36:31 UTC ++++ src/echo.cpp +@@ -19,7 +19,7 @@ + #include "echo.h" #include "exception.h" - +- +#include #include #include Copied and modified: head/net/hanstunnel/files/patch-src_tun.cpp (from r384558, head/net/hanstunnel/files/patch-tun.cpp) ============================================================================== --- head/net/hanstunnel/files/patch-tun.cpp Thu Apr 23 11:11:11 2015 (r384558, copy source) +++ head/net/hanstunnel/files/patch-src_tun.cpp Wed May 13 16:14:46 2015 (r386226) @@ -1,45 +1,11 @@ ---- tun.cpp.orig 2010-02-17 10:30:21.000000000 -0500 -+++ tun.cpp 2014-08-06 10:10:51.000000000 -0400 -@@ -21,6 +21,7 @@ +--- src/tun.cpp.orig 2014-02-07 03:36:31 UTC ++++ src/tun.cpp +@@ -20,7 +20,7 @@ + #include "tun.h" #include "exception.h" #include "utility.h" - +- +#include #include #include #include -@@ -41,8 +42,7 @@ - - if (device != NULL) - { -- strncpy(this->device, device, VTUN_DEV_LEN); -- this->device[VTUN_DEV_LEN] = 0; -+ strlcpy(this->device, device, VTUN_DEV_LEN); - } - else - this->device[0] = 0; -@@ -68,23 +68,17 @@ - string ips = Utility::formatIp(ip); - string destIps = Utility::formatIp(destIp); - --#ifdef LINUX -- snprintf(cmdline, sizeof(cmdline), "/sbin/ifconfig %s %s netmask 255.255.255.0", device, ips.c_str()); --#else -- snprintf(cmdline, sizeof(cmdline), "/sbin/ifconfig %s %s %s netmask 255.255.255.255", device, ips.c_str(), destIps.c_str()); --#endif -+ snprintf(cmdline, sizeof(cmdline), "/sbin/ifconfig %s %s %s netmask 255.255.255.0", device, ips.c_str(), destIps.c_str()); - - if (system(cmdline) != 0) - syslog(LOG_ERR, "could not set tun device ip address"); - --#ifndef LINUX - if (includeSubnet) - { - snprintf(cmdline, sizeof(cmdline), "/sbin/route add %s/24 %s", destIps.c_str(), destIps.c_str()); - if (system(cmdline) != 0) - syslog(LOG_ERR, "could not add route"); - } --#endif - } - - void Tun::write(const char *buffer, int length) Added: head/net/hanstunnel/files/patch-src_tun__dev__freebsd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hanstunnel/files/patch-src_tun__dev__freebsd.c Wed May 13 16:14:46 2015 (r386226) @@ -0,0 +1,14 @@ +--- src/tun_dev_freebsd.c.orig 2014-02-07 03:36:31 UTC ++++ src/tun_dev_freebsd.c +@@ -31,7 +31,11 @@ + #include + + #include ++#ifdef __DragonFly__ ++#include ++#else + #include ++#endif + + /* #include "vtun.h" + #include "lib.h" */ Modified: head/net/hanstunnel/pkg-descr ============================================================================== --- head/net/hanstunnel/pkg-descr Wed May 13 15:40:41 2015 (r386225) +++ head/net/hanstunnel/pkg-descr Wed May 13 16:14:46 2015 (r386226) @@ -3,4 +3,7 @@ could call it a ping tunnel. This can be in the situation that your Internet access is firewalled, but pings are allowed. +Hans runs on Linux as a client and a server. It runs on Mac OS X, +iPhone/iPod touch, FreeBSD and OpenBSD as a client only. + WWW: http://code.gerade.org/hans/ Copied: head/net/hanstunnel/pkg-message (from r326013, head/net/hanstunnel/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hanstunnel/pkg-message Wed May 13 16:14:46 2015 (r386226, copy of r326013, head/net/hanstunnel/pkg-message) @@ -0,0 +1,23 @@ +------------------------------------------------------------ + +Hans runs on Linux as a client and a server. +It runs on FreeBSD client only. + +NOTE: that Hans can not receive echo requests on BSD systems. +Therefore the server only works on Linux. + +------------------------------------------------------------ + +### Running as a server ### + +% hans -s 10.1.2.0 -r -p password -u nobody + +### Running as a client ### + +% hans -c server_address -p password -u nobody + +### Help ### + +% hans + +------------------------------------------------------------