Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[5585] branches/1.0/package
|
From: <abe...@us...> - 2012-07-03 21:08:06
|
Revision: 5585
http://astlinux.svn.sourceforge.net/astlinux/?rev=5585&view=rev
Author: abelbeck
Date: 2012-07-03 21:07:59 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
miniupnpd, initial checkin provided by David Kerr. For custom builds.
Added Paths:
-----------
branches/1.0/package/miniupnpd/
branches/1.0/package/miniupnpd/Config.in
branches/1.0/package/miniupnpd/miniupnpd-config.patch
branches/1.0/package/miniupnpd/miniupnpd-iptables.patch
branches/1.0/package/miniupnpd/miniupnpd.init
branches/1.0/package/miniupnpd/miniupnpd.mk
Added: branches/1.0/package/miniupnpd/Config.in
===================================================================
--- branches/1.0/package/miniupnpd/Config.in (rev 0)
+++ branches/1.0/package/miniupnpd/Config.in 2012-07-03 21:07:59 UTC (rev 5585)
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MINIUPNPD
+ bool "miniupnpd"
+ help
+ Implements UPnP and NAT-PMP protocols.
+
+ http://miniupnp.free.fr/
Added: branches/1.0/package/miniupnpd/miniupnpd-config.patch
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd-config.patch (rev 0)
+++ branches/1.0/package/miniupnpd/miniupnpd-config.patch 2012-07-03 21:07:59 UTC (rev 5585)
@@ -0,0 +1,27 @@
+--- miniupnpd-1.6.20120509-orig/genconfig.sh 2012-05-09 06:40:34.000000000 -0400
++++ miniupnpd-1.6.20120509/genconfig.sh 2012-05-24 21:13:04.412605721 -0400
+@@ -56,6 +56,12 @@
+ OS_VERSION=$(cat ./os.openwrt)
+ fi
+
++# AstLinux special case
++if [ -f ./os.astlinux ]; then
++ OS_NAME=AstLinux
++ OS_VERSION=$(cat ./os.astlinux)
++fi
++
+ # Tomato USB special case
+ if [ -f ../shared/tomato_version ]; then
+ OS_NAME=Tomato
+@@ -223,6 +229,11 @@
+ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
+ FW=netfilter
+ ;;
++ AstLinux)
++ OS_URL=http://www.astlinux.org/
++ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
++ FW=netfilter
++ ;;
+ Tomato)
+ OS_NAME=UPnP
+ OS_URL=http://tomatousb.org/
Added: branches/1.0/package/miniupnpd/miniupnpd-iptables.patch
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd-iptables.patch (rev 0)
+++ branches/1.0/package/miniupnpd/miniupnpd-iptables.patch 2012-07-03 21:07:59 UTC (rev 5585)
@@ -0,0 +1,129 @@
+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~
Added: branches/1.0/package/miniupnpd/miniupnpd.init
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.init (rev 0)
+++ branches/1.0/package/miniupnpd/miniupnpd.init 2012-07-03 21:07:59 UTC (rev 5585)
@@ -0,0 +1,127 @@
+#!/bin/sh
+
+# If Astlinux GUI support added then some or all of these may come from rc.conf
+UPNP_ENABLE_NATPMP=yes
+UPNP_ENABLE_UPNP=yes
+UPNP_BITRATE_UP=1000000
+UPNP_BITRATE_DOWN=10000000
+UPNP_SECURE_MODE=no
+INTUPNP=yes
+INT2UPNP=yes
+INT3UPNP=yes
+DMZUPNP=yes
+
+. /etc/rc.conf
+
+MINIUPNPD=/usr/sbin/miniupnpd
+MINIUPNPD_CONF=/tmp/etc/miniupnpd.conf
+IPTABLES_CREATE=/etc/miniupnpd/iptables_init.sh
+IPTABLES_REMOVE=/etc/miniupnpd/iptables_removeall.sh
+
+is_interface_enabled()
+{
+ # args: IF, IP, NM
+ if [ -n "$1" -a "$1" != "none" -a -n "$2" -a -n "$3" ]; then
+ return 0
+ fi
+ return 1
+}
+
+get_cidr()
+{
+ # args: IP, NM
+ local NETWORK PREFIX
+ eval $(ipcalc -np $1 $2)
+
+ echo "$NETWORK/$PREFIX"
+}
+
+init () {
+ local RULES=""
+ if [ -z "$UUID" ]; then
+ # Use the UUID assigned to the asturw filesystem.
+ UUID=$(blkid | sed -n -r -e 's/^.*: LABEL="ASTURW" UUID="([^"]*)" .*$/\1/p')
+ fi
+
+ echo "## Auto generated file. Do not edit.
+## see miniupnpd init.d script
+ext_ifname=$EXTIF" > $MINIUPNPD_CONF
+ if [ "$INTUPNP" = "yes" ] && is_interface_enabled "$INTIF" "$INTIP" "$INTNM"; then
+ echo "listening_ip=$INTIF" >> $MINIUPNPD_CONF
+ RULES="$RULES${RULES:+\n}allow 1024-65535 $(get_cidr $INTIP $INTNM) 1024-65535"
+ fi
+ if [ "$INT2UPNP" = "yes" ] && is_interface_enabled "$INT2IF" "$INT2IP" "$INT2NM"; then
+ echo "listening_ip=$INT2IF" >> $MINIUPNPD_CONF
+ RULES="$RULES${RULES:+\n}allow 1024-65535 $(get_cidr $INT2IP $INT2NM) 1024-65535"
+ fi
+ if [ "$INT3UPNP" = "yes" ] && is_interface_enabled "$INT3IF" "$INT3IP" "$INT3NM"; then
+ echo "listening_ip=$INT3IF" >> $MINIUPNPD_CONF
+ RULES="$RULES${RULES:+\n}allow 1024-65535 $(get_cidr $INT3IP $INT3NM) 1024-65535"
+ fi
+ if [ "$DMZUPNP" = "yes" ] && is_interface_enabled "$DMZIF" "$DMZIP" "$DMZNM"; then
+ echo "listening_ip=$DMZIF" >> $MINIUPNPD_CONF
+ RULES="$RULES${RULES:+\n}allow 1024-65535 $(get_cidr $DMZIP $DMZNM) 1024-65535"
+ fi
+ echo "port=0
+enable_natpmp=$UPNP_ENABLE_NATPMP
+enable_upnp=$UPNP_ENABLE_UPNP
+bitrate_up=$UPNP_BITRATE_UP
+bitrate_down=$UPNP_BITRATE_DOWN
+secure_mode=$UPNP_SECURE_MODE
+system_uptime=yes
+notify_interval=60
+clean_ruleset_interval=600
+uuid=$UUID
+friendly_name=AstLinux Router
+serial=000001
+model_number=$(cat /etc/astlinux-release)" >> $MINIUPNPD_CONF
+ echo -e "$RULES" >> $MINIUPNPD_CONF
+ echo "deny 0-65535 0.0.0.0/0 0-65535" >> $MINIUPNPD_CONF
+}
+
+start () {
+ if [ "$UPNP_ENABLE_NATPMP" = "yes" -o "$UPNP_ENABLE_UPNP" = "yes" ]; then
+ if [ "$INTUPNP" = "yes" -o "$INT2UPNP" = "yes" -o "$INT3UPNP" = "yes" -o "$DMZUPNP" = "yes" ]; then
+ echo "Starting miniupnpd..."
+ $IPTABLES_CREATE > /dev/null 2>&1
+ $MINIUPNPD -f $MINIUPNPD_CONF
+ fi
+ fi
+}
+
+stop () {
+ if [ -f /var/run/miniupnpd.pid ]; then
+ echo "Stopping miniupnpd..."
+ kill $(cat /var/run/miniupnpd.pid) >/dev/null 2>&1
+ rm -f /var/run/miniupnpd.pid
+ $IPTABLES_REMOVE > /dev/null 2>&1
+ fi
+}
+
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
Added: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk (rev 0)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk 2012-07-03 21:07:59 UTC (rev 5585)
@@ -0,0 +1,36 @@
+#############################################################
+#
+# miniupnpd
+#
+#############################################################
+
+MINIUPNPD_VERSION = 1.7
+MINIUPNPD_SOURCE = miniupnpd-$(MINIUPNPD_VERSION).tar.gz
+MINIUPNPD_SITE = http://miniupnp.free.fr/files
+MINIUPNPD_DEPENDENCIES = iptables
+
+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
+ $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" CFLAGS="$(TARGET_CFLAGS)" \
+ -f Makefile.linux -C $(@D) config.h
+endef
+
+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" \
+ -f Makefile.linux -C $(@D) miniupnpd
+endef
+
+define MINIUPNPD_INSTALL_TARGET_CMDS
+ $(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/
+endef
+
+$(eval $(call GENTARGETS,package,miniupnpd))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
