bump xupnpd git-6578ceb

diff --git a/archive-patches/xupnpd/xupnpd-crossbuild.diff b/archive-patches/xupnpd/xupnpd-crossbuild.diff
index 677542e96260f22b3125e3ab54e78ffb003c5df2..ac009a6457bcd1dec18731f3ddc5e2a9dfa659c2 100644 (file)
--- a/archive-patches/xupnpd/xupnpd-crossbuild.diff
+++ b/archive-patches/xupnpd/xupnpd-crossbuild.diff
@@ -2,7 +2,7 @@
 +++ b/Makefile
 @@ -1,17 +1,14 @@
 -LUA     = lua-5.1.4
-+LUA     = lua-5.2.0
++LUA     = lua-5.2.4
  #LUA     = lua-5.2.0
  STATIC  = false
 -OPENSSL = /home/user/src/openssl-0.9.8e

diff --git a/archive-patches/xupnpd/xupnpd-fix-webif-backlinks.diff b/archive-patches/xupnpd/xupnpd-fix-webif-backlinks.diff
new file mode 100644 (file)
index 0000000..4b072e6
--- /dev/null
+++ b/archive-patches/xupnpd/xupnpd-fix-webif-backlinks.diff
@@ -0,0 +1,47 @@
+--- src/ui/xupnpd_ui.lua_orig
++++ src/ui/xupnpd_ui.lua
+@@ -14,7 +14,7 @@ end
+ 
+ function ui_error()
+     http.send('<h2>Error occurred</h3>')
+-    http.send('<br/><a class="btn btn-info" href="/ui">Back</a>')
++    http.send('<br/><a class="btn btn-info" href="/ui/">Back</a>')
+ end
+ 
+ function ui_downloads()
+@@ -26,7 +26,7 @@ function ui_downloads()
+         end
+     end
+     http.send('</table>')
+-    http.send('<br/><a class="btn btn-info" href="/ui">Back</a>')
++    http.send('<br/><a class="btn btn-info" href="/ui/">Back</a>')
+ end
+ 
+ function ui_download(name)
+@@ -87,7 +87,7 @@ function ui_playlists()
+     http.send('<input type=file name=m3ufile><br /><br />')
+     http.send('<input class="btn btn-primary" type=submit value=Send>')
+     http.send('</form><hr/>')
+-    http.send('<br/><a class="btn btn-primary" href="/ui/reload">Reload</a> <a class="btn btn-primary" href="/ui/reload_feeds?return_url=/ui/playlists">Reload feeds</a> <a class="btn btn-info" href="/ui">Back</a>')
++    http.send('<br/><a class="btn btn-primary" href="/ui/reload">Reload</a> <a class="btn btn-primary" href="/ui/reload_feeds?return_url=/ui/playlists">Reload feeds</a> <a class="btn btn-info" href="/ui/">Back</a>')
+ end
+ 
+ function ui_feeds()
+@@ -121,7 +121,7 @@ function ui_feeds()
+     http.send('<br/><input class="btn btn-primary" type=submit value=Add> <a class="btn btn-info" href="/ui/fhelp" target="_blank">Help</a>')
+     http.send('</form><hr/>')
+ 
+-    http.send('<br/><a class="btn btn-primary" href="/ui/save_feeds">Save</a> <a class="btn btn-primary" href="/ui/reload_feeds?return_url=/ui/feeds">Reload feeds</a> <a class="btn btn-info" href="/ui">Back</a>')
++    http.send('<br/><a class="btn btn-primary" href="/ui/save_feeds">Save</a> <a class="btn btn-primary" href="/ui/reload_feeds?return_url=/ui/feeds">Reload feeds</a> <a class="btn btn-info" href="/ui/">Back</a>')
+ end
+ 
+ function ui_fhelp()
+@@ -429,7 +429,7 @@ function ui_status()
+ 
+     http.send('</table>')
+ 
+-    http.send('<br/><a class="btn btn-primary" href="/ui/status">Refresh</a> <a class="btn btn-info" href="/ui">Back</a>')
++    http.send('<br/><a class="btn btn-primary" href="/ui/status">Refresh</a> <a class="btn btn-info" href="/ui/">Back</a>')
+ end
+ 
+ function ui_kill()

diff --git a/make/applications.mk b/make/applications.mk
index e676251fc1b4b3dd695028a8d9b57614e54c9a98..42be3c0c6a30a194a3fc0e8f7050310f631210c5 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -717,6 +717,7 @@ $(D)/xupnpd: $(ARCHIVE)/xupnpd-git-$(XUPNPD_GIT).tar.gz $(D)/udpxy $(D)/lua $(D)
                $(PATCH)/xupnpd/xupnpd_cst.diff; \
                $(PATCH)/xupnpd/xupnpd-fix-memleak-on-coolstream-boxes.patch; \
                $(PATCH)/xupnpd/xupnpd-dont-bind-daemon-to-specific-ip-address.patch; \
+               $(PATCH)/xupnpd/xupnpd-fix-webif-backlinks.diff; \
                make embedded \
                        CC=$(TARGET)-gcc \
                        STRIP=$(TARGET)-strip \

diff --git a/make/versions.mk b/make/versions.mk
index a70f1051cb1eff48659b3005f711f351d5afe40a..c291be6b5acf4540c8d70e7178927baeeb0c44ae 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -163,7 +163,7 @@ USHARE_VER = 1.1a
 VSFTPD_VER = 3.0.3
 
 # eXtensible UPnP agent (official)
-XUPNPD_GIT = 24500f8
+XUPNPD_GIT = 6578ceb
 
 # zlib; compression an decompressin library
 ZLIB_VER=1.2.11