From a31a37dd3d9b31026197617531096638fbcbd579 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Mon, 19 May 2008 18:50:34 +0000
Subject: [PATCH 01/17] [packages] Added batman experimental: net/bmxd (#3457)

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@11216 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile                       | 70 ++++++++++++++++++++++++++++++++++
 files/etc/config/bmxd          | 10 +++++
 files/etc/init.d/bmxd          | 60 +++++++++++++++++++++++++++++
 patches/001-makefile-fix.patch | 21 ++++++++++
 4 files changed, 161 insertions(+)
 create mode 100644 Makefile
 create mode 100644 files/etc/config/bmxd
 create mode 100644 files/etc/init.d/bmxd
 create mode 100644 patches/001-makefile-fix.patch

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..16733e0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,70 @@
+#
+# Copyright (C) 2008 Freifunk Leipzig
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bmxd
+PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/batman-experimental/
+
+PKG_REV:=$(shell LC_ALL=C svn info $(PKG_SOURCE_URL) | sed -ne 's/^Last Changed Rev: //p')
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/bmxd/Default
+  URL:=https://www.open-mesh.net/
+endef
+
+define Package/bmxd
+$(call Package/bmxd/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libpthread +kmod-tun
+  TITLE:=B.A.T.M.A.N. Experimental (BMX) layer 3 routing daemon
+endef
+
+define Package/bmxd/description
+B.A.T.M.A.N. Experimental (BMX) layer 3 routing daemon
+endef
+
+MAKE_ARGS += \
+	EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+	CCFLAGS="$(TARGET_CFLAGS)" \
+	OFLAGS="$(TARGET_CFLAGS)" \
+	REVISION="$(PKG_REV)" \
+	CC="$(TARGET_CC)" \
+	NODEBUG=1 \
+	UNAME="Linux" \
+	INSTALL_DIR="$(PKG_INSTALL_DIR)" \
+	STRIP="/bin/true" \
+	batmand install
+
+define Build/Configure
+	mkdir -p $(PKG_INSTALL_DIR)/bin
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS)
+endef
+
+define Package/bmxd/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/batmand $(1)/usr/sbin/bmxd
+	$(INSTALL_BIN) ./files/etc/init.d/bmxd $(1)/etc/init.d
+	$(INSTALL_DATA) ./files/etc/config/bmxd $(1)/etc/config
+endef
+
+$(eval $(call BuildPackage,bmxd))
diff --git a/files/etc/config/bmxd b/files/etc/config/bmxd
new file mode 100644
index 0000000..ad14d17
--- /dev/null
+++ b/files/etc/config/bmxd
@@ -0,0 +1,10 @@
+config bmxd general
+	option interface		ath0
+	option announce			
+	option gateway_class		
+	option originator_interval
+	option preferred_gateway	
+	option routing_class
+	option visualisation_srv
+	option policy_routing_script
+	
diff --git a/files/etc/init.d/bmxd b/files/etc/init.d/bmxd
new file mode 100644
index 0000000..9eb1095
--- /dev/null
+++ b/files/etc/init.d/bmxd
@@ -0,0 +1,60 @@
+#!/bin/sh /etc/rc.common
+START=91
+. /lib/config/uci.sh
+uci_load bmxd
+start () {
+	interface=$(uci get bmxd.general.interface)
+	if [ "$interface" = "" ]; then
+		echo $1 Error, you must specify at least a network interface
+		exit
+	fi
+	announce=$(uci get bmxd.general.announce)
+	gateway_class=$(uci get bmxd.general.gateway_class)
+	originator_interval=$(uci get bmxd.general.originator_interval)
+	preferred_gateway=$(uci get bmxd.general.preferred_gateway)
+	routing_class=$(uci get bmxd.general.routing_class)
+	visualisation_srv=$(uci get bmxd.general.visualisation_srv)
+	policy_routing_script=$(uci get bmxd.general.policy_routing_script)
+	bmx_args=""
+
+	if [ $announce ]; then
+		bmx_args=${bmx_args}'-a '$announce' '
+	fi
+
+	if [ $gateway_class ]; then
+		bmx_args=${bmx_args}'-g '$gateway_class' '
+	fi
+
+	if [ $originator_interval ]; then
+		bmx_args=${bmx_args}'-o '$originator_interval' '
+	fi
+
+	if [ $preferred_gateway ]; then
+		bmx_args=${bmx_args}'-p '$preferred_gateway' '
+	fi
+
+	if [ $routing_class ]; then
+		bmx_args=${bmx_args}'-r '$routing_class' '
+	fi
+		
+	if [ $visualisation_srv ]; then
+		bmx_args=${bmx_args}'-s '$visualisation_srv' '
+	fi
+	
+	if [ $policy_routing_script ]; then
+		bmx_args=${bmx_args}'--policy-routing-script '$policy_routing_script' '
+	fi
+
+	bmx_args=${bmx_args}$interface
+	bmxd $bmx_args >/dev/null 2>&1
+}
+
+restart () {
+	$0 stop
+	sleep 3
+	$0 start
+}
+        
+stop () {
+	killall bmxd
+}
diff --git a/patches/001-makefile-fix.patch b/patches/001-makefile-fix.patch
new file mode 100644
index 0000000..2c47db4
--- /dev/null
+++ b/patches/001-makefile-fix.patch
@@ -0,0 +1,21 @@
+diff -urb bmxd-r1042.orig/Makefile bmxd-r1042/Makefile
+--- bmxd-r1042.orig/Makefile	2008-05-08 00:07:50.000000000 +0200
++++ bmxd-r1042/Makefile	2008-05-08 00:07:16.000000000 +0200
+@@ -19,11 +19,15 @@
+ 
+ # CC =		gcc
+ 
+-CFLAGS =	-Wall -O1 -g -pg
++# JoW: "-pg" results in "gcrt1.o: No such file" ?!
++#CFLAGS =	-Wall -O1 -g -pg
++CFLAGS =	-Wall -O1 -g
+ 
+ #-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA
+ 
+-LDFLAGS =	-lpthread -static -g -pg
++# JoW: "-pg" results in "gcrt1.o: No such file" ?!
++#LDFLAGS =	-lpthread -static -g -pg
++LDFLAGS =	-lpthread -static -g
+ 
+ 
+ #STRIP=			strip

From 69394a0b271fc83bea7b2ad47dc2231a9dddd13a Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 5 Jun 2008 20:59:28 +0000
Subject: [PATCH 02/17] [packages] net/bmxd: Updated to revision 1075

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@11372 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 16733e0..42545ac 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bmxd
 PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/batman-experimental/
 
-PKG_REV:=$(shell LC_ALL=C svn info $(PKG_SOURCE_URL) | sed -ne 's/^Last Changed Rev: //p')
+PKG_REV:=1075
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 

From 18fed78ff923826bf0c93f1d9d3c339f34f630b2 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 5 Aug 2008 22:04:10 +0000
Subject: [PATCH 03/17] Makefile cleanups, round 6 and last

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@12175 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 42545ac..62727c3 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,6 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 

From 400c2a893df70538c9ee734851cbce39384a0a51 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 17 Apr 2009 14:22:30 +0000
Subject: [PATCH 04/17] nuke $Id$ in /packages as well

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@15244 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 62727c3..d3ee4d0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 

From 5d8cb1567a88409084f8e806bee6bf6d03abc154 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 14 Jul 2009 00:28:24 +0000
Subject: [PATCH 05/17] [package] do not link bmxd statically (#5501)

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@16834 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 patches/001-makefile-fix.patch | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/patches/001-makefile-fix.patch b/patches/001-makefile-fix.patch
index 2c47db4..cf18493 100644
--- a/patches/001-makefile-fix.patch
+++ b/patches/001-makefile-fix.patch
@@ -1,6 +1,6 @@
-diff -urb bmxd-r1042.orig/Makefile bmxd-r1042/Makefile
---- bmxd-r1042.orig/Makefile	2008-05-08 00:07:50.000000000 +0200
-+++ bmxd-r1042/Makefile	2008-05-08 00:07:16.000000000 +0200
+diff -urN bmxd-r1075/Makefile bmxd-r1075.new/Makefile
+--- bmxd-r1075/Makefile	2008-08-04 20:10:56.000000000 +0200
++++ bmxd-r1075.new/Makefile	2009-07-14 02:28:16.000000000 +0200
 @@ -19,11 +19,15 @@
  
  # CC =		gcc
@@ -15,7 +15,14 @@ diff -urb bmxd-r1042.orig/Makefile bmxd-r1042/Makefile
 -LDFLAGS =	-lpthread -static -g -pg
 +# JoW: "-pg" results in "gcrt1.o: No such file" ?!
 +#LDFLAGS =	-lpthread -static -g -pg
-+LDFLAGS =	-lpthread -static -g
++LDFLAGS =	-lpthread -g
  
  
  #STRIP=			strip
+@@ -80,4 +84,4 @@
+ 		rm -f $(BINARY_NAME) *.o
+ 
+ clean-all:
+-		rm -rf $(PACKAGE_NAME)_* dl/*
+\ No newline at end of file
++		rm -rf $(PACKAGE_NAME)_* dl/*

From 42159362c1da902fd73d5ee998e2f65dbf4ed9e3 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 24 Dec 2009 02:56:03 +0000
Subject: [PATCH 06/17] [packages] bmxd: fix rebuild issue

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@18911 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d3ee4d0..04c8fff 100644
--- a/Makefile
+++ b/Makefile
@@ -50,11 +50,8 @@ MAKE_ARGS += \
 	STRIP="/bin/true" \
 	batmand install
 
-define Build/Configure
-	mkdir -p $(PKG_INSTALL_DIR)/bin
-endef
-
 define Build/Compile
+	mkdir -p $(PKG_INSTALL_DIR)/bin
 	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS)
 endef
 

From 6c92908b05a8d0ac3da4042067923862d808340b Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Sun, 25 Apr 2010 21:13:31 +0000
Subject: [PATCH 07/17] [packages] /net/bmxd: update to revision 1636, adapt
 Makefile, do not overwrite /etc/config/bmxd

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@21160 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile                       | 25 ++++++++++++++++---------
 files/etc/config/bmxd          | 17 ++++++++---------
 files/etc/init.d/bmxd          | 15 +++------------
 patches/001-makefile-fix.patch | 28 ----------------------------
 4 files changed, 27 insertions(+), 58 deletions(-)
 delete mode 100644 patches/001-makefile-fix.patch

diff --git a/Makefile b/Makefile
index 04c8fff..c2ec119 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bmxd
 PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/batman-experimental/
 
-PKG_REV:=1075
+PKG_REV:=1636
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
+PKG_EXTRA_CFLAGS:=-DNODEBUGALL
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -24,40 +25,46 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/bmxd/Default
   URL:=https://www.open-mesh.net/
+  MAINTAINER:=Axel Neumann <bmxd@neumann.cgws.de>
 endef
 
 define Package/bmxd
 $(call Package/bmxd/Default)
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpthread +kmod-tun
-  TITLE:=B.A.T.M.A.N. Experimental (BMX) layer 3 routing daemon
+  DEPENDS:=+kmod-tun
+  TITLE:=B.a.t.M.a.n. eXperimental (BMX) layer 3 routing daemon
 endef
 
+define Package/bmxd/conffiles
+/etc/config/bmxd
+endef
+
+
 define Package/bmxd/description
-B.A.T.M.A.N. Experimental (BMX) layer 3 routing daemon
+B.a.t.M.a.n. eXperimental (BMX) layer 3 routing daemon
 endef
 
 MAKE_ARGS += \
-	EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+	EXTRA_CFLAGS="$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)" \
 	CCFLAGS="$(TARGET_CFLAGS)" \
 	OFLAGS="$(TARGET_CFLAGS)" \
 	REVISION="$(PKG_REV)" \
 	CC="$(TARGET_CC)" \
 	NODEBUG=1 \
 	UNAME="Linux" \
-	INSTALL_DIR="$(PKG_INSTALL_DIR)" \
+	INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
 	STRIP="/bin/true" \
-	batmand install
+	bmxd install
 
 define Build/Compile
-	mkdir -p $(PKG_INSTALL_DIR)/bin
+	mkdir -p $(PKG_INSTALL_DIR)/usr/sbin
 	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS)
 endef
 
 define Package/bmxd/install
 	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/batmand $(1)/usr/sbin/bmxd
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bmxd $(1)/usr/sbin/bmxd
 	$(INSTALL_BIN) ./files/etc/init.d/bmxd $(1)/etc/init.d
 	$(INSTALL_DATA) ./files/etc/config/bmxd $(1)/etc/config
 endef
diff --git a/files/etc/config/bmxd b/files/etc/config/bmxd
index ad14d17..c8619e9 100644
--- a/files/etc/config/bmxd
+++ b/files/etc/config/bmxd
@@ -1,10 +1,9 @@
 config bmxd general
-	option interface		ath0
-	option announce			
-	option gateway_class		
-	option originator_interval
-	option preferred_gateway	
-	option routing_class
-	option visualisation_srv
-	option policy_routing_script
-	
+	option interface		'ath0'
+#	option announce			
+#	option gateway_class		
+#	option originator_interval	
+#	option preferred_gateway	
+#	option routing_class		
+#	option visualisation_srv	
+#	option misc			'base-port=14305'	
diff --git a/files/etc/init.d/bmxd b/files/etc/init.d/bmxd
index 9eb1095..d23b4c8 100644
--- a/files/etc/init.d/bmxd
+++ b/files/etc/init.d/bmxd
@@ -3,7 +3,7 @@ START=91
 . /lib/config/uci.sh
 uci_load bmxd
 start () {
-	interface=$(uci get bmxd.general.interface)
+	interface="$(uci get bmxd.general.interface)"
 	if [ "$interface" = "" ]; then
 		echo $1 Error, you must specify at least a network interface
 		exit
@@ -14,7 +14,7 @@ start () {
 	preferred_gateway=$(uci get bmxd.general.preferred_gateway)
 	routing_class=$(uci get bmxd.general.routing_class)
 	visualisation_srv=$(uci get bmxd.general.visualisation_srv)
-	policy_routing_script=$(uci get bmxd.general.policy_routing_script)
+	misc="$(uci get bmxd.general.misc)"
 	bmx_args=""
 
 	if [ $announce ]; then
@@ -41,20 +41,11 @@ start () {
 		bmx_args=${bmx_args}'-s '$visualisation_srv' '
 	fi
 	
-	if [ $policy_routing_script ]; then
-		bmx_args=${bmx_args}'--policy-routing-script '$policy_routing_script' '
-	fi
 
-	bmx_args=${bmx_args}$interface
+	bmx_args="$misc ${bmx_args} $interface"
 	bmxd $bmx_args >/dev/null 2>&1
 }
 
-restart () {
-	$0 stop
-	sleep 3
-	$0 start
-}
-        
 stop () {
 	killall bmxd
 }
diff --git a/patches/001-makefile-fix.patch b/patches/001-makefile-fix.patch
deleted file mode 100644
index cf18493..0000000
--- a/patches/001-makefile-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN bmxd-r1075/Makefile bmxd-r1075.new/Makefile
---- bmxd-r1075/Makefile	2008-08-04 20:10:56.000000000 +0200
-+++ bmxd-r1075.new/Makefile	2009-07-14 02:28:16.000000000 +0200
-@@ -19,11 +19,15 @@
- 
- # CC =		gcc
- 
--CFLAGS =	-Wall -O1 -g -pg
-+# JoW: "-pg" results in "gcrt1.o: No such file" ?!
-+#CFLAGS =	-Wall -O1 -g -pg
-+CFLAGS =	-Wall -O1 -g
- 
- #-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA
- 
--LDFLAGS =	-lpthread -static -g -pg
-+# JoW: "-pg" results in "gcrt1.o: No such file" ?!
-+#LDFLAGS =	-lpthread -static -g -pg
-+LDFLAGS =	-lpthread -g
- 
- 
- #STRIP=			strip
-@@ -80,4 +84,4 @@
- 		rm -f $(BINARY_NAME) *.o
- 
- clean-all:
--		rm -rf $(PACKAGE_NAME)_* dl/*
-\ No newline at end of file
-+		rm -rf $(PACKAGE_NAME)_* dl/*

From ea108d5a51df4f9a8c723fc8922daa7496765659 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Tue, 8 Jun 2010 20:47:57 +0000
Subject: [PATCH 08/17] packages/net/bmxd  update to revision 1694

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@21731 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c2ec119..28b1069 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bmxd
 PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/batman-experimental/
 
-PKG_REV:=1636
+PKG_REV:=1694
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 PKG_EXTRA_CFLAGS:=-DNODEBUGALL

From ed89821f0763b55611f627af41e9b8a68610c284 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 9 Jul 2010 23:36:50 +0000
Subject: [PATCH 10/17] [packages] bmxd: fix subversion repository url

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@22106 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 28b1069..637e17e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bmxd
-PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/batman-experimental/
+PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/bmx/
 
 PKG_REV:=1694
 PKG_VERSION:=r$(PKG_REV)

From 5911ef276d28f07348b4d1444ec930ee2ebd56b1 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Mon, 26 Jul 2010 10:52:38 +0000
Subject: [PATCH 11/17] packages/net/bmxd: use stable branches/bmxd-0.3.x
 (instead of upcoming, unstable, and incompatible trunk/bmxd v0.4) bmxd-0.3.x
 is fully compatible to former trunk/batman-experimental

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@22389 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 637e17e..001e7bf 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bmxd
-PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/bmx/
+PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/branches/bmx-0.3.x/
 
-PKG_REV:=1694
+PKG_REV:=1707
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 PKG_EXTRA_CFLAGS:=-DNODEBUGALL

From 4861f576b90f9e83f5730570d7a32eab2aeb9fdd Mon Sep 17 00:00:00 2001
From: Stephen Walker <stephendwalker@gmail.com>
Date: Sun, 19 Sep 2010 14:15:24 +0000
Subject: [PATCH 12/17] [packages] batman, bmxd: change urls for the
 open-mesh.net -> open-mesh.org move

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@23089 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 001e7bf..1b145f6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2008 Freifunk Leipzig
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bmxd
-PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/branches/bmx-0.3.x/
+PKG_SOURCE_URL:=http://downloads.open-mesh.org/svn/batman/branches/bmx-0.3.x/
 
 PKG_REV:=1707
 PKG_VERSION:=r$(PKG_REV)
@@ -24,7 +25,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bmxd/Default
-  URL:=https://www.open-mesh.net/
+  URL:=https://www.open-mesh.org/
   MAINTAINER:=Axel Neumann <bmxd@neumann.cgws.de>
 endef
 

From a9bf2716ca6de00eec7f51da218fa57194135667 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Sat, 22 Jan 2011 18:19:01 +0000
Subject: [PATCH 13/17] [packages] bmxd: move to git repository at bmx6.net

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@25063 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 1b145f6..fa57ca0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,24 +9,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bmxd
-PKG_SOURCE_URL:=http://downloads.open-mesh.org/svn/batman/branches/bmx-0.3.x/
 
-PKG_REV:=1707
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-PKG_EXTRA_CFLAGS:=-DNODEBUGALL
-
-PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.bmx6.net/bmxd.git
+PKG_REV:=0f8bd1285741d709cfbfbdf4ee443e3c2e03da4c
+PKG_VERSION:=r2011012201
+#PKG_RELEASE:=1
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
+PKG_EXTRA_CFLAGS:=-DNODEBUGALL
+
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bmxd/Default
-  URL:=https://www.open-mesh.org/
-  MAINTAINER:=Axel Neumann <bmxd@neumann.cgws.de>
+  URL:=http://www.bmx6.net/
+  MAINTAINER:=Axel Neumann <neumann@cgws.de>
 endef
 
 define Package/bmxd

From 741e55f2c7444f494e63197c0d3799cfb8450967 Mon Sep 17 00:00:00 2001
From: Daniel Dickinson <daniel@cshore.neomailbox.net>
Date: Sat, 12 Mar 2011 06:55:07 +0000
Subject: [PATCH 14/17] [net] Routing and Redirection: Moved programs for
 routing and redirecting/relaying traffic to the Routing and Redirection
 submenu.

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@26072 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index fa57ca0..c182d8e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ define Package/bmxd
 $(call Package/bmxd/Default)
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
   DEPENDS:=+kmod-tun
   TITLE:=B.a.t.M.a.n. eXperimental (BMX) layer 3 routing daemon
 endef

From 3afa328288ab766e53e2710c749f7b73ad187ece Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Tue, 10 Jan 2012 13:06:22 +0000
Subject: [PATCH 15/17] package bmxd: update repository and revision

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@29704 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c182d8e..1498b64 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bmxd
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.bmx6.net/bmxd.git
-PKG_REV:=0f8bd1285741d709cfbfbdf4ee443e3c2e03da4c
-PKG_VERSION:=r2011012201
+PKG_SOURCE_URL:=git@github.com:axn/bmxd.git
+PKG_REV:=9c1d12b554dccd2efde249f5e44a7d4de59ce1a8
+PKG_VERSION:=r2012011001
 #PKG_RELEASE:=1
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

From 07fbead69cf3bc7bcc3efb1983dee02da13b20dc Mon Sep 17 00:00:00 2001
From: Stephen Walker <stephendwalker@gmail.com>
Date: Fri, 13 Jan 2012 19:44:57 +0000
Subject: [PATCH 16/17] [packages] bmxd: use the read-only source url

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/bmxd@29733 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1498b64..5dfd7f9 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=bmxd
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@github.com:axn/bmxd.git
+PKG_SOURCE_URL:=git://github.com/axn/bmxd.git
 PKG_REV:=9c1d12b554dccd2efde249f5e44a7d4de59ce1a8
 PKG_VERSION:=r2012011001
 #PKG_RELEASE:=1

From cfb8185235467d2c6c3398871729fd525b09a16a Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 18 Apr 2013 18:50:55 +0200
Subject: [PATCH 17/17] move bmx files to subdirectory

---
 Makefile => bmxd/Makefile             | 0
 {files => bmxd/files}/etc/config/bmxd | 0
 {files => bmxd/files}/etc/init.d/bmxd | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename Makefile => bmxd/Makefile (100%)
 rename {files => bmxd/files}/etc/config/bmxd (100%)
 rename {files => bmxd/files}/etc/init.d/bmxd (100%)

diff --git a/Makefile b/bmxd/Makefile
similarity index 100%
rename from Makefile
rename to bmxd/Makefile
diff --git a/files/etc/config/bmxd b/bmxd/files/etc/config/bmxd
similarity index 100%
rename from files/etc/config/bmxd
rename to bmxd/files/etc/config/bmxd
diff --git a/files/etc/init.d/bmxd b/bmxd/files/etc/init.d/bmxd
similarity index 100%
rename from files/etc/init.d/bmxd
rename to bmxd/files/etc/init.d/bmxd