From 46f996b4f02a3a235d39a4721c31901e7804f78c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Sep 2015 21:02:31 +0900
Subject: [PATCH] Update modules

This also takes us past the OpenWrt 15.05 final release.
---
 include/gluon.mk                                       |  2 +-
 modules                                                | 10 +++++-----
 ...und-unconditional-libopenssl-build-dependency.patch |  4 ++--
 targets/ar71xx-generic/vermagic                        |  2 +-
 targets/ar71xx-nand/vermagic                           |  2 +-
 targets/brcm2708-bcm2708/vermagic                      |  2 +-
 targets/brcm2708-bcm2709/vermagic                      |  2 +-
 targets/mpc85xx-generic/vermagic                       |  2 +-
 targets/ramips-rt305x/vermagic                         |  2 +-
 targets/sunxi/vermagic                                 |  2 +-
 targets/x86-64/vermagic                                |  2 +-
 targets/x86-generic/vermagic                           |  2 +-
 targets/x86-kvm_guest/vermagic                         |  2 +-
 13 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/gluon.mk b/include/gluon.mk
index 4f99ec1cf..8aca3f749 100644
--- a/include/gluon.mk
+++ b/include/gluon.mk
@@ -35,7 +35,7 @@ export GLUON_LANGS
 ifeq ($(OPENWRT_BUILD),1)
 ifeq ($(GLUON_TOOLS),1)
 
-DEFAULT_OPKG_REPO := http://downloads.openwrt.org/chaos_calmer/15.05-rc3/%S/packages
+DEFAULT_OPKG_REPO := http://downloads.openwrt.org/chaos_calmer/15.05/%S/packages
 
 CONFIG_VERSION_REPO := $(shell $(GLUONDIR)/scripts/site.sh opkg_repo || echo '$(DEFAULT_OPKG_REPO)')
 export CONFIG_VERSION_REPO
diff --git a/modules b/modules
index 275de0307..47335984a 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=be73b965acbf449a10fe3e5d64238ca60cef71c3
+OPENWRT_COMMIT=8aa5672b43d5e6e4a768a0b703e918592a312cd0
 
 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
-PACKAGES_OPENWRT_COMMIT=d32e986ef6ae6ac414a908d914a2230b1ecf482e
+PACKAGES_OPENWRT_COMMIT=9cadde21830c2e3ac66e4de1eafd5d9cfa006eec
 PACKAGES_OPENWRT_BRANCH=for-15.05
 
 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=6c6fafa0bad263c220aef25a5dba69dee90353ba
+PACKAGES_GLUON_COMMIT=fc35a19d2a054a9fb0a8b25c5924966cfb32d946
 
 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
-PACKAGES_ROUTING_COMMIT=a845bb4b95bb6598bb1f04a578c47383ff2aaac2
+PACKAGES_ROUTING_COMMIT=3b4de3e11226a12f29ccf333fc6a569ea0d48ff0
 
 PACKAGES_LUCI_REPO=git://github.com/openwrt/luci.git
-PACKAGES_LUCI_COMMIT=791ca8b6d217cd17b563c008c86159f519874d72
+PACKAGES_LUCI_COMMIT=30f6fe82af20fded9ab4100f0f2a652bf5881947
 PACKAGES_LUCI_BRANCH=for-15.05
diff --git a/patches/openwrt/0021-opkg-work-around-unconditional-libopenssl-build-dependency.patch b/patches/openwrt/0021-opkg-work-around-unconditional-libopenssl-build-dependency.patch
index e87afb859..b9eec309f 100644
--- a/patches/openwrt/0021-opkg-work-around-unconditional-libopenssl-build-dependency.patch
+++ b/patches/openwrt/0021-opkg-work-around-unconditional-libopenssl-build-dependency.patch
@@ -8,10 +8,10 @@ not only opkg-smime. Fix this by applying the same workaround as in
 ustream-ssl.
 
 diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
-index d38ed52..16ff225 100644
+index 32bcf2b..4da4d46 100644
 --- a/package/system/opkg/Makefile
 +++ b/package/system/opkg/Makefile
-@@ -70,7 +70,7 @@ endef
+@@ -72,7 +72,7 @@ endef
  define Package/opkg-smime
    $(call Package/opkg/Default)
    TITLE+= (with S/MIME signature support)
diff --git a/targets/ar71xx-generic/vermagic b/targets/ar71xx-generic/vermagic
index 122a8aab8..ff4754757 100644
--- a/targets/ar71xx-generic/vermagic
+++ b/targets/ar71xx-generic/vermagic
@@ -1 +1 @@
-5dcb66d04a38219f7fd91c748f0e9a32
+7bed08fa9c06eb8089e82c200340ec66
diff --git a/targets/ar71xx-nand/vermagic b/targets/ar71xx-nand/vermagic
index f359f68a0..bde150ed8 100644
--- a/targets/ar71xx-nand/vermagic
+++ b/targets/ar71xx-nand/vermagic
@@ -1 +1 @@
-08d628f1b60980ae837e80caaf2d7e37
+a44d8090b8f752ec1d96871dbbb8988a
diff --git a/targets/brcm2708-bcm2708/vermagic b/targets/brcm2708-bcm2708/vermagic
index f6eb6b841..f63671890 100644
--- a/targets/brcm2708-bcm2708/vermagic
+++ b/targets/brcm2708-bcm2708/vermagic
@@ -1 +1 @@
-a8463905834d64a3df8c231cf94ffc88
+57d4b7d13c23edd1a689dd6d6adc65ad
diff --git a/targets/brcm2708-bcm2709/vermagic b/targets/brcm2708-bcm2709/vermagic
index 2964cf3e3..5264819cf 100644
--- a/targets/brcm2708-bcm2709/vermagic
+++ b/targets/brcm2708-bcm2709/vermagic
@@ -1 +1 @@
-beebeea48e3792a20d2324a49f04b74d
+0fec8065ae15bf9934ffbe2512e8e39f
diff --git a/targets/mpc85xx-generic/vermagic b/targets/mpc85xx-generic/vermagic
index a29e7e744..5ca6009d1 100644
--- a/targets/mpc85xx-generic/vermagic
+++ b/targets/mpc85xx-generic/vermagic
@@ -1 +1 @@
-682734a2bcc20cf580e27db161f6d0df
+521812ea85032e662b3d3469a3a10df8
diff --git a/targets/ramips-rt305x/vermagic b/targets/ramips-rt305x/vermagic
index a39462c9c..3bc73d5ef 100644
--- a/targets/ramips-rt305x/vermagic
+++ b/targets/ramips-rt305x/vermagic
@@ -1 +1 @@
-73d2b013e81727fe0664fd1b78bd291e
+c8b57a131072a3198e594822481af3e0
diff --git a/targets/sunxi/vermagic b/targets/sunxi/vermagic
index 21f65d6e8..ef11e4c30 100644
--- a/targets/sunxi/vermagic
+++ b/targets/sunxi/vermagic
@@ -1 +1 @@
-67fc80824241f73ea9ef5de62059465a
+3c199b535784c56bd7a6b4d6ad82b91f
diff --git a/targets/x86-64/vermagic b/targets/x86-64/vermagic
index 52037a9b8..cc552ff2a 100644
--- a/targets/x86-64/vermagic
+++ b/targets/x86-64/vermagic
@@ -1 +1 @@
-fd9bfcbbba8366c338b3e2a3eb8448d5
+30da46d39f906146155850351fa0acd9
diff --git a/targets/x86-generic/vermagic b/targets/x86-generic/vermagic
index bc39f47da..3c2f8d1b7 100644
--- a/targets/x86-generic/vermagic
+++ b/targets/x86-generic/vermagic
@@ -1 +1 @@
-efa451855d1db0df511f08a5ef56377c
+8549f8163c15d79b053f26aa0d52e96f
diff --git a/targets/x86-kvm_guest/vermagic b/targets/x86-kvm_guest/vermagic
index d4170ba53..b0031811b 100644
--- a/targets/x86-kvm_guest/vermagic
+++ b/targets/x86-kvm_guest/vermagic
@@ -1 +1 @@
-77694101191b9fcdbf96b2622dd5d5a8
+d0d2aab265f2535385cf8d756315d27c
-- 
GitLab