Date: Sat, 2 May 2015 19:33:13 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385211 - in head/net/hanstunnel: . files Message-ID: <201505021933.t42JXDPe052220@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat May 2 19:33:12 2015 New Revision: 385211 URL: https://svnweb.freebsd.org/changeset/ports/385211 Log: Back out part of r385209 related to bug 195313 Not bumping PORTEPOCH because I'll eventually land those changes, anyway. PR: 199723 Added: head/net/hanstunnel/files/patch-Makefile - copied unchanged from r385208, head/net/hanstunnel/files/patch-Makefile head/net/hanstunnel/files/patch-client.cpp - copied unchanged from r385208, head/net/hanstunnel/files/patch-client.cpp head/net/hanstunnel/files/patch-echo.cpp - copied unchanged from r385208, head/net/hanstunnel/files/patch-echo.cpp head/net/hanstunnel/files/patch-main.cpp - copied unchanged from r385208, head/net/hanstunnel/files/patch-main.cpp head/net/hanstunnel/files/patch-tun.cpp - copied unchanged from r385208, head/net/hanstunnel/files/patch-tun.cpp head/net/hanstunnel/files/patch-utility.cpp - copied unchanged from r385208, head/net/hanstunnel/files/patch-utility.cpp head/net/hanstunnel/files/pkg-message.in - copied unchanged from r385208, head/net/hanstunnel/files/pkg-message.in Deleted: head/net/hanstunnel/files/patch-src_echo.cpp head/net/hanstunnel/files/patch-src_tun.cpp head/net/hanstunnel/files/patch-src_tun__dev__freebsd.c head/net/hanstunnel/pkg-message Modified: head/net/hanstunnel/Makefile head/net/hanstunnel/distinfo head/net/hanstunnel/pkg-descr Modified: head/net/hanstunnel/Makefile ============================================================================== --- head/net/hanstunnel/Makefile Sat May 2 19:25:50 2015 (r385210) +++ head/net/hanstunnel/Makefile Sat May 2 19:33:12 2015 (r385211) @@ -2,30 +2,42 @@ # $FreeBSD$ PORTNAME= hans -PORTVERSION= 0.4.4 +PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= net security MASTER_SITES= SF/hanstunnel/source MAINTAINER= vsityz@gmail.com COMMENT= Hans makes it possible to tunnel IPv4 through ICMP -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" +LICENSE= GPLv3 + +OPTIONS_DEFINE= CLANG + +CLANG_DESC= Build with Clang instead of GCC + +OPTIONS_DEFAULT= CLANG + PLIST_FILES= bin/hans -# Remove CRs before ask-license to fix formatting in dialog(1) -post-extract: dos2unix +SUB_FILES= pkg-message + +.include <bsd.port.options.mk> + +.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 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hans ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/hans ${STAGEDIR}${LOCALBASE}/bin .include <bsd.port.mk> Modified: head/net/hanstunnel/distinfo ============================================================================== --- head/net/hanstunnel/distinfo Sat May 2 19:25:50 2015 (r385210) +++ head/net/hanstunnel/distinfo Sat May 2 19:33:12 2015 (r385211) @@ -1,2 +1,2 @@ -SHA256 (hans-0.4.4.tar.gz) = 81378258b8c9510ac01ad4d69f191e2927b9304daae033ee097f6ba4d39f6bb3 -SIZE (hans-0.4.4.tar.gz) = 33992 +SHA256 (hans-0.4.1.tar.gz) = 8e4df005bcf6a877ffd0810cc9b31aa3ae04f23d798bea6cc2893a3f26cac29c +SIZE (hans-0.4.1.tar.gz) = 32860 Copied: head/net/hanstunnel/files/patch-Makefile (from r385208, head/net/hanstunnel/files/patch-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hanstunnel/files/patch-Makefile Sat May 2 19:33:12 2015 (r385211, copy of r385208, head/net/hanstunnel/files/patch-Makefile) @@ -0,0 +1,73 @@ +--- Makefile.orig 2010-02-17 17:30:21.000000000 +0200 ++++ Makefile 2013-04-04 15:18:50.818219413 +0300 +@@ -1,53 +1,51 @@ +-LDFLAGS = `sh osflags ld $(MODE)` +-CFLAGS = -c -g `sh osflags c $(MODE)` +-TUN_DEV_FILE = `sh osflags dev $(MODE)` +-GCC = gcc +-GPP = g++ ++TUN_DEV_FILE = tun_dev_freebsd.c ++GCC = ${CC} ++GPP = ${CXX} + + all: hans + + hans: tun.o sha1.o main.o client.o server.o auth.o worker.o time.o tun_dev.o echo.o exception.o utility.o +- $(GPP) -o hans tun.o sha1.o main.o client.o server.o auth.o worker.o time.o tun_dev.o echo.o exception.o utility.o $(LDFLAGS) ++ ${GPP} -o hans tun.o sha1.o main.o client.o server.o auth.o worker.o time.o tun_dev.o echo.o exception.o utility.o ${LDFLAGS} + + utility.o: utility.cpp utility.h +- $(GPP) -c utility.cpp $(CFLAGS) ++ ${GPP} -c utility.cpp ${CFLAGS} + + exception.o: exception.cpp exception.h +- $(GPP) -c exception.cpp $(CFLAGS) ++ ${GPP} -c exception.cpp ${CFLAGS} + + echo.o: echo.cpp echo.h exception.h +- $(GPP) -c echo.cpp $(CFLAGS) ++ ${GPP} -c echo.cpp ${CFLAGS} + + tun.o: tun.cpp tun.h exception.h utility.h tun_dev.h +- $(GPP) -c tun.cpp $(CFLAGS) ++ ${GPP} -c tun.cpp ${CFLAGS} + + tun_dev.o: +- $(GCC) -c $(TUN_DEV_FILE) -o tun_dev.o $(CFLAGS) ++ ${GCC} -c ${TUN_DEV_FILE} -o tun_dev.o ${CFLAGS} + + sha1.o: sha1.cpp sha1.h +- $(GPP) -c sha1.cpp $(CFLAGS) ++ ${GPP} -c sha1.cpp ${CFLAGS} + + main.o: main.cpp client.h server.h exception.h worker.h auth.h time.h echo.h tun.h tun_dev.h +- $(GPP) -c main.cpp $(CFLAGS) ++ ${GPP} -c main.cpp ${CFLAGS} + + client.o: client.cpp client.h server.h exception.h config.h worker.h auth.h time.h echo.h tun.h tun_dev.h +- $(GPP) -c client.cpp $(CFLAGS) ++ ${GPP} -c client.cpp ${CFLAGS} + + server.o: server.cpp server.h client.h utility.h config.h worker.h auth.h time.h echo.h tun.h tun_dev.h +- $(GPP) -c server.cpp $(CFLAGS) ++ ${GPP} -c server.cpp ${CFLAGS} + + auth.o: auth.cpp auth.h sha1.h utility.h +- $(GPP) -c auth.cpp $(CFLAGS) ++ ${GPP} -c auth.cpp ${CFLAGS} + + worker.o: worker.cpp worker.h tun.h exception.h time.h echo.h tun_dev.h config.h +- $(GPP) -c worker.cpp $(CFLAGS) ++ ${GPP} -c worker.cpp ${CFLAGS} + + time.o: time.cpp time.h +- $(GPP) -c time.cpp $(CFLAGS) ++ ${GPP} -c time.cpp ${CFLAGS} + + clean: + rm -f tun.o sha1.o main.o client.o server.o auth.o worker.o time.o tun_dev.o echo.o exception.o utility.o tunemu.o hans + + + tunemu.o: tunemu.h tunemu.c +- $(GCC) -c tunemu.c -o tunemu.o ++ ${GCC} -c tunemu.c -o tunemu.o Copied: head/net/hanstunnel/files/patch-client.cpp (from r385208, head/net/hanstunnel/files/patch-client.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hanstunnel/files/patch-client.cpp Sat May 2 19:33:12 2015 (r385211, copy of r385208, head/net/hanstunnel/files/patch-client.cpp) @@ -0,0 +1,11 @@ +--- client.cpp.orig 2010-02-17 17:30:21.000000000 +0200 ++++ client.cpp 2013-04-03 16:05:10.000000000 +0300 +@@ -27,6 +27,8 @@ + #include <arpa/inet.h> + #include <syslog.h> + ++#include <netinet/in.h> ++ + using namespace std; + + const Worker::TunnelHeader::Magic Client::magic("hanc"); Copied: head/net/hanstunnel/files/patch-echo.cpp (from r385208, head/net/hanstunnel/files/patch-echo.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hanstunnel/files/patch-echo.cpp Sat May 2 19:33:12 2015 (r385211, copy of r385208, head/net/hanstunnel/files/patch-echo.cpp) @@ -0,0 +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 @@ + #include "echo.h" + #include "exception.h" + ++#include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in_systm.h> + #include <netinet/in.h> Copied: head/net/hanstunnel/files/patch-main.cpp (from r385208, head/net/hanstunnel/files/patch-main.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hanstunnel/files/patch-main.cpp Sat May 2 19:33:12 2015 (r385211, copy of r385208, head/net/hanstunnel/files/patch-main.cpp) @@ -0,0 +1,10 @@ +--- main.cpp.orig 2014-08-06 10:11:00.000000000 -0400 ++++ main.cpp 2014-08-06 10:11:12.000000000 -0400 +@@ -30,6 +30,7 @@ + #include <stdlib.h> + #include <errno.h> + #include <syslog.h> ++#include <unistd.h> + + void usage() + { Copied: head/net/hanstunnel/files/patch-tun.cpp (from r385208, head/net/hanstunnel/files/patch-tun.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hanstunnel/files/patch-tun.cpp Sat May 2 19:33:12 2015 (r385211, copy of r385208, head/net/hanstunnel/files/patch-tun.cpp) @@ -0,0 +1,45 @@ +--- 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 @@ + #include "exception.h" + #include "utility.h" + ++#include <sys/types.h> + #include <arpa/inet.h> + #include <netinet/in_systm.h> + #include <netinet/in.h> +@@ -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) Copied: head/net/hanstunnel/files/patch-utility.cpp (from r385208, head/net/hanstunnel/files/patch-utility.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hanstunnel/files/patch-utility.cpp Sat May 2 19:33:12 2015 (r385211, copy of r385208, head/net/hanstunnel/files/patch-utility.cpp) @@ -0,0 +1,10 @@ +--- utility.cpp.orig 2014-08-06 10:12:15.000000000 -0400 ++++ utility.cpp 2014-08-06 10:12:30.000000000 -0400 +@@ -21,6 +21,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <time.h> + + using namespace std; + Copied: head/net/hanstunnel/files/pkg-message.in (from r385208, head/net/hanstunnel/files/pkg-message.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/hanstunnel/files/pkg-message.in Sat May 2 19:33:12 2015 (r385211, copy of r385208, head/net/hanstunnel/files/pkg-message.in) @@ -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 + +------------------------------------------------------------ Modified: head/net/hanstunnel/pkg-descr ============================================================================== --- head/net/hanstunnel/pkg-descr Sat May 2 19:25:50 2015 (r385210) +++ head/net/hanstunnel/pkg-descr Sat May 2 19:33:12 2015 (r385211) @@ -3,7 +3,4 @@ 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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505021933.t42JXDPe052220>