From 2addacffd2bc410b96436b580ed3b78f5d24d617 Mon Sep 17 00:00:00 2001
From: root <root@lamia.panaceas.james.local>
Date: Mon, 28 Sep 2015 05:12:45 +0100
Subject: fish

---
 master/config                           | 200 ++++++++++++++------------------
 master/fix-mjpg-streamer-stack-smashing |   6 +-
 master/motors                           |   2 +-
 3 files changed, 90 insertions(+), 118 deletions(-)

diff --git a/master/config b/master/config
index 84c504c..bf1cc1c 100644
--- a/master/config
+++ b/master/config
@@ -1,9 +1,9 @@
 diff --git a/.config b/.config
 new file mode 100644
-index 0000000..e9f4329
+index 0000000..00fed37
 --- /dev/null
 +++ b/.config
-@@ -0,0 +1,2230 @@
+@@ -0,0 +1,2285 @@
 +#
 +# Automatically generated file; DO NOT EDIT.
 +# OpenWrt Configuration
@@ -84,6 +84,7 @@ index 0000000..e9f4329
 +# CONFIG_TARGET_ramips_rt305x_HT-TM02 is not set
 +# CONFIG_TARGET_ramips_rt305x_HG255D is not set
 +# CONFIG_TARGET_ramips_rt305x_M2M is not set
++CONFIG_TARGET_ramips_rt305x_TP-C516W=y
 +# CONFIG_TARGET_ramips_rt305x_A5-V11 is not set
 +# CONFIG_TARGET_ramips_rt305x_WT1520 is not set
 +# CONFIG_TARGET_ramips_rt305x_RT5350F-OLINUXINO is not set
@@ -101,7 +102,7 @@ index 0000000..e9f4329
 +# CONFIG_TARGET_ramips_rt305x_UR-326N4G is not set
 +# CONFIG_TARGET_ramips_rt305x_UR-336UN is not set
 +# CONFIG_TARGET_ramips_rt305x_VOCORE is not set
-+CONFIG_TARGET_ramips_rt305x_NCS601W=y
++# CONFIG_TARGET_ramips_rt305x_NCS601W is not set
 +# CONFIG_TARGET_ramips_rt305x_WIZFI630A is not set
 +CONFIG_HAS_SUBTARGETS=y
 +CONFIG_TARGET_BOARD="ramips"
@@ -128,6 +129,7 @@ index 0000000..e9f4329
 +CONFIG_DEFAULT_kmod-video-uvc=y
 +CONFIG_DEFAULT_libc=y
 +CONFIG_DEFAULT_libgcc=y
++CONFIG_DEFAULT_mjg-streamer=y
 +CONFIG_DEFAULT_mtd=y
 +CONFIG_DEFAULT_netifd=y
 +CONFIG_DEFAULT_odhcp6c=y
@@ -170,7 +172,7 @@ index 0000000..e9f4329
 +# Root filesystem images
 +#
 +# CONFIG_TARGET_ROOTFS_EXT4FS is not set
-+# CONFIG_TARGET_ROOTFS_JFFS2 is not set
++CONFIG_TARGET_ROOTFS_JFFS2=y
 +CONFIG_TARGET_ROOTFS_SQUASHFS=y
 +CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=256
 +CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP=y
@@ -305,7 +307,7 @@ index 0000000..e9f4329
 +# CONFIG_IB is not set
 +# CONFIG_SDK is not set
 +# CONFIG_MAKE_TOOLCHAIN is not set
-+# CONFIG_IMAGEOPT is not set
++CONFIG_IMAGEOPT=y
 +# CONFIG_PREINITOPT is not set
 +CONFIG_TARGET_PREINIT_SUPPRESS_STDERR=y
 +CONFIG_TARGET_PREINIT_TIMEOUT=2
@@ -320,16 +322,16 @@ index 0000000..e9f4329
 +CONFIG_TARGET_INIT_ENV=""
 +CONFIG_TARGET_INIT_CMD="/sbin/init"
 +CONFIG_TARGET_INIT_SUPPRESS_STDERR=y
-+# CONFIG_VERSIONOPT is not set
-+CONFIG_PER_FEED_REPO=y
-+CONFIG_PER_FEED_REPO_ADD_DISABLED=y
-+CONFIG_PER_FEED_REPO_ADD_COMMENTED=y
-+# CONFIG_FEED_packages is not set
-+# CONFIG_FEED_luci is not set
-+# CONFIG_FEED_routing is not set
-+# CONFIG_FEED_telephony is not set
-+# CONFIG_FEED_management is not set
-+# CONFIG_FEED_targets is not set
++CONFIG_VERSIONOPT=y
++CONFIG_VERSION_DIST="OpenWrt"
++CONFIG_VERSION_NICK=""
++CONFIG_VERSION_NUMBER=""
++CONFIG_VERSION_REPO="http://openwrt.panaceas.org/repos/tl-c516w/%v/%T/packages"
++CONFIG_VERSION_MANUFACTURER=""
++CONFIG_VERSION_PRODUCT=""
++CONFIG_VERSION_HWREV=""
++# CONFIG_VERSION_FILENAMES is not set
++# CONFIG_PER_FEED_REPO is not set
 +# CONFIG_SMIMEOPT is not set
 +CONFIG_OPKGSMIME_PASSPHRASE=y
 +
@@ -1251,12 +1253,7 @@ index 0000000..e9f4329
 +CONFIG_PACKAGE_dnsmasq=y
 +# CONFIG_PACKAGE_dnsmasq-dhcpv6 is not set
 +# CONFIG_PACKAGE_dnsmasq-full is not set
-+CONFIG_PACKAGE_dropbear=y
-+
-+#
-+# Configuration
-+#
-+# CONFIG_DROPBEAR_ECC is not set
++# CONFIG_PACKAGE_dropbear is not set
 +# CONFIG_PACKAGE_ead is not set
 +CONFIG_PACKAGE_firewall=y
 +CONFIG_PACKAGE_fstools=y
@@ -1302,7 +1299,7 @@ index 0000000..e9f4329
 +# CONFIG_PACKAGE_ar is not set
 +# CONFIG_PACKAGE_binutils is not set
 +# CONFIG_PACKAGE_gdb is not set
-+# CONFIG_PACKAGE_gdbserver is not set
++CONFIG_PACKAGE_gdbserver=m
 +# CONFIG_PACKAGE_objdump is not set
 +# CONFIG_PACKAGE_trace-cmd is not set
 +# CONFIG_PACKAGE_trace-cmd-extra is not set
@@ -1625,7 +1622,7 @@ index 0000000..e9f4329
 +# CONFIG_PACKAGE_kmod-slip is not set
 +# CONFIG_PACKAGE_kmod-stp is not set
 +# CONFIG_PACKAGE_kmod-trelay is not set
-+# CONFIG_PACKAGE_kmod-tun is not set
++CONFIG_PACKAGE_kmod-tun=y
 +# CONFIG_PACKAGE_kmod-udptunnel4 is not set
 +# CONFIG_PACKAGE_kmod-udptunnel6 is not set
 +# CONFIG_PACKAGE_kmod-veth is not set
@@ -1797,6 +1794,8 @@ index 0000000..e9f4329
 +#
 +# Filesystem
 +#
++# CONFIG_PACKAGE_libacl is not set
++# CONFIG_PACKAGE_libattr is not set
 +# CONFIG_PACKAGE_libext2fs is not set
 +# CONFIG_PACKAGE_libfuse is not set
 +# CONFIG_PACKAGE_libsysfs is not set
@@ -1814,21 +1813,36 @@ index 0000000..e9f4329
 +#
 +# CONFIG_PACKAGE_libcyassl is not set
 +# CONFIG_PACKAGE_libmbedtls is not set
-+# CONFIG_PACKAGE_libopenssl is not set
++CONFIG_PACKAGE_libopenssl=y
++
++#
++# Configuration
++#
++# CONFIG_OPENSSL_WITH_EC is not set
++# CONFIG_OPENSSL_WITH_SSL3 is not set
++# CONFIG_OPENSSL_ENGINE_CRYPTO is not set
 +# CONFIG_PACKAGE_libpolarssl is not set
 +# CONFIG_PACKAGE_argp-standalone is not set
++# CONFIG_PACKAGE_libavahi-client is not set
++# CONFIG_PACKAGE_libavahi-compat-libdnssd is not set
++# CONFIG_PACKAGE_libavahi-dbus-support is not set
++# CONFIG_PACKAGE_libavahi-nodbus-support is not set
++# CONFIG_PACKAGE_libbfd is not set
 +# CONFIG_PACKAGE_libblkid is not set
 +CONFIG_PACKAGE_libblobmsg-json=y
 +# CONFIG_PACKAGE_libcharset is not set
 +# CONFIG_PACKAGE_libconfig is not set
-+# CONFIG_PACKAGE_libelf1 is not set
-+# CONFIG_PACKAGE_libbfd is not set
 +# CONFIG_PACKAGE_libcurl is not set
++# CONFIG_PACKAGE_libdaemon is not set
++# CONFIG_PACKAGE_libdbus is not set
++# CONFIG_PACKAGE_libelf1 is not set
 +# CONFIG_PACKAGE_libevent2 is not set
 +# CONFIG_PACKAGE_libevent2-core is not set
 +# CONFIG_PACKAGE_libevent2-extra is not set
 +# CONFIG_PACKAGE_libevent2-openssl is not set
 +# CONFIG_PACKAGE_libevent2-pthreads is not set
++# CONFIG_PACKAGE_libexpat is not set
++# CONFIG_PACKAGE_libgdbm is not set
 +# CONFIG_PACKAGE_libgmp is not set
 +# CONFIG_PACKAGE_libiconv is not set
 +# CONFIG_PACKAGE_libiconv-full is not set
@@ -1840,7 +1854,7 @@ index 0000000..e9f4329
 +CONFIG_PACKAGE_libjson-c=y
 +# CONFIG_PACKAGE_libltdl is not set
 +# CONFIG_PACKAGE_liblua is not set
-+# CONFIG_PACKAGE_liblzo is not set
++CONFIG_PACKAGE_liblzo=y
 +# CONFIG_PACKAGE_libmnl is not set
 +# CONFIG_PACKAGE_libmount is not set
 +# CONFIG_PACKAGE_libncurses is not set
@@ -1860,8 +1874,9 @@ index 0000000..e9f4329
 +# CONFIG_PACKAGE_libnl-route is not set
 +CONFIG_PACKAGE_libnl-tiny=y
 +# CONFIG_PACKAGE_libopcodes is not set
++# CONFIG_PACKAGE_libpam is not set
 +# CONFIG_PACKAGE_libpcap is not set
-+# CONFIG_PACKAGE_libpopt is not set
++CONFIG_PACKAGE_libpopt=y
 +# CONFIG_PACKAGE_libreadline is not set
 +# CONFIG_PACKAGE_libroxml is not set
 +# CONFIG_PACKAGE_librpc is not set
@@ -1884,7 +1899,7 @@ index 0000000..e9f4329
 +# CONFIG_PACKAGE_linux-atm is not set
 +# CONFIG_PACKAGE_terminfo is not set
 +CONFIG_PACKAGE_uclibcxx=y
-+# CONFIG_PACKAGE_zlib is not set
++CONFIG_PACKAGE_zlib=y
 +
 +#
 +# Multimedia
@@ -1906,6 +1921,11 @@ index 0000000..e9f4329
 +# File Transfer
 +#
 +# CONFIG_PACKAGE_curl is not set
++CONFIG_PACKAGE_rsync=y
++# CONFIG_RSYNC_xattr is not set
++# CONFIG_RSYNC_acl is not set
++CONFIG_RSYNC_zlib=y
++# CONFIG_PACKAGE_rsyncd is not set
 +
 +#
 +# Firewall
@@ -1958,6 +1978,13 @@ index 0000000..e9f4329
 +# CONFIG_PACKAGE_nftables is not set
 +
 +#
++# IP Addresses and Names
++#
++# CONFIG_PACKAGE_avahi-autoipd is not set
++# CONFIG_PACKAGE_avahi-dbus-daemon is not set
++# CONFIG_PACKAGE_avahi-nodbus-daemon is not set
++
++#
 +# Linux ATM tools
 +#
 +# CONFIG_PACKAGE_atm-aread is not set
@@ -1992,7 +2019,7 @@ index 0000000..e9f4329
 +#
 +# CONFIG_PACKAGE_genl is not set
 +# CONFIG_PACKAGE_igmpproxy is not set
-+# CONFIG_PACKAGE_ip is not set
++CONFIG_PACKAGE_ip=y
 +# CONFIG_PACKAGE_ip-bridge is not set
 +# CONFIG_PACKAGE_ip-full is not set
 +# CONFIG_PACKAGE_lldpd is not set
@@ -2001,6 +2028,18 @@ index 0000000..e9f4329
 +# CONFIG_PACKAGE_tc is not set
 +
 +#
++# SSH
++#
++CONFIG_PACKAGE_openssh-client=y
++CONFIG_PACKAGE_openssh-client-utils=y
++CONFIG_PACKAGE_openssh-keygen=y
++CONFIG_PACKAGE_openssh-moduli=y
++CONFIG_PACKAGE_openssh-server=y
++# CONFIG_PACKAGE_openssh-server-pam is not set
++# CONFIG_PACKAGE_openssh-sftp-client is not set
++# CONFIG_PACKAGE_openssh-sftp-server is not set
++
++#
 +# THC-IPv6 attack and analyzing toolkit
 +#
 +# CONFIG_PACKAGE_thc-ipv6-address6 is not set
@@ -2061,7 +2100,20 @@ index 0000000..e9f4329
 +#
 +# CONFIG_PACKAGE_openvpn-easy-rsa is not set
 +# CONFIG_PACKAGE_openvpn-nossl is not set
-+# CONFIG_PACKAGE_openvpn-openssl is not set
++CONFIG_PACKAGE_openvpn-openssl=m
++CONFIG_OPENVPN_openssl_ENABLE_LZO=y
++CONFIG_OPENVPN_openssl_ENABLE_X509_ALT_USERNAME=y
++CONFIG_OPENVPN_openssl_ENABLE_SERVER=y
++# CONFIG_OPENVPN_openssl_ENABLE_MANAGEMENT is not set
++# CONFIG_OPENVPN_openssl_ENABLE_HTTP is not set
++# CONFIG_OPENVPN_openssl_ENABLE_SOCKS is not set
++CONFIG_OPENVPN_openssl_ENABLE_FRAGMENT=y
++# CONFIG_OPENVPN_openssl_ENABLE_MULTIHOME is not set
++# CONFIG_OPENVPN_openssl_ENABLE_PORT_SHARE is not set
++CONFIG_OPENVPN_openssl_ENABLE_DEF_AUTH=y
++# CONFIG_OPENVPN_openssl_ENABLE_PF is not set
++CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
++CONFIG_OPENVPN_openssl_ENABLE_SMALL=y
 +# CONFIG_PACKAGE_openvpn-polarssl is not set
 +
 +#
@@ -2157,6 +2209,8 @@ index 0000000..e9f4329
 +#
 +# Filesystem
 +#
++# CONFIG_PACKAGE_acl is not set
++# CONFIG_PACKAGE_attr is not set
 +# CONFIG_PACKAGE_badblocks is not set
 +# CONFIG_PACKAGE_debugfs is not set
 +# CONFIG_PACKAGE_dumpe2fs is not set
@@ -2195,6 +2249,7 @@ index 0000000..e9f4329
 +# CONFIG_PACKAGE_comgt is not set
 +# CONFIG_PACKAGE_comgt-directip is not set
 +# CONFIG_PACKAGE_comgt-ncm is not set
++# CONFIG_PACKAGE_dbus is not set
 +# CONFIG_PACKAGE_dmesg is not set
 +# CONFIG_PACKAGE_dropbearconvert is not set
 +# CONFIG_PACKAGE_fconfig is not set
@@ -2234,86 +2289,3 @@ index 0000000..e9f4329
 +# CONFIG_PACKAGE_uuidgen is not set
 +CONFIG_PACKAGE_v4l-utils=y
 +# CONFIG_PACKAGE_whereis is not set
-diff --git a/.config b/.config
-index e9f4329..0d33ce6 100644
---- a/.config
-+++ b/.config
-@@ -78,6 +78,7 @@ CONFIG_TARGET_ramips_rt305x=y
- # CONFIG_TARGET_ramips_rt305x_HT-TM02 is not set
- # CONFIG_TARGET_ramips_rt305x_HG255D is not set
- # CONFIG_TARGET_ramips_rt305x_M2M is not set
-+CONFIG_TARGET_ramips_rt305x_TP-C516W=y
- # CONFIG_TARGET_ramips_rt305x_A5-V11 is not set
- # CONFIG_TARGET_ramips_rt305x_WT1520 is not set
- # CONFIG_TARGET_ramips_rt305x_RT5350F-OLINUXINO is not set
-@@ -95,7 +96,7 @@ CONFIG_TARGET_ramips_rt305x=y
- # CONFIG_TARGET_ramips_rt305x_UR-326N4G is not set
- # CONFIG_TARGET_ramips_rt305x_UR-336UN is not set
- # CONFIG_TARGET_ramips_rt305x_VOCORE is not set
--CONFIG_TARGET_ramips_rt305x_NCS601W=y
-+# CONFIG_TARGET_ramips_rt305x_NCS601W is not set
- # CONFIG_TARGET_ramips_rt305x_WIZFI630A is not set
- CONFIG_HAS_SUBTARGETS=y
- CONFIG_TARGET_BOARD="ramips"
-@@ -122,6 +123,7 @@ CONFIG_DEFAULT_kmod-video-core=y
- CONFIG_DEFAULT_kmod-video-uvc=y
- CONFIG_DEFAULT_libc=y
- CONFIG_DEFAULT_libgcc=y
-+CONFIG_DEFAULT_mjg-streamer=y
- CONFIG_DEFAULT_mtd=y
- CONFIG_DEFAULT_netifd=y
- CONFIG_DEFAULT_odhcp6c=y
-@@ -164,7 +166,7 @@ CONFIG_EXTERNAL_CPIO=""
- # Root filesystem images
- #
- # CONFIG_TARGET_ROOTFS_EXT4FS is not set
--# CONFIG_TARGET_ROOTFS_JFFS2 is not set
-+CONFIG_TARGET_ROOTFS_JFFS2=y
- CONFIG_TARGET_ROOTFS_SQUASHFS=y
- CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=256
- CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP=y
-@@ -299,7 +301,7 @@ CONFIG_TARGET_SUFFIX="musl"
- # CONFIG_IB is not set
- # CONFIG_SDK is not set
- # CONFIG_MAKE_TOOLCHAIN is not set
--# CONFIG_IMAGEOPT is not set
-+CONFIG_IMAGEOPT=y
- # CONFIG_PREINITOPT is not set
- CONFIG_TARGET_PREINIT_SUPPRESS_STDERR=y
- CONFIG_TARGET_PREINIT_TIMEOUT=2
-@@ -314,16 +316,16 @@ CONFIG_TARGET_INIT_PATH="/bin:/sbin:/usr/bin:/usr/sbin"
- CONFIG_TARGET_INIT_ENV=""
- CONFIG_TARGET_INIT_CMD="/sbin/init"
- CONFIG_TARGET_INIT_SUPPRESS_STDERR=y
--# CONFIG_VERSIONOPT is not set
--CONFIG_PER_FEED_REPO=y
--CONFIG_PER_FEED_REPO_ADD_DISABLED=y
--CONFIG_PER_FEED_REPO_ADD_COMMENTED=y
--# CONFIG_FEED_packages is not set
--# CONFIG_FEED_luci is not set
--# CONFIG_FEED_routing is not set
--# CONFIG_FEED_telephony is not set
--# CONFIG_FEED_management is not set
--# CONFIG_FEED_targets is not set
-+CONFIG_VERSIONOPT=y
-+CONFIG_VERSION_DIST="OpenWrt"
-+CONFIG_VERSION_NICK=""
-+CONFIG_VERSION_NUMBER=""
-+CONFIG_VERSION_REPO="http://openwrt.panaceas.org/repos/tl-c516w/%v/%T/packages"
-+CONFIG_VERSION_MANUFACTURER=""
-+CONFIG_VERSION_PRODUCT=""
-+CONFIG_VERSION_HWREV=""
-+# CONFIG_VERSION_FILENAMES is not set
-+# CONFIG_PER_FEED_REPO is not set
- # CONFIG_SMIMEOPT is not set
- CONFIG_OPKGSMIME_PASSPHRASE=y
- 
-@@ -1296,7 +1298,7 @@ CONFIG_PACKAGE_usign=y
- # CONFIG_PACKAGE_ar is not set
- # CONFIG_PACKAGE_binutils is not set
- # CONFIG_PACKAGE_gdb is not set
--# CONFIG_PACKAGE_gdbserver is not set
-+CONFIG_PACKAGE_gdbserver=m
- # CONFIG_PACKAGE_objdump is not set
- # CONFIG_PACKAGE_trace-cmd is not set
- # CONFIG_PACKAGE_trace-cmd-extra is not set
diff --git a/master/fix-mjpg-streamer-stack-smashing b/master/fix-mjpg-streamer-stack-smashing
index f04434e..9d70159 100644
--- a/master/fix-mjpg-streamer-stack-smashing
+++ b/master/fix-mjpg-streamer-stack-smashing
@@ -1,13 +1,13 @@
 diff --git a/feeds/packages/multimedia/mjpg-streamer/patches/998-fix-stack-smashing.patch b/feeds/packages/multimedia/mjpg-streamer/patches/998-fix-stack-smashing.patch
 new file mode 100644
-index 0000000..24ef14e
+index 0000000..a1a2239
 --- /dev/null
 +++ b/feeds/packages/multimedia/mjpg-streamer/patches/998-fix-stack-smashing.patch
 @@ -0,0 +1,13 @@
 +Index: mjpg-streamer-r182/plugins/input_uvc/v4l2uvc.c
 +===================================================================
-+--- a/mjpg-streamer-r182/plugins/input_uvc/v4l2uvc.c
-++++ b/mjpg-streamer-r182/plugins/input_uvc/v4l2uvc.c
++--- a/plugins/input_uvc/v4l2uvc.c
+++++ b/plugins/input_uvc/v4l2uvc.c
 +@@ -130,7 +130,7 @@ int init_videoIn(struct vdIn *vd, char *
 +             return -1;
 +         }
diff --git a/master/motors b/master/motors
index 33f4a7c..12cfa5a 100644
--- a/master/motors
+++ b/master/motors
@@ -855,7 +855,7 @@ index 0000000..5ffdc58
 ++		<script type="text/javascript"> 
 ++
 ++		function send_button(command,value) {
-++			action_zone.location='http://10.32.48.227:8080/?action=command_ng&dest=0&plugin=1&id='+command+'&group=0&value='+value;
+++			action_zone.location='/?action=command_ng&dest=0&plugin=1&id='+command+'&group=0&value='+value;
 ++		}
 ++
 ++	function up_onmousedown()
-- 
cgit v1.2.3