diff options
| -rw-r--r-- | security/n2n/Makefile | 16 | ||||
| -rw-r--r-- | security/n2n/distinfo | 6 | ||||
| -rw-r--r-- | security/n2n/files/patch-Makefile | 13 | ||||
| -rw-r--r-- | security/n2n/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | security/n2n/files/patch-tuntap__freebsd.c | 20 | ||||
| -rw-r--r-- | security/n2n/pkg-descr | 14 |
6 files changed, 35 insertions, 45 deletions
diff --git a/security/n2n/Makefile b/security/n2n/Makefile index 8802a436b359..254fbd9e8f5a 100644 --- a/security/n2n/Makefile +++ b/security/n2n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= n2n -PORTVERSION= 2.4 +PORTVERSION= ${PORT_V_MAJOR}.${PORT_V_MINOR} CATEGORIES= security net net-vpn MAINTAINER= farrokhi@FreeBSD.org @@ -11,7 +11,12 @@ COMMENT= Layer Two Peer-to-peer VPN LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake ssl +GNU_CONFIGURE= yes +USES= autoreconf gmake ssl + +PORT_V_MAJOR= 2 +PORT_V_MINOR= 6 +PORT_V_PATCH= 0 USE_GITHUB= yes GH_ACCOUNT= ntop @@ -22,6 +27,13 @@ PLIST_FILES= sbin/edge \ man/man7/n2n.7.gz \ man/man8/edge.8.gz +post-patch: + @${SED} -e "s/@N2N_MAJOR@/${PORT_V_MAJOR}/g" \ + -e "s/@N2N_MINOR@/${PORT_V_MINOR}/g" \ + -e "s/@N2N_PATCH@/${PORT_V_PATCH}/g" \ + -e "s/@N2N_VERSION_SHORT@/${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}/g" \ + ${WRKSRC}/configure.seed >${WRKSRC}/configure.ac + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/edge ${STAGEDIR}${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/supernode ${STAGEDIR}${PREFIX}/sbin diff --git a/security/n2n/distinfo b/security/n2n/distinfo index fa5c976d28b2..2b1b66e4d9ea 100644 --- a/security/n2n/distinfo +++ b/security/n2n/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534574950 -SHA256 (ntop-n2n-2.4_GH0.tar.gz) = acbf5792935b84fb6516b9a2133a0f6f70023ee6ee4ca0d2d4248cab187f3c04 -SIZE (ntop-n2n-2.4_GH0.tar.gz) = 501614 +TIMESTAMP = 1586460913 +SHA256 (ntop-n2n-2.6_GH0.tar.gz) = d08a75cba32394e7077d8b3afdef913d61cdf5911141effb5cd3ee2d79c66bc2 +SIZE (ntop-n2n-2.6_GH0.tar.gz) = 559529 diff --git a/security/n2n/files/patch-Makefile b/security/n2n/files/patch-Makefile deleted file mode 100644 index cab4da7f3c20..000000000000 --- a/security/n2n/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig 2018-08-17 12:16:07 UTC -+++ Makefile -@@ -4,8 +4,8 @@ N2N_OSNAME=$(shell uname -p) - - ######## - --CC=gcc --DEBUG?=-g3 -+CC?=gcc -+#DEBUG?=-g3 - #OPTIMIZATION?=-O2 - WARN?=-Wall -Wshadow -Wpointer-arith -Wmissing-declarations -Wnested-externs - diff --git a/security/n2n/files/patch-Makefile.in b/security/n2n/files/patch-Makefile.in new file mode 100644 index 000000000000..4b15f34b59e1 --- /dev/null +++ b/security/n2n/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2020-04-09 19:38:26 UTC ++++ Makefile.in +@@ -6,7 +6,7 @@ GIT_COMMITS=@GIT_COMMITS@ + ######## + + CC?=gcc +-DEBUG?=-g3 ++#DEBUG?=-g3 + #OPTIMIZATION?=-O2 + WARN?=-Wall + diff --git a/security/n2n/files/patch-tuntap__freebsd.c b/security/n2n/files/patch-tuntap__freebsd.c deleted file mode 100644 index 08b1fc0a462d..000000000000 --- a/security/n2n/files/patch-tuntap__freebsd.c +++ /dev/null @@ -1,20 +0,0 @@ ---- tuntap_freebsd.c.orig 2018-08-18 08:16:29 UTC -+++ tuntap_freebsd.c -@@ -20,7 +20,7 @@ - - #ifdef __FreeBSD__ - --void tun_close(tuntap_dev *device); -+void tuntap_close(tuntap_dev *device); - - /* ********************************** */ - -@@ -78,7 +78,7 @@ int tuntap_open(tuntap_dev *device /* ignored */, - - fd = popen(buf, "r"); - if(fd < 0) { -- tun_close(device); -+ tuntap_close(device); - return(-1); - } else { - int a, b, c, d, e, f; diff --git a/security/n2n/pkg-descr b/security/n2n/pkg-descr index 475d4d1cdd0b..bb8ef4746df2 100644 --- a/security/n2n/pkg-descr +++ b/security/n2n/pkg-descr @@ -1,10 +1,10 @@ -n2n is a layer-two peer-to-peer virtual private network (VPN) which allows -users to exploit features typical of P2P applications at network instead of -application level. This means that users can gain native IP visibility -(e.g. two PCs belonging to the same n2n network can ping each other) and be -reachable with the same network IP address regardless of the network where -they currently belong. In a nutshell, as OpenVPN moved SSL from application -(e.g. used to implement the https protocol) to network protocol, n2n moves +n2n is a layer-two peer-to-peer virtual private network (VPN) which allows +users to exploit features typical of P2P applications at network instead of +application level. This means that users can gain native IP visibility +(e.g. two PCs belonging to the same n2n network can ping each other) and be +reachable with the same network IP address regardless of the network where +they currently belong. In a nutshell, as OpenVPN moved SSL from application +(e.g. used to implement the https protocol) to network protocol, n2n moves P2P from application to network level. WWW: https://www.ntop.org/products/n2n/ |