tinc: 1.0.36 -> 1.1pre18

6 files changed, 18 insertions, 31 deletions

diff --git a/manualPorts/tinc/.footprint b/manualPorts/tinc/.footprint
index 4def84e..8d0ffd7 100644
--- a/manualPorts/tinc/.footprint
+++ b/manualPorts/tinc/.footprint
@@ -1,13 +1,19 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/tinc
 -rwxr-xr-x	root/root	usr/bin/tincd
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/bash-completion/
+drwxr-xr-x	root/root	usr/share/bash-completion/completions/
+-rw-r--r--	root/root	usr/share/bash-completion/completions/tinc
 drwxr-xr-x	root/root	usr/share/info/
 -rw-r--r--	root/root	usr/share/info/tinc.info
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/tinc.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/tinc-gui.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/tinc.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/tincd.8.gz
 drwxr-xr-x	root/root	usr/share/tinc/
 drwxr-xr-x	root/root	usr/share/tinc/examples/
diff --git a/manualPorts/tinc/.md5sum b/manualPorts/tinc/.md5sum
index 4aab7d0..f4c1964 100644
--- a/manualPorts/tinc/.md5sum
+++ b/manualPorts/tinc/.md5sum
@@ -1,2 +1 @@
-d35a40c75cef47e98c30cc45f1b1b16c  graph.patch
-535b58ee026ec9551954dcc6ed56edca  tinc-1.0.36.tar.gz
+2983fcbdf3775120922b672b1cc4c2df  tinc-1.1pre18.tar.gz
diff --git a/manualPorts/tinc/.signature b/manualPorts/tinc/.signature
index 08fb7e4..1163787 100644
--- a/manualPorts/tinc/.signature
+++ b/manualPorts/tinc/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/deepthought.pub
-RWQxCptPusLGGrT7vr1aQ34u5FDUE76HgRj+M3oIPdvxshrKsgzB7f04okF4TpZ1DPLga9FuyjVCDnzRRPw/lNerWi4n6DEoawE=
-SHA256 (Pkgfile) = 21583107d4f95061dbd17808fa6cf6c8fbcabc16a45300e41a04618a3f1590a2
-SHA256 (.footprint) = 64fd9502ba488349b9bba48f8ce2c2646e2876cb9a27bdd50f2e801585ea9c2f
-SHA256 (tinc-1.0.36.tar.gz) = 40f73bb3facc480effe0e771442a706ff0488edea7a5f2505d4ccb2aa8163108
-SHA256 (graph.patch) = abbfb72bb094d3974294bfcc654f1651eab825ff13c1e5e676272c3b9e78d512
+RWQxCptPusLGGmK4dj2PGRhkON0iv7RgguRO6PkWdTOBHuKkMMsOGr+oMUMGM02Xf4myajzBPy8Gnp5EVSGOuId3iRZTc3AVlQs=
+SHA256 (Pkgfile) = 96bbedca8ecaed01e4fe597f0441a3f2f23adfefd9d6da3c90222beb8288203b
+SHA256 (.footprint) = 09360bdb9366dfbd49017bcd9a67dc405f1a7efc5ab855ea6204896f5e6f242c
+SHA256 (tinc-1.1pre18.tar.gz) = 2757ddc62cf64b411f569db2fa85c25ec846c0db110023f6befb33691f078986
diff --git a/manualPorts/tinc/Pkgfile b/manualPorts/tinc/Pkgfile
index 1983502..067aceb 100644
--- a/manualPorts/tinc/Pkgfile
+++ b/manualPorts/tinc/Pkgfile
@@ -4,14 +4,13 @@
 # Depends on: lzo openssl zlib
 
 name=tinc
-version=1.0.36
+version=1.1pre18
 release=1
-source=("https://www.tinc-vpn.org/packages/tinc-$version.tar.gz" "graph.patch")
+source=("https://www.tinc-vpn.org/packages/tinc-$version.tar.gz")
 
 build() {
 
     cd ${name}-${version}
-    patch -p1 -i ../graph.patch
     ./configure \
       --prefix=/usr \
       --sysconfdir=/etc \
diff --git a/manualPorts/tinc/graph.patch b/manualPorts/tinc/graph.patch
deleted file mode 100644
index 1e903a1..0000000
--- a/manualPorts/tinc/graph.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/graph.c b/src/graph.c
-index c63fdf9c..91f5c990 100644
---- a/src/graph.c
-+++ b/src/graph.c
-@@ -366,7 +366,13 @@ void dump_graph(void) {
- 	/* now dump all edges */
- 	for(node = edge_weight_tree->head; node; node = node->next) {
- 		e = node->data;
--		fprintf(file, "	\"%s\" -> \"%s\";\n", e->from->name, e->to->name);
-+		if (e->reverse) {
-+			if (e->reverse > e)
-+				fprintf(file, "	\"%s\" -> \"%s\" [dir=both];\n", e->from->name, e->to->name);
-+		}
-+		else {
-+			fprintf(file, "	\"%s\" -> \"%s\";\n", e->from->name, e->to->name);
-+		}
- 	}
- 
- 	fprintf(file, "}\n");
diff --git a/manualPorts/tinc/lastVersion.sh b/manualPorts/tinc/lastVersion.sh
index 11e510a..582ca2c 100755
--- a/manualPorts/tinc/lastVersion.sh
+++ b/manualPorts/tinc/lastVersion.sh
@@ -2,9 +2,12 @@
 
 curl -Ss 'https://www.tinc-vpn.org/packages/' \
 | sed '
-  s@^.*<a href="\(tinc-\([0-9.]\+\)\.tar\.gz\)">\1</a>.*$@\2@
+  s@^.*<a href="\(tinc-\([0-9.]\+\)\.tar\.gz\)">\1</a>.*$@\2 normal \2@
+  t
+  s@^.*<a href="\(tinc-\(\([0-9.]\+\)pre\([0-9]\+\)\)\.tar\.gz\)">\1</a>.*$@\2 pre \3 \4@
   t
   d
 ' \
-| sort -V \
+| sort -k3V,3 -k2r,2 -k4n,4 \
+| cut -d' ' -f1 \
 | tail -n1