uci-diff: update

dectmngr/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.23
+PKG_VERSION:=1.0.24
 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=90aff0da98c626d58201c14c34b3b3a64878ceee
+PKG_SOURCE_VERSION:=6ba403663bc9cfdb8f89fb34de367f0796d68552
 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:=ee63f0c087840adba9d944ae31d71a3ef9d64043
+PKG_SOURCE_VERSION:=07c8a1665dc1f767c8ae2da92e41f482956f8959
 PKG_NAME:=dectmngr2
 
 

gigaset-elements/.gitignore

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

gigaset-elements/Makefile

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

icwmp/Makefile

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

iop/configs/config

@@ -121,7 +121,6 @@ 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
@@ -148,7 +147,6 @@ 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

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,15 +71,13 @@ 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=$?
@@ -92,7 +90,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;;
@@ -107,7 +105,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
 }
@@ -118,7 +116,7 @@ remove_netdevices() {
 	local rest
 	local x=0
 	#local baseifname
-	local vpivci=`xtmctl operate conn --show | grep "ATM\|mode" | awk '{if (NR!=1 && $1!="PTM") {print $3}}'`
+	local vpivci=`xtmctl operate conn --show | awk '{if (NR!=1 && $1!="PTM") {print $3}}'`
 
 	for i in $vpivci
 	do
@@ -148,7 +146,7 @@ stop_service() {
 	echo "Stopping ADSL"
 #xtmctl stop causes IRQ issues"
 #	xtmctl stop
-	remove_netdevices
+	remove_netdevices	
 }
 
 reload_service() {
@@ -157,7 +155,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,23 +7,19 @@ 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
@@ -37,9 +33,6 @@ 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
@@ -50,26 +43,23 @@ addethernet() {
 	config_get baseifname $1 baseifname
 	config_get ifname $1 ifname
 	config_get bridge $1 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)
@@ -78,7 +68,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 || \
@@ -108,7 +98,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,16 +38,13 @@ 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 # 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 --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 --createnetdev $dslat.$ptmprio ${ifname%%.*}
 		xtmctl operate intf --state 1 enable
 		xtmctl start
@@ -60,7 +57,7 @@ remove_netdevices() {
 	local x=0
 
 	IFS=$'\n'
-	for i in `xtmctl operate conn --show | grep "PTM\|mode"`
+	for i in `xtmctl operate conn --show`
 	do
 		if [ $x -eq 1 ]; then
 			delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$10}')
@@ -99,7 +96,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,9 +16,6 @@ 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"
 }
 
@@ -45,6 +42,6 @@ reload_service() {
 }
 
 service_triggers() {
-	procd_add_reload_trigger layer2_interface_vlan
+        procd_add_reload_trigger layer2_interface_vlan
 }
 

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,16 +58,17 @@ ifbaseexists()
 	return 0
 }
 
-addbrcmvlan()
+addbrcmvlan ()
 {
 	local baseifname=$1
 	local vlan8021p=$2
 	local vlan8021q=$3
 	local bridge=$4
 	local ifname=$5
-
-	bridge="${bridge:-0}"
-
+	#local ifname=$4
+	#config_get baseifname $1 baseifname
+	#config_get vlan8021p $1 vlan8021p
+	#config_get vlan8021q $1 vlan8021q
 	ifbaseexists $baseifname
 	ret=$?
 	if [ "$ret" -eq 1 ]; then
@@ -85,17 +86,17 @@ addbrcmvlan()
 				typ=$(uci -q get network."$net".type)
 				proto=$(uci -q get network."$net".proto)
 				proto="${proto:-none}"
-				if [ "$typ" == "bridge" ]; then
-					bridge=1
-					if [ "$proto" == "none" ]; then
-						unmanaged=1
-						break
-					fi
+				if [ "$typ" == "bridge" -a "$proto" == "none" ]; then
+					unmanaged=1
+					break
 				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
@@ -118,7 +119,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
@@ -135,8 +136,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
@@ -147,14 +148,12 @@ 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")
@@ -162,19 +161,18 @@ brcm_virtual_interface_rules()
 		typ=$(uci -q get network."$net".type)
 		proto=$(uci -q get network."$net".proto)
 		proto="${proto:-none}"
-
-		if [ "$typ" == "bridge" ]; then
-			bridge=1
-			if [ "$proto" == "none" ]; then
-				unmanaged=1
-				break
-			fi
+		if [ "$typ" == "bridge" -a "$proto" == "none" ]; then
+			unmanaged=1
+			break
 		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
@@ -201,21 +199,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

@@ -1,221 +0,0 @@
-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");
- 

natalie-dect-h/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=natalie-dect-h
-PKG_VERSION:=12.26
+PKG_VERSION:=11.19
 
 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:=9e2236989ff58d0db897f938b6b07b535144e0e2
+PKG_SOURCE_VERSION:=c2139d05e3d082f1dcf58ce3f19306cb76fd0873
 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:=12.26
+PKG_VERSION:=11.19
 
-PKG_SOURCE_VERSION:=35fed3a10124bd660b74704011256039ba9cf54d
+PKG_SOURCE_VERSION:=2015e8106c7d541dd038381c2845bd8462d74a30
 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-12.26
+PKG_SOURCE_URL:=git@private.inteno.se:natalie-dect-11.19
 PKG_SOURCE_PROTO:=git
 endif
 
@@ -46,6 +46,10 @@ 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

questd/Makefile

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

samba2/Makefile

@@ -1,220 +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:=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))

uci-diff/Makefile

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2016 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=uci-diff
+PKG_VERSION:=1.0
+
+PKG_SOURCE_VERSION:=2fbd9ca65e0f670dcf34a5dd17a0fd1fde6bf54c
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@private.inteno.se:/uci-diff
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(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
+
+define Package/uci-diff
+	CATEGORY:=Utilities
+	DEPENDS:=+libc +libuci +libubox +ubus +libjson-c +libblobmsg-json
+	TITLE:=uci-diff
+endef
+
+define Package/uci-diff/description
+	uci-diff
+endef
+
+define Package/uci-diff/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-diff $(1)/bin/
+endef
+
+$(eval $(call BuildPackage,uci-diff))

uci-diff/files/etc/uci-diff/default/wireless

@@ -0,0 +1,43 @@
+{"wireless": {
+    "wifi-device": {
+        "type": "broadcom",
+        "country": "EU/13",
+        "band": "a",
+        "bandwidth": "80",
+        "hwmode": "11ac",
+        "channel": "auto",
+        "scantimer": "0",
+        "wmm": "1",
+        "wmm_noack": "0",
+        "wmm_apsd": "1",
+        "txpower": "100",
+        "rateset": "default",
+        "frag": "2346",
+        "rts": "2347",
+        "dtim_period": "1",
+        "beacon_int": "100",
+        "rxchainps": "0",
+        "rxchainps_qt": "10",
+        "rxchainps_pps": "10",
+        "rifs": "0",
+        "rifs_advert": "0",
+        "maxassoc": "32",
+        "doth": "1",
+        "dfsc": "1",
+        "disabled": "1"
+    },
+    "wifi-iface": {
+        "device": "wl0",
+        "network": "lan",
+        "mode": "ap",
+        "ssid": "Inteno-4BC8",
+        "encryption": "mixed-psk",
+        "cipher": "auto",
+        "key": "1234567890",
+        "gtk_rekey": "3600",
+        "macfilter": "0",
+        "wps_pbc": "1",
+        "wmf_bss_enable": "1",
+        "bss_max": "16"
+    }
+}}

uci-diff/files/etc/uci-diff/inteno/wireless

@@ -0,0 +1,22 @@
+{"wireless": {
+    "wl0": {
+        ".name": "wl0",
+        ".type": "wifi-device",
+        "channel": 100
+    },
+    "wl1": {
+        ".name": "wl1",
+        ".type": "wifi-device",
+        "wmm": 0
+    },
+    "wi0-0": {
+        ".type": "wifi-iface",
+        "device": "wi0-0",
+        "ssid": "Fredrik"
+    },
+    "wi1-0": {
+        ".type": "wifi-iface",
+        "device": "wi1-0",
+        "ssid": "blah"
+    }
+}}