From: <abe...@us...> - 2012-07-03 22:58:03
|
Revision: 5587 http://astlinux.svn.sourceforge.net/astlinux/?rev=5587&view=rev Author: abelbeck Date: 2012-07-03 22:57:57 +0000 (Tue, 03 Jul 2012) Log Message: ----------- miniupnpd, build fixes and tweaks Modified Paths: -------------- branches/1.0/package/miniupnpd/miniupnpd.mk Removed Paths: ------------- branches/1.0/package/miniupnpd/miniupnpd-iptables.patch Deleted: branches/1.0/package/miniupnpd/miniupnpd-iptables.patch =================================================================== --- branches/1.0/package/miniupnpd/miniupnpd-iptables.patch 2012-07-03 21:23:22 UTC (rev 5586) +++ branches/1.0/package/miniupnpd/miniupnpd-iptables.patch 2012-07-03 22:57:57 UTC (rev 5587) @@ -1,129 +0,0 @@ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/ip6tables_display.sh miniupnpd-1.6.20120509/netfilter/ip6tables_display.sh ---- miniupnpd-1.6.20120509-orig/netfilter/ip6tables_display.sh 2012-04-24 18:13:41.000000000 -0400 -+++ miniupnpd-1.6.20120509/netfilter/ip6tables_display.sh 2012-05-25 17:54:38.840942612 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # $Id: ip6tables_display.sh,v 1.1 2012/04/24 22:13:41 nanard Exp $ --IPTABLES=/sbin/ip6tables -+IPTABLES=/usr/sbin/ip6tables - - #display all chains relative to miniupnpd - $IPTABLES -v -n -t filter -L FORWARD -Only in miniupnpd-1.6.20120509/netfilter: ip6tables_display.sh~ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/ip6tables_flush.sh miniupnpd-1.6.20120509/netfilter/ip6tables_flush.sh ---- miniupnpd-1.6.20120509-orig/netfilter/ip6tables_flush.sh 2012-04-24 18:13:41.000000000 -0400 -+++ miniupnpd-1.6.20120509/netfilter/ip6tables_flush.sh 2012-05-25 17:54:52.905319865 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # $Id: ip6tables_flush.sh,v 1.1 2012/04/24 22:13:41 nanard Exp $ --IPTABLES=/sbin/ip6tables -+IPTABLES=/usr/sbin/ip6tables - - #flush all rules owned by miniupnpd - $IPTABLES -t filter -F MINIUPNPD -Only in miniupnpd-1.6.20120509/netfilter: ip6tables_flush.sh~ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/ip6tables_init_and_clean.sh miniupnpd-1.6.20120509/netfilter/ip6tables_init_and_clean.sh ---- miniupnpd-1.6.20120509-orig/netfilter/ip6tables_init_and_clean.sh 2012-04-24 18:13:41.000000000 -0400 -+++ miniupnpd-1.6.20120509/netfilter/ip6tables_init_and_clean.sh 2012-05-25 17:55:16.889967350 -0400 -@@ -4,8 +4,8 @@ - # Checks for state of filter before doing anything.. - - EXTIF=eth0 --IPTABLES=/sbin/ip6tables --FDIRTY="`LC_ALL=C /sbin/ip6tables -t filter -L -n | grep 'MINIUPNPD' | awk '{printf $1}'`" -+IPTABLES=/usr/sbin/ip6tables -+FDIRTY="`LC_ALL=C /usr/sbin/ip6tables -t filter -L -n | grep 'MINIUPNPD' | awk '{printf $1}'`" - - if [[ $FDIRTY = "MINIUPNPDChain" ]]; then - echo "Filter table dirty; Cleaning..." -Only in miniupnpd-1.6.20120509/netfilter: ip6tables_init_and_clean.sh~ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/ip6tables_init.sh miniupnpd-1.6.20120509/netfilter/ip6tables_init.sh ---- miniupnpd-1.6.20120509-orig/netfilter/ip6tables_init.sh 2012-04-24 18:13:41.000000000 -0400 -+++ miniupnpd-1.6.20120509/netfilter/ip6tables_init.sh 2012-05-25 17:55:02.149567735 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # $Id: ip6tables_init.sh,v 1.1 2012/04/24 22:13:41 nanard Exp $ --IPTABLES=/sbin/ip6tables -+IPTABLES=/usr/sbin/ip6tables - - #change this parameters : - EXTIF=eth0 -Only in miniupnpd-1.6.20120509/netfilter: ip6tables_init.sh~ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/ip6tables_removeall.sh miniupnpd-1.6.20120509/netfilter/ip6tables_removeall.sh ---- miniupnpd-1.6.20120509-orig/netfilter/ip6tables_removeall.sh 2012-04-24 18:13:41.000000000 -0400 -+++ miniupnpd-1.6.20120509/netfilter/ip6tables_removeall.sh 2012-05-25 17:55:32.962400684 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # $Id: ip6tables_removeall.sh,v 1.1 2012/04/24 22:13:41 nanard Exp $ --IPTABLES=/sbin/ip6tables -+IPTABLES=/usr/sbin/ip6tables - - #change this parameters : - EXTIF=eth0 -Only in miniupnpd-1.6.20120509/netfilter: ip6tables_removeall.sh~ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/iptables_display.sh miniupnpd-1.6.20120509/netfilter/iptables_display.sh ---- miniupnpd-1.6.20120509-orig/netfilter/iptables_display.sh 2011-05-16 08:42:29.000000000 -0400 -+++ miniupnpd-1.6.20120509/netfilter/iptables_display.sh 2012-05-25 17:52:43.781837854 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # $Id: iptables_display.sh,v 1.4 2011/05/16 12:11:37 nanard Exp $ --IPTABLES=/sbin/iptables -+IPTABLES=/usr/sbin/iptables - - #display all chains relative to miniupnpd - $IPTABLES -v -n -t nat -L PREROUTING -Only in miniupnpd-1.6.20120509/netfilter: iptables_display.sh~ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/iptables_flush.sh miniupnpd-1.6.20120509/netfilter/iptables_flush.sh ---- miniupnpd-1.6.20120509-orig/netfilter/iptables_flush.sh 2011-05-16 08:42:29.000000000 -0400 -+++ miniupnpd-1.6.20120509/netfilter/iptables_flush.sh 2012-05-25 17:52:57.810213703 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # $Id: iptables_flush.sh,v 1.3 2011/05/16 12:11:37 nanard Exp $ --IPTABLES=/sbin/iptables -+IPTABLES=/usr/sbin/iptables - - #flush all rules owned by miniupnpd - $IPTABLES -t nat -F MINIUPNPD -Only in miniupnpd-1.6.20120509/netfilter: iptables_flush.sh~ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/iptables_init_and_clean.sh miniupnpd-1.6.20120509/netfilter/iptables_init_and_clean.sh ---- miniupnpd-1.6.20120509-orig/netfilter/iptables_init_and_clean.sh 2012-03-05 15:37:13.000000000 -0500 -+++ miniupnpd-1.6.20120509/netfilter/iptables_init_and_clean.sh 2012-05-25 17:53:50.411635052 -0400 -@@ -4,10 +4,10 @@ - # Checks for state of filter before doing anything.. - - EXTIF=eth0 --IPTABLES=/sbin/iptables -+IPTABLES=/usr/sbin/iptables - EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet ' | awk '{print $2}' | sed -e 's/.*://'`" --NDIRTY="`LC_ALL=C /sbin/iptables -t nat -L -n | grep 'MINIUPNPD' | awk '{printf $1}'`" --FDIRTY="`LC_ALL=C /sbin/iptables -t filter -L -n | grep 'MINIUPNPD' | awk '{printf $1}'`" -+NDIRTY="`LC_ALL=C /usr/sbin/iptables -t nat -L -n | grep 'MINIUPNPD' | awk '{printf $1}'`" -+FDIRTY="`LC_ALL=C /usr/sbin/iptables -t filter -L -n | grep 'MINIUPNPD' | awk '{printf $1}'`" - echo "External IP = $EXTIP" - - if [[ $NDIRTY = "MINIUPNPDChain" ]]; then -Only in miniupnpd-1.6.20120509/netfilter: iptables_init_and_clean.sh~ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/iptables_init.sh miniupnpd-1.6.20120509/netfilter/iptables_init.sh ---- miniupnpd-1.6.20120509-orig/netfilter/iptables_init.sh 2012-01-02 05:46:25.000000000 -0500 -+++ miniupnpd-1.6.20120509/netfilter/iptables_init.sh 2012-05-25 17:53:13.634643345 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # $Id: iptables_init.sh,v 1.6 2012/01/02 09:55:20 nanard Exp $ --IPTABLES=/sbin/iptables -+IPTABLES=/usr/sbin/iptables - - #change this parameters : - EXTIF=eth0 -Only in miniupnpd-1.6.20120509/netfilter: iptables_init.sh~ -diff -rup miniupnpd-1.6.20120509-orig/netfilter/iptables_removeall.sh miniupnpd-1.6.20120509/netfilter/iptables_removeall.sh ---- miniupnpd-1.6.20120509-orig/netfilter/iptables_removeall.sh 2012-01-02 05:46:25.000000000 -0500 -+++ miniupnpd-1.6.20120509/netfilter/iptables_removeall.sh 2012-05-25 17:54:02.151949940 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # $Id: iptables_removeall.sh,v 1.6 2012/01/02 09:55:20 nanard Exp $ --IPTABLES=/sbin/iptables -+IPTABLES=/usr/sbin/iptables - - #change this parameters : - EXTIF=eth0 -Only in miniupnpd-1.6.20120509/netfilter: iptables_removeall.sh~ Modified: branches/1.0/package/miniupnpd/miniupnpd.mk =================================================================== --- branches/1.0/package/miniupnpd/miniupnpd.mk 2012-07-03 21:23:22 UTC (rev 5586) +++ branches/1.0/package/miniupnpd/miniupnpd.mk 2012-07-03 22:57:57 UTC (rev 5587) @@ -7,12 +7,18 @@ MINIUPNPD_VERSION = 1.7 MINIUPNPD_SOURCE = miniupnpd-$(MINIUPNPD_VERSION).tar.gz MINIUPNPD_SITE = http://miniupnp.free.fr/files -MINIUPNPD_DEPENDENCIES = iptables +MINIUPNPD_DEPENDENCIES = linux iptables +define MINIUPNPD_IPTABLES_PATH_FIX + $(SED) 's:/sbin/iptables:/usr/sbin/iptables:g' \ + -e 's:/sbin/ip6tables:/usr/sbin/ip6tables:g' $(@D)/netfilter/ip*.sh +endef + +MINIUPNPD_POST_PATCH_HOOKS += MINIUPNPD_IPTABLES_PATH_FIX + define MINIUPNPD_CONFIGURE_CMDS # add this to make for IPv6... CONFIG_OPTIONS="--ipv6" - echo -n "AstLinux/" >$(@D)/os.astlinux - cat $(RUNFS_DIR)/os/ver | tr \(\)\ _ >>$(@D)/os.astlinux + echo "$(LINUX_VERSION_PROBED)" >$(@D)/os.astlinux $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" CFLAGS="$(TARGET_CFLAGS)" \ -f Makefile.linux -C $(@D) config.h endef @@ -20,7 +26,7 @@ define MINIUPNPD_BUILD_CMDS $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \ CFLAGS="$(TARGET_CFLAGS) -I$(BUILD_DIR)/iptables-$(IPTABLES_VERSION)/include/ -DIPTABLES_143" \ - LIBS="$(TARGET_DIR)/usr/lib/libiptc.so $(TARGET_DIR)/usr/lib/libip4tc.so $(TARGET_DIR)/usr/lib/libip6tc.so" \ + LIBS="$(STAGING_DIR)/usr/lib/libiptc.so $(STAGING_DIR)/usr/lib/libip4tc.so $(STAGING_DIR)/usr/lib/libip6tc.so" \ -f Makefile.linux -C $(@D) miniupnpd endef @@ -28,9 +34,18 @@ $(INSTALL) -D -m 0755 package/miniupnpd/miniupnpd.init $(TARGET_DIR)/etc/init.d/miniupnpd $(INSTALL) -D $(@D)/miniupnpd $(TARGET_DIR)/usr/sbin/miniupnpd -mkdir $(TARGET_DIR)/etc/miniupnpd -# $(INSTALL) -D package/miniupnpd/miniupnpd.conf -m 0644 $(TARGET_DIR)/etc/miniupnpd/miniupnpd.conf $(INSTALL) -D $(@D)/netfilter/iptables_*.sh $(TARGET_DIR)/etc/miniupnpd/ # $(INSTALL) -D $(@D)/netfilter/ip6tables_*.sh $(TARGET_DIR)/etc/miniupnpd/ + ln -snf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/S54miniupnpd + ln -snf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/K09miniupnpd endef +define MINIUPNPD_UNINSTALL_TARGET_CMDS + rm -f $(TARGET_DIR)/etc/init.d/miniupnpd + rm -f $(TARGET_DIR)/usr/sbin/miniupnpd + rm -rf $(TARGET_DIR)/etc/miniupnpd/ + rm -f $(TARGET_DIR)/etc/runlevels/default/S54miniupnpd + rm -f $(TARGET_DIR)/etc/runlevels/default/K09miniupnpd +endef + $(eval $(call GENTARGETS,package,miniupnpd)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2012-07-05 21:53:20
|
Revision: 5592 http://astlinux.svn.sourceforge.net/astlinux/?rev=5592&view=rev Author: abelbeck Date: 2012-07-05 21:53:14 +0000 (Thu, 05 Jul 2012) Log Message: ----------- miniupnpd, enable lease_file and default to secure_mode=yes, more closely matches OpenWRT Modified Paths: -------------- branches/1.0/package/miniupnpd/miniupnpd.init branches/1.0/package/miniupnpd/miniupnpd.mk Modified: branches/1.0/package/miniupnpd/miniupnpd.init =================================================================== --- branches/1.0/package/miniupnpd/miniupnpd.init 2012-07-05 13:25:11 UTC (rev 5591) +++ branches/1.0/package/miniupnpd/miniupnpd.init 2012-07-05 21:53:14 UTC (rev 5592) @@ -8,14 +8,15 @@ if [ "$UPNP_ENABLE_UPNP" != "yes" ]; then UPNP_ENABLE_UPNP="no" fi -if [ "$UPNP_SECURE_MODE" != "yes" ]; then - UPNP_SECURE_MODE="no" +if [ "$UPNP_SECURE_MODE" != "no" ]; then + UPNP_SECURE_MODE="yes" fi UPNP_BITRATE_UP="${UPNP_BITRATE_UP:-1000000}" UPNP_BITRATE_DOWN="${UPNP_BITRATE_DOWN:-10000000}" MINIUPNPD=/usr/sbin/miniupnpd MINIUPNPD_CONF=/tmp/etc/miniupnpd.conf +MINIUPNPD_LEASEFILE=/var/db/upnp.leases is_upnp_enabled() { @@ -88,9 +89,10 @@ return fi - echo "port=0 + echo "port=5000 enable_natpmp=$UPNP_ENABLE_NATPMP enable_upnp=$UPNP_ENABLE_UPNP +lease_file=$MINIUPNPD_LEASEFILE bitrate_up=$UPNP_BITRATE_UP bitrate_down=$UPNP_BITRATE_DOWN secure_mode=$UPNP_SECURE_MODE @@ -108,6 +110,7 @@ start () { if [ -f $MINIUPNPD_CONF ]; then echo "Starting miniupnpd..." + touch $MINIUPNPD_LEASEFILE $MINIUPNPD -f $MINIUPNPD_CONF fi } Modified: branches/1.0/package/miniupnpd/miniupnpd.mk =================================================================== --- branches/1.0/package/miniupnpd/miniupnpd.mk 2012-07-05 13:25:11 UTC (rev 5591) +++ branches/1.0/package/miniupnpd/miniupnpd.mk 2012-07-05 21:53:14 UTC (rev 5592) @@ -19,6 +19,7 @@ define MINIUPNPD_CONFIGURE_CMDS # add this to make for IPv6... CONFIG_OPTIONS="--ipv6" echo "$(LINUX_VERSION_PROBED)" >$(@D)/os.astlinux + CONFIG_OPTIONS="--leasefile" \ $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" CFLAGS="$(TARGET_CFLAGS)" \ -f Makefile.linux -C $(@D) config.h endef @@ -36,14 +37,16 @@ # -mkdir $(TARGET_DIR)/etc/miniupnpd # $(INSTALL) -D $(@D)/netfilter/iptables_*.sh $(TARGET_DIR)/etc/miniupnpd/ # $(INSTALL) -D $(@D)/netfilter/ip6tables_*.sh $(TARGET_DIR)/etc/miniupnpd/ - ln -snf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/S54miniupnpd - ln -snf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/K09miniupnpd + ln -sf /tmp/etc/miniupnpd.conf $(TARGET_DIR)/etc/miniupnpd.conf + ln -sf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/S54miniupnpd + ln -sf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/K09miniupnpd endef define MINIUPNPD_UNINSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/etc/init.d/miniupnpd rm -f $(TARGET_DIR)/usr/sbin/miniupnpd rm -rf $(TARGET_DIR)/etc/miniupnpd/ + rm -f $(TARGET_DIR)/etc/miniupnpd.conf rm -f $(TARGET_DIR)/etc/runlevels/default/S54miniupnpd rm -f $(TARGET_DIR)/etc/runlevels/default/K09miniupnpd endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2015-02-28 14:20:20
|
Revision: 6991 http://sourceforge.net/p/astlinux/code/6991 Author: abelbeck Date: 2015-02-28 14:20:12 +0000 (Sat, 28 Feb 2015) Log Message: ----------- miniupnpd, use the more descriptive 'http_port' instead of 'port', and re-enable 'friendly_name' along with some other strings Modified Paths: -------------- branches/1.0/package/miniupnpd/miniupnpd.init branches/1.0/package/miniupnpd/miniupnpd.mk Modified: branches/1.0/package/miniupnpd/miniupnpd.init =================================================================== --- branches/1.0/package/miniupnpd/miniupnpd.init 2015-02-27 17:48:43 UTC (rev 6990) +++ branches/1.0/package/miniupnpd/miniupnpd.init 2015-02-28 14:20:12 UTC (rev 6991) @@ -158,7 +158,9 @@ return fi - echo "port=5000 + astlinux_release="$(cat /etc/astlinux-release)" + + echo "http_port=5000 enable_natpmp=$UPNP_ENABLE_NATPMP enable_upnp=$UPNP_ENABLE_UPNP lease_file=$MINIUPNPD_LEASEFILE @@ -170,7 +172,10 @@ clean_ruleset_interval=600 uuid=$UUID serial=000001 -model_number=$(cat /etc/astlinux-release)" >> $MINIUPNPD_CONF +friendly_name=AstLinux Router +model_name=AstLinux Router +model_description=$astlinux_release +model_number=$astlinux_release" >> $MINIUPNPD_CONF if [ -n "$UPNP_ALLOW" ]; then upnp_allow >> $MINIUPNPD_CONF else Modified: branches/1.0/package/miniupnpd/miniupnpd.mk =================================================================== --- branches/1.0/package/miniupnpd/miniupnpd.mk 2015-02-27 17:48:43 UTC (rev 6990) +++ branches/1.0/package/miniupnpd/miniupnpd.mk 2015-02-28 14:20:12 UTC (rev 6991) @@ -22,7 +22,7 @@ define MINIUPNPD_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ - CONFIG_OPTIONS="--leasefile --portinuse" \ + CONFIG_OPTIONS="--leasefile --portinuse --vendorcfg" \ $(MAKE) -f Makefile.linux -C $(@D) miniupnpd endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2016-02-16 22:53:25
|
Revision: 7535 http://sourceforge.net/p/astlinux/code/7535 Author: abelbeck Date: 2016-02-16 22:53:23 +0000 (Tue, 16 Feb 2016) Log Message: ----------- miniupnpd, version bump to 1.9.20160216 Modified Paths: -------------- branches/1.0/package/miniupnpd/Config.in branches/1.0/package/miniupnpd/miniupnpd.mk Modified: branches/1.0/package/miniupnpd/Config.in =================================================================== --- branches/1.0/package/miniupnpd/Config.in 2016-02-15 22:35:36 UTC (rev 7534) +++ branches/1.0/package/miniupnpd/Config.in 2016-02-16 22:53:23 UTC (rev 7535) @@ -2,6 +2,9 @@ bool "miniupnpd" depends on BR2_LINUX_KERNEL select BR2_PACKAGE_IPTABLES + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Implements UPnP and NAT-PMP/PCP protocols. Modified: branches/1.0/package/miniupnpd/miniupnpd.mk =================================================================== --- branches/1.0/package/miniupnpd/miniupnpd.mk 2016-02-15 22:35:36 UTC (rev 7534) +++ branches/1.0/package/miniupnpd/miniupnpd.mk 2016-02-16 22:53:23 UTC (rev 7535) @@ -4,14 +4,15 @@ # ############################################################# -MINIUPNPD_VERSION = 1.9.20160113 +MINIUPNPD_VERSION = 1.9.20160216 MINIUPNPD_SOURCE = miniupnpd-$(MINIUPNPD_VERSION).tar.gz MINIUPNPD_SITE = http://miniupnp.free.fr/files -MINIUPNPD_DEPENDENCIES = host-pkg-config linux iptables +MINIUPNPD_DEPENDENCIES = host-pkg-config linux iptables openssl util-linux define MINIUPNPD_IPTABLES_PATH_FIX $(SED) 's:/sbin/iptables:/usr/sbin/iptables:g' \ -e 's:/sbin/ip6tables:/usr/sbin/ip6tables:g' $(@D)/netfilter/ip*.sh + $(SED) 's:#define ENABLE_PORT_TRIGGERING:/*&*/:' $(@D)/genconfig.sh endef MINIUPNPD_POST_PATCH_HOOKS += MINIUPNPD_IPTABLES_PATH_FIX This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |