Migrate to new development repository

1 files changed, 31 insertions, 46 deletions

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"
 }
-