bmx: Use repos from https://github.com/bmx-routing and remove bmx7 json-c patch

diff --git a/bmx6/Makefile b/bmx6/Makefile
index 1741d94c86bd910f04e10b6be509d0b89f757bd1..d6e224afe8e73b653b3dd0276b1e56c25eb8a141 100644 (file)
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -28,11 +28,11 @@ PKG_NAME:=bmx6
 
 PKG_SOURCE_PROTO:=git
 
-#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
-PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
+PKG_SOURCE_URL:=git://github.com/bmx-routing/bmx6.git
+#PKG_SOURCE_URL:=file:///usr/src/bmx-routing/bmx6.git
 
 PKG_REV:=4016a1980d900309771e432d1f7c741d6c48d477
-PKG_VERSION:=r2017032301
+PKG_VERSION:=r2018010201
 PKG_RELEASE:=5
 PKG_LICENSE:=GPL-2.0
 

diff --git a/bmx7/Makefile b/bmx7/Makefile
index f1e4485922284204dadb141559b5a0b440cc555d..8999d8d0e3765fe8bce318b67b9b98412d5a1164 100644 (file)
--- a/bmx7/Makefile
+++ b/bmx7/Makefile
@@ -27,12 +27,11 @@ PKG_NAME:=bmx7
 
 PKG_SOURCE_PROTO:=git
 
-#PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
-PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
-#PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6.git
+PKG_SOURCE_URL:=git://github.com/bmx-routing/bmx7.git
+#PKG_SOURCE_URL:=file:///usr/src/bmx-routing/bmx7.git
 
-PKG_REV:=1b8cf4c119d3bf886a9b9c5a1bca8043506f3684
-PKG_VERSION:=r2017071001
+PKG_REV:=a0b18da22d4195afdea82ac080eba02f1121f86b
+PKG_VERSION:=r2018010203
 PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
@@ -45,7 +44,6 @@ include $(INCLUDE_DIR)/package.mk
 
 TARGET_CFLAGS += $(FPIC)
 
-#MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=POLARSSL_1_3_4 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO"
 MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) -I. -I$(STAGING_DIR)/usr/include -DCRYPTLIB=MBEDTLS_2_4_0 -DCORE_LIMIT=20000 -DTRAFFIC_DUMP -DNO_TRACE_FUNCTION_CALLS -DBMX7_LIB_IWINFO"
 
 MAKE_ARGS += \
@@ -60,9 +58,8 @@ define Package/bmx7/Default
   CATEGORY:=Network
   SUBMENU:=Routing and Redirection
   TITLE:=BMX7 layer 3 routing daemon
-  URL:=http://bmx6.net/
+  URL:=http://github.com/bmx-routing/bmx7
   MAINTAINER:=Axel Neumann <neumann@cgws.de>
-#  DEPENDS:=+zlib +libpolarssl +libiwinfo
   DEPENDS:=+zlib +libmbedtls +libiwinfo
 endef
 

diff --git a/bmx7/patches/001-json-c.patch b/bmx7/patches/001-json-c.patch
deleted file mode 100644 (file)
index 794bd9e..0000000
--- a/bmx7/patches/001-json-c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: bmx7-r2014112401/lib/bmx7_json/json.c
-===================================================================
---- bmx7-r2014112401.orig/lib/bmx7_json/json.c
-+++ bmx7-r2014112401/lib/bmx7_json/json.c
-@@ -27,7 +27,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <stdint.h>
--#include <json/json.h>
-+#include <json-c/json.h>
- //#include <dirent.h>
- //#include <sys/inotify.h>
-