Migrate to new development repository

8 files changed, 36 insertions, 135 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0f382742f06..4d3c286cf0c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,20 @@
-# Generated by mksrcinfo v8
-# Mon Jan  4 03:36:12 UTC 2016
 pkgbase = n2n-git
 	pkgdesc = Peer-to-Peer VPN.
-	pkgver = 20151130
+	pkgver = 2.5.0.r104
 	pkgrel = 1
-	url = https://github.com/meyerd/n2n
+	url = https://github.com/ntop/n2n
 	arch = i686
 	arch = x86_64
+	arch = armv7h
+	arch = aarch64
 	license = GPL3
 	makedepends = git
 	depends = openssl
 	depends = net-tools
 	provides = n2n
 	conflicts = n2n
-	source = git+https://github.com/meyerd/n2n.git
-	source = edge.conf.example
-	source = edge.sh
-	source = n2n-edge@.service
-	source = n2n-supernode.service
-	source = supernode.conf
-	source = supernode.sh
+	source = git+https://github.com/ntop/n2n.git
 	md5sums = SKIP
-	md5sums = 2ece2e5b7d8180c8a157df4394014efe
-	md5sums = 3f7f42b27ab24e206e58f7147e726f07
-	md5sums = 9f1b096a3a2a2c1492cf553b36c478e8
-	md5sums = 12c1fd79cc6584defe2837a154f95acc
-	md5sums = 5af8895c46608a443ff48ea9c5041e1a
-	md5sums = 9eab67d3412dba7c004a22bd90fbbd77
 
 pkgname = n2n-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 726477247918..84616318cf5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,50 @@
-# Maintainer: maz-1 <ohmygod19993 at gmail dot com>
+# Maintainer: Emanuele Faranda <black.silver@hotmail.it>
+# Contributor: maz-1 <ohmygod19993 at gmail dot com>
 pkgname=n2n-git
-_gitname=n2n
-pkgver=20151130
+_pkgname=n2n
+pkgver=2.5.0.r104
 pkgrel=1
 pkgdesc="Peer-to-Peer VPN."
-arch=(i686 x86_64)
-url="https://github.com/meyerd/n2n"
+arch=(i686 x86_64 armv7h aarch64)
+url="https://github.com/ntop/n2n"
 license=('GPL3')
-depends=('openssl' 'net-tools') #iproute2?
+depends=('openssl' 'net-tools')
 makedepends=('git')
 provides=(n2n)
 conflicts=(n2n)
-source=('git+https://github.com/meyerd/n2n.git'
-        'edge.conf.example'
-        'edge.sh'
-        'n2n-edge@.service'
-        'n2n-supernode.service'
-        'supernode.conf'
-        'supernode.sh'
-        )
-md5sums=('SKIP'
-         '2ece2e5b7d8180c8a157df4394014efe'
-         '3f7f42b27ab24e206e58f7147e726f07'
-         '9f1b096a3a2a2c1492cf553b36c478e8'
-         '12c1fd79cc6584defe2837a154f95acc'
-         '5af8895c46608a443ff48ea9c5041e1a'
-         '9eab67d3412dba7c004a22bd90fbbd77')
+source=('git+https://github.com/ntop/n2n.git')
+md5sums=('SKIP')
 
 pkgver() {
-  cd  "$srcdir/$_gitname"
-  git log -1 --format="%cd" --date=short | sed 's|-||g'
-}
-
-prepare() {
-  rm -rf "$srcdir/build"
-  mkdir -p "$srcdir/build"
+  cd "$srcdir/$_pkgname"
+  local rev=`git rev-list --all |wc -l | tr -d '[[:space:]]'`
+  local rel=`grep -F "AC_INIT([edge]" configure.ac | sed -rs 's/^[^,]*,([^\)]+).*$/\1/'`
+  printf "%s.r%s" "$rel" "$rev"
 }
 
 build() {
-  cd "$srcdir/build"
-  cmake ../$_gitname/n2n_v2 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib 
-    
+  cd "$srcdir/$_pkgname"
+  ./autogen.sh
+  ./configure --prefix=/usr
+
   make
+
+  # Prepare the service files
+  cd packages/debian
+  ./configure
 }
 
 package() {
-  cd "$srcdir/build"
-  install -dm755 "$pkgdir/etc/n2n/edge"
-  install -dm755 "$pkgdir/usr/share/n2n"
-  install -Dm755 "$srcdir/edge.conf.example" "$pkgdir/etc/n2n/edge/edge.conf.example"
-  install -Dm755 "$srcdir/supernode.conf" "$pkgdir/etc/n2n/supernode.conf"
-  install -Dm755 "$srcdir/edge.sh" "$pkgdir/usr/share/n2n/edge.sh"
-  install -Dm755 "$srcdir/supernode.sh" "$pkgdir/usr/share/n2n/supernode.sh"
-  install -Dm755 "$srcdir/n2n-edge@.service" "$pkgdir/usr/lib/systemd/system/n2n-edge@.service"
-  install -Dm755 "$srcdir/n2n-supernode.service" "$pkgdir/usr/lib/systemd/system/n2n-supernode.service"
-  
-  
+  cd "$srcdir/$_pkgname"
+  install -dm700 "$pkgdir/etc/n2n"
+  install -dm755 "$pkgdir/usr/lib/systemd/system"
+
+  install -Dm600 "packages/etc/n2n/edge.conf.sample" "$pkgdir/etc/n2n/edge.conf"
+  install -Dm600 "packages/etc/n2n/supernode.conf.sample" "$pkgdir/etc/n2n/supernode.conf"
+  install -Dm644 "packages/etc/systemd/system/edge.service" "$pkgdir/usr/lib/systemd/system/edge.service"
+  install -Dm644 "packages/etc/systemd/system/edge@.service" "$pkgdir/usr/lib/systemd/system/edge@.service"
+  install -Dm644 "packages/etc/systemd/system/supernode.service" "$pkgdir/usr/lib/systemd/system/supernode.service"
+
   make DESTDIR="$pkgdir" install
   mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
 }
-
diff --git a/edge.conf.example b/edge.conf.example
deleted file mode 100644
index db9a09dc46e7..000000000000
--- a/edge.conf.example
+++ /dev/null
@@ -1,28 +0,0 @@
-# example configuration
-# TUN device name
-TUN=tun1
-# Enable package forwarding or not. 0=no, 1=yes.
-FORWADING=1
-# Allow DHCP or not. 0=no, 1=yes. Must enable package forwarding.
-DHCP=0
-# Static address. Useful when DHCP disabled.
-ADDRESS=10.10.10.2
-# Community name.
-COMMUNITY=n2n
-# Key
-KEY=12345678
-# Netmask. Leave blank if you use DHCP
-NETMASK=255.255.255.0
-# MAC address. Leave blank if you don't want to set a static one. Format: 01:02:03:04:05:06
-MACADDR=
-
-# Supernode server address and port.
-SUPERNODE=42.159.99.50:6060
-# Local port
-LPORT=
-# MTU
-MTU=
-# Management UDP Port
-TPORT=
-# Periodically resolve supernode IP (when supernodes are running on dynamic IPs)
-PRESOLV=0
\ No newline at end of file
diff --git a/edge.sh b/edge.sh
deleted file mode 100644
index c02aee987f51..000000000000
--- a/edge.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-source /etc/n2n/edge/$1.conf
-PARAMS="-d $TUN"
-[[ "z$DHCP" = "z1" ]] && PARAMS="$PARAMS -a dhcp:0.0.0.0" || PARAMS="$PARAMS -a static:$ADDRESS"
-PARAMS="$PARAMS -c $COMMUNITY"
-PARAMS="$PARAMS -k $KEY"
-[[ -z "$NETMASK" ]] || PARAMS="$PARAMS -s $NETMASK"
-[[ -z "$MACADDR" ]] || PARAMS="$PARAMS -m $MACADDR"
-PARAMS="$PARAMS -l $SUPERNODE"
-[[ "z$FORWADING" = "z1" ]] && PARAMS="$PARAMS -r"
-[[ -z "$LPORT" ]] || PARAMS="$PARAMS -p $LPORT"
-[[ -z "$MTU" ]] || PARAMS="$PARAMS -M $MTU"
-[[ -z "$TPORT" ]] || PARAMS="$PARAMS -t $TPORT"
-[[ "z$PRESOLV" = "z1" ]] && PARAMS="$PARAMS -b"
-exec /usr/bin/edge $PARAMS -f
\ No newline at end of file
diff --git a/n2n-edge@.service b/n2n-edge@.service
deleted file mode 100644
index 340e69177918..000000000000
--- a/n2n-edge@.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=N2N VPN Edge
-After=network.target
-
-[Service]
-Type=simple
-User=root
-ExecStart=/usr/share/n2n/edge.sh %i
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/n2n-supernode.service b/n2n-supernode.service
deleted file mode 100644
index 85c95abb7f39..000000000000
--- a/n2n-supernode.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=N2N VPN Supernode
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-ExecStart=/usr/share/n2n/supernode.sh
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/supernode.conf b/supernode.conf
deleted file mode 100644
index 6677cfd0336e..000000000000
--- a/supernode.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# set the port that supernode listen on.
-SPORT=4385
diff --git a/supernode.sh b/supernode.sh
deleted file mode 100644
index 17a57b668a13..000000000000
--- a/supernode.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-source /etc/n2n/supernode.conf
-exec /usr/bin/supernode -l $SPORT -f
\ No newline at end of file