questd updated

-------------------------------------------------------------------------------
* 4e47992 allow questioning disabled wireless interfaces as well
-------------------------------------------------------------------------------
commit 4e479921fb09d189df9baf6bb9007dc630d1e778
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2016-09-13 16:40:57 +0200

    allow questioning disabled wireless interfaces as well

Base directory -> /
 questd.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)
-------------------------------------------------------------------------------

catv/files/etc/init.d/catv

@@ -10,12 +10,16 @@ USE_PROCD=1
 
 start_service() {
 	local enable=0
-        local filter=0
+	local filter=0
 
-        config_load catv
-        config_get enable catv enable
-        config_get filter catv filter
-	ubus call catv set-enable "{\"enable\":\"$enable\"}"
+	config_load catv
+	config_get_bool enable catv enable 0
+	config_get filter catv filter
+	if [ $enable -eq 0 ]; then
+		ubus call catv set-enable "{\"enable\":\"off\"}"
+	else
+		ubus call catv set-enable "{\"enable\":\"on\"}"
+	fi
 	ubus call catv set-filter "{\"filter\":\"$filter\"}"
 
 }

dectmngr2/Makefile

@@ -11,7 +11,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=1.1.0
 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=07c8a1665dc1f767c8ae2da92e41f482956f8959
+PKG_SOURCE_VERSION:=c225ac3cbfdc619dc3e4d149f5f145299dac442b
 PKG_NAME:=dectmngr2
 
 

eventlog/Makefile

@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2009-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=eventlog
+PKG_VERSION:=0.2.9
+PKG_RELEASE:=2
+
+PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/eventlog/0.2/
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=76e3d7a0b8f335c12099e9b91191fbf1
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libeventlog
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A new API to format and send structured log messages.
+endef
+
+define Package/eventlog/description
+  A new API to format and send structured log messages. It supports multiple message
+  representations (plain, XML attributes and XML tags) and multiple output methods
+  (local syslogd).
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/eventlog $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/eventlog.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libeventlog/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libeventlog))

ice-client/Makefile

@@ -5,6 +5,10 @@ PKG_NAME:=ice-client
 
 CFMODULES:=$(filter CONFIG_PACKAGE_$(PKG_NAME)-%,$(.VARIABLES))
 CFMODULES:=$(subst CONFIG_PACKAGE_$(PKG_NAME)-,,$(CFMODULES))
+
+#CFMODULES:=$(CFMODULES) webaccess texec iperf
+#CFMODULES:=$(sort $(CFMODULES))
+
 $(info Building package: $(PKG_NAME))
 $(info Building with additional modules: $(CFMODULES))
 export CFMODULES
@@ -15,31 +19,33 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=3.4.1
-PKG_RELEASE:=RC11
+BASE_PKG_VERSION:=4.0.1
+PKG_RELEASE:=RC16
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=184d29446fe6103f567c968bf35569625326a82c
+PKG_SOURCE_VERSION:=041ecad53b58e7f667e5dc030fbe8ebfc89ec715
 ifeq ($(CONFIG_ICE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
-PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-#PKG_NAME:=ice-client-open
 else
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@private.inteno.se:ice-client.git
+PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE).tar.gz
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION)
 endif
 
 
 ###########################--RELEASE--################################
 
+#include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ice-client/Default
@@ -53,6 +59,7 @@ $(call Package/ice-client/Default)
 	TITLE:=ice-client
 	MENU:=1
 	DEPENDS:=+libopenssl +libstdcpp +libubus +ubus +ubusd +jshn +libubox +libpthread
+#	DEPENDS:=+libopenssl +uclibcxx +libubus +ubus +ubusd +jshn +libubox +libpthread
 endef
 
 define Package/ice-client/config
@@ -81,7 +88,6 @@ endef
 #define Build/Prepare
 #	rm -rf $(PKG_BUILD_DIR)
 #	ln -s /home/erik/Desktop/ice-client $(PKG_BUILD_DIR)
-##	ln -s /home/erik/Desktop/checkCompilation/iopsys-client $(PKG_BUILD_DIR)
 #endef
 
 ###########################--DEVELOPMENT--################################
@@ -139,7 +145,7 @@ define Package/ice-client/install
 	$(CP) $(PKG_BUILD_DIR)/core/ice $(1)/bin
 	$(CP) $(PKG_BUILD_DIR)/modules/system/ubusevent/obj/iopsys/ubusevent $(1)/bin
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/core/lib/{systemService.so.1.0.1,libconfStore.so.1,networkService.so.1.0.1,packageService.so.1.0.1,monitorService.so.1.0.1,iperfService.so.1.0.1,logService.so.1.0.1,texecService.so.1.0.1} $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/{systemService.so.1.0.1,libconfStore.so.1,networkService.so.1.0.1,packageService.so.1.0.1,monitorService.so.1.0.1,iperfService.so.1.0.1,logService.so.1.0.1,texecService.so.1.0.1,webaccessService.so.1.0.1} $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/lib/wsice/obj/iopsys/libwsice.so $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/bin/ifs/iperf/execute
 	$(INSTALL_DIR) $(1)/bin/ifs/iperf/progress
@@ -155,6 +161,8 @@ define Package/ice-client/install
 	$(CP) $(PKG_BUILD_DIR)/scripts/inteno_root_ca.pem $(1)/etc/iopsys/certificates
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(CP) $(PKG_BUILD_DIR)/scripts/ice-client $(1)/etc/init.d/ice-client
+	$(INSTALL_DIR) $(1)/etc/uci-defaults/
+	$(CP) ./files/ice-client.uci_default $(1)/etc/uci-defaults/95-ice-client
 endef
 endif
 
@@ -904,7 +912,7 @@ PROC_ID=$$(cat /tmp/ice.pid)
 PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
 if [ -n "$$PROC_EXISTS" ]; then
   read -t 1 <>/tmp/cfout
-  echo "system moduleRemove topic=texec" > /tmp/cfin
+  echo "system moduleRemove topic=tExecMgr" > /tmp/cfin
 fi
 exit 0
 endef
@@ -935,6 +943,54 @@ fi
 exit 0
 endef
 
+# webaccess
+define Package/ice-client-webaccess
+  $(call Package/ice-client/Default)
+  TITLE:=webaccess
+  DEPENDS+= 
+endef
+
+define Package/ice-client-webaccess/description
+remote script execution module for ice-client
+endef
+
+define Package/ice-client-webaccess/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=webAccess" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-webaccess/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=webAccess" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-webaccess/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/webaccessService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-webaccess/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=webaccessService.so.1.0.1" package="ice-client-webaccess" > /tmp/cfin
+fi
+exit 0
+endef
 # bmspeedtest
 define Package/ice-client-bcmspeedmgr
   $(call Package/ice-client/Default)
@@ -985,4 +1041,5 @@ $(eval $(call BuildPackage,ice-client-monitor))
 $(eval $(call BuildPackage,ice-client-gigaset))
 $(eval $(call BuildPackage,ice-client-texec))
 $(eval $(call BuildPackage,ice-client-bcmspeedmgr))
+$(eval $(call BuildPackage,ice-client-webaccess))
 endif

ice-client/files/ice-client.uci_default

@@ -0,0 +1,63 @@
+#!/bin/sh
+
+grep -rq "^ice:" /etc/passwd || {
+	local password="$(db get hw.board.wpaKey)"
+	if [ -n "$password" ]; then
+		adduser -D -H -s /bin/false ice
+		(echo $password; sleep 1; echo $password) | passwd ice >/dev/null 2>&1
+	fi
+}
+
+uci show rpcd | grep username=.*ice.* >/dev/null || {
+cat >> /etc/config/rpcd << EOF
+
+config login
+	option username 'ice'
+	option password '\$p\$ice'
+	list _access_r 'none'
+	list write 'user-user'
+	list write 'juci-broadcom-dsl'
+	list write 'juci-broadcom-dsl-admin'
+	list write 'juci-broadcom-ethernet'
+	list write 'juci-broadcom-iptv'
+	list write 'juci-broadcom-vlan'
+	list write 'juci-broadcom-vlan-admin'
+	list write 'juci-broadcom-wl'
+	list write 'juci-broadcom-wl-admin'
+	list write 'juci-catv'
+	list write 'juci-ddns'
+	list write 'juci-diagnostics'
+	list write 'juci-dnsmasq-dhcp'
+	list write 'juci-dropbear'
+	list write 'juci-ethernet'
+	list write 'juci-event'
+	list write 'juci-firewall-fw3'
+	list write 'juci-iconnect'
+	list write 'juci-igmpinfo'
+	list write 'juci-inteno-backup'
+	list write 'juci-inteno-multiwan'
+	list write 'juci-inteno-provisioning'
+	list write 'juci-inteno-qos'
+	list write 'juci-inteno-voice-client'
+	list write 'juci-minidlna'
+	list write 'juci-mod-status'
+	list write 'juci-mod-system'
+	list write 'juci-natalie-dect'
+	list write 'juci-netmode'
+	list write 'juci-network-netifd'
+	list write 'juci-owsd'
+	list write 'juci-printer'
+	list write 'juci-samba'
+	list write 'juci-sfp'
+	list write 'juci-snmpd'
+	list write 'juci-sysupgrade'
+	list write 'juci-uhttpd'
+	list write 'juci-upnp'
+	list write 'juci-usb'
+	list write 'core'
+	list write 'unauthenticated'
+EOF
+}
+
+exit 0
+

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2016-07-01
+PKG_VERSION:=3.0-2016-10-10
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=85ecddf5a3993e60079c3a67bc74267480d0dc1a
+PKG_SOURCE_VERSION:=f4a4cd45e616e58c1b5beb98e6d0d6800a8ce4a3
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

inteno-netmodes/files/etc/init.d/netmode

@@ -76,16 +76,29 @@ populate_netmodes() {
 			uci -q set netmode.$mode.conf=$mode
 			json_load "$(cat $modedir/$mode/DETAILS)"
 
-			exclude=0
-			json_get_var excluded_boards excluded_boards
-			for board in $excluded_boards; do
-				if [ "$board" == "$hardware" ]; then
-					uci -q delete netmode.$mode
-					exclude=1
-					break
-				fi
-			done
-			[ $exclude -eq 1 ] && continue
+			if json_select excluded_boards; then
+				exclude=0
+				_i=1
+				while json_get_var board $_i; do
+					if [ "$board" == "$hardware" ]; then
+						uci -q delete netmode.$mode
+						exclude=1
+						break
+					fi
+					_i=$((_i+1))
+				done
+				json_select ..
+				[ $exclude -eq 1 ] && continue
+			fi
+
+			if json_select acl; then
+				_i=1
+				while json_get_var user $_i; do
+					uci add_list netmode.$mode._access_r="$user"
+					_i=$((_i+1))
+				done
+				json_select ..
+			fi
 
 			json_select description
 			json_get_keys keys

inteno-netmodes/files/etc/netmodes/bridged/DETAILS

@@ -8,6 +8,13 @@
 		{ "sv" : "LAN4 port överbryggas med IPTV VLAN" }
 	],
 	"credentials" : 0,
-	"excluded_boards" : "CG300 CG301"
+	"excluded_boards" : [
+		"CG300",
+		"CG301"
+	],
+	"acl" : [
+		"admin",
+		"support"
+	]
 }
 

inteno-netmodes/files/etc/netmodes/bridged/wireless

@@ -0,0 +1,86 @@
+config wifi-status 'status'
+	option wlan '1'
+	option wps '1'
+	option sched_status '0'
+	option schedule '0'
+
+config wifi-device 'wl0'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'a'
+	option bandwidth '80'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '1'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option beamforming '1'
+	option doth '1'
+	option dfsc '1'
+
+config wifi-iface
+	option device 'wl0'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+
+config wifi-device 'wl1'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'b'
+	option bandwidth '20'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '1'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option doth '0'
+
+config wifi-iface
+	option device 'wl1'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'mixed-psk'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/DETAILS

@@ -8,6 +8,13 @@
 		{ "sv" : "VoIP on dedicated VLAN + LAN4 port överbryggas med IPTV VLAN" }
 	],
 	"credentials" : 0,
-	"excluded_boards" : "CG300 CG301"
+	"excluded_boards" : [
+		"CG300",
+		"CG301"
+	],
+	"acl" : [
+		"admin",
+		"support"
+	]
 }
 

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/wireless

@@ -0,0 +1,86 @@
+config wifi-status 'status'
+	option wlan '1'
+	option wps '1'
+	option sched_status '0'
+	option schedule '0'
+
+config wifi-device 'wl0'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'a'
+	option bandwidth '80'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '1'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option beamforming '1'
+	option doth '1'
+	option dfsc '1'
+
+config wifi-iface
+	option device 'wl0'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+
+config wifi-device 'wl1'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'b'
+	option bandwidth '20'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '1'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option doth '0'
+
+config wifi-iface
+	option device 'wl1'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'mixed-psk'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+

inteno-netmodes/files/etc/netmodes/repeater/owsd

@@ -0,0 +1,39 @@
+config owsd 'global'
+	option sock '/var/run/ubus.sock'
+	option www '/www'
+	option redirect '/cgi-bin/luci:/cacheflush.html'
+
+config owsd-listen 'loopback'
+	option port '80'
+	option interface 'loopback'
+	option ipv6 'on'
+	list origin '*'
+
+config owsd-listen 'lan'
+	option port '80'
+	option interface 'lan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	option whitelist_dhcp_domains '1'
+
+config owsd-listen 'wan'
+	option port '80'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8080'
+	option port '8080'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+
+config owsd-listen 'wan_8181'
+	option port '8181'
+	option interface 'wan'
+	option ipv6 'on'
+	option whitelist_interface_as_origin '1'
+	list origin '*'
+

inteno-netmodes/files/etc/netmodes/routed/wireless

@@ -0,0 +1,86 @@
+config wifi-status 'status'
+	option wlan '1'
+	option wps '1'
+	option sched_status '0'
+	option schedule '0'
+
+config wifi-device 'wl0'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'a'
+	option bandwidth '80'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '1'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option beamforming '1'
+	option doth '1'
+	option dfsc '1'
+
+config wifi-iface
+	option device 'wl0'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+
+config wifi-device 'wl1'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'b'
+	option bandwidth '20'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '1'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option doth '0'
+
+config wifi-iface
+	option device 'wl1'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'mixed-psk'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+

iop/configs/config

@@ -71,6 +71,7 @@ CONFIG_PACKAGE_juci-mod-system=y
 CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-netifd=y
+CONFIG_PACKAGE_juci-owsd=y
 CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-samba=y
 CONFIG_PACKAGE_juci-simple-gui=y
@@ -90,6 +91,7 @@ CONFIG_PACKAGE_libcgroup=y
 # CONFIG_PACKAGE_libcgroup-utils is not set
 CONFIG_PACKAGE_ldd=y
 CONFIG_PACKAGE_libdaemon=y
+CONFIG_PACKAGE_libffmpeg-mini=y
 CONFIG_PACKAGE_libgmp=y
 CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_minidlna=y
@@ -117,10 +119,10 @@ CONFIG_PACKAGE_ppp-mod-pppol2tp=y
 CONFIG_PACKAGE_ppp-multilink=y
 # CONFIG_PACKAGE_ppp is not set
 CONFIG_PACKAGE_qos-scripts=y
-CONFIG_PACKAGE_qrencode=y
 CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rdisc6=y
 CONFIG_PACKAGE_rdnssd=y
+CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_samba3=y
@@ -147,6 +149,7 @@ CONFIG_USE_STRIP=y
 CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
 # CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y

iop/scripts/compile.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+function compile {
+	if [ -z "$1" ]; then
+		echo "Please give a valid package as first argument."
+		return 1
+	fi
+
+	local cpath pck
+	local lpath=$(find package/ -type l -name $1)
+	local dpath=$(find package/ -type d -name $1)
+
+	for pck in $lpath $dpath; do
+		if [ -n "$(ls $pck/Makefile 2>/dev/null)" ]; then
+			cpath=$pck
+			break
+		fi
+	done
+
+	if [ -n "$cpath" ]; then
+		make $cpath/compile V=$2
+	else
+		echo "Package $1 does not exist. Make sure you have installed the necessary feed."
+	fi
+}
+
+register_command "compile" "Compile a specific package: ./iop compile <PACKAGE_NAME> [0-99]; i.e ./iop compile netifd 99"

iop/scripts/feeds_update.sh

@@ -3,25 +3,21 @@
 function feeds_update {
 
     developer=0
+    override=1
+    start=$(date -u +'%s');
+    while getopts "n" opt; do
+	case $opt in
+	    n)
+		override=0
+		;;
+	esac
+    done
+
 
     git remote -v | grep -q http || developer=1
 
-    #while getopts "d" opt; do
-    #    case $opt in
-    #        d)
-    #	    developer=1
-    #            ;;
-    #        \?)
-    #            echo "Invalid option: -$OPTARG" >&2
-    #            exit 1
-    #            ;;
-    #    esac
-    #done
-
     cp .config .genconfig_config_bak
 
-    rm -rf package/feeds
-
     #if -d argument is passed, clone feeds with ssh instead of http
     if [ $developer == 1 ]; then
 	./scripts/feeds update -g
@@ -29,25 +25,21 @@ function feeds_update {
 	./scripts/feeds update
     fi
 
+    # replace core packages with iopsys versions
+    if [ $override == 1 ]; then
+	./scripts/feeds install -f -p feed_inteno_openwrt -a
+    fi
 
-    ./scripts/feeds install -f -p feed_inteno_openwrt -a
-    ./scripts/feeds install -f -p feed_inteno_juci -a
-    ./scripts/feeds install -f -p feed_inteno_packages -a
-    ./scripts/feeds install -f -p feed_inteno_broadcom -a
-    ./scripts/feeds install -f -p feed_inteno_targets iopsys-brcm63xx-mips
-    ./scripts/feeds install -f -p feed_inteno_targets iopsys-brcm63xx-arm
+    # targets need to be installed explicitly
+    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
+    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
+    ./scripts/feeds install -p feed_inteno_targets iopsys-ramips
+    
+    # install all packages
     ./scripts/feeds install -a 
-    ./scripts/feeds uninstall asterisk18
-    ./scripts/feeds uninstall zstream
-    ./scripts/feeds uninstall mtd-utils
-    ./scripts/feeds install -f -p feed_inteno_packages mtd-utils
-    ./scripts/feeds uninstall qrencode
-    ./scripts/feeds install -f -p feed_inteno_packages qrencode
-    ./scripts/feeds uninstall libwebsockets
-    ./scripts/feeds uninstall libwebsockets-openssl
-    ./scripts/feeds install -f -p feed_inteno_juci libwebsockets
 
-    rm -rf package/feeds/oldpackages/libzstream # have to run this for now since uninstall is not working every time
+    # remove broken symlinks ( for packages that are no longer in the feed )
+    find -L package/feeds -maxdepth 2 -type l -delete
 
     cp .genconfig_config_bak .config
     make defconfig

iop/scripts/genconfig.sh

@@ -12,8 +12,11 @@ function genconfig {
     LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
     iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25"
-    iopsys_brcm63xx_arm="dg400"
+    iopsys_brcm63xx_arm="dg400 eg400"
+    iopsys_ramips="ex300"
+    ramips="mt7621"
     target="bogus"
+    masterconfig=1
 
     set_target() {
 
@@ -22,14 +25,33 @@ function genconfig {
 	for p in $iopsys_brcm63xx_mips; do
             if [ $p == $profile ]; then
 		target="iopsys_brcm63xx_mips"
+		return
             fi
 	done
 
 	for p in $iopsys_brcm63xx_arm; do
             if [ $p == $profile ]; then
 		target="iopsys_brcm63xx_arm"
+		return
             fi
 	done
+
+	for p in $iopsys_ramips; do
+            if [ $p == $profile ]; then
+		target="iopsys_ramips"
+		masterconfig=0
+		return
+            fi
+	done
+
+	for p in $ramips; do
+            if [ $p == $profile ]; then
+		target="ramips"
+		masterconfig=0
+		return
+            fi
+	done
+
     }
 
 
@@ -139,13 +161,14 @@ function genconfig {
 	    exit 1
 	fi
 
-	# Clean base-file package to force rebuild when changing profile
-	make package/base-files/clean
-
-	# Base config on master
-	v  "Config $BOARDTYPE selected"
-	v "cp  $CONFIGPATH/config  .config"
-	cp  $CONFIGPATH/config  .config
+	# Generate base config 
+	# Used only for iopsys targets, not openwrt targets
+	rm -f .config
+	if [ $masterconfig -eq 1 ]; then
+	    v  "Config $BOARDTYPE selected"
+	    v "cp  $CONFIGPATH/config  .config"
+	    cp  $CONFIGPATH/config  .config
+	fi
 
 	# Apply profile diff to master config if selected
 	if [ -n "$PROFILE" ]; then 
@@ -165,9 +188,10 @@ function genconfig {
 	echo "CONFIG_TARGET_${target}=y" >> .config
 	echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
 
+	echo "$BOARDTYPE $CUSTOMER" > .current_config_file
+
 	# Add customerconfig diff if a customer is selected
 	if [ -n "$CUSTOMER" ]; then
-	    echo "$BOARDTYPE $CUSTOMER" > .current_config_file
 	    if [ -d "$CUSTCONF/$BOARDTYPE/$CUSTOMER/fs" ]; then
 		v "cp -rLp $CUSTCONF/$BOARDTYPE/$CUSTOMER/fs/* $FILEDIR"
 		cp -rLp $CUSTCONF/$BOARDTYPE/$CUSTOMER/fs/* $FILEDIR
@@ -202,7 +226,11 @@ function genconfig {
 	    echo "CONFIG_ENDPT_OPEN=y" >> .config
 	    echo "CONFIG_NATALIE_OPEN=y" >> .config
 	fi
-
+	
+	# Force regeneration of kernel Makefile
+	# Needed to disable kmods for iopsys-brcm targets
+	touch package/kernel/linux/Makefile
+	
 	# Set default values based on selected parameters
 	make defconfig
 
@@ -213,7 +241,14 @@ function genconfig {
 	    sed -i '/CONFIG_PACKAGE_uhttpd/d' .config
 	fi
 
-	echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
+	if [ $masterconfig -eq 1 ]; then
+	    echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
+	fi
+
+	# Clean base-file package to force rebuild when changing profile
+	make package/base-files/clean
+
+
     }
 
     ####### main #####
@@ -251,7 +286,10 @@ function genconfig {
 	done
 	setup_dirs
 	create_and_copy_files "$1" "$2"
-	use_local_mirror
+
+	if [ $masterconfig -eq 1 ]; then
+	    use_local_mirror
+	fi
     fi
 }
 

iop/scripts/generate_tarballs.sh

@@ -1,17 +1,16 @@
 #!/bin/sh
 
 
-
 build_bcmkernel_consumer() {
 	local tarfile bcmkernelcommith
 	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/$sdkversion.mk | cut -d'=' -f2)
 	# do not build bcmopen sdk if it was already built before
-	ssh inteno@iopsys.inteno.se "ls public/www/iopsys/consumer/bcmopen-$profile-$bcmkernelcommith.tar.gz" && return
+	ssh $SERVER "ls $FPATH/bcmopen-$profile-$bcmkernelcommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/bcmkernel-3.4-$sdkversion/bcm963xx/release
 	sh do_consumer_release -p $profile -y
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
 	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
-	scp $tarfile inteno@ihgsp.inteno.se:/home/inteno/public/www/iopsys/consumer/bcmopen-$profile-$bcmkernelcommith.tar.gz
+	scp $tarfile $SERVER:$FPATH/bcmopen-$profile-$bcmkernelcommith.tar.gz
 	rm -f $tarfile
 	cd $curdir
 }
@@ -22,12 +21,12 @@ build_natalie_consumer() {
 	grep -q "CONFIG_TARGET_NO_DECT=y" .config && return
 	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
 	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
-	ssh inteno@iopsys.inteno.se "ls public/www/iopsys/consumer/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
+	ssh $SERVER "ls $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/natalie-dect-$natalieversion/
 	mkdir natalie-dect-open-$natalieversion
 	cp NatalieFpCvm6362/Src/Projects/NatalieV3/FpCvm/Linux6362/dects.ko natalie-dect-open-$natalieversion/dect.ko
 	tar -czv  natalie-dect-open-$natalieversion/ -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
-	scp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz inteno@iopsys.inteno.se:/home/inteno/public/www/iopsys/consumer/
+	scp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $SERVER:$FPATH/
 	cp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $curdir/
 	rm -rf natalie-dect-open-$natalieversion
 	rm -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
@@ -40,12 +39,12 @@ build_endptcfg_consumer() {
 	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
 	endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
 	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
-	ssh inteno@iopsys.inteno.se "ls public/www/iopsys/consumer/endptcfg-$profile-$endptversion-$endptcommith.tar.gz" && return
+	ssh $SERVER "ls $FPATH/endptcfg-$profile-$endptversion-$endptcommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/endptcfg-$endptversion/
 	mkdir endptcfg-open-$endptversion
 	cp endptcfg endptcfg-open-$endptversion/
 	tar -czv  endptcfg-open-$endptversion/ -f endptcfg-$profile-$endptversion-$endptcommith.tar.gz
-	scp endptcfg-$profile-$endptversion-$endptcommith.tar.gz inteno@iopsys.inteno.se:/home/inteno/public/www/iopsys/consumer/
+	scp endptcfg-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
 	cp endptcfg-$profile-$endptversion-$endptcommith.tar.gz $curdir/
 	rm -rf endptcfg-open-$endptversion
 	rm -f endptcfg-$profile-$endptversion-$endptcommith.tar.gz
@@ -59,18 +58,20 @@ build_ice_consumer() {
 	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
 	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
 	iceversion=$icebasever$icerelease
-	ssh inteno@iopsys.inteno.se "ls public/www/iopsys/consumer/ice-client-$profile-$iceversion-$icecommith.tar.gz" && return
+	ssh $SERVER "ls $FPATH/ice-client-$profile-$iceversion-$icecommith.tar.gz" && return
 	cd ./build_dir/target-*_uClibc-0.9.33.*/ice-client-$icebasever/ipkg-*
 	tar -czv  ice-client -f ice-client-$profile-$iceversion-$icecommith.tar.gz
-	scp ice-client-$profile-$iceversion-$icecommith.tar.gz inteno@iopsys.inteno.se:/home/inteno/public/www/iopsys/consumer/
+	scp ice-client-$profile-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
 	cp ice-client-$profile-$iceversion-$icecommith.tar.gz $curdir/
 	rm -f ice-client-$profile-$iceversion-$icecommith.tar.gz
 	cd $curdir
 }
 
-
 function generate_tarballs {
 
+    SERVER="god@software.inteno.se"
+    FPATH="/var/www/html/iopsys/consumer"
+
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
@@ -84,5 +85,5 @@ function generate_tarballs {
 
 }
 
-register_command "generate_tarballs" "Generate tarballs for openstk"
+register_command "generate_tarballs" "Generate tarballs for Open SDK"
 

iop/scripts/ssh_sysupgrade.sh

@@ -34,7 +34,7 @@ function ssh_sysupgrade_latest {
 		exit 1
 	fi
 	{ cd `dirname $0`
-		IMAGE=`ls -Art bin/*/*.y | tail -n1`
+		IMAGE=`ls -Art bin/*/*.y2 | tail -n1`
 		[ "$IMAGE" ] && [ -e "$IMAGE" ] && ./iop ssh_sysupgrade $1 $IMAGE $2
 	}
 }

iup/files/sbin/iup

@@ -16,7 +16,7 @@ export IUPTEMP="/tmp/iup"
 export INTERACTIVE=0
 export VERBOSE=0
 export CONF=1
-export DESKEY=$(cat /proc/nvram/DesKey | hexdump -e '16/1 "%02x"')
+export DESKEY=$(cat /proc/nvram/DesKey | tr -d '\n' | hexdump -e '16/1 "%02x"')
 export MAC=$(cat /proc/nvram/BaseMacAddr)
 export RANGE=10
 export RETRYSTOP=5
@@ -160,7 +160,7 @@ handle_Downloaded_file()
 {
 	local DECKEY
 	local KEY
-	[ -n "$1" ] && DECKEY=$(echo $1 | hexdump -e '16/1 "%02x"')
+	[ -n "$1" ] && DECKEY=$(echo $1 | tr -d '\n' | hexdump -e '16/1 "%02x"')
 	KEY=${DECKEY:-$DESKEY}
 	local img_type
 	case "$(get_image_type "$IUPCONFFILES")" in                                  
@@ -201,6 +201,9 @@ handle_Downloaded_file()
 						reload $CONFILESLURP
 					fi
 					rm -rf $IUPTEMP
+
+					cp /rom/etc/uci-defaults/* /etc/uci-defaults/
+					sync
 				fi
 			;;
 			*)
@@ -423,9 +426,9 @@ if [ -n "$1" ]; then
 	elif [ -n "$vlanid" ]; then
 		logger -t dhcp_opt132 "vlanid: ${vlanid}"
 		change_to_vlan ${vlanid} 0 ${interface}
-	else
-		logger -t dhcp_opt132 "no vlanid given"
 	fi
+
+	exit 0
 fi
 
 local iupurl

layer2interface/broadcom/etc/init.d/layer2_interface

@@ -10,14 +10,14 @@ USE_PROCD=1
 start_service() {
 	local AnnexM
 	local GDmt
-	local Glite 
-	local T1413 
+	local Glite
+	local T1413
 	local ADSL2
 	local AnnexL
 	local ADSL2plus
-	local VDSL2 
-	local a8a 
-	local b8b 
+	local VDSL2
+	local a8a
+	local b8b
 	local c8c
 	local d8d
 	local a12a
@@ -75,20 +75,20 @@ start_service() {
 	sra=$(echo $sra | sed 's/0/off/g')
 
 	echo "Starting DSL"
-	
+
 	xtmctl start
 	xtmctl operate intf --state 1 enable
 	json_load "$(ubus call router quest "{ \"info\": \"specs\" }")"
 	json_get_var vdsl vdsl
 
 	if [ $vdsl -eq 1 ]; then
-		echo "xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM$VDSL2 --profile \"$a8a $b8b $c8c $d8d $a12a $b12b $a17a\" --sra $sra --bitswap $bitswap --us0 $US0" 
+		echo "xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM$VDSL2 --profile \"$a8a $b8b $c8c $d8d $a12a $b12b $a17a\" --sra $sra --bitswap $bitswap --us0 $US0"
 		xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM$VDSL2 --profile "$a8a $b8b $c8c $d8d $a12a $b12b $a17a" --sra $sra --bitswap $bitswap --us0 $US0
 	else
 		echo "xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM --sra $sra --bitswap $bitswap"
 		xdslctl start --up --mod $GDmt$Glite$T1413$ADSL2$AnnexL$ADSL2plus$AnnexM --sra $sra --bitswap $bitswap
 	fi
-	
+
 }
 
 

layer2interface/broadcom/etc/init.d/layer2_interface_adsl

@@ -10,7 +10,7 @@ checkpvc() {
 	local retur
 	local vpi=$1
 	local vci=$2
-	
+
 	retur=$(xtmctl operate conn --show | awk -v test="$vpi/$vci" '{if ($3 ==test ) print $5 }')
 
 	case $retur in
@@ -25,31 +25,31 @@ checkxtmlist() {
 	local scr
 	local mbs
 	local retur
-	
+
 	case $# in
 		1)
 			pcr=0
 			scr=0
 			mbs=0
-		;; 
-		2) 
+		;;
+		2)
 			pcr=$2
 			scr=0
-			mbs=0 
+			mbs=0
 		;;
-		4) 
+		4)
 			pcr=$2
 			scr=$3
-			mbs=$4 
+			mbs=$4
 		;;
 	esac
-	
+
 	retur=$(xtmctl operate tdte --show | awk -v test="$dtype" -v pcr="$pcr" -v scr="$scr" -v mbs="$mbs" '{if ($2 ==test && $3==pcr && $4==scr && $5==mbs ) print $1 }')
 
 	case $retur in
 		''|*[!0-9]*) return 0 ;;
 		*) return $retur ;;
-	esac	
+	esac
 }
 
 atm_inf_conf() {
@@ -71,13 +71,15 @@ atm_inf_conf() {
 	config_get mbs $1 mbs
 	config_get vpi $1 vpi
 	config_get vci $1 vci
-	config_get ifname $1 ifname 
+	config_get ifname $1 ifname
 	config_get baseifname $1 baseifname
 	config_get name $1 name
 	config_get bridge $1 bridge
 	checkpvc $vpi $vci
 	ret=$?
 
+	ifname="${ifname:-$baseifname.1}"
+
 	if [ "$ret" -eq 0 ]; then
 		checkxtmlist $atmtype $pcr $scr $mbs
 		ret=$?
@@ -90,7 +92,7 @@ atm_inf_conf() {
 				rtvbr)xtmctl operate tdte --add "$atmtype" $pcr $scr $mbs;;
 			esac
 		fi
-		 
+
 		case $link_type in
 			EoA)config_get encaps $1 encapseoa;;
 			PPPoA)config_get encaps $1 encapspppoa;;
@@ -105,7 +107,7 @@ atm_inf_conf() {
 		xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue, internal traffic dhcp igmp dns and icmp
 		xtmctl operate conn --createnetdev 1.$vpi.$vci ${ifname%%.*}
 		xtmctl operate intf --state 1 enable
-		
+
 		brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge"
 	fi
 }
@@ -116,7 +118,7 @@ remove_netdevices() {
 	local rest
 	local x=0
 	#local baseifname
-	local vpivci=`xtmctl operate conn --show | awk '{if (NR!=1 && $1!="PTM") {print $3}}'`
+	local vpivci=`xtmctl operate conn --show | grep "ATM\|mode" | awk '{if (NR!=1 && $1!="PTM") {print $3}}'`
 
 	for i in $vpivci
 	do
@@ -146,7 +148,7 @@ stop_service() {
 	echo "Stopping ADSL"
 #xtmctl stop causes IRQ issues"
 #	xtmctl stop
-	remove_netdevices	
+	remove_netdevices
 }
 
 reload_service() {
@@ -155,7 +157,7 @@ reload_service() {
 }
 
 service_triggers() {
-        procd_add_reload_trigger layer2_interface_adsl
+	procd_add_reload_trigger layer2_interface_adsl
 }
 
 

layer2interface/broadcom/etc/init.d/layer2_interface_ethernet

@@ -7,19 +7,23 @@ START=21
 USE_PROCD=1
 
 get_current_status() {
-        local port="$1"
-        local media="$(ethctl $port media-type 2>&1)"
-        if echo $media | grep "1000" >/dev/null; then
-                return 0
-        elif echo $media | grep "100" >/dev/null; then
-                return 1
-          elif echo $media | grep "10" >/dev/null; then
-                return 1
-        fi
+	local port="$1"
+	local media="$(ethctl $port media-type 2>&1)"
+	if echo $media | grep "1000" >/dev/null; then
+		return 0
+	elif echo $media | grep "100" >/dev/null; then
+		return 1
+	elif echo $media | grep "10" >/dev/null; then
+		return 1
+	fi
 }
 
 removeethernet() {
+	config_get baseifname $1 baseifname
 	config_get ifname $1 ifname
+
+	ifname="${ifname:-$baseifname.1}"
+
 	vlanctl --if-delete $ifname
 	config_load layer2_interface_vlan
 	#kill all vlans related to this interface
@@ -33,6 +37,9 @@ removevlan() {
 
 	config_get baseifname $1 baseifname
 	config_get ifname $1 ifname
+
+	ifname="${ifname:-$baseifname.1}"
+
 	if [ "$wan" == "$baseifname" ]; then
 		echo "vlanctl --if-delete $ifname"
 		vlanctl --if-delete $ifname
@@ -43,23 +50,26 @@ addethernet() {
 	config_get baseifname $1 baseifname
 	config_get ifname $1 ifname
 	config_get bridge $1 bridge
-	brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge"
 	
+	ifname="${ifname:-$baseifname.1}"
+
+	brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge"
+
 }
 
 boot() {
 	local baseifname wanport portnum
 	config_load layer2_interface_ethernet
 	config_get baseifname Wan baseifname
-	
-	if [ "$(db get hw.board.hardware)" != "EG300" ]; then  
-	  get_current_status $baseifname
-	  local ret=$?
-	  if [ $ret -eq 1 ]; then                                                        
-	      ethctl $baseifname phy-power down
-	      ethctl $baseifname phy-power up    
-	  fi
-	fi  
+
+	if [ "$(db get hw.board.hardware)" != "EG300" ]; then
+		get_current_status $baseifname
+		local ret=$?
+		if [ $ret -eq 1 ]; then
+			ethctl $baseifname phy-power down
+			ethctl $baseifname phy-power up
+		fi
+	fi
 	for interf in `db get hw.board.ethernetPortOrder`; do ethswctl -c wan -i $interf -o disable ; done
 	wanport=$(db get hw.board.ethernetWanPort)
 	portnum=$(get_port_number $wanport)
@@ -68,7 +78,7 @@ boot() {
 	if [ $baseifname ]; then
 		ethswctl -c wan -i $baseifname -o enable
 	fi
-					    
+
 	if [ "`db get hw.board.tm`" == "1" ]; then
 		for interf in `db get hw.board.ethernetPortOrder`; do
 			tmctl porttminit --devtype ETH --if $interf --flag 1 || \
@@ -98,7 +108,7 @@ reload_service() {
 }
 
 service_triggers() {
-        procd_add_reload_trigger layer2_interface_ethernet
+	procd_add_reload_trigger layer2_interface_ethernet
 }
 
 

layer2interface/broadcom/etc/init.d/layer2_interface_vdsl

@@ -18,7 +18,7 @@ checkptm() {
 	fi
 
 	retur=$(xtmctl operate conn --show | awk -v dslat="$dslat" -v ptmprio="$ptmprio" '{if ($2 == dslat && $3 == ptmprio ) print $2 }')
-	
+
 	case $retur in
 		''|*[!0-9]*) return 0 ;;
 		*) return $retur ;;
@@ -38,13 +38,16 @@ ptm_inf_conf() {
 	config_get baseifname $1 baseifname
 	config_get bridge $1 bridge
 
+	ifname="${ifname:-$baseifname.1}"
+
 	checkptm $ptmprio $dslat
 	ret=$?
 
 	if [ "$ret" -eq 0 ]; then
 		xtmctl operate conn --add $dslat.$ptmprio 0 1
-		xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 -1 -1 3000
-		xtmctl operate conn --addq $dslat.$ptmprio 7 wrr 1 -1 -1 3000 # fixes pppoe disconnect issue
+		xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 -1 -1 3000 # low  priority queue
+		xtmctl operate conn --addq $dslat.$ptmprio 1 wrr 1 -1 -1 3000 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+		xtmctl operate conn --addq $dslat.$ptmprio 7 wrr 1 -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp
 		xtmctl operate conn --createnetdev $dslat.$ptmprio ${ifname%%.*}
 		xtmctl operate intf --state 1 enable
 		xtmctl start
@@ -57,7 +60,7 @@ remove_netdevices() {
 	local x=0
 
 	IFS=$'\n'
-	for i in `xtmctl operate conn --show`
+	for i in `xtmctl operate conn --show | grep "PTM\|mode"`
 	do
 		if [ $x -eq 1 ]; then
 			delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$10}')
@@ -96,7 +99,7 @@ reload_service() {
 }
 
 service_triggers() {
-        procd_add_reload_trigger layer2_interface_vdsl
+	procd_add_reload_trigger layer2_interface_vdsl
 }
 
 

layer2interface/broadcom/etc/init.d/layer2_interface_vlan

@@ -16,6 +16,9 @@ vlan_inf_conf() {
 	config_get vlan8021p $1 vlan8021p
 	config_get vlan8021q $1 vlan8021q
 	config_get bridge $1 bridge
+
+	ifname="${ifname:-$baseifname.$vlan8021q}"
+
 	addbrcmvlan "$baseifname" "$vlan8021p" "$vlan8021q" "$bridge" "$ifname"
 }
 
@@ -42,6 +45,6 @@ reload_service() {
 }
 
 service_triggers() {
-        procd_add_reload_trigger layer2_interface_vlan
+	procd_add_reload_trigger layer2_interface_vlan
 }
 

layer2interface/broadcom/lib/network/brcmwifi.sh

@@ -183,7 +183,7 @@ wlmngr_startWsc()
 	nvram set wl_wps_reg="enabled"
 	nvram set lan_wps_reg=enabled #"enabled/disabled"
 	nvram set wps_uuid=0x000102030405060708090a0b0c0d0ebb
-	nvram set wps_device_name=BroadcomAP
+	nvram set wps_device_name=Inteno
 	nvram set wps_mfstring=Broadcom
 	nvram set wps_modelname=Broadcom
 	nvram set wps_modelnum=123456

layer2interface/broadcom/lib/network/vlan.sh

@@ -9,7 +9,7 @@ removeall_vlandevices()
 	local i
 
 	for i in `ls /proc/sys/net/ipv4/conf`; do
-		case "$i" in 
+		case "$i" in
 			[eap][t][mh][0-9].v1)
 			;;
 			[eap][t][mh][0-9].1)
@@ -33,13 +33,13 @@ ifvlanexits()
 
 	for i in `ls /proc/sys/net/ipv4/conf`; do
 		if [ "$i" == "$vif" ]; then
-			return 1 
+			return 1
 		fi
 	done
 	return 0
 }
 
-ifbaseexists ()
+ifbaseexists()
 {
 	local if=$1
 
@@ -58,17 +58,16 @@ ifbaseexists ()
 	return 0
 }
 
-addbrcmvlan ()
+addbrcmvlan()
 {
 	local baseifname=$1
 	local vlan8021p=$2
 	local vlan8021q=$3
 	local bridge=$4
 	local ifname=$5
-	#local ifname=$4
-	#config_get baseifname $1 baseifname
-	#config_get vlan8021p $1 vlan8021p
-	#config_get vlan8021q $1 vlan8021q
+
+	bridge="${bridge:-0}"
+
 	ifbaseexists $baseifname
 	ret=$?
 	if [ "$ret" -eq 1 ]; then
@@ -86,17 +85,17 @@ addbrcmvlan ()
 				typ=$(uci -q get network."$net".type)
 				proto=$(uci -q get network."$net".proto)
 				proto="${proto:-none}"
-				if [ "$typ" == "bridge" -a "$proto" == "none" ]; then
-					unmanaged=1
-					break
+				if [ "$typ" == "bridge" ]; then
+					bridge=1
+					if [ "$proto" == "none" ]; then
+						unmanaged=1
+						break
+					fi
 				fi
 			done
 
 			echo '1' > /proc/sys/net/ipv6/conf/$baseifname/disable_ipv6
 			ifconfig $baseifname up
-			if [ "x$bridge" = "x" ]; then
-				bridge=0
-			fi
 
 			if [ "$bridge" -eq 1 ]; then
 				if [ "$unmanaged" == "1" ]; then
@@ -119,7 +118,7 @@ addbrcmvlan ()
 				vlanctl --if $baseifname --tx --tags 1 --filter-txif $ifname --push-tag --set-vid $vlan8021q 0 --set-pbits $vlan8021p 0 --rule-insert-before -1
 				# tags 2 tx
 				vlanctl --if $baseifname --tx --tags 2 --filter-txif $ifname --push-tag --set-vid $vlan8021q 0 --set-pbits $vlan8021p 0 --rule-insert-before -1
-				# tags 1 rx				
+				# tags 1 rx
 				vlanctl --if $baseifname --rx --tags 1 --filter-vid $vlan8021q 0 --pop-tag --set-rxif $ifname --rule-insert-before -1
 				# tags 2 rx
 				vlanctl --if $baseifname --rx --tags 2 --filter-vid $vlan8021q 0 --pop-tag --set-rxif $ifname --rule-insert-before -1
@@ -136,8 +135,8 @@ addbrcmvlan ()
 				vlanctl --if $baseifname --rx --tags 1 --set-rxif $ifname --filter-vlan-dev-mac-addr 0 --drop-frame --rule-insert-before -1
 				# tags 2 rx
 				vlanctl --if $baseifname --rx --tags 2 --set-rxif $ifname --filter-vlan-dev-mac-addr 0 --drop-frame --rule-insert-before -1
-				# tags 1 rx 
-				vlanctl --if $baseifname --rx --tags 1 --filter-vlan-dev-mac-addr 1 --filter-vid $vlan8021q 0 --pop-tag --set-rxif $ifname --rule-insert-before -1	 
+				# tags 1 rx
+				vlanctl --if $baseifname --rx --tags 1 --filter-vlan-dev-mac-addr 1 --filter-vid $vlan8021q 0 --pop-tag --set-rxif $ifname --rule-insert-before -1
 				# tags 2 rx
 				vlanctl --if $baseifname --rx --tags 2 --filter-vlan-dev-mac-addr 1 --filter-vid $vlan8021q 0 --pop-tag --set-rxif $ifname --rule-insert-before -1
 			fi
@@ -148,12 +147,14 @@ addbrcmvlan ()
 }
 
 
-brcm_virtual_interface_rules ()
+brcm_virtual_interface_rules()
 {
 	local baseifname=$1
 	local ifname=$2
 	local bridge=$3
 
+	bridge="${bridge:-0}"
+
 	local unmanaged=0
 	local nets net typ proto
 	nets=$(get_network_of "$ifname")
@@ -161,18 +162,19 @@ brcm_virtual_interface_rules ()
 		typ=$(uci -q get network."$net".type)
 		proto=$(uci -q get network."$net".proto)
 		proto="${proto:-none}"
-		if [ "$typ" == "bridge" -a "$proto" == "none" ]; then
-			unmanaged=1
-			break
+
+		if [ "$typ" == "bridge" ]; then
+			bridge=1
+			if [ "$proto" == "none" ]; then
+				unmanaged=1
+				break
+			fi
 		fi
 	done
 
 	echo '1' > /proc/sys/net/ipv6/conf/$baseifname/disable_ipv6
 	ifconfig $baseifname up
-	if [ "x$bridge" = "x" ]; then                                                                                                                         
-		bridge=0
-	fi
-      
+
 	if [ "$bridge" -eq 1 ]; then
 		if [ "$unmanaged" == "1" ]; then
 			vlanctl --if-create-name $baseifname $ifname
@@ -199,21 +201,21 @@ brcm_virtual_interface_rules ()
 		# tags 2 tx
 		vlanctl --if $baseifname --tx --tags 2 --filter-txif $ifname --rule-insert-before -1
 		# tags 0 rx
-		vlanctl --if $baseifname --rx --tags 0 --set-rxif $ifname --rule-insert-last 
+		vlanctl --if $baseifname --rx --tags 0 --set-rxif $ifname --rule-insert-last
 		# tags 1 rx
-		vlanctl --if $baseifname --rx --tags 1 --set-rxif $ifname --rule-insert-last 
+		vlanctl --if $baseifname --rx --tags 1 --set-rxif $ifname --rule-insert-last
 		# tags 2 rx
-		vlanctl --if $baseifname --rx --tags 2 --set-rxif $ifname --rule-insert-last 
+		vlanctl --if $baseifname --rx --tags 2 --set-rxif $ifname --rule-insert-last
 	else
 		# tags 1 rx
 		vlanctl --if $baseifname --rx --tags 1 --set-rxif $ifname --filter-vlan-dev-mac-addr 0 --drop-frame --rule-insert-before -1
 		# tags 2 rx
 		vlanctl --if $baseifname --rx --tags 2 --set-rxif $ifname --filter-vlan-dev-mac-addr 0 --drop-frame --rule-insert-before -1
-		# tags 0 rx 
+		# tags 0 rx
 		vlanctl --if $baseifname --rx --tags 0 --set-rxif $ifname --filter-vlan-dev-mac-addr 1 --rule-insert-before -1
 	fi
 
 	ifconfig $ifname up
-	ifconfig $ifname multicast	 
+	ifconfig $ifname multicast
 }
 

libstrophe/patches/100-rename_base64_functions.patch

@@ -0,0 +1,221 @@
+diff --git a/src/auth.c b/src/auth.c
+index b3056a2..2673bdf 100644
+--- a/src/auth.c
++++ b/src/auth.c
+@@ -455,7 +455,7 @@ static int _handle_scram_sha1_challenge(xmpp_conn_t * const conn,
+         if (!text)
+             goto err;
+ 
+-        challenge = (char *)base64_decode(conn->ctx, text, strlen(text));
++        challenge = (char *)strophe_base64_decode(conn->ctx, text, strlen(text));
+         xmpp_free(conn->ctx, text);
+         if (!challenge)
+             goto err;
+@@ -515,7 +515,7 @@ static char *_get_nonce(xmpp_ctx_t *ctx)
+         *(time_t *)(buffer + sizeof(clock_t)) = (time_t)rand();
+     }
+ 
+-    return base64_encode(ctx, buffer, sizeof(buffer));
++    return strophe_base64_encode(ctx, buffer, sizeof(buffer));
+ }
+ 
+ static char *_make_scram_sha1_init_msg(xmpp_conn_t * const conn)
+@@ -662,7 +662,7 @@ static void _auth(xmpp_conn_t * const conn)
+             return;
+         }
+ 
+-        str = (char *)base64_encode(conn->ctx, (unsigned char *)scram_init,
++        str = (char *)strophe_base64_encode(conn->ctx, (unsigned char *)scram_init,
+                                     strlen(scram_init));
+         if (!str) {
+             xmpp_free(conn->ctx, scram_init);
+diff --git a/src/sasl.c b/src/sasl.c
+index 3d83fd0..b6f2b89 100644
+--- a/src/sasl.c
++++ b/src/sasl.c
+@@ -46,7 +46,7 @@ char *sasl_plain(xmpp_ctx_t *ctx, const char *authid, const char *password) {
+ 	memcpy(msg+1, authid, idlen);
+ 	msg[1+idlen] = '\0';
+ 	memcpy(msg+1+idlen+1, password, passlen);
+-	result = base64_encode(ctx, (unsigned char *)msg, 2 + idlen + passlen);
++	result = strophe_base64_encode(ctx, (unsigned char *)msg, 2 + idlen + passlen);
+ 	xmpp_free(ctx, msg);
+     }
+ 
+@@ -92,7 +92,7 @@ static hash_t *_parse_digest_challenge(xmpp_ctx_t *ctx, const char *msg)
+     char *key, *value;
+     unsigned char *s, *t;
+ 
+-    text = base64_decode(ctx, msg, strlen(msg));
++    text = strophe_base64_decode(ctx, msg, strlen(msg));
+     if (text == NULL) {
+ 	xmpp_error(ctx, "SASL", "couldn't Base64 decode challenge!");
+ 	return NULL;
+@@ -344,7 +344,7 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx, const char *challenge,
+     hash_release(table); /* also frees value strings */
+ 
+     /* reuse response for the base64 encode of our result */
+-    response = base64_encode(ctx, (unsigned char *)result, strlen(result));
++    response = strophe_base64_encode(ctx, (unsigned char *)result, strlen(result));
+     xmpp_free(ctx, result);
+ 
+     return response;
+@@ -396,7 +396,7 @@ char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
+         goto out;
+     }
+ 
+-    sval = (char *)base64_decode(ctx, s, strlen(s));
++    sval = (char *)strophe_base64_decode(ctx, s, strlen(s));
+     if (!sval) {
+         goto out;
+     }
+@@ -426,7 +426,7 @@ char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
+         sign[j] ^= key[j];
+     }
+ 
+-    sign_b64 = base64_encode(ctx, sign, sizeof(sign));
++    sign_b64 = strophe_base64_encode(ctx, sign, sizeof(sign));
+     if (!sign_b64) {
+         goto out_response;
+     }
+@@ -439,7 +439,7 @@ char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
+     strcat(response, sign_b64);
+     xmpp_free(ctx, sign_b64);
+ 
+-    response_b64 = base64_encode(ctx, (unsigned char *)response,
++    response_b64 = strophe_base64_encode(ctx, (unsigned char *)response,
+                                  strlen(response));
+     if (!response_b64) {
+         goto out_response;
+@@ -501,7 +501,7 @@ int base64_encoded_len(xmpp_ctx_t *ctx, const unsigned len)
+     return ((len + 2)/3) << 2;
+ }
+ 
+-char *base64_encode(xmpp_ctx_t *ctx, 
++char *strophe_base64_encode(xmpp_ctx_t *ctx, 
+ 		    const unsigned char * const buffer, const unsigned len)
+ {
+     int clen;
+@@ -579,7 +579,7 @@ int base64_decoded_len(xmpp_ctx_t *ctx,
+     return 3 * (len >> 2) - nudge;
+ }
+ 
+-unsigned char *base64_decode(xmpp_ctx_t *ctx,
++unsigned char *strophe_base64_decode(xmpp_ctx_t *ctx,
+ 			     const char * const buffer, const unsigned len)
+ {
+     int dlen;
+diff --git a/src/sasl.h b/src/sasl.h
+index bc7511a..98c27bf 100644
+--- a/src/sasl.h
++++ b/src/sasl.h
+@@ -32,13 +32,13 @@ char *sasl_scram_sha1(xmpp_ctx_t *ctx, const char *challenge,
+ 
+ int base64_encoded_len(xmpp_ctx_t *ctx, const unsigned len);
+ 
+-char *base64_encode(xmpp_ctx_t *ctx, 
++char *strophe_base64_encode(xmpp_ctx_t *ctx, 
+ 		    const unsigned char * const buffer, const unsigned len);
+ 
+ int base64_decoded_len(xmpp_ctx_t *ctx,
+ 		       const char * const buffer, const unsigned len);
+ 
+-unsigned char *base64_decode(xmpp_ctx_t *ctx,
++unsigned char *strophe_base64_decode(xmpp_ctx_t *ctx,
+ 			     const char * const buffer, const unsigned  len);
+ 
+ #endif /* _LIBXMPP_SASL_H__ */
+diff --git a/tests/test_base64.c b/tests/test_base64.c
+index 9e16862..82995b4 100644
+--- a/tests/test_base64.c
++++ b/tests/test_base64.c
+@@ -45,31 +45,31 @@ static const char base64_5[] =
+ int test_encode(xmpp_ctx_t *ctx)
+ {
+     char *result;
+-    result = base64_encode(ctx, text_1, strlen(text_1));
++    result = strophe_base64_encode(ctx, text_1, strlen(text_1));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(base64_1)) return 1;
+     if (strncmp(base64_1, result, strlen(base64_1))) return 1;
+     xmpp_free(ctx,result);
+ 
+-    result = base64_encode(ctx, text_2, strlen(text_2));
++    result = strophe_base64_encode(ctx, text_2, strlen(text_2));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(base64_2)) return 1;
+     if (strncmp(base64_2, result, strlen(base64_2))) return 1;
+     xmpp_free(ctx,result);
+ 
+-    result = base64_encode(ctx, text_3, strlen(text_3));
++    result = strophe_base64_encode(ctx, text_3, strlen(text_3));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(base64_3)) return 1;
+     if (strncmp(base64_3, result, strlen(base64_3))) return 1;
+     xmpp_free(ctx,result);
+ 
+-    result = base64_encode(ctx, text_4, strlen(text_4));
++    result = strophe_base64_encode(ctx, text_4, strlen(text_4));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(base64_4)) return 1;
+     if (strncmp(base64_4, result, strlen(base64_4))) return 1;
+     xmpp_free(ctx,result);
+ 
+-    result = base64_encode(ctx, text_5, strlen(text_5));
++    result = strophe_base64_encode(ctx, text_5, strlen(text_5));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(base64_5)) return 1;
+     if (strncmp(base64_5, result, strlen(base64_5))) return 1;
+@@ -83,31 +83,31 @@ int test_decode(xmpp_ctx_t *ctx)
+ {
+     unsigned char *result;
+ 
+-    result = base64_decode(ctx, base64_1, strlen(base64_1));
++    result = strophe_base64_decode(ctx, base64_1, strlen(base64_1));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(text_1)) return 1;
+     if (strncmp(text_1, result, strlen(text_1))) return 1;
+     xmpp_free(ctx,result);
+ 
+-    result = base64_decode(ctx, base64_2, strlen(base64_2));
++    result = strophe_base64_decode(ctx, base64_2, strlen(base64_2));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(text_2)) return 1;
+     if (strncmp(text_2, result, strlen(text_2))) return 1;
+     xmpp_free(ctx,result);
+ 
+-    result = base64_decode(ctx, base64_3, strlen(base64_3));
++    result = strophe_base64_decode(ctx, base64_3, strlen(base64_3));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(text_3)) return 1;
+     if (strncmp(text_3, result, strlen(text_3))) return 1;
+     xmpp_free(ctx,result);
+ 
+-    result = base64_decode(ctx, base64_4, strlen(base64_4));
++    result = strophe_base64_decode(ctx, base64_4, strlen(base64_4));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(text_4)) return 1;
+     if (strncmp(text_4, result, strlen(text_4))) return 1;
+     xmpp_free(ctx,result);
+ 
+-    result = base64_decode(ctx, base64_5, strlen(base64_5));
++    result = strophe_base64_decode(ctx, base64_5, strlen(base64_5));
+     if (result == NULL) return 2;
+     if (strlen(result) != strlen(text_5)) return 1;
+     if (strncmp(text_5, result, strlen(text_5))) return 1;
+@@ -130,13 +130,13 @@ int main(int argc, char *argv[])
+ 
+     printf("testing encode... ");   
+     ret = test_encode(ctx);
+-    if (ret) printf("base64_encode failed!\n");
++    if (ret) printf("strophe_base64_encode failed!\n");
+     if (ret) return ret;
+     printf("ok.\n");
+ 
+     printf("testing decode... ");   
+     ret = test_decode(ctx);
+-    if (ret) printf("base64_decode failed!\n");
++    if (ret) printf("strophe_base64_decode failed!\n");
+     if (ret) return ret;
+     printf("ok.\n");
+ 

lmbench/Makefile

@@ -0,0 +1,122 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lmbench
+PKG_VERSION:=3.0-a9
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=@SF/lmbench/
+PKG_MD5SUM:=b3351a3294db66a72e2864a199d37cbf
+
+PKG_BUILD_DEPENDS:=librpc
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lmbench
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=lmbench microbenchmarks
+  URL:=http://sourceforge.net/projects/lmbench
+  MENU:=1
+endef
+
+define Package/lmbench/description
+  lmbench is a series of micro benchmarks intended to measure basic operating
+  system and hardware system metrics.
+endef
+
+define Package/lmbench/install
+	true
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/src \
+		CC="$(TARGET_CC)" \
+		AR="$(TARGET_CROSS)ar" \
+		OS="$(ARCH)" \
+		BASE="$(PKG_INSTALL_DIR)" \
+		LDLIBS="-lrpc" \
+		COMPILE="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
+		lmbench install
+endef
+
+define PartGen
+define Package/lmbench-$(subst _,-,$(1))
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=$(1) microbenchmark
+  URL:=http://sourceforge.net/projects/lmbench
+  DEPENDS:=lmbench +librpc
+endef
+endef
+
+define PartInstall
+define Package/lmbench-$(subst _,-,$(1))/install
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/$(1) $$(1)/usr/sbin/$(1)
+endef
+endef
+
+LMBENCH_FILES:= \
+	bw_file_rd \
+	bw_mem \
+	bw_mmap_rd \
+	bw_pipe \
+	bw_tcp \
+	bw_unix \
+	cache \
+	disk \
+	enough \
+	flushdisk \
+	hello \
+	lat_cmd \
+	lat_connect \
+	lat_ctx \
+	lat_dram_page \
+	lat_fcntl \
+	lat_fifo \
+	lat_fs \
+	lat_http \
+	lat_mem_rd \
+	lat_mmap \
+	lat_ops \
+	lat_pagefault \
+	lat_pipe \
+	lat_pmake \
+	lat_proc \
+	lat_rand \
+	lat_rpc \
+	lat_select \
+	lat_sem \
+	lat_sig \
+	lat_syscall \
+	lat_tcp \
+	lat_udp \
+	lat_unix \
+	lat_unix_connect \
+	lat_usleep \
+	line \
+	lmdd \
+	lmhttp \
+	loop_o \
+	memsize \
+	mhz \
+	msleep \
+	par_mem \
+	par_ops \
+	stream \
+	timing_o \
+	tlb
+
+$(foreach file,$(LMBENCH_FILES),$(eval $(call PartGen,$(file))))
+$(foreach file,$(LMBENCH_FILES),$(eval $(call PartInstall,$(file))))
+
+$(eval $(call BuildPackage,lmbench))
+$(foreach file,$(LMBENCH_FILES),$(eval $(call BuildPackage,lmbench-$(subst _,-,$(file)))))

lmbench/patches/001-fix_socklen_t_define.patch

@@ -0,0 +1,11 @@
+--- a/src/bench.h
++++ b/src/bench.h
+@@ -77,7 +77,7 @@ typedef long long int64;
+ #endif /* HAVE_int64_t */
+ #endif /* HAVE_int64 */
+ 
+-#ifndef HAVE_socklen_t
++#if (!defined(HAVE_socklen_t) && !defined(__socklen_t_defined))
+ typedef int socklen_t;
+ #endif
+ 

lmbench/patches/002-install-cache.patch

@@ -0,0 +1,10 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -144,6 +144,7 @@ install-target:
+ 	if [ ! -d $(BASE)/include ]; then mkdir $(BASE)/include; fi
+ 	if [ ! -d $(BASE)/lib ]; then mkdir $(BASE)/lib; fi
+ 	cp $(EXES) $(BASE)/bin
++	cp $(OPT_EXES) $(BASE)/bin
+ 	cp $(INCS) $(BASE)/include
+ 	cp $O/lmbench.a $(BASE)/lib/libmbench.a
+ 	cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install

lmbench/patches/003-add-LDLIBS.patch

@@ -0,0 +1,30 @@
+--- a/scripts/build
++++ b/scripts/build
+@@ -18,7 +18,7 @@ done
+ 
+ trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15
+ 
+-LDLIBS=-lm
++LDLIBS=${LDLIBS-"-lm -lrpc"}
+ 
+ # check for HP-UX's ANSI compiler
+ echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -38,6 +38,7 @@ CC=`../scripts/compiler`
+ MAKE=`../scripts/make`
+ AR=ar
+ ARCREATE=cr
++LDLIBS=
+ 
+ # base of installation location
+ BASE=/usr/local
+@@ -111,7 +112,7 @@ LIBOBJS= $O/lib_tcp.o $O/lib_udp.o $O/li
+ 	$O/lib_sched.o
+ 
+ lmbench: $(UTILS)
+-	@env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build all
++	@env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" LDLIBS="$(LDLIBS)" ../scripts/build all
+ 	-@env CFLAGS=-O MAKE="$(MAKE)" MAKEFLAGS="k$(MAKEFLAGS)" CC="$(CC)" OS="$(OS)" ../scripts/build opt
+ 
+ results: lmbench

lmbench/patches/100-bw_mem-add-newline-after-usage.patch

@@ -0,0 +1,11 @@
+--- a/src/bw_mem.c
++++ b/src/bw_mem.c
+@@ -65,7 +65,7 @@ main(int ac, char **av)
+ 	size_t	nbytes;
+ 	state_t	state;
+ 	int	c;
+-	char	*usage = "[-P <parallelism>] [-W <warmup>] [-N <repetitions>] <size> what [conflict]\nwhat: rd wr rdwr cp fwr frd fcp bzero bcopy\n<size> must be larger than 512";
++	char	*usage = "[-P <parallelism>] [-W <warmup>] [-N <repetitions>] <size> what [conflict]\nwhat: rd wr rdwr cp fwr frd fcp bzero bcopy\n<size> must be larger than 512\n";
+ 
+ 	state.overhead = 0;
+ 

multiwan/Makefile

@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2010-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=multiwan
+PKG_VERSION:=1.0.22
+PKG_RELEASE:=2
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/multiwan
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+ip +iptables +kmod-ipt-conntrack +iptables-mod-conntrack-extra +iptables-mod-ipopt
+  TITLE:=Simple multi WAN configuration
+  URL:=ftp://ftp.netlab7.com/
+  MAINTAINER:=Craig M. Coffee <craigc@netlab7.com>
+endef
+
+define Package/multiwan/description
+An agent script that makes Multi-WAN configuration simple,
+easy and manageable. Complete with load balancing, failover and an easy
+to manage traffic ruleset.
+endef
+
+define Package/multiwan/conffiles
+/etc/config/multiwan
+endef
+
+define Build/Compile
+endef
+
+define Package/multiwan/install
+	$(CP) ./files/* $(1)
+endef
+
+define Package/multiwan/postinst
+[ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/multiwan enable
+exit 0
+endef
+
+$(eval $(call BuildPackage,multiwan))

multiwan/files/etc/config/multiwan

@@ -0,0 +1,57 @@
+
+config 'multiwan' 'config'
+	# REMOVE THIS LINE OR PUT TO 1 TO ENABLE MULTIWAN
+	option 'enabled' '0'
+
+	option 'default_route' 'balancer'
+	# health_monitor below is defaulted to parallel, and can be set to
+	# serial to save system resources.
+	# option 'health_monitor' 'serial'
+	# option 'debug' '1'
+
+config 'interface' 'wan'
+	option 'weight' '10'
+	option 'health_interval' '10'
+	option 'icmp_hosts' 'dns'
+	# icmp_count is defaulted to 1, and can be increased to reduce
+	# false positives.
+	# option 'icmp_count' '3'
+	option 'timeout' '3'
+	option 'health_fail_retries' '3'
+	option 'health_recovery_retries' '5'
+	option 'failover_to' 'wwan'
+	option 'dns' 'auto'
+
+config 'interface' 'wwan'
+	option 'weight' '10'
+	option 'health_interval' '10'
+	option 'icmp_hosts' 'gateway'
+	option 'timeout' '3'
+	option 'health_fail_retries' '3'
+	option 'health_recovery_retries' '5'
+	option 'failover_to' 'balancer'
+	option 'dns' '208.67.222.222 208.67.220.220'
+
+#config 'mwanfw'
+#	option 'src' '192.168.1.0/24'
+#	option 'dst' 'ftp.netlab7.com'
+#	option 'proto' 'tcp'
+#	option 'ports' '21'
+#	option 'wanrule' 'wan2'
+
+# VoIP traffic goes through wan
+# config 'mwanfw'
+	# option 'src' '192.168.1.0/24'
+	# option 'proto' 'udp'
+	# option 'port_type' 'source-ports'
+	# option 'ports' '5060,16384:16482'
+	# option 'wanrule' 'wan'
+
+#config 'mwanfw'
+#	option 'src' '192.168.0.3'
+#	option 'proto' 'icmp'
+#	option 'wanrule' 'balancer'
+
+#config 'mwanfw'
+#	option 'dst' 'www.whatismyip.com'
+#	option 'wanrule' 'fastbalancer'

multiwan/files/etc/init.d/multiwan

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+START=99
+EXTRA_COMMANDS="single"
+USE_PROCD=1
+
+start_service () {
+   /usr/bin/multiwan agent &
+}
+
+stop_service () {
+  sh /usr/bin/multiwan stop
+}
+
+reload_service () {
+  /usr/bin/multiwan restart &
+}
+
+single () {
+  /usr/bin/multiwan single &
+}
+
+service_triggers() {
+        procd_add_reload_trigger multiwan
+}
+

ndisc/Makefile

@@ -0,0 +1,98 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ndisc6
+PKG_VERSION:=1.0.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6
+PKG_MD5SUM:=50cb4c19606cf6ff2b7388e71832f579
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ndisc
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=IPv6 discovery tools
+  TITLE:=IPv6 discovery tools
+  URL:=http://www.remlab.net/ndisc6/
+  DEPENDS:=+libpthread +librt
+endef
+
+define Package/ndisc/description
+IPv6 discovery tools
+endef
+
+define Package/ndisc6
+  $(call Package/ndisc)
+  TITLE:=An ICMPv6 neighbour discovery tool
+endef
+
+define Package/ndisc6/description
+An ICMPv6 neighbour discovery tools
+endef
+
+define Package/rdisc6
+  $(call Package/ndisc)
+  TITLE:=An ICMPv6 router discovery tool
+endef
+
+define Package/rdisc6/description
+An ICMPv6 router discovery tool
+endef
+
+define Package/traceroute6
+  $(call Package/ndisc)
+  TITLE:=An IPv6-based traceroute implementation
+endef
+
+define Package/traceroute6/description
+An IPv6-based traceroute implementation
+endef
+
+define Package/rdnssd
+  $(call Package/ndisc)
+  TITLE:=DNS server discovery daemon
+endef
+
+define Package/rdnssd/description
+A recursive DNS server discovery daemon gathering
+information through stateless IPv6 autoconfiguration (RFC5006)
+endef
+
+TARGET_CFLAGS += -std=c99
+
+define Package/ndisc6/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndisc6 $(1)/usr/bin/
+endef
+
+define Package/rdisc6/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdisc6 $(1)/usr/bin/
+endef
+
+define Package/traceroute6/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{rl,tcp}traceroute6 $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tracert6 $(1)/usr/bin/
+endef
+
+define Package/rdnssd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rdnssd $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,ndisc6))
+$(eval $(call BuildPackage,rdisc6))
+$(eval $(call BuildPackage,traceroute6))
+$(eval $(call BuildPackage,rdnssd))

ndisc/patches/100-favor_bsd.patch

@@ -0,0 +1,20 @@
+--- a/src/trace-tcp.c
++++ b/src/trace-tcp.c
+@@ -24,6 +24,7 @@
+ 
+ #undef _GNU_SOURCE
+ #define _BSD_SOURCE 1
++#define __FAVOR_BSD 1
+ 
+ #include <string.h>
+ #include <inttypes.h>
+--- a/src/trace-udp.c
++++ b/src/trace-udp.c
+@@ -24,6 +24,7 @@
+ 
+ #undef _GNU_SOURCE
+ #define _BSD_SOURCE 1
++#define __FAVOR_BSD 1
+ 
+ #include <string.h>
+ #include <stdbool.h>

ndisc/patches/110-strverscmp.patch

@@ -0,0 +1,175 @@
+--- a/rdnssd/Makefile.am
++++ b/rdnssd/Makefile.am
+@@ -30,7 +30,8 @@ conf_SCRIPTS = merge-hook
+ # rdnssd
+ rdnssd_SOURCES = rdnssd.c rdnssd.h \
+ 	icmp.c \
+-	netlink.c
++	netlink.c \
++	strverscmp.c
+ rdnssd_LDADD = $(LIBRT) \
+ 		@top_builddir@/compat/libcompat.a
+ 
+--- a/rdnssd/Makefile.in
++++ b/rdnssd/Makefile.in
+@@ -60,7 +60,7 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(confdir)"
+ PROGRAMS = $(sbin_PROGRAMS)
+-am_rdnssd_OBJECTS = rdnssd.$(OBJEXT) icmp.$(OBJEXT) netlink.$(OBJEXT)
++am_rdnssd_OBJECTS = rdnssd.$(OBJEXT) icmp.$(OBJEXT) netlink.$(OBJEXT) strverscmp.$(OBJEXT)
+ rdnssd_OBJECTS = $(am_rdnssd_OBJECTS)
+ am__DEPENDENCIES_1 =
+ rdnssd_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -251,7 +251,8 @@ conf_SCRIPTS = merge-hook
+ # rdnssd
+ rdnssd_SOURCES = rdnssd.c rdnssd.h \
+ 	icmp.c \
+-	netlink.c
++	netlink.c \
++	strverscmp.c
+ 
+ rdnssd_LDADD = $(LIBRT) \
+ 		@top_builddir@/compat/libcompat.a
+@@ -373,6 +374,7 @@ distclean-compile:
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icmp.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlink.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strverscmp.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rdnssd.Po@am__quote@
+ 
+ .c.o:
+--- /dev/null
++++ b/rdnssd/strverscmp.c
+@@ -0,0 +1,131 @@
++/* Compare strings while treating digits characters numerically.
++   Copyright (C) 1997, 2000, 2002, 2004 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License along
++   with this program; if not, write to the Free Software Foundation,
++   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include <string.h>
++#include <ctype.h>
++
++/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
++           fractional parts, S_Z: idem but with leading Zeroes only */
++#define S_N    0x0
++#define S_I    0x4
++#define S_F    0x8
++#define S_Z    0xC
++
++/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
++#define CMP    2
++#define LEN    3
++
++
++/* ISDIGIT differs from isdigit, as follows:
++   - Its arg may be any int or unsigned int; it need not be an unsigned char.
++   - It's guaranteed to evaluate its argument exactly once.
++   - It's typically faster.
++   POSIX says that only '0' through '9' are digits.  Prefer ISDIGIT to
++   ISDIGIT_LOCALE unless it's important to use the locale's definition
++   of `digit' even when the host does not conform to POSIX.  */
++#define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
++
++#undef __strverscmp
++#undef strverscmp
++
++#ifndef weak_alias
++# define __strverscmp strverscmp
++#endif
++
++/* Compare S1 and S2 as strings holding indices/version numbers,
++   returning less than, equal to or greater than zero if S1 is less than,
++   equal to or greater than S2 (for more info, see the texinfo doc).
++*/
++
++int
++__strverscmp (const char *s1, const char *s2)
++{
++  const unsigned char *p1 = (const unsigned char *) s1;
++  const unsigned char *p2 = (const unsigned char *) s2;
++  unsigned char c1, c2;
++  int state;
++  int diff;
++
++  /* Symbol(s)    0       [1-9]   others  (padding)
++     Transition   (10) 0  (01) d  (00) x  (11) -   */
++  static const unsigned int next_state[] =
++  {
++      /* state    x    d    0    - */
++      /* S_N */  S_N, S_I, S_Z, S_N,
++      /* S_I */  S_N, S_I, S_I, S_I,
++      /* S_F */  S_N, S_F, S_F, S_F,
++      /* S_Z */  S_N, S_F, S_Z, S_Z
++  };
++
++  static const int result_type[] =
++  {
++      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
++                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
++
++      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
++                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
++      /* S_I */  CMP, -1,  -1,  CMP,  1,  LEN, LEN, CMP,
++                  1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
++      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
++                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
++      /* S_Z */  CMP,  1,   1,  CMP, -1,  CMP, CMP, CMP,
++                 -1,  CMP, CMP, CMP
++  };
++
++  if (p1 == p2)
++    return 0;
++
++  c1 = *p1++;
++  c2 = *p2++;
++  /* Hint: '0' is a digit too.  */
++  state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0));
++
++  while ((diff = c1 - c2) == 0 && c1 != '\0')
++    {
++      state = next_state[state];
++      c1 = *p1++;
++      c2 = *p2++;
++      state |= (c1 == '0') + (ISDIGIT (c1) != 0);
++    }
++
++  state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))];
++
++  switch (state)
++    {
++    case CMP:
++      return diff;
++
++    case LEN:
++      while (ISDIGIT (*p1++))
++	if (!ISDIGIT (*p2++))
++	  return 1;
++
++      return ISDIGIT (*p2) ? -1 : diff;
++
++    default:
++      return state;
++    }
++}
++#ifdef weak_alias
++weak_alias (__strverscmp, strverscmp)
++#endif

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=71c89213516c735b6c12d0e8c17a5bd75333421c
+PKG_SOURCE_VERSION:=db710fed768e20fba40212e11fa4191593e168fc
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se/peripheral_manager
 
@@ -36,7 +36,7 @@ define Package/peripheral_manager
 	CATEGORY:=Utilities
 	TITLE:=Application deamon for handling of peripheral
 	URL:=
-	DEPENDS:=+libuci +libubus +libblobmsg-json bcmkernel
+	DEPENDS:=+libuci +libubus +libblobmsg-json +PACKAGE_bcmkernel:bcmkernel
 endef
 
 define Package/peripheral_manager/description
@@ -54,7 +54,7 @@ define Package/peripheral_manager/install
 	$(INSTALL_DIR) $(1)/etc/init.d/
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/peripheral_manager $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpio_test $(1)/sbin/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpio_test $(1)/sbin/
 endef
 
 $(eval $(call BuildPackage,peripheral_manager))

qrencode/Makefile

@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2009 ePoint Systems Ltd.
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=qrencode
-PKG_VERSION:=3.0.3
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=2f575b43703c801f4f7bfac65e8845ce967c3d9e
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/qrencode
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-Wl,-rpath-link=$(STAGING_DIR)/lib -lpng
-
-TARGET_CFLAGS += $(FPIC)
-
-define Package/qrencode
-	CATEGORY:=Utilities
-	DEPENDS:=+libpng
-	TITLE:=QRcode encoder library
-	URL:=http://megaui.net/fukuchi/works/qrencode/index.en.html
-endef
-
-define Package/qrencode/description
-	Libqrencode is a C library for encodingdata in a QR Code symbol, a
-	kind of 2D symbology that can be scanned by handy terminals such as
-	a mobile phone with CCD. The capacity of QR Code is up to 7000
-	digits or 4000 characters, and is highly robust.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) LINUX_DIR=$(LINUX_DIR) LDFLAGS="$(TARGET_LDFLAGS)" CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include -I$(STAGING_DIR)/usr/include"
-endef
-
-define Package/qrencode/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qrencode $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,qrencode))

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=3.1.8
+PKG_VERSION:=3.1.16
 
-PKG_SOURCE_VERSION:=4466c00f581968c4b2299d2464ffe283d906b758
+PKG_SOURCE_VERSION:=cbbd946cb9318978e4a42e1681dfd13852a649fb
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

samba2/Makefile

@@ -0,0 +1,220 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=samba2
+PKG_VERSION:=2.2.12.inteno
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://public.inteno.se:/samba2
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=d687d07a137981f4fe78cc289b040e6426c61e29
+PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/samba2/Default
+  SUBMENU:=Filesystem
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=samba - NetBIOS/SMB implementation
+  DEPENDS:= +libreadline +ncurses +popt
+  URL:=http://www.samba.org/
+endef  
+
+define Package/samba2/Default/description
+The Samba software suite is a collection of programs that implements the
+	SMB protocol for unix systems, allowing you to serve files and printers to
+	Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred
+	to as the LanManager or Netbios protocol.
+endef
+
+define Package/samba2-common
+  $(call Package/samba2/Default)
+  MENU:=1
+  TITLE:=NetBIOS/SMB server and client shared files
+endef
+
+#define Package/samba2-server
+#  $(call Package/samba2/Default)
+#  TITLE:=NetBIOS/SMB file and print server
+#  DEPENDS:=samba2-common
+#endef
+
+define Package/samba2-client
+  $(call Package/samba2/Default)
+  TITLE:=NetBIOS/SMB simple client
+  DEPENDS:=samba2-common
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Compile	
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	(cd $(PKG_BUILD_DIR)/source ; rm -rf config.{cache,status} ; \
+		./configure \
+			$(HOST_CONFIGURE_VARS) \
+			$(HOST_CONFIGURE_ARGS) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var/log/samba2 \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc/samba2 \
+			$(DISABLE_NLS) \
+			--with-included-popt \
+			--with-lockdir=/var/run/samba2 \
+			--with-privatedir=/etc/samba2 \
+			--with-readline=no \
+	);
+	$(MAKE) -C $(PKG_BUILD_DIR)/source \
+		bin/make_smbcodepage bin/make_unicodemap
+	(cd $(PKG_BUILD_DIR)/source/bin ; \
+		mv -f make_smbcodepage make_smbcodepage.old ; \
+		mv -f make_unicodemap make_unicodemap.old ; \
+	);
+	$(MAKE) -C $(PKG_BUILD_DIR)/source \
+		clean
+	(cd $(PKG_BUILD_DIR)/source; rm -rf config.{cache,status}; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288 -Dfcntl=fcntl64" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) $(LIBGCC_S)" \
+		ac_cv_lib_cups_httpConnect=no \
+		samba_cv_FTRUNCATE_NEEDS_ROOT=no \
+		samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no \
+		samba_cv_HAVE_BROKEN_GETGROUPS=no \
+		samba_cv_HAVE_BROKEN_READDIR=no \
+		samba_cv_HAVE_FCNTL_LOCK=yes \
+		samba_cv_HAVE_FNMATCH=yes \
+		samba_cv_HAVE_FTRUNCATE_EXTEND=no \
+		samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
+		samba_cv_HAVE_IFACE_AIX=no \
+		samba_cv_HAVE_IFACE_IFCONF=yes \
+		samba_cv_HAVE_IFACE_IFREQ=yes \
+		samba_cv_HAVE_INO64_T=yes \
+		samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no \
+		samba_cv_HAVE_OFF64_T=yes \
+		samba_cv_HAVE_ROOT=yes \
+		samba_cv_HAVE_SECURE_MKSTEMP=yes \
+		samba_cv_HAVE_SHARED_MMAP=yes \
+		samba_cv_HAVE_STRUCT_FLOCK64=yes \
+		samba_cv_HAVE_SYSV_IPC=no \
+		samba_cv_HAVE_TRUNCATED_SALT=no \
+		samba_cv_HAVE_UNION_SEMUN=no \
+		samba_cv_HAVE_UNSIGNED_CHAR=yes \
+		samba_cv_NEED_SGI_SEMUN_HACK=no \
+		samba_cv_REPLACE_INET_NTOA=no \
+		samba_cv_SIZEOF_INO_T=4 \
+		samba_cv_SIZEOF_OFF_T=4 \
+		samba_cv_SYSCONF_SC_NGROUPS_MAX=yes \
+		samba_cv_USE_SETEUID=yes \
+		samba_cv_USE_SETRESUID=no \
+		samba_cv_USE_SETREUID=yes \
+		samba_cv_USE_SETUIDX=no \
+		samba_cv_have_longlong=yes \
+		samba_cv_have_setresgid=no \
+		samba_cv_have_setresuid=no \
+		./configure \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var/log/samba2 \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc/samba2 \
+			$(DISABLE_NLS) \
+			--with-included-popt \
+			--with-lockdir=/var/run/samba2 \
+			--with-privatedir=/etc/samba2 \
+			--with-readline=no \
+			--with-syslog \
+	);
+	$(MAKE) -C $(PKG_BUILD_DIR)/source \
+		$(TARGET_CONFIGURE_OPTS) \
+		CODEPAGEDIR="/usr/share/samba2" \
+		all 
+	(cd $(PKG_BUILD_DIR)/source/bin ; \
+		mv -f make_smbcodepage.old make_smbcodepage ; touch make_smbcodepage ; \
+		mv -f make_unicodemap.old make_unicodemap ; touch make_unicodemap ; \
+	);
+	mkdir -p $(PKG_INSTALL_DIR)/usr/share/samba2
+	mkdir -p $(PKG_INSTALL_DIR)/var/log
+	$(MAKE) -C $(PKG_BUILD_DIR)/source \
+		BASEDIR="$(PKG_INSTALL_DIR)/usr" \
+		BINDIR="$(PKG_INSTALL_DIR)/usr/bin" \
+		SBINDIR="$(PKG_INSTALL_DIR)/usr/bin" \
+		LIBDIR="$(PKG_INSTALL_DIR)/usr/lib" \
+		VARDIR="$(PKG_INSTALL_DIR)/var/log/samba2" \
+		MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \
+		CONFIGDIR="$(PKG_INSTALL_DIR)/etc/samba2" \
+		PRIVATEDIR="$(PKG_INSTALL_DIR)/etc/samba2" \
+		SWATDIR="$(PKG_INSTALL_DIR)/usr/swat" \
+		LOCKDIR="$(PKG_INSTALL_DIR)/var/run/samba2" \
+		SAMBABOOK="$(PKG_INSTALL_DIR)/usr/swat/using_samba2" \
+		CODEPAGEDIR="$(PKG_INSTALL_DIR)/usr/share/samba2" \
+		install
+endef
+
+define Package/samba2-common/install
+	$(INSTALL_DIR) $(1)/etc/samba2
+#	$(INSTALL_DATA) ./files/smb.conf $(1)/etc/samba2/smb.conf
+	$(INSTALL_DIR) $(1)/usr/bin
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbpasswd.shared $(1)/usr/bin/smbpasswd
+	$(INSTALL_DIR) $(1)/usr/share/samba2
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/codepage.{437,850} $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/unicode_map.{437,850,ISO8859-1,ISO8859-15} $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/codepage.852 $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/unicode_map.{852,ISO8859-2} $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/codepage.{866,1251} $(1)/usr/share/samba2/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/samba2/unicode_map.{866,ISO8859-5,KOI8-R,1251} $(1)/usr/share/samba2/
+endef
+
+define Package/samba2-common/conffiles
+/etc/samba2/smb.conf
+endef
+
+#define Package/samba2-server/install
+#	$(INSTALL_DIR) $(1)/etc/init.d
+#	$(INSTALL_BIN) ./files/samba2.init $(1)/etc/init.d/samba2
+#	$(INSTALL_DIR) $(1)/usr/lib
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/libsmb.so $(1)/usr/lib/
+#	$(INSTALL_DIR) $(1)/usr/sbin
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/nmbd.shared $(1)/usr/sbin/nmbd
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbd.shared $(1)/usr/sbin/smbd
+#endef
+
+define Package/samba2-client/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rpcclient $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,samba2-common))
+#$(eval $(call BuildPackage,samba2-server))
+$(eval $(call BuildPackage,samba2-client))

samba3/files/samba.init

@@ -124,10 +124,20 @@ smb_add_share() {
 	config_get dir_mask $1 dir_mask
 	config_get browseable $1 browseable
 	config_get dirpath $1 dirpath
-	path="$path/$dirpath"
 
 	[ -z "$name" -o -z "$path" ] && return
 
+	path="$path/$dirpath"
+	path=$(readlink -f $path)
+
+	# restrict the shared paths to always be under /mnt/ tree
+	[ "${path:0:4}" == "/mnt" ] || path="/mnt/"$path
+
+	# if the real path is still not under /mnt/, overwrite it completely
+	# (very unlikely case, but possible). increases security
+	path=$(readlink -f $path)
+	[ "${path:0:4}" == "/mnt" ] || path="/mnt/"
+
 	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/smb.conf
 	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/smb.conf
 	[ -n "$read_only" ] && echo -e "\tread only = $read_only" >> /var/etc/smb.conf
@@ -164,5 +174,19 @@ reload_service() {
 }
 
 service_triggers() {
-	procd_add_reload_trigger samba network
+	procd_open_trigger
+
+	add_interface_trigger() {
+		local interface net
+		config_get interface "$1" interface
+		for net in $interface; do
+			procd_add_interface_trigger "interface.*" "${net}" /etc/init.d/samba reload
+		done
+	}
+
+	config_load samba
+	config_foreach add_interface_trigger "samba"
+	procd_add_config_trigger "config.change" "samba" /etc/init.d/samba reload
+	procd_add_config_trigger "config.change" "network" /etc/init.d/samba reload
+	procd_close_trigger
 }

samba3/files/smb.conf.template

@@ -14,6 +14,6 @@
 	guest account = nobody
 	invalid users = root
 	smb passwd file = /etc/samba/smbpasswd
-        interfaces = |INTERFACES|
-        bind interfaces only = yes
-
+	interfaces = |INTERFACES|
+	bind interfaces only = yes
+	wide links = no

syslog-ng3/Makefile

@@ -0,0 +1,72 @@
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=syslog-ng
+PKG_VERSION:=3.0.5
+PKG_RELEASE:=5
+
+PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(PKG_VERSION)/source/
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=28f0d9ff2243b330e8cd6311ef9b2f12
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_IPV6 \
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/syslog-ng3
+  SECTION:=admin
+  CATEGORY:=Administration
+  DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap +libpthread +librt +zlib +libdbi
+  TITLE:=A powerful syslog daemon
+  URL:=http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
+endef
+
+define Package/syslog-ng3/description
+  syslog-ng reads and logs messages to the system console, log
+  files, other machines and/or users as specified by its
+  configuration file.
+endef
+
+define Package/syslog-ng3/conffiles
+/etc/syslog-ng.conf
+endef
+
+define Build/Configure
+	$(SED) 's,-I/usr/include,,' $(PKG_BUILD_DIR)/configure
+	$(Build/Configure/Default)
+endef
+
+CONFIGURE_ARGS +=  \
+	$(call autoconf_bool,CONFIG_IPV6,ipv6) \
+	--disable-dependency-tracking \
+	--enable-tcp-wrapper \
+	--disable-glibtest \
+	--disable-spoof-source \
+	--disable-sql \
+	--enable-prce \
+	--disable-linux-caps \
+
+TARGET_CPPFLAGS += \
+	-I$(STAGING_DIR)/usr/include/eventlog
+
+CONFIGURE_VARS += \
+	LIBDBI_CFLAGS="-I$(STAGING_DIR)/usr/include"
+
+define Package/syslog-ng3/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/syslog-ng $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc
+endef
+
+$(eval $(call BuildPackage,syslog-ng3))

syslog-ng3/files/syslog-ng.conf

@@ -0,0 +1,37 @@
+@version:3.0
+
+options {
+	chain_hostnames(no);
+	create_dirs(yes);
+	flush_lines(0);
+	keep_hostname(yes);
+	log_fifo_size(256);
+	log_msg_size(1024);
+	stats_freq(0);
+	flush_lines(0);
+	use_fqdn(no);
+};
+
+source src {
+	internal();
+	unix-stream("/dev/log");
+};
+
+source net {
+	udp(ip(0.0.0.0) port(514));
+};
+
+source kernel {
+        file("/proc/kmsg" program_override("kernel"));
+};
+
+destination messages {
+	file("/var/log/messages");
+};
+
+log {
+	source(src);
+	source(net);
+        source(kernel);
+	destination(messages);
+};

syslog-ng3/files/syslog-ng.init

@@ -0,0 +1,19 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=50
+
+SERVICE_USE_PID=1
+
+start() {
+	[ -f /etc/syslog-ng.conf ] || return 1
+	service_start /usr/sbin/syslog-ng
+}
+
+stop() {
+	service_stop /usr/sbin/syslog-ng
+}
+
+reload() {
+	service_reload /usr/sbin/syslog-ng
+}

syslog-ng3/patches/001-fix-libconv_so_2-not-found-error

@@ -0,0 +1,12 @@
+--- a/configure
++++ b/configure
+@@ -7357,6 +7357,9 @@ dynamic_threads () {
+ 	esac
+ }
+ 
++GLIB_LIBS="-Wl,-rpath-link=$STAGING_DIR/usr/lib/libiconv-full/lib $GLIB_LIBS"
++LIBS="-Wl,-rpath-link=$STAGING_DIR/usr/lib/libiconv-full/lib $LIBS"
++
+ case "$ostype" in
+ 	FreeBSD)
+ 		GLIB_LIBS="$GLIB_LIBS -lintl"

uboot/Makefile

@@ -0,0 +1,96 @@
+#
+# Copyright (C) 2013-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=u-boot
+PKG_VERSION:=2016.08
+PKG_RELEASE:=1
+PKG_SOURCE_URL:=git@private.inteno.se:uboot
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=cfe658c690831ad73a0038220ff402dd3d5a26e7
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define uboot/Default
+  TITLE:=
+  CONFIG:=
+  IMAGE:=
+endef
+
+define uboot/ex300
+  TITLE:=U-Boot for the ex300
+endef
+
+UBOOTS := \
+	ex300
+
+define Package/uboot/template
+define Package/uboot-$(1)
+  SECTION:=boot
+  CATEGORY:=Boot Loaders
+  DEPENDS:=@TARGET_iopsys_ramips
+  TITLE:=$(2)
+  URL:=http://www.denx.de/wiki/U-Boot
+  VARIANT:=$(1)
+endef
+endef
+
+define BuildUBootPackage
+	$(eval $(uboot/Default))
+	$(eval $(uboot/$(1)))
+	$(call Package/uboot/template,$(1),$(TITLE))
+endef
+
+ifdef BUILD_VARIANT
+$(eval $(call uboot/$(BUILD_VARIANT)))
+UBOOT_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
+UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),openwrt-$(BOARD)-$(BUILD_VARIANT)-u-boot.bin)
+endif
+
+define Build/Configure
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		$(UBOOT_CONFIG)_config
+endef
+
+define Build/Compile
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE=$(TARGET_CROSS)
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE=$(TARGET_CROSS) env
+endef
+
+define Package/uboot/install/default
+	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
+	$(CP) \
+		$(PKG_BUILD_DIR)/uboot.img \
+		$(BIN_DIR)/$(TARGET)/
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $$(1)/usr/sbin/
+	ln -s /usr/sbin/fw_printenv $$(1)/usr/sbin/fw_setenv
+endef
+
+define Package/uboot/install/template
+define Package/uboot-$(1)/install
+	$(call Package/uboot/install/default,$(2))
+endef
+endef
+
+$(foreach u,$(UBOOTS), \
+	$(eval $(call Package/uboot/install/template,$(u),$(u))) \
+)
+
+$(foreach u,$(UBOOTS), \
+	$(eval $(call BuildUBootPackage,$(u))) \
+	$(eval $(call BuildPackage,uboot-$(u))) \
+)

voice-client/files/etc/config/voice_client

@@ -141,7 +141,8 @@ config log 'LOG'
 
 config ringing_status 'RINGING_STATUS'
 	option status '0'
-	option enabled '1'
+	option enabled '0'
+	option shouldring '1'
 
 config call_filter 'call_filter0'
         option block_foreign '0'

voice-client/files/etc/uci-defaults/99-voice_client

@@ -27,5 +27,13 @@ EOT
 
 }
 
+uci -q batch <<-EOT
+        delete firewall.sip
+        set firewall.sip=include
+        set firewall.sip.path=/etc/firewall.sip
+        set firewall.sip.reload=1
+        commit firewall
+EOT
+
 exit 0