initial bmx7 package

3 files changed, 35 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce4a5b61184b..a5e820110c2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = bmx6
-	pkgdesc = Bmx6 mesh routing network protocol including json, sms and table plugins
-	pkgver = r662.8f26909
+pkgbase = bmx7
+	pkgdesc = Bmx7 mesh routing network protocol including plugins
+	pkgver = r917.85841b0
 	pkgrel = 1
 	url = http://bmx6.net
 	arch = i686
@@ -11,9 +11,11 @@ pkgbase = bmx6
 	makedepends = gcc
 	depends = glibc
 	depends = json-c
-	provides = bmx6
-	source = bmx6::git+https://github.com/axn/bmx6
+	depends = wireless_tools
+	depends = mbedtls
+	provides = bmx7
+	source = bmx7::git+https://github.com/bmx-routing/bmx7.git
 	sha256sums = SKIP
 
-pkgname = bmx6
+pkgname = bmx7
 
diff --git a/PKGBUILD b/PKGBUILD
index 7bc5af64dab5..6243e52c53fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
-# Maintainer: Pau Escrich <p4u@dabax.net>
+# Maintainer: Arne Zachlod <arne@nerdkeller.org>
 
-pkgname=bmx6
-pkgver=r662.8f26909
+pkgname=bmx7
+pkgver=r917.85841b0
 pkgrel=1
-pkgdesc="Bmx6 mesh routing network protocol including json, sms and table plugins"
+pkgdesc="Bmx7 mesh routing network protocol including plugins"
 arch=('i686' 'x86_64')
 url="http://bmx6.net"
 license=('GPL2')
-depends=('glibc' 'json-c')
+depends=('glibc' 'json-c' 'wireless_tools' 'mbedtls')
 makedepends=('git' 'make' 'gcc')
 conflicts=('')
-provides=('bmx6')
+provides=('bmx7')
 
-source=("$pkgname"::'git+https://github.com/axn/bmx6')
+source=("$pkgname"::'git+https://github.com/bmx-routing/bmx7.git')
 sha256sums=('SKIP')
 
 pkgver() {
@@ -24,19 +24,30 @@ build() {
   cd "$srcdir/$pkgname"
   make
   #JSON plugin
-  sed -i s/"json\/json.h"/"json-c\/json.h"/g lib/bmx6_json/json.c
-  make -C lib/bmx6_json/
+  make -C lib/bmx7_json/
   #SMS plugin
-  make -C lib/bmx6_sms/
+  make -C lib/bmx7_sms/
   #Table plugin
-  make -C lib/bmx6_table/
+#  make -C lib/bmx7_table/
+  #topology plugin
+  make -C lib/bmx7_topology/
+  #tun plugin
+  make -C lib/bmx7_tun/
+  #evil plugin
+  make -C lib/bmx7_evil/
+  #http-info plugin
+  make -C lib/bmx7_http_info/
 }
 
 package() {
   install -D -m 644 ${startdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
   cd "$srcdir/$pkgname"
-  install -D -m 755 bmx6 ${pkgdir}/usr/bin/bmx6
-  install -D -m 755 lib/bmx6_json/bmx6_json.so ${pkgdir}/usr/lib/bmx6_json.so
-  install -D -m 755 lib/bmx6_sms/bmx6_sms.so ${pkgdir}/usr/lib/bmx6_sms.so
-  install -D -m 755 lib/bmx6_table/bmx6_table.so ${pkgdir}/usr/lib/bmx6_table.so
+  install -D -m 755 bmx7 ${pkgdir}/usr/bin/bmx7
+  install -D -m 755 lib/bmx7_json/bmx7_json.so ${pkgdir}/usr/lib/bmx7_json.so
+  install -D -m 755 lib/bmx7_sms/bmx7_sms.so ${pkgdir}/usr/lib/bmx7_sms.so
+#  install -D -m 755 lib/bmx7_table/bmx7_table.so ${pkgdir}/usr/lib/bmx7_table.so
+  install -D -m 755 lib/bmx7_topology/bmx7_topology.so ${pkgdir}/usr/lib/bmx7_topology.so
+  install -D -m 755 lib/bmx7_tun/bmx7_tun.so ${pkgdir}/usr/lib/bmx7_tun.so
+  install -D -m 755 lib/bmx7_evil/bmx7_evil.so ${pkgdir}/usr/lib/bmx7_evil.so
+  install -D -m 755 lib/bmx7_http_info/bmx7_http_info.so ${pkgdir}/usr/lib/bmx7_http_info.so
 }
diff --git a/bmx7.service b/bmx7.service
index e3521a5774a5..6462cf997177 100644
--- a/bmx7.service
+++ b/bmx7.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/bmx6
+ExecStart=/usr/bin/bmx7
 ExecStop=/usr/bin/kill -15 $MAINPID
 PIDFile=/var/run/bmx6/pid
 Restart=on-failure