From efbc88ddbac586494bd9ab012f52e51a67d35571 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 10 Jul 2015 20:34:11 +0200
Subject: [PATCH] Update modules

---
 modules                                       |  8 +-
 ...8-respect-CONFIG_TARGET_IMAGES_GZIP.patch} |  0
 ...-it-breaks-ebtables-on-64bit-targets.patch | 73 -------------------
 3 files changed, 4 insertions(+), 77 deletions(-)
 rename patches/openwrt/{0017-brcm2708-respect-CONFIG_TARGET_IMAGES_GZIP.patch => 0016-brcm2708-respect-CONFIG_TARGET_IMAGES_GZIP.patch} (100%)
 delete mode 100644 patches/openwrt/0016-ebtables-remove-musl-build-fix-it-breaks-ebtables-on-64bit-targets.patch

diff --git a/modules b/modules
index d5c33a86..dd6b94cc 100644
--- a/modules
+++ b/modules
@@ -1,18 +1,18 @@
 GLUON_FEEDS='openwrt gluon routing luci'
 
 OPENWRT_REPO=git://git.openwrt.org/15.05/openwrt.git
-OPENWRT_COMMIT=54b2f42f724c287d720ca4e12b297e9ea76f8a4d
+OPENWRT_COMMIT=e5682a7ac77fc7c6ec13d72fb4726b15980f373b
 
 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
-PACKAGES_OPENWRT_COMMIT=fa7ed79149b371294f12905210bb032610a11621
+PACKAGES_OPENWRT_COMMIT=62037ba35fda4ae07e89c33946f229da2a941d47
 PACKAGES_OPENWRT_BRANCH=for-15.05
 
 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=9d5b304e95e00ce34811ad4a1ef17c3f4791bad3
 
 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
-PACKAGES_ROUTING_COMMIT=6172dcef329e1b306149cded3340da8f28501266
+PACKAGES_ROUTING_COMMIT=6c78c2ac2cb9ec3be25e68b1cef7b2e2e0e4a346
 
 PACKAGES_LUCI_REPO=git://github.com/openwrt/luci.git
-PACKAGES_LUCI_COMMIT=cf2e3f6c20dbdfdc3d8c4d4115cf9c533444e61f
+PACKAGES_LUCI_COMMIT=218e8f608e4ef988a5c74a9fb499eba4926084be
 PACKAGES_LUCI_BRANCH=for-15.05
diff --git a/patches/openwrt/0017-brcm2708-respect-CONFIG_TARGET_IMAGES_GZIP.patch b/patches/openwrt/0016-brcm2708-respect-CONFIG_TARGET_IMAGES_GZIP.patch
similarity index 100%
rename from patches/openwrt/0017-brcm2708-respect-CONFIG_TARGET_IMAGES_GZIP.patch
rename to patches/openwrt/0016-brcm2708-respect-CONFIG_TARGET_IMAGES_GZIP.patch
diff --git a/patches/openwrt/0016-ebtables-remove-musl-build-fix-it-breaks-ebtables-on-64bit-targets.patch b/patches/openwrt/0016-ebtables-remove-musl-build-fix-it-breaks-ebtables-on-64bit-targets.patch
deleted file mode 100644
index 6831e74b..00000000
--- a/patches/openwrt/0016-ebtables-remove-musl-build-fix-it-breaks-ebtables-on-64bit-targets.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 9 Jul 2015 01:04:52 +0200
-Subject: ebtables: remove musl build fix, it breaks ebtables on 64bit targets
-
-diff --git a/package/network/utils/ebtables/Makefile b/package/network/utils/ebtables/Makefile
-index 4f6d7f5..d3d714f 100644
---- a/package/network/utils/ebtables/Makefile
-+++ b/package/network/utils/ebtables/Makefile
-@@ -49,7 +49,7 @@ endef
- MAKE_VARS += EXT_LIBSI="$(LIBGCC_S)"
- 
- MAKE_FLAGS += \
--	CFLAGS="$(TARGET_CFLAGS)" \
-+	CFLAGS="$(TARGET_CFLAGS) -g" \
- 	LIBDIR="/usr/lib/ebtables"
- 
- define Package/ebtables/install
-diff --git a/package/network/utils/ebtables/patches/100-musl_fix.patch b/package/network/utils/ebtables/patches/100-musl_fix.patch
-deleted file mode 100644
-index 462fea6..0000000
---- a/package/network/utils/ebtables/patches/100-musl_fix.patch
-+++ /dev/null
-@@ -1,50 +0,0 @@
----- a/extensions/ebt_among.c
--+++ b/extensions/ebt_among.c
--@@ -13,7 +13,6 @@
-- #include <ctype.h>
-- #include <unistd.h>
-- #include "../include/ebtables_u.h"
---#include <netinet/ether.h>
-- #include "../include/ethernetdb.h"
-- #include <linux/if_ether.h>
-- #include <linux/netfilter_bridge/ebt_among.h>
----- a/extensions/ebt_arpreply.c
--+++ b/extensions/ebt_arpreply.c
--@@ -12,7 +12,6 @@
-- #include <string.h>
-- #include <getopt.h>
-- #include "../include/ebtables_u.h"
---#include <netinet/ether.h>
-- #include <linux/netfilter_bridge/ebt_arpreply.h>
-- 
-- static int mac_supplied;
----- a/extensions/ebt_nat.c
--+++ b/extensions/ebt_nat.c
--@@ -11,7 +11,6 @@
-- #include <string.h>
-- #include <getopt.h>
-- #include "../include/ebtables_u.h"
---#include <netinet/ether.h>
-- #include <linux/netfilter_bridge/ebt_nat.h>
-- 
-- static int to_source_supplied, to_dest_supplied;
----- a/useful_functions.c
--+++ b/useful_functions.c
--@@ -25,7 +25,6 @@
-- #include "include/ebtables_u.h"
-- #include "include/ethernetdb.h"
-- #include <stdio.h>
---#include <netinet/ether.h>
-- #include <string.h>
-- #include <stdlib.h>
-- #include <getopt.h>
----- a/include/ebtables_u.h
--+++ b/include/ebtables_u.h
--@@ -23,6 +23,7 @@
-- 
-- #ifndef EBTABLES_U_H
-- #define EBTABLES_U_H
--+#include <sys/types.h>
-- #include <netinet/in.h>
-- #include <linux/netfilter_bridge/ebtables.h>
-- #include <linux/netfilter/x_tables.h>