update xupnpd to git-24500f8

diff --git a/archive-patches/xupnpd/xupnpd-crossbuild.diff b/archive-patches/xupnpd/xupnpd-crossbuild.diff
index 22341c9f9404834546573c472c638ad65af74ae2..677542e96260f22b3125e3ab54e78ffb003c5df2 100644 (file)
--- a/archive-patches/xupnpd/xupnpd-crossbuild.diff
+++ b/archive-patches/xupnpd/xupnpd-crossbuild.diff
@@ -1,58 +1,62 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1,15 +1,12 @@
+@@ -1,17 +1,14 @@
 -LUA     = lua-5.1.4
 +LUA     = lua-5.2.0
  #LUA     = lua-5.2.0
  STATIC  = false
+-OPENSSL = /home/user/src/openssl-0.9.8e
++OPENSSL = $(TARGETPREFIX)
  
 -CFLAGS  = -fno-exceptions -fno-rtti -O2 -I$(LUA) -L$(LUA)
+-CFLAGS+= -I$(OPENSSL)/include -L$(OPENSSL)/lib/openwrt
 +CFLAGS  = -fno-exceptions -fno-rtti -O2
++CFLAGS+= -I$(OPENSSL)/include -L$(OPENSSL)/lib -L$(OPENSSL)/lib/openwrt
  SRC     = main.cpp soap.cpp mem.cpp mcast.cpp luaxlib.cpp luaxcore.cpp luajson.cpp luajson_parser.cpp
 +STAGING_DIR = /u01/home/shocker/staff/openwrt/staging_dir
  LUAMYCFLAGS = -DLUA_USE_LINUX
  
 -SDK_8_09 = /u01/home/shocker_old/staff/openwrt_8_09/staging_dir
--SDK_BACKFIRE = /u01/home/shocker_old/staff/openwrt/staging_dir
+-SDK_BACKFIRE = /home/user/src/OpenWrt-Toolchain-ar71xx-for-mips_r2-gcc-4.3.3+cs_uClibc-0.9.30.1/toolchain-mips_r2_gcc-4.3.3+cs_uClibc-0.9.30.1
 -SDK_BBREAKER = /home/shocker/staff/openwrt/staging_dir
 -
  ifeq ($(STATIC),true)
  CFLAGS+=-static
  LUAMYCFLAGS+=-static
-@@ -36,42 +33,18 @@
+@@ -38,42 +35,19 @@ x86_bsd:
  
  
  # D-Link DIR-320/DD-WRT (mipsel)
 -bcm947x_ddwrt:
 -      $(MAKE) embedded TARGET=bcm947x-ddwrt SDK=$(SDK_8_09)/toolchain-mipsel_gcc3.4.6/mipsel-linux/bin UTILS=$(SDK_8_09)/toolchain-mipsel_gcc3.4.6/libexec/gcc/mipsel-linux-uclibc/3.4.6 STAGING_DIR=$(SDK_8_09)
-+bcm947xx_ddwrt:
-+      $(MAKE) embedded TARGET=bcm947xx-ddwrt SDK=/u01/home/shocker/staff/openwrt_8_09/staging_dir/toolchain-mipsel_gcc3.4.6/mipsel-linux/bin PATH=$(PATH):/u01/home/shocker/staff/openwrt_8_09/staging_dir/toolchain-mipsel_gcc3.4.6/libexec/gcc/mipsel-linux-uclibc/3.4.6
- 
- # OpenWrt Backfire
+-
+-# OpenWrt Backfire
 -bcm947x_backfire:
 -      $(MAKE) embedded TARGET=bcm947x-bf SDK=$(SDK_BACKFIRE)/toolchain-mipsel_gcc-3.4.6-bcm947xx/mipsel-openwrt-linux/bin UTILS=$(SDK_BACKFIRE)/toolchain-mipsel_gcc-3.4.6-bcm947xx/libexec/gcc/mipsel-openwrt-linux-uclibc/3.4.6 STAGING_DIR=$(SDK_BACKFIRE)
 -
 -ar71xx_backfire:
--      $(MAKE) embedded TARGET=ar71xx-bf SDK=$(SDK_BACKFIRE)/toolchain-mips_r2_gcc-4.3.3+cs-ar71xx/mips-openwrt-linux/bin UTILS=$(SDK_BACKFIRE)/toolchain-mips_r2_gcc-4.3.3+cs-ar71xx/libexec/gcc/mips-openwrt-linux-uclibc/4.3.3 STAGING_DIR=$(SDK_BACKFIRE)
--
+-      $(MAKE) embedded TARGET=ar71xx-bf SDK=$(SDK_BACKFIRE)/usr/mips-openwrt-linux/bin UTILS=$(SDK_BACKFIRE)/usr/libexec/gcc/mips-openwrt-linux-uclibc/4.3.3 STAGING_DIR=$(SDK_BACKFIRE)
++bcm947xx_ddwrt:
++      $(MAKE) embedded TARGET=bcm947xx-ddwrt SDK=/u01/home/shocker/staff/openwrt_8_09/staging_dir/toolchain-mipsel_gcc3.4.6/mipsel-linux/bin PATH=$(PATH):/u01/home/shocker/staff/openwrt_8_09/staging_dir/toolchain-mipsel_gcc3.4.6/libexec/gcc/mipsel-linux-uclibc/3.4.6
+ 
 -ar231x_backfire:
 -      $(MAKE) embedded TARGET=ar231x-bf SDK=$(SDK_BACKFIRE)/toolchain-mips_gcc-4.3.3+cs-ar231x/mips-openwrt-linux/bin UTILS=$(SDK_BACKFIRE)/toolchain-mips_gcc-4.3.3+cs-ar231x/libexec/gcc/mips-openwrt-linux-uclibc/4.3.3 STAGING_DIR=$(SDK_BACKFIRE)
--
--
--# OpenWrt Barrier Breaker
-+bcm947xx:
-+      $(MAKE) embedded TARGET=bcm947xx SDK=$(STAGING_DIR)/toolchain-mipsel_gcc-3.4.6-bcm947xx/mipsel-openwrt-linux/bin PATH=$(PATH):$(STAGING_DIR)/toolchain-mipsel_gcc-3.4.6-bcm947xx/libexec/gcc/mipsel-openwrt-linux-uclibc/3.4.6 STAGING_DIR=$(STAGING_DIR)
+++bcm947xx:
+++     $(MAKE) embedded TARGET=bcm947xx SDK=$(STAGING_DIR)/toolchain-mipsel_gcc-3.4.6-bcm947xx/mipsel-openwrt-linux/bin PATH=$(PATH):$(STAGING_DIR)/toolchain-mipsel_gcc-3.4.6-bcm947xx/libexec/gcc/mipsel-openwrt-linux-uclibc/3.4.6 STAGING_DIR=$(STAGING_DIR)
  
--# Broadcom BCM2708/BCM2835
+ 
+-# OpenWrt Barrier Breaker
+-
+ # Broadcom BCM2708/BCM2835
 -bcm2708:
 -      $(MAKE) embedded TARGET=bcm2708 SDK=$(SDK_BBREAKER)/toolchain-arm_arm1176jzf-s+vfp_gcc-4.8-linaro-bcm2708/arm-openwrt-linux/bin UTILS=$(SDK_BBREAKER)/toolchain-arm_arm1176jzf-s+vfp_gcc-4.8-linaro-bcm2708/libexec/gcc/arm-openwrt-linux-uclibcgnueabi/4.8.3 STAGING_DIR=$(SDK_BBREAKER)
-+ar71xx:
-+      $(MAKE) embedded TARGET=ar71xx SDK=$(STAGING_DIR)/toolchain-mips_r2_gcc-4.3.3+cs-ar71xx/mips-openwrt-linux/bin PATH=$(PATH):$(STAGING_DIR)/toolchain-mips_r2_gcc-4.3.3+cs-ar71xx/libexec/gcc/mips-openwrt-linux-uclibc/4.3.3 STAGING_DIR=$(STAGING_DIR)
- 
+-
 -# Broadcom BCM47xx/BCM53xx (MIPS)
 -bcm47xx:
 -      $(MAKE) embedded TARGET=bcm47xx SDK=$(SDK_BBREAKER)/toolchain-mipsel_mips32_gcc-4.8-linaro-bcm47xx/mipsel-openwrt-linux/bin UTILS=$(SDK_BBREAKER)/toolchain-mipsel_mips32_gcc-4.8-linaro-bcm47xx/libexec/gcc/mipsel-openwrt-linux-uclibc/4.8.3 STAGING_DIR=$(SDK_BBREAKER)
--
++ar71xx:
++      $(MAKE) embedded TARGET=ar71xx SDK=$(STAGING_DIR)/toolchain-mips_r2_gcc-4.3.3+cs-ar71xx/mips-openwrt-linux/bin PATH=$(PATH):$(STAGING_DIR)/toolchain-mips_r2_gcc-4.3.3+cs-ar71xx/libexec/gcc/mips-openwrt-linux-uclibc/4.3.3 STAGING_DIR=$(STAGING_DIR)
+ 
 -# Broadcom BCM63xx
 -bcm63xx:
 -      $(MAKE) embedded TARGET=bcm63xx SDK=$(SDK_BBREAKER)/toolchain-mips_mips32_gcc-4.8-linaro-bcm63xx/mips-openwrt-linux/bin UTILS=$(SDK_BBREAKER)/toolchain-mips_mips32_gcc-4.8-linaro-bcm63xx/libexec/gcc/mips-openwrt-linux-uclibc/4.8.3 STAGING_DIR=$(SDK_BBREAKER)
@@ -69,18 +73,18 @@
  
  # Other
  samsung_d:
-@@ -85,10 +58,11 @@
+@@ -87,10 +61,11 @@ dreambox:
  
  
  embedded:
--      PATH=$(PATH):$(UTILS) $(MAKE) -C $(LUA) CC=$(SDK)/$(CC) a MYCFLAGS='$(LUAMYCFLAGS)'
--      $(SDK)/$(CC) -O2 -c -B$(UTILS) -o md5.o md5c.c
--      $(SDK)/$(CC) $(CFLAGS) -B$(UTILS) -DWITH_URANDOM -o xupnpd-$(TARGET) $(SRC) md5.o -llua -lm -ldl
+-      PATH=$(PATH):$(UTILS) $(MAKE) -C $(LUA) CC=$(SDK)/gcc a MYCFLAGS='$(LUAMYCFLAGS)'
+-      $(SDK)/gcc -O2 -c -B$(UTILS) -o md5.o md5c.c
+-      $(SDK)/gcc $(CFLAGS) -B$(UTILS) -DWITH_URANDOM -o xupnpd-$(TARGET) $(SRC) md5.o -llua -lm -ldl -lssl -lcrypto
 -      $(SDK)/strip xupnpd-$(TARGET)
 +      export PATH
 +      export STAGING_DIR
 +      $(CC) -O2 -c -o md5.o md5c.c
-+      ${CC} ${CFLAGS} ${LUAFLAGS} -DWITH_URANDOM -o xupnpd $(SRC) md5.o -llua -lm -ldl -rdynamic
++      ${CC} ${CFLAGS} ${LUAFLAGS} -DWITH_URANDOM -o xupnpd $(SRC) md5.o -llua -lm -ldl -rdynamic -ldl -lssl -lcrypto
 +      ${STRIP} xupnpd
  
  clean:

diff --git a/make/applications.mk b/make/applications.mk
index 18552213173bff0fb9b3853483f4e0c897ee4a0a..7bc957f943980a8c85bd8fc641984b8ab06e85e6 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -677,7 +677,7 @@ $(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGETPREFIX)
        $(REMOVE)/libupnp-$(LIBUPNP_VER)
        touch $@
 
-$(D)/xupnpd: $(ARCHIVE)/xupnpd-git-$(XUPNPD_GIT).tar.gz $(D)/udpxy $(D)/lua | $(TARGETPREFIX)
+$(D)/xupnpd: $(ARCHIVE)/xupnpd-git-$(XUPNPD_GIT).tar.gz $(D)/udpxy $(D)/lua $(D)/openssl | $(TARGETPREFIX)
        $(UNTAR)/xupnpd-git-$(XUPNPD_GIT).tar.gz
        pushd $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src; \
                $(PATCH)/xupnpd/xupnpd-crossbuild.diff; \
@@ -700,7 +700,9 @@ $(D)/xupnpd: $(ARCHIVE)/xupnpd-git-$(XUPNPD_GIT).tar.gz $(D)/udpxy $(D)/lua | $(
                cp -rf $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/www $(TARGETPREFIX)/share/xupnpd/
                cp -rf $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/ui $(TARGETPREFIX)/share/xupnpd/
                cp -f $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/*.lua $(TARGETPREFIX)/share/xupnpd/
-       $(REMOVE)/xupnpd
+               mv $(TARGETPREFIX)/share/xupnpd/xupnpd.lua $(TARGETPREFIX)/var/tuxbox/config
+               ln -sf /var/tuxbox/config/xupnpd.lua $(TARGETPREFIX)/share/xupnpd/xupnpd.lua
+       $(REMOVE)/xupnpd-git-$(XUPNPD_GIT)
        touch $@
 
 $(D)/udpxy: $(ARCHIVE)/udpxy.1.0.23-7-prod.tar.gz | $(TARGETPREFIX)

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