From 62b203d0ea5bb0367c99bd4978edfe86908e427c Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 2 Sep 2015 09:41:14 +0200
Subject: [PATCH] contrib: remove obsolete host uci configurations

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---
 contrib/uci/.gitignore                        |  4 --
 contrib/uci/Makefile                          | 43 -------------
 contrib/uci/hostfiles/bin/uci                 |  2 -
 contrib/uci/hostfiles/bin/uci-defaults        |  7 ---
 contrib/uci/hostfiles/etc/config/batmand      | 10 ---
 contrib/uci/hostfiles/etc/config/ddns         | 85 -------------------------
 contrib/uci/hostfiles/etc/config/dhcp         | 23 -------
 contrib/uci/hostfiles/etc/config/dropbear     |  3 -
 contrib/uci/hostfiles/etc/config/firewall     | 80 ------------------------
 contrib/uci/hostfiles/etc/config/fstab        | 10 ---
 contrib/uci/hostfiles/etc/config/httpd        |  5 --
 contrib/uci/hostfiles/etc/config/luci_devinfo | 29 ---------
 contrib/uci/hostfiles/etc/config/mactodevinfo | 10 ---
 contrib/uci/hostfiles/etc/config/network      | 27 --------
 contrib/uci/hostfiles/etc/config/ntpclient    | 22 -------
 contrib/uci/hostfiles/etc/config/qos          | 89 ---------------------------
 contrib/uci/hostfiles/etc/config/system       |  3 -
 contrib/uci/hostfiles/etc/config/upnpd        |  4 --
 contrib/uci/hostfiles/etc/config/wireless     | 16 -----
 19 files changed, 472 deletions(-)
 delete mode 100644 contrib/uci/.gitignore
 delete mode 100644 contrib/uci/Makefile
 delete mode 100755 contrib/uci/hostfiles/bin/uci
 delete mode 100755 contrib/uci/hostfiles/bin/uci-defaults
 delete mode 100644 contrib/uci/hostfiles/etc/config/batmand
 delete mode 100644 contrib/uci/hostfiles/etc/config/ddns
 delete mode 100644 contrib/uci/hostfiles/etc/config/dhcp
 delete mode 100644 contrib/uci/hostfiles/etc/config/dropbear
 delete mode 100644 contrib/uci/hostfiles/etc/config/firewall
 delete mode 100644 contrib/uci/hostfiles/etc/config/fstab
 delete mode 100644 contrib/uci/hostfiles/etc/config/httpd
 delete mode 100644 contrib/uci/hostfiles/etc/config/luci_devinfo
 delete mode 100644 contrib/uci/hostfiles/etc/config/mactodevinfo
 delete mode 100644 contrib/uci/hostfiles/etc/config/network
 delete mode 100644 contrib/uci/hostfiles/etc/config/ntpclient
 delete mode 100644 contrib/uci/hostfiles/etc/config/qos
 delete mode 100644 contrib/uci/hostfiles/etc/config/system
 delete mode 100644 contrib/uci/hostfiles/etc/config/upnpd
 delete mode 100644 contrib/uci/hostfiles/etc/config/wireless

diff --git a/contrib/uci/.gitignore b/contrib/uci/.gitignore
deleted file mode 100644
index 692aa37c2..000000000
--- a/contrib/uci/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-uci-*
-uci.git
-*.tar.gz
-patches/series
diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile
deleted file mode 100644
index d04c5a146..000000000
--- a/contrib/uci/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-include ../../build/config.mk
-include ../../build/gccconfig.mk
-
-UCI_VERSION  = 0.8.0
-#UCI_SITE    = http://mirror2.openwrt.org/sources
-#UCI_DIR     = uci-$(UCI_VERSION)
-#UCI_FILE    = $(UCI_DIR).tar.gz
-#UCI_URL     = $(UCI_SITE)/$(UCI_FILE)
-UCI_GITREV   = aa3ab8012bfbf793d2884c08ea924545a04e9544
-UCI_SITE     = http://nbd.name
-UCI_DIR      = uci.git
-UCI_FILE     = uci-$(UCI_VERSION)$(UCI_APPEND).tar.gz
-UCI_URL      = $(UCI_SITE)/gitweb.cgi?p=uci.git;a=snapshot;h=$(UCI_GITREV)
-UCI_PATCHDIR = patches
-
-all: compile
-
-include ../../build/module.mk
-
-$(UCI_FILE):
-	wget -O $@ "$(UCI_URL)" || rm -f $@
-
-$(UCI_DIR)/.prepared: $(UCI_FILE)
-	rm -rf $(UCI_DIR)
-	tar xvfz $(UCI_FILE)
-	(cd $(UCI_PATCHDIR); ls *.patch | sort > series) || true
-	[ -f "$(UCI_PATCHDIR)/series" ] && while read patch; do \
-		patch -d $(UCI_DIR) -p1 < $(UCI_PATCHDIR)/$$patch; \
-	done < $(UCI_PATCHDIR)/series || true
-	touch $@
-
-compile: $(UCI_DIR)/.prepared
-	$(MAKE) -C $(UCI_DIR) CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OS="$(OS)"
-	mkdir -p dist/usr/lib dist/usr/bin
-	$(MAKE) -C $(UCI_DIR) install DESTDIR=../dist prefix=/usr
-	$(MAKE) -C $(UCI_DIR)/lua CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OS="$(OS)"
-	$(MAKE) -C $(UCI_DIR)/lua install DESTDIR=../../dist luadir=$(LUA_LIBRARYDIR)
-
-compile-all: compile
-
-clean:
-	rm -rf $(UCI_PATCHDIR)/series
-	rm -rf $(UCI_DIR) $(UCI_FILE)
diff --git a/contrib/uci/hostfiles/bin/uci b/contrib/uci/hostfiles/bin/uci
deleted file mode 100755
index f6104c6ef..000000000
--- a/contrib/uci/hostfiles/bin/uci
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-$(dirname $0)/../usr/bin/uci -c $(dirname $0)/../etc/config "$@"
diff --git a/contrib/uci/hostfiles/bin/uci-defaults b/contrib/uci/hostfiles/bin/uci-defaults
deleted file mode 100755
index 3b58d7b32..000000000
--- a/contrib/uci/hostfiles/bin/uci-defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-for i in $(find $(dirname $0)/../etc/uci-defaults -type f -not -name "$2")
-do 
-	[ -f $i ] && { 
-		bash $i; rm $i
-	}
-done
diff --git a/contrib/uci/hostfiles/etc/config/batmand b/contrib/uci/hostfiles/etc/config/batmand
deleted file mode 100644
index 95ec3fab2..000000000
--- a/contrib/uci/hostfiles/etc/config/batmand
+++ /dev/null
@@ -1,10 +0,0 @@
-config batmand general
-	option interface		ath0
-	option announce			
-	option gateway_class		
-	option originator_interval
-	option preferred_gateway	
-	option routing_class
-	option visualisation_srv
-	option policy_routing_script
-	
diff --git a/contrib/uci/hostfiles/etc/config/ddns b/contrib/uci/hostfiles/etc/config/ddns
deleted file mode 100644
index 7c3f3c1a7..000000000
--- a/contrib/uci/hostfiles/etc/config/ddns
+++ /dev/null
@@ -1,85 +0,0 @@
-#################################################################
-# In order to enable dynamic dns you need at least one section,
-# and in that seciton the "enabled" option must be set to one
-# 
-# Each section represents an update to a different service
-#
-# You specify your domain name, your username and your password
-# with the optins "domain", "username" and "password" respectively
-#
-# Next you need to specify the name of the service you are 
-# connecting to "eg. dyndns.org".  The format of the update
-# urls for several different dynamic dns services is specified
-# in the /usr/lib/ddns/services file.  This list is hardly complete
-# as there are many, many different dynamic dns services.  If your
-# service is on the list you can merely specify it with the 
-# "service_name" option.  Otherwise you will need to determine
-# the format of the url to update with.  You can either add an
-# entry to the /usr/lib/ddns/services file or specify this with
-# the "update_url" option.
-#
-# We also need to specify the source of the ip address to associate with
-# your domain.  The "ip_source" option can be "network", "interface"
-# or "web", with "network" as the default.  
-#
-# If "ip_source" is "network" you specify a network section in your 
-# /etc/network config file (e.g. "wan", which is the default) with
-# the "ip_network" option.  If you specify "wan", you will update
-# with whatever the ip for your wan is.
-# 
-# If "ip_source" is "interface" you specify a hardware interface 
-# (e.g. "eth1") and whatever the current ip of this interface is
-# will be associated with the domain when an update is performed.
-#
-# The last possibility is that "ip_source" is "web", which means
-# that in order to obtain our ip address we will connect to a 
-# website, and the first valid ip address listed on that page
-# will be assumed to be ours.  If you are behind another firewall
-# this is the best option since none of the local networks or 
-# interfaces will have the external ip.  The website to connect
-# to is specified by the "ip_url" option.  You may specify multiple
-# urls in the option, separated by whitespace.
-#
-# Finally we need to specify how often to check whether we need
-# to check whether the ip address has changed (and if so update
-# it) and how often we need to force an update ( many services
-# will expire your domain if you don't connect and do an update
-# every so often).  Use the "check_interval" to specify how
-# often to check whether an update is necessary, and the 
-# "force_interval" option to specify how often to force an
-# update.  Specify the units for these values with the "check_unit"
-# and the "force_unit" options.  Units can be "days", "hours",
-# "minutes" or "seconds".  The default force_unit is hours and the
-# default check_unit is seconds.  The default check_interval is
-# 600 seconds, or ten minutes.  The default force_interval is 
-# 72 hours or 3 days.
-#
-#
-#########################################################
-
-config service "myddns"
-	option enabled		"0"
-
-	option service_name	"dyndns.org"
-	option domain		"mypersonaldomain.dyndns.org"
-	option username		"myusername"
-	option password		"mypassword"
-
-	option ip_source	"network" 
-	option ip_network	"wan"
-	
-
-	option force_interval	"72"
-	option force_unit	"hours"
-	option check_interval	"10"
-	option check_unit	"minutes"
-
-	#option ip_source	"interface"
-	#option ip_interface	"eth0.1"
-
-	#option ip_source	"web"
-	#option ip_url		"http://www.whatismyip.com/automation/n09230945.asp"
-
-	#option update_url	"http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
-
-
diff --git a/contrib/uci/hostfiles/etc/config/dhcp b/contrib/uci/hostfiles/etc/config/dhcp
deleted file mode 100644
index 4904b0253..000000000
--- a/contrib/uci/hostfiles/etc/config/dhcp
+++ /dev/null
@@ -1,23 +0,0 @@
-config dnsmasq
-	option domainneeded	1
-	option boguspriv	1
-	option filterwin2k	'0'  #enable for dial on demand
-	option localise_queries	1
-	option local	'/lan/'
-	option domain	'lan'
-	option expandhosts	1
-	option nonegcache	0
-	option authoritative	1
-	option readethers	1
-	option leasefile	'/tmp/dhcp.leases'
-	option resolvfile	'/tmp/resolv.conf.auto'
-
-config dhcp
-	option interface	lan
-	option start 	100
-	option limit	150
-	option leasetime	12h
-
-config dhcp
-	option interface	wan
-	option ignore	1
diff --git a/contrib/uci/hostfiles/etc/config/dropbear b/contrib/uci/hostfiles/etc/config/dropbear
deleted file mode 100644
index e660ac735..000000000
--- a/contrib/uci/hostfiles/etc/config/dropbear
+++ /dev/null
@@ -1,3 +0,0 @@
-config dropbear
-	option PasswordAuth 'on'
-	option Port         '22'
diff --git a/contrib/uci/hostfiles/etc/config/firewall b/contrib/uci/hostfiles/etc/config/firewall
deleted file mode 100644
index 073169013..000000000
--- a/contrib/uci/hostfiles/etc/config/firewall
+++ /dev/null
@@ -1,80 +0,0 @@
-config defaults
-	option syn_flood	1
-	option input		DROP 
-	option output		ACCEPT 
-	option forward		DROP 
-
-config zone
-	option name		lan
-	option input	ACCEPT 
-	option output	ACCEPT 
-	option forward	DROP 
-
-config zone
-	option name		wan
-	option input	DROP 
-	option output	ACCEPT 
-	option forward	DROP 
-	option masq		1 
-
-config forwarding 
-	option src      lan
-	option dest     wan
-
-
-### EXAMPLE CONFIG SECTIONS
-# do not allow a specific ip to access wan
-#config rule
-#	option src		lan
-#	option src_ip	192.168.45.2
-#	option dest		wan
-#	option proto	tcp
-#	option target	REJECT 
-
-# block a specific mac on wan
-#config rule
-#	option dest		wan
-#	option src_mac	00:11:22:33:44:66
-#	option target	REJECT 
-
-# block incoming ICMP traffic on a zone
-#config rule
-#	option src		lan
-#	option proto	ICMP
-#	option target	DROP
-
-# port redirect port coming in on wan to lan
-#config redirect
-#	option src			wan
-#	option src_dport	80
-#	option dest			lan
-#	option dest_ip		192.168.16.235
-#	option dest_port	80 
-#	option protocol		tcp
-
-# include a file with users custom iptables rules
-#config include
-#	option path /etc/firewall.user
-
-
-### FULL CONFIG SECTIONS
-#config rule
-#	option src		lan
-#	option src_ip	192.168.45.2
-#	option src_mac	00:11:22:33:44:55
-#	option src_port	80
-#	option dest		wan
-#	option dest_ip	194.25.2.129
-#	option dest_port	120
-#	option proto	tcp
-#	option target	REJECT 
-
-#config redirect
-#	option src		lan
-#	option src_ip	192.168.45.2
-#	option src_mac	00:11:22:33:44:55
-#	option src_port		1024
-#	option src_dport	80
-#	option dest_ip	194.25.2.129
-#	option dest_port	120
-#	option proto	tcp
diff --git a/contrib/uci/hostfiles/etc/config/fstab b/contrib/uci/hostfiles/etc/config/fstab
deleted file mode 100644
index eccf0ce69..000000000
--- a/contrib/uci/hostfiles/etc/config/fstab
+++ /dev/null
@@ -1,10 +0,0 @@
-config mount
-	option target	/home
-	option device	/dev/sda1
-	option fstype	ext3
-	option options	rw,sync
-	option enabled	0
-
-config swap
-	option device	/dev/sda2
-	option enabled	0
diff --git a/contrib/uci/hostfiles/etc/config/httpd b/contrib/uci/hostfiles/etc/config/httpd
deleted file mode 100644
index 2f8020ff2..000000000
--- a/contrib/uci/hostfiles/etc/config/httpd
+++ /dev/null
@@ -1,5 +0,0 @@
-
-config 'httpd'
-	option 'port' '80'
-	option 'home' '/www'
-
diff --git a/contrib/uci/hostfiles/etc/config/luci_devinfo b/contrib/uci/hostfiles/etc/config/luci_devinfo
deleted file mode 100644
index a8ab3ee7c..000000000
--- a/contrib/uci/hostfiles/etc/config/luci_devinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-config 'smap_scannet' 'SIP_LAN'
-        option 'enable' '0'
-	option 'interface' 'lan'
-	option 'subnet' '192.168.99.0/24'
-	option 'ports'	'5060'
-	option 'timeout' '10'
-	option 'repeat_count' '1'
-	option 'sleepreq' '100'
-	
-config 'smap_scannet' 'SIP_WAN'
-        option 'enable' '0'
-	option 'interface' 'wan'
-	option 'subnet' '216.218.0.0/16'
-
-config 'netdiscover_scannet' 'SCAN_LAN'
-        option 'enable' '0'
-	option 'interface' 'lan'
-	option 'subnet' '192.168.99.0/24'
-	
-config 'netdiscover_scannet' 'SCAN_WAN'
-        option 'enable' '0'
-	option 'interface' 'wan'
-	option 'subnet' '216.218.0.0/16'
-	option 'ports'	'5060'
-	option 'timeout' '10'
-	option 'repeat_count' '1'
-	option 'sleepreq' '100'
-	
-
diff --git a/contrib/uci/hostfiles/etc/config/mactodevinfo b/contrib/uci/hostfiles/etc/config/mactodevinfo
deleted file mode 100644
index ca2432409..000000000
--- a/contrib/uci/hostfiles/etc/config/mactodevinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-
-config 'mactodevinfo'
-	option 'maclow' '00:19:15:00:00:00'
-	option 'machigh' '00:19:15:ff:ff:ff'
-	option 'vendor' 'Vertical Communications'
-	option 'devtype' 'SIP devices'
-	option 'model' 'varies'
-	option 'ouiowneroverride' 'Some company'
-	option 'name' 'Vertical XIP and Phones'
-
diff --git a/contrib/uci/hostfiles/etc/config/network b/contrib/uci/hostfiles/etc/config/network
deleted file mode 100644
index 6f499c99e..000000000
--- a/contrib/uci/hostfiles/etc/config/network
+++ /dev/null
@@ -1,27 +0,0 @@
-#### VLAN configuration 
-config switch eth0
-	option vlan0	"0 1 2 3 5*"
-	option vlan1	"4 5"
-
-
-#### Loopback configuration
-config interface loopback
-	option ifname	"lo"
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-
-#### LAN configuration
-config interface lan
-	option type 	bridge
-	option ifname	"eth0"
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
-
-
-#### WAN configuration
-config interface	wan
-	option ifname	"wlan0"
-	option proto	dhcp
diff --git a/contrib/uci/hostfiles/etc/config/ntpclient b/contrib/uci/hostfiles/etc/config/ntpclient
deleted file mode 100644
index 1b56f1b7d..000000000
--- a/contrib/uci/hostfiles/etc/config/ntpclient
+++ /dev/null
@@ -1,22 +0,0 @@
-config ntpserver
-	option hostname '0.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpserver
-	option hostname '1.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpserver
-	option hostname '2.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpserver
-	option hostname '3.openwrt.pool.ntp.org'
-	option port     '123'
-
-config ntpdrift
-	option freq     '0'
-
-config ntpclient
-	option interval	60
-	#option count	10
diff --git a/contrib/uci/hostfiles/etc/config/qos b/contrib/uci/hostfiles/etc/config/qos
deleted file mode 100644
index 51959b530..000000000
--- a/contrib/uci/hostfiles/etc/config/qos
+++ /dev/null
@@ -1,89 +0,0 @@
-# QoS configuration for OpenWrt
-
-# INTERFACES:
-config interface wan
-	option classgroup  "Default"
-	option enabled      1
-	option overhead     1
-	option upload       128
-	option download     1024
-
-# RULES:
-config classify
-	option target       "Bulk"
-	option ipp2p        "all"
-config classify
-	option target       "Bulk"
-	option layer7       "edonkey"
-config classify
-	option target       "Bulk"
-	option layer7       "bittorrent"
-config classify
-	option target       "Priority"
-	option ports        "22,53"
-config classify
-	option target       "Normal"
-	option proto        "tcp"
-	option ports        "20,21,25,80,110,443,993,995"
-config classify
-	option target       "Express"
-	option ports        "5190"
-config default
-	option target       "Express"
-	option proto        "udp"
-	option pktsize      "-500"
-config reclassify
-	option target       "Priority"
-	option proto        "icmp"
-config default
-	option target       "Bulk"
-	option portrange    "1024-65535"
-config reclassify
-	option target       "Priority"
-	option proto        "tcp"
-	option pktsize      "-128"
-	option mark         "!Bulk"
-	option tcpflags     "SYN"
-config reclassify
-	option target       "Priority"
-	option proto        "tcp"
-	option pktsize      "-128"
-	option mark	        "!Bulk"
-	option tcpflags     "ACK"
-
-
-# Don't change the stuff below unless you
-# really know what it means :)
-
-config classgroup "Default"
-	option classes      "Priority Express Normal Bulk"
-	option default      "Normal"
-
-
-config class "Priority"
-	option packetsize  400
-	option maxsize     400
-	option avgrate     10
-	option priority    20
-config class "Priority_down"
-	option packetsize  1000
-	option avgrate     10
-
-
-config class "Express"
-	option packetsize  1000
-	option maxsize     800
-	option avgrate     50
-	option priority    10
-
-config class "Normal"
-	option packetsize  1500
-	option packetdelay 100
-	option avgrate     10
-	option priority    5
-config class "Normal_down"
-	option avgrate     20
-
-config class "Bulk"
-	option avgrate     1
-	option packetdelay 200
diff --git a/contrib/uci/hostfiles/etc/config/system b/contrib/uci/hostfiles/etc/config/system
deleted file mode 100644
index b0726b7b7..000000000
--- a/contrib/uci/hostfiles/etc/config/system
+++ /dev/null
@@ -1,3 +0,0 @@
-config system
-	option hostname	OpenWrt
-	option timezone	UTC
diff --git a/contrib/uci/hostfiles/etc/config/upnpd b/contrib/uci/hostfiles/etc/config/upnpd
deleted file mode 100644
index 75dcb9ac4..000000000
--- a/contrib/uci/hostfiles/etc/config/upnpd
+++ /dev/null
@@ -1,4 +0,0 @@
-config upnpd config
-	option log_output	0
-	option download 	1024
-	option upload   	512
diff --git a/contrib/uci/hostfiles/etc/config/wireless b/contrib/uci/hostfiles/etc/config/wireless
deleted file mode 100644
index 7e7d2d864..000000000
--- a/contrib/uci/hostfiles/etc/config/wireless
+++ /dev/null
@@ -1,16 +0,0 @@
-config wifi-device  wifi0
-	option type     atheros
-	option channel  auto
-	option disabled 0
-
-config wifi-iface
-	option device	wifi0
-	option network	lan
-	option mode	ap
-	option ssid	OpenWrt
-	option encryption none
-
-	# Fake active wifi
-	option ifname	ath0
-	option up		1
-
-- 
2.11.0