dectproxy has been enabled in Dectmngr2 for

third party applications.

catv/files/etc/init.d/catv

@@ -10,16 +10,12 @@ USE_PROCD=1
 
 start_service() {
 	local enable=0
-	local filter=0
+        local filter=0
 
-	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
+        config_load catv
+        config_get enable catv enable
+        config_get filter catv filter
+	ubus call catv set-enable "{\"enable\":\"$enable\"}"
 	ubus call catv set-filter "{\"filter\":\"$filter\"}"
 
 }

dectmngr/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.24
+PKG_VERSION:=1.0.23
 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6ba403663bc9cfdb8f89fb34de367f0796d68552
+PKG_SOURCE_VERSION:=90aff0da98c626d58201c14c34b3b3a64878ceee
 PKG_NAME:=dectmngr
 
 

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:=c225ac3cbfdc619dc3e4d149f5f145299dac442b
+PKG_SOURCE_VERSION:=ee63f0c087840adba9d944ae31d71a3ef9d64043
 PKG_NAME:=dectmngr2
 
 

eventlog/Makefile

@@ -1,49 +0,0 @@
-#
-# 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))

gigaset-elements/.gitignore

@@ -0,0 +1,3 @@
+
+git-src
+

gigaset-elements/Makefile

@@ -0,0 +1,64 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gigaset-elements
+
+PKG_VERSION:=2.1.4
+# PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
+PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
+
+PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=$(PKG_GIGASET_ELEMENTS_VERSION)
+
+
+PKG_MAINTAINER:=Magier Marcin, Figlarek Piotr
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(INCLUDE_DIR)/package.mk
+
+######################################################
+
+define Package/gigaset-elements
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libjson-c +libcurl
+  TITLE:=Gigaset elements
+endef
+
+######################################################
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) all
+endef
+
+
+
+define Package/gigaset-elements/install
+	$(CP) -r $(PKG_BUILD_DIR)/sysroot/* $(1)/
+endef
+
+
+
+define Package/gigaset-elements/preinst
+#!/bin/sh
+mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/cert
+mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/fw
+endef
+
+
+define Package/gigaset-elements/postrm
+#!/bin/sh
+rm -rf $${IPKG_INSTROOT}/usr/gigaset/data
+rm -rf /usr/share/gigaset
+endef
+
+
+######################################################
+
+$(eval $(call BuildPackage,gigaset-elements))
+

ice-client/Makefile

@@ -5,10 +5,6 @@ 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
@@ -19,33 +15,31 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=4.0.1
-PKG_RELEASE:=RC16
+BASE_PKG_VERSION:=3.4.1
+PKG_RELEASE:=RC11
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=041ecad53b58e7f667e5dc030fbe8ebfc89ec715
+PKG_SOURCE_VERSION:=184d29446fe6103f567c968bf35569625326a82c
 ifeq ($(CONFIG_ICE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
-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_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 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
@@ -59,7 +53,6 @@ $(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
@@ -88,6 +81,7 @@ 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--################################
@@ -145,7 +139,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,webaccessService.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} $(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
@@ -161,8 +155,6 @@ 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
 
@@ -912,7 +904,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=tExecMgr" > /tmp/cfin
+  echo "system moduleRemove topic=texec" > /tmp/cfin
 fi
 exit 0
 endef
@@ -943,54 +935,6 @@ 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)
@@ -1041,5 +985,4 @@ $(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

@@ -1,63 +0,0 @@
-#!/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-10-10
+PKG_VERSION:=3.0-2016-07-04
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f4a4cd45e616e58c1b5beb98e6d0d6800a8ce4a3
+PKG_SOURCE_VERSION:=bbd3867e3158e9942a5b930747abf45a041a05ec
 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,29 +76,16 @@ populate_netmodes() {
 			uci -q set netmode.$mode.conf=$mode
 			json_load "$(cat $modedir/$mode/DETAILS)"
 
-			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
+			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
 
 			json_select description
 			json_get_keys keys

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

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

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

@@ -1,86 +0,0 @@
-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,13 +8,6 @@
 		{ "sv" : "VoIP on dedicated VLAN + LAN4 port överbryggas med IPTV VLAN" }
 	],
 	"credentials" : 0,
-	"excluded_boards" : [
-		"CG300",
-		"CG301"
-	],
-	"acl" : [
-		"admin",
-		"support"
-	]
+	"excluded_boards" : "CG300 CG301"
 }
 

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

@@ -1,86 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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

@@ -1,86 +0,0 @@
-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,7 +71,6 @@ 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
@@ -91,7 +90,6 @@ 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
@@ -119,6 +117,7 @@ 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

iop/scripts/compile.sh

@@ -1,27 +0,0 @@
-#!/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,21 +3,25 @@
 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
@@ -25,21 +29,25 @@ 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
 
-    # 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 -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
     ./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
 
-    # remove broken symlinks ( for packages that are no longer in the feed )
-    find -L package/feeds -maxdepth 2 -type l -delete
+    rm -rf package/feeds/oldpackages/libzstream # have to run this for now since uninstall is not working every time
 
     cp .genconfig_config_bak .config
     make defconfig

iop/scripts/genconfig.sh

@@ -12,11 +12,8 @@ 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 eg400"
-    iopsys_ramips="ex300"
-    ramips="mt7621"
+    iopsys_brcm63xx_arm="dg400"
     target="bogus"
-    masterconfig=1
 
     set_target() {
 
@@ -25,33 +22,14 @@ 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
-
     }
 
 
@@ -161,14 +139,13 @@ function genconfig {
 	    exit 1
 	fi
 
-	# 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
+	# 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
 
 	# Apply profile diff to master config if selected
 	if [ -n "$PROFILE" ]; then 
@@ -188,10 +165,9 @@ 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
@@ -226,11 +202,7 @@ 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
 
@@ -241,14 +213,7 @@ function genconfig {
 	    sed -i '/CONFIG_PACKAGE_uhttpd/d' .config
 	fi
 
-	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
-
-
+	echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
     }
 
     ####### main #####
@@ -286,10 +251,7 @@ function genconfig {
 	done
 	setup_dirs
 	create_and_copy_files "$1" "$2"
-
-	if [ $masterconfig -eq 1 ]; then
-	    use_local_mirror
-	fi
+	use_local_mirror
     fi
 }
 

iop/scripts/generate_tarballs.sh

@@ -1,16 +1,17 @@
 #!/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 $SERVER "ls $FPATH/bcmopen-$profile-$bcmkernelcommith.tar.gz" && return
+	ssh inteno@iopsys.inteno.se "ls public/www/iopsys/consumer/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 $SERVER:$FPATH/bcmopen-$profile-$bcmkernelcommith.tar.gz
+	scp $tarfile inteno@ihgsp.inteno.se:/home/inteno/public/www/iopsys/consumer/bcmopen-$profile-$bcmkernelcommith.tar.gz
 	rm -f $tarfile
 	cd $curdir
 }
@@ -21,12 +22,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 $SERVER "ls $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
+	ssh inteno@iopsys.inteno.se "ls public/www/iopsys/consumer/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 $SERVER:$FPATH/
+	scp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz inteno@iopsys.inteno.se:/home/inteno/public/www/iopsys/consumer/
 	cp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $curdir/
 	rm -rf natalie-dect-open-$natalieversion
 	rm -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
@@ -39,12 +40,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 $SERVER "ls $FPATH/endptcfg-$profile-$endptversion-$endptcommith.tar.gz" && return
+	ssh inteno@iopsys.inteno.se "ls public/www/iopsys/consumer/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 $SERVER:$FPATH/
+	scp endptcfg-$profile-$endptversion-$endptcommith.tar.gz inteno@iopsys.inteno.se:/home/inteno/public/www/iopsys/consumer/
 	cp endptcfg-$profile-$endptversion-$endptcommith.tar.gz $curdir/
 	rm -rf endptcfg-open-$endptversion
 	rm -f endptcfg-$profile-$endptversion-$endptcommith.tar.gz
@@ -58,19 +59,17 @@ 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 $SERVER "ls $FPATH/ice-client-$profile-$iceversion-$icecommith.tar.gz" && return
+	ssh inteno@iopsys.inteno.se "ls public/www/iopsys/consumer/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 $SERVER:$FPATH/
+	scp ice-client-$profile-$iceversion-$icecommith.tar.gz inteno@iopsys.inteno.se:/home/inteno/public/www/iopsys/consumer/
 	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"
+function generate_tarballs {
 
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
@@ -85,5 +84,5 @@ function generate_tarballs {
 
 }
 
-register_command "generate_tarballs" "Generate tarballs for Open SDK"
+register_command "generate_tarballs" "Generate tarballs for openstk"
 

iop/scripts/ssh_sysupgrade.sh

@@ -34,7 +34,7 @@ function ssh_sysupgrade_latest {
 		exit 1
 	fi
 	{ cd `dirname $0`
-		IMAGE=`ls -Art bin/*/*.y2 | tail -n1`
+		IMAGE=`ls -Art bin/*/*.y | 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 | tr -d '\n' | hexdump -e '16/1 "%02x"')
+export DESKEY=$(cat /proc/nvram/DesKey | 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 | tr -d '\n' | hexdump -e '16/1 "%02x"')
+	[ -n "$1" ] && DECKEY=$(echo $1 | hexdump -e '16/1 "%02x"')
 	KEY=${DECKEY:-$DESKEY}
 	local img_type
 	case "$(get_image_type "$IUPCONFFILES")" in                                  
@@ -201,9 +201,6 @@ handle_Downloaded_file()
 						reload $CONFILESLURP
 					fi
 					rm -rf $IUPTEMP
-
-					cp /rom/etc/uci-defaults/* /etc/uci-defaults/
-					sync
 				fi
 			;;
 			*)
@@ -426,9 +423,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/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=Inteno
+	nvram set wps_device_name=BroadcomAP
 	nvram set wps_mfstring=Broadcom
 	nvram set wps_modelname=Broadcom
 	nvram set wps_modelnum=123456

lmbench/Makefile

@@ -1,122 +0,0 @@
-#
-# 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

@@ -1,11 +0,0 @@
---- 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

@@ -1,10 +0,0 @@
---- 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

@@ -1,30 +0,0 @@
---- 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

@@ -1,11 +0,0 @@
---- 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

@@ -1,47 +0,0 @@
-#
-# 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

@@ -1,57 +0,0 @@
-
-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

@@ -1,25 +0,0 @@
-#!/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
-}
-

natalie-dect-h/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=natalie-dect-h
-PKG_VERSION:=11.19
+PKG_VERSION:=12.26
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=http://public.inteno.se:/natalie-dect-h
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c2139d05e3d082f1dcf58ce3f19306cb76fd0873
+PKG_SOURCE_VERSION:=9e2236989ff58d0db897f938b6b07b535144e0e2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk

natalie-dect/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=natalie-dect
-PKG_VERSION:=11.19
+PKG_VERSION:=12.26
 
-PKG_SOURCE_VERSION:=2015e8106c7d541dd038381c2845bd8462d74a30
+PKG_SOURCE_VERSION:=35fed3a10124bd660b74704011256039ba9cf54d
 ifeq ($(CONFIG_NATALIE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=git@private.inteno.se:natalie-dect-11.19
+PKG_SOURCE_URL:=git@private.inteno.se:natalie-dect-12.26
 PKG_SOURCE_PROTO:=git
 endif
 
@@ -46,10 +46,6 @@ define Package/natalie-dect/description
 	Kernel dect driver
 endef
 
-define Package/natalie-dect/config
-	source "$(SOURCE)/Config.in"
-endef
-
 ifeq ($(CONFIG_NATALIE_OPEN),y)
 define Build/Compile
 endef

ndisc/Makefile

@@ -1,98 +0,0 @@
-#
-# 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

@@ -1,20 +0,0 @@
---- 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

@@ -1,175 +0,0 @@
---- 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:=db710fed768e20fba40212e11fa4191593e168fc
+PKG_SOURCE_VERSION:=71c89213516c735b6c12d0e8c17a5bd75333421c
 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 +PACKAGE_bcmkernel:bcmkernel
+	DEPENDS:=+libuci +libubus +libblobmsg-json 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

@@ -0,0 +1,53 @@
+#
+# 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.16
+PKG_VERSION:=3.1.11
 
-PKG_SOURCE_VERSION:=cbbd946cb9318978e4a42e1681dfd13852a649fb
+PKG_SOURCE_VERSION:=b8838ae06d17e9eb6e54d65311b7007d5431f824
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

samba3/files/samba.init

@@ -124,20 +124,10 @@ 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
@@ -174,19 +164,5 @@ reload_service() {
 }
 
 service_triggers() {
-	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
+	procd_add_reload_trigger samba network
 }

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
-	wide links = no
+        interfaces = |INTERFACES|
+        bind interfaces only = yes
+

syslog-ng3/Makefile

@@ -1,72 +0,0 @@
-#
-# 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

@@ -1,37 +0,0 @@
-@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

@@ -1,19 +0,0 @@
-#!/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

@@ -1,12 +0,0 @@
---- 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

@@ -1,96 +0,0 @@
-#
-# 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,8 +141,7 @@ config log 'LOG'
 
 config ringing_status 'RINGING_STATUS'
 	option status '0'
-	option enabled '0'
-	option shouldring '1'
+	option enabled '1'
 
 config call_filter 'call_filter0'
         option block_foreign '0'

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

@@ -27,13 +27,5 @@ 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