spawn-fcgi: moved to github
spawn-fcgi: moved to github

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@46326 3c298f89-4303-0410-b956-a3cf2f4a3e73

--- a/devel/dmalloc/Makefile
+++ b/devel/dmalloc/Makefile
@@ -30,7 +30,7 @@
 define Package/libdmalloc
   $(call Package/dmalloc/Default)
   TITLE+= (library)
-  DEPENDS:=@USE_EGLIBC
+  DEPENDS:=@USE_GLIBC
 endef
 
 define Package/dmalloc-utils

--- a/devel/electric-fence/Makefile
+++ b/devel/electric-fence/Makefile
@@ -22,7 +22,7 @@
   CATEGORY:=Development
   TITLE:=electric-fence
   URL:=http://perens.com/FreeSoftware/ElectricFence/
-  DEPENDS:=@USE_EGLIBC
+  DEPENDS:=@USE_GLIBC
   MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
 endef
 

--- a/lang/php5-pecl-bcompiler/Makefile
+++ /dev/null
@@ -1,30 +1,1 @@
-#
-# 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
-
-PECL_NAME:=bcompiler
-PECL_LONGNAME:=PHP bytecode Compiler
-
-PKG_VERSION:=1.0.2
-PKG_RELEASE:=1
-PKG_MD5SUM:=99f76a5ef536d43180b41036a6a13e43
-
-PKG_NAME:=php5-pecl-$(PECL_NAME)
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php5/pecl.mk
-
-$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),@BROKEN))
-$(eval $(call BuildPackage,$(PKG_NAME)))
-

--- a/lang/php5-pecl-dio/Makefile
+++ /dev/null
@@ -1,30 +1,1 @@
-#
-# 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
-
-PECL_NAME:=dio
-PECL_LONGNAME:=Direct I/O functions
-
-PKG_VERSION:=0.0.6
-PKG_RELEASE:=1
-PKG_MD5SUM:=95bde93a41def9c2d97532eeb0c83bd3
-
-PKG_NAME:=php5-pecl-$(PECL_NAME)
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php5/pecl.mk
-
-$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)))
-

--- a/lang/php5-pecl-dio/patches/010-additional-baudrates.patch
+++ /dev/null
@@ -1,30 +1,1 @@
---- a/dio.c
-+++ b/dio.c
-@@ -442,6 +442,26 @@ PHP_FUNCTION(dio_tcsetattr)
- 
- 	/* assign to correct values... */
- 	switch (Baud_Rate)  {
-+#ifdef B460800
-+		case 460800:
-+			BAUD = B460800;
-+			break;
-+#endif
-+#ifdef B230400
-+		case 230400:
-+			BAUD = B230400;
-+			break;
-+#endif
-+#ifdef B115200
-+		case 115200:
-+			BAUD = B115200;
-+			break;
-+#endif
-+#ifdef B57600
-+		case 57600:
-+			BAUD = B57600;
-+			break;
-+#endif
- 		case 38400:
- 			BAUD = B38400;
- 			break;
 

--- a/lang/php5-pecl-libevent/Makefile
+++ /dev/null
@@ -1,32 +1,1 @@
-#
-# Copyright (C) 2012-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=libevent
-PECL_LONGNAME:=Libevent - event notification
-
-PKG_VERSION:=0.1.0
-PKG_RELEASE:=1
-PKG_MD5SUM:=e091371a9e714098a4c04a6e3daeb56a
-
-PKG_NAME:=php5-pecl-$(PECL_NAME)
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php5/pecl.mk
-
-CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr"
-
-$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent2))
-$(eval $(call BuildPackage,$(PKG_NAME)))
-

file:a/lang/pymysql/Makefile (deleted)
--- a/lang/pymysql/Makefile
+++ /dev/null
@@ -1,52 +1,1 @@
-#
-# Copyright (C) 2007-2008 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:=MySQL-python
-PKG_VERSION:=1.2.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/mysql-python
-PKG_MD5SUM:=532268f02870bea18c1d465e88afff30
-
-PKG_BUILD_DEPENDS:=python
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/python-mysql
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=MySQL database adapter for Python
-  URL:=http://mysql-python.sourceforge.net/
-  DEPENDS:=+python +libmysqlclient
-endef
-
-define Package/python-mysql/description
- MySQLdb is an thread-compatible interface to the popular MySQL database
- server that provides the Python database API.
-endef
-
-define PyPackage/python-mysql/filespec
-+|$(PYTHON_PKG_DIR)/_mysql.so
-+|$(PYTHON_PKG_DIR)/_mysql_exceptions.py*
-+|$(PYTHON_PKG_DIR)/MySQLdb
-endef
-
-define Build/Compile
-	$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
-	$(call Build/Compile/PyMod,., \
-		install --prefix="$(PKG_INSTALL_DIR)/usr", \
-	)
-endef
-
-$(eval $(call PyPackage,python-mysql))
-$(eval $(call BuildPackage,python-mysql))
-

--- a/lang/pymysql/patches/000-setup.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- MySQL-python-1.2.2/setup.py	2007-02-25 04:37:12.000000000 +0100
-+++ MySQL-python-1.2.2/setup.py	2007-08-15 12:23:18.000000000 +0200
-@@ -2,8 +2,7 @@
- 
- import os
- import sys
--import ez_setup; ez_setup.use_setuptools()
--from setuptools import setup, Extension
-+from distutils.core import setup, Extension
- 
- if sys.version_info < (2, 3):
-     raise Error, "Python-2.3 or newer is required"
 

--- a/lang/pymysql/patches/010-threadsafe.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- MySQL-python-1.2.2/site_orig.cfg	2007-08-15 12:58:40.000000000 +0200
-+++ MySQL-python-1.2.2/site.cfg	2007-08-15 12:58:49.000000000 +0200
-@@ -4,7 +4,7 @@
- # static: link against a static library (probably required for embedded)
- 
- embedded = False
--threadsafe = True
-+threadsafe = False
- static = False
- 
- # The path to mysql_config.
 

file:a/lang/pyyaml/Makefile (deleted)
--- a/lang/pyyaml/Makefile
+++ /dev/null
@@ -1,48 +1,1 @@
-#
-# Copyright (C) 2008 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:=PyYAML
-PKG_VERSION:=3.11
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://pyyaml.org/download/pyyaml/
-PKG_MD5SUM:=f50e08ef0fe55178479d3a618efe21db
-
-PKG_BUILD_DEPENDS:=python
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/pyyaml
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=pyyaml
-  URL:=http://pyyaml.org
-  DEPENDS:=+python +libyaml
-endef
-
-define Package/pyyaml/description
-  yaml python bindings
-endef
-
-define Build/Compile
-	$(call Build/Compile/PyMod,,--with-libyaml install --prefix="$(PKG_INSTALL_DIR)/usr")
-endef
-
-define Package/pyyaml/install
-	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-	$(CP) \
-	    $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-	    $(1)$(PYTHON_PKG_DIR)
-endef
-
-$(eval $(call BuildPackage,pyyaml))
-

file:a/libs/ldns/Makefile (deleted)
--- a/libs/ldns/Makefile
+++ /dev/null
@@ -1,81 +1,1 @@
-#
-# Copyright (C) 2011-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:=ldns
-PKG_VERSION:=1.6.17
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.nlnetlabs.nl/downloads/ldns
-PKG_MD5SUM:=a79423bcc4129e6d59b616b1cae11e5e
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libldns/Default
-  URL:=http://www.nlnetlabs.nl/projects/ldns/
-  DEPENDS:=+libopenssl
-endef
-
-define Package/libldns
-  $(call Package/libldns/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A library to simplify DNS programming
-endef
-
-define Package/libldns/description
-  The goal of ldns is to simplify DNS programming, it supports recent RFCs like
-  the DNSSEC documents, and allows developers to easily create software
-  conforming to current RFCs, and experimental software for current Internet
-  Drafts.
-endef
-
-define Package/drill
-  $(call Package/libldns/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  TITLE:=DNS(SEC) information tool
-  DEPENDS+= +libldns
-endef
-
-define Package/drill/description
-  drill is a tool to designed to get all sorts of information out of the DNS. It
-  is specificly designed to be used with DNSSEC.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-ecdsa \
-	--disable-gost \
-	--with-drill \
-	--with-ssl="$(STAGING_DIR)/usr"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ldns $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libldns.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libldns/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libldns.so.* $(1)/usr/lib/
-endef
-
-define Package/drill/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/drill $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libldns))
-$(eval $(call BuildPackage,drill))
-

--- a/libs/libmicrohttpd/Makefile
+++ /dev/null
@@ -1,54 +1,1 @@
-#
-# Copyright (C) 2011-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:=libmicrohttpd
-PKG_VERSION:=0.9.19
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/libmicrohttpd
-PKG_MD5SUM:=0f4c55ba224ce75b3b993b558e072a6b
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmicrohttpd
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Microhttpd
-  URL:=http://www.gnu.org/software/libmicrohttpd
-  DEPENDS:=+libpthread
-endef
-
-define Package/libmicrohttpd/description
- GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-curl \
-	--disable-https \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/microhttpd.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmicrohttpd.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libmicrohttpd/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmicrohttpd))
-

--- a/libs/libmicroxml/Makefile
+++ /dev/null
@@ -1,54 +1,1 @@
-#
-# 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:=libmicroxml
-PKG_VERSION:=2012-06-11
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://dev.freecwmp.org/microxml
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmicroxml
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=XML library
-endef
-
-define Package/libmicroxml/description
- A micro sized XML library
-endef
-
-CONFIGURE_ARGS += \
-	--disable-threads \
-	--enable-static \
-	--enable-shared
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig
-endef
-
-define Package/libmicroxml/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,libmicroxml))
-

file:a/libs/libshout/Makefile (deleted)
--- a/libs/libshout/Makefile
+++ /dev/null
@@ -1,67 +1,1 @@
-#
-# Copyright (C) 2008-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:=libshout
-PKG_VERSION:=2.3.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/libshout/
-PKG_MD5SUM:=11765b2592e7ea623ccd93d3f8df172c
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(FPIC) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Package/libshout
-  SECTION:=libs
-  DEPENDS:= +libspeex +libtheora +libvorbis +libvorbisidec +libpthread
-  CATEGORY:=Libraries
-  TITLE:=Library which can be used to write a source client like ices
-  URL:=http://www.icecast.org/download.php
-endef
-
-define Package/libshout/description
-	libshout allows applications to easily communicate and broadcast
-	to an Icecast streaming media server. It handles the socket connections,
-	metadata communication, and data streaming for the calling application,
-	and lets developers focus on feature sets instead of implementation
-	details.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		VORBIS_CFLAGS="-I$(STAGING_DIR)/usr/include/tremor/" \
-		VORBIS_LIBS="$(TARGET_LDFLAGS) -lvorbis -lvorbisidec" \
-		--enable-shared \
-		--enable-static \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/shout
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/shout/shout.h $(1)/usr/include/shout
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(SED) 's|/usr/include|$(STAGING_DIR)/usr/include|' \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc $(1)/usr/lib/pkgconfig/		
-endef
-
-define Package/libshout/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libshout))
-

--- a/libs/libshout/patches/120-vorbis-c.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/src/vorbis.c
-+++ b/src/vorbis.c
-@@ -28,7 +28,7 @@
- #endif
- #include <stdlib.h>
- 
--#include <vorbis/codec.h>
-+#include <tremor/ivorbiscodec.h>
- 
- #include "shout_private.h"
- #include "shout_ogg.h"
 

--- a/libs/libshout/patches/140-no_example_doc_win32.patch
+++ /dev/null
@@ -1,18 +1,1 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -288,12 +288,12 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.6 foreign
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = include src examples debian doc win32
-+SUBDIRS = include src debian
- EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
- 	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
- 	m4/xiph_types.m4
- 
--doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
-+doc_DATA = COPYING NEWS README
- m4datadir = $(datadir)/aclocal
- m4data_DATA = m4/shout.m4
- @HAVE_PKGCONFIG_TRUE@pkgconfigdir = $(libdir)/pkgconfig
 

file:a/libs/libyaml/Makefile (deleted)
--- a/libs/libyaml/Makefile
+++ /dev/null
@@ -1,49 +1,1 @@
-#
-# Copyright (C) 2008-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:=yaml
-PKG_VERSION:=0.1.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://pyyaml.org/download/libyaml/
-PKG_MD5SUM:=5fe00cda18ca5daeb43762b80c38e06e
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(FPIC)
-
-define Package/libyaml
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=libyaml
-  URL:=http://pyyaml.org/wiki/LibYAML
-endef
-
-define Package/libyaml/description
-  yaml library written in c
-endef
-
-define Package/libyaml/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libyaml.so $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libyaml.{a,la} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libyaml))
-

file:a/libs/sctp/Makefile (deleted)
--- a/libs/sctp/Makefile
+++ /dev/null
@@ -1,61 +1,1 @@
-#
-# Copyright (C) 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:=lksctp-tools
-PKG_VERSION:=1.0.11
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/lksctp/
-PKG_MD5SUM:=e9cf6c57402c9d4f1173a9529466e16d
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-#####
-## lksctp library: provides sctp_* functions in user space
-#####
-
-define Package/sctp
-  SECTION:=libs
-  CATEGORY:=Network
-  TITLE:=SCTP user-land library
-  URL:=http://lksctp.sourceforge.net
-  DEPENDS:=+kmod-sctp
-endef
-
-define Package/sctp/description
- SCTP user-land library for sctp_* functions (when socket API is too limited).
-endef
-
-TARGET_LDFLAGS := -L$(STAGING_DIR)/usr/lib $(TARGET_LDFLAGS)
-
-define Package/sctp/install
-	# Install the library in the router
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsctp.so* \
-		$(1)/usr/lib/
-	# And also in staging for dependent packages
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/netinet
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/netinet/* \
-		$(STAGING_DIR)/usr/include/netinet/
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libsctp.so* \
-		$(STAGING_DIR)/usr/lib/
-
-endef
-
-$(eval $(call BuildPackage,sctp))
-
-

file:a/net/apcupsd/Makefile (deleted)
--- a/net/apcupsd/Makefile
+++ /dev/null
@@ -1,75 +1,1 @@
-#
-# 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:=apcupsd
-PKG_VERSION:=3.14.7
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/apcupsd
-PKG_MD5SUM:=bb2f8e4fc6b2f5d7b3e236eb57b81640
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/apcupsd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libpthread +libusb-compat
-  TITLE:=UPS control software
-  URL:=http://www.apcupsd.org/
-endef
-
-define Build/Configure
-	$(CP) $(SCRIPT_DIR)/config.* $(PKG_BUILD_DIR)/autoconf/
-	$(call Build/Configure/Default, \
-		--with-distname=unknown \
-		--sysconfdir=/etc/apcupsd \
-		--enable-usb \
-		--without-x \
-	)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		LD="$(TARGET_CC)" \
-		all install
-endef
-
-define Package/apcupsd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apcupsd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smtp $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apctest $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apcaccess $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/apcupsd
-	$(INSTALL_CONF) ./files/apcupsd.conf $(1)/etc/apcupsd/
-	$(INSTALL_CONF) ./files/apcupsd_mail.conf $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/changeme $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/commfailure $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/commok $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/offbattery $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/onbattery $(1)/etc/apcupsd/
-	$(INSTALL_BIN) ./files/apccontrol $(1)/etc/apcupsd/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN)	./files/apcupsd.init $(1)/etc/init.d/apcupsd
-endef
-
-define Package/apcupsd/conffiles
-/etc/apcupsd/apcupsd.conf
-/etc/apcupsd/apcupsd_mail.conf
-/etc/apcupsd/changeme
-/etc/apcupsd/commfailure
-/etc/apcupsd/commok
-/etc/apcupsd/offbattery
-/etc/apcupsd/onbattery
-endef
-
-$(eval $(call BuildPackage,apcupsd))
-

--- a/net/apcupsd/files/apccontrol
+++ /dev/null
@@ -1,147 +1,1 @@
-#!/bin/sh
-#
-# Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it>
-#
-#  for apcupsd release 3.14.1 (04 May 2007) - unknown
-#
-# platforms/apccontrol.  Generated from apccontrol.in by configure.
-#
-#  Note, this is a generic file that can be used by most
-#   systems. If a particular system needs to have something
-#   special, start with this file, and put a copy in the
-#   platform subdirectory.
-#
 
-#
-# These variables are needed for set up the autoconf other variables.
-#
-prefix=/usr
-exec_prefix=/usr
-
-APCPID=/var/run/apcupsd.pid
-APCUPSD=/usr/sbin/apcupsd
-SHUTDOWN=/sbin/shutdown
-SCRIPTSHELL=/bin/sh
-SCRIPTDIR=/etc/apcupsd
-WALL=true
-
-#
-# Concatenate all output from this script to the events file
-#  Note, the following kills the script in a power fail situation
-#   where the disks are mounted read-only.
-# exec >>/var/log/apcupsd.events 2>&1
-
-#
-# This piece is to substitute the default behaviour with your own script,
-# perl, or C program.
-# You can customize every single command creating an executable file (may be a
-# script or a compiled program) and calling it the same as the $1 parameter
-# passed by apcupsd to this script.
-#
-# After executing your script, apccontrol continues with the default action.
-# If you do not want apccontrol to continue, exit your script with exit 
-# code 99. E.g. "exit 99".
-#
-# WARNING: the apccontrol file will be overwritten every time you update your
-# apcupsd, doing `make install'. Your own customized scripts will _not_ be
-# overwritten. If you wish to make changes to this file (discouraged), you
-# should change apccontrol.sh.in and then rerun the configure process.
-#
-if [ -f ${SCRIPTDIR}/${1} -a -x ${SCRIPTDIR}/${1} ]
-then
-    ${SCRIPTDIR}/${1} ${2} ${3} ${4}
-    # exit code 99 means he does not want us to do default action
-    if [ $? = 99 ] ; then
-	exit 0
-    fi
-fi
-
-case "$1" in
-    killpower)
-	echo "Apccontrol doing: ${APCUPSD} --killpower on UPS ${2}"
-	sleep 10
-	${APCUPSD} --killpower
-	echo "Apccontrol has done: ${APCUPSD} --killpower on UPS ${2}" | ${WALL}
-    ;;
-    commfailure)
-	echo "Warning communications lost with UPS ${2}" | ${WALL}
-    ;;
-    commok)
-	echo "Communications restored with UPS ${2}" | ${WALL}
-    ;;
-#
-# powerout, onbattery, offbattery, mainsback events occur
-#   in that order.
-#
-    powerout)
-	echo "Warning power loss detected on UPS ${2}" | ${WALL}
-    ;;
-    onbattery)
-	echo "Power failure on UPS ${2}. Running on batteries." | ${WALL}
-    ;;
-    offbattery)
-    ;;
-    mainsback)
-	echo "Power has returned on UPS ${2}..." | ${WALL}
-	if [ -f /etc/powerfail ] ; then
-	   printf "Continuing with shutdown."  | ${WALL}
-	fi
-    ;;
-    failing)
-	echo "Battery power exhaused on UPS ${2}. Doing shutdown." | ${WALL}
-    ;;
-    timeout)
-	echo "Battery time limit exceeded on UPS ${2}. Doing shutdown." | ${WALL}
-    ;;
-    loadlimit)
-	echo "Remaining battery charge below limit on UPS ${2}. Doing shutdown." | ${WALL}
-    ;;
-    runlimit)
-	echo "Remaining battery runtime below limit on UPS ${2}. Doing shutdown." | ${WALL}
-    ;;
-    doreboot)
-	echo "UPS ${2} initiating Reboot Sequence" | ${WALL}
-	${SHUTDOWN} -r now "apcupsd UPS ${2} initiated reboot"
-    ;;
-    doshutdown)
-	echo "UPS ${2} initiated Shutdown Sequence" | ${WALL}
-	${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown"
-    ;;
-    annoyme)
-	echo "Power problems with UPS ${2}. Please logoff." | ${WALL}
-    ;;
-    emergency)
-	echo "Emergency Shutdown. Possible battery failure on UPS ${2}." | ${WALL}
-    ;;
-    changeme)
-	echo "Emergency! Batteries have failed on UPS ${2}. Change them NOW" | ${WALL}
-    ;;
-    remotedown)
-	echo "Remote Shutdown. Beginning Shutdown Sequence." | ${WALL}
-    ;;
-    restartme)
-	echo -n "Restarting APCUPSD Power Management: "
-	THEPID=`cat ${APCPID}`
-	kill ${THEPID}
-	rm -f ${APCPID}
-	rm -f /etc/powerfail
-	rm -f /etc/nologin
-	sleep 5
-	`${APCUPSD}`
-	echo "apcupsd"
-    ;;
-    startselftest)
-    ;;
-    endselftest)
-    ;;
-    battdetach)
-    ;;
-    battattach)
-    ;;
-    *)	echo "Usage: ${0##*/} command"
-	echo "	     warning: this script is intended to be launched by"
-	echo "	     apcupsd and should never be launched by users."
-	exit 1
-    ;;
-esac
-

--- a/net/apcupsd/files/apcupsd.conf
+++ /dev/null
@@ -1,323 +1,1 @@
-## apcupsd.conf v1.1 ##
-# 
-#  for apcupsd release 3.14.1 (04 May 2007) - unknown
-#
-# "apcupsd" POSIX config file
 
-#
-# ========= General configuration parameters ============
-#
-
-# UPSNAME xxx
-#   Use this to give your UPS a name in log files and such. This
-#   is particulary useful if you have multiple UPSes. This does not
-#   set the EEPROM. It should be 8 characters or less.
-UPSNAME ups1
-
-# UPSCABLE <cable>
-#   Defines the type of cable connecting the UPS to your computer.
-#
-#   Possible generic choices for <cable> are:
-#     simple, smart, ether, usb
-#
-#   Or a specific cable model number may be used:
-#     940-0119A, 940-0127A, 940-0128A, 940-0020B,
-#     940-0020C, 940-0023A, 940-0024B, 940-0024C,
-#     940-1524C, 940-0024G, 940-0095A, 940-0095B,
-#     940-0095C, M-04-02-2000
-#
-UPSCABLE smart
-
-# To get apcupsd to work, in addition to defining the cable
-# above, you must also define a UPSTYPE, which corresponds to
-# the type of UPS you have (see the Description for more details).
-# You must also specify a DEVICE, sometimes referred to as a port.
-# For USB UPSes, please leave the DEVICE directive blank. For
-# other UPS types, you must specify an appropriate port or address.
-#
-# UPSTYPE   DEVICE           Description
-# apcsmart  /dev/tty**       Newer serial character device,
-#                            appropriate for SmartUPS models using
-#                            a serial cable (not USB).
-#
-# usb       <BLANK>          Most new UPSes are USB. A blank DEVICE
-#                            setting enables autodetection, which is
-#                            the best choice for most installations.
-#
-# net       hostname:port    Network link to a master apcupsd
-#                            through apcupsd's Network Information
-#                            Server. This is used if you don't have
-#                            a UPS directly connected to your computer.
-#
-# snmp      hostname:port:vendor:community
-#                            SNMP Network link to an SNMP-enabled
-#                            UPS device. Vendor is the MIB used by
-#                            the UPS device: can be "APC", "APC_NOTRAP"
-#                            or "RFC" where APC is the powernet MIB,
-#                            "APC_NOTRAP" is powernet with SNMP trap
-#                            catching disabled, and RFC is the IETF's 
-#                            rfc1628 UPS-MIB. You usually want "APC".
-#                            Port is usually 161. Community is usually
-#                            "private".
-#
-# dumb      /dev/tty**       Old serial character device for use 
-#                            with simple-signaling UPSes.
-#
-# pcnet    ipaddr:username:passphrase
-#                            PowerChute Network Shutdown protocol
-#                            which can be used as an alternative to SNMP
-#                            with AP9617 family of smart slot cards.
-#                            ipaddr is the IP address of the UPS mgmt
-#                            card. username and passphrase are the
-#                            credentials for which the card has been
-#                            configured.
-#
-UPSTYPE apcsmart
-DEVICE /dev/ttyS0
-
-
-# LOCKFILE <path to lockfile>
-#   Path for device lock file. Not used on Win32.
-LOCKFILE /var/lock
-
-# SCRIPTDIR <path to script directory>
-#   Directory in which apccontrol and event scripts are located.
-SCRIPTDIR /etc/apcupsd
-
-# PWRFAILDIR <path to powerfail directory>
-#   Directory in which to write the powerfail flag file. This file
-#   is created when apcupsd initiates a system shutdown and is
-#   checked in the OS halt scripts to determine if a killpower
-#   (turning off UPS output power) is required.
-PWRFAILDIR /etc
-
-# NOLOGINDIR <path to nologin directory>
-#   Directory in which to write the nologin file. The existence
-#   of this flag file tells the OS to disallow new logins.
-NOLOGINDIR /etc
-
-
-#
-# ======== Configuration parameters used during power failures ==========
-#
-
-# The ONBATTERYDELAY is the time in seconds from when a power failure
-#   is detected until we react to it with an onbattery event.
-#
-#   This means that, apccontrol will be called with the powerout argument
-#   immediately when a power failure is detected.  However, the
-#   onbattery argument is passed to apccontrol only after the 
-#   ONBATTERYDELAY time.  If you don't want to be annoyed by short
-#   powerfailures, make sure that apccontrol powerout does nothing
-#   i.e. comment out the wall.
-#ONBATTERYDELAY 6
-
-# 
-# Note: BATTERYLEVEL, MINUTES, and TIMEOUT work in conjunction, so
-# the first that occurs will cause the initation of a shutdown.
-#
-
-# If during a power failure, the remaining battery percentage
-# (as reported by the UPS) is below or equal to BATTERYLEVEL, 
-# apcupsd will initiate a system shutdown.
-BATTERYLEVEL 5
-
-# If during a power failure, the remaining runtime in minutes 
-# (as calculated internally by the UPS) is below or equal to MINUTES,
-# apcupsd, will initiate a system shutdown.
-MINUTES 3
-
-# If during a power failure, the UPS has run on batteries for TIMEOUT
-# many seconds or longer, apcupsd will initiate a system shutdown.
-# A value of 0 disables this timer.
-#
-#  Note, if you have a Smart UPS, you will most likely want to disable
-#    this timer by setting it to zero. That way, you UPS will continue
-#    on batteries until either the % charge remaing drops to or below BATTERYLEVEL,
-#    or the remaining battery runtime drops to or below MINUTES.  Of course,
-#    if you are testing, setting this to 60 causes a quick system shutdown
-#    if you pull the power plug.   
-#  If you have an older dumb UPS, you will want to set this to less than
-#    the time you know you can run on batteries.
-TIMEOUT 0
-
-#  Time in seconds between annoying users to signoff prior to
-#  system shutdown. 0 disables.
-ANNOY 300
-
-# Initial delay after power failure before warning users to get
-# off the system.
-ANNOYDELAY 60
-
-# The condition which determines when users are prevented from
-# logging in during a power failure.
-# NOLOGON <string> [ disable | timeout | percent | minutes | always ]
-NOLOGON disable
-
-# If KILLDELAY is non-zero, apcupsd will continue running after a
-# shutdown has been requested, and after the specified time in
-# seconds attempt to kill the power. This is for use on systems
-# where apcupsd cannot regain control after a shutdown.
-# KILLDELAY <seconds>  0 disables
-KILLDELAY 0
-
-#
-# ==== Configuration statements for Network Information Server ====
-#
-
-# NETSERVER [ on | off ] on enables, off disables the network
-#  information server. If netstatus is on, a network information
-#  server process will be started for serving the STATUS and
-#  EVENT data over the network (used by CGI programs).
-NETSERVER on
-
-# NISIP <dotted notation ip address>
-#  IP address on which NIS server will listen for incoming connections.
-#  This is useful if your server is multi-homed (has more than one
-#  network interface and IP address). Default value is 0.0.0.0 which
-#  means any incoming request will be serviced. Alternatively, you can
-#  configure this setting to any specific IP address of your server and 
-#  NIS will listen for connections only on that interface. Use the
-#  loopback address (127.0.0.1) to accept connections only from the
-#  local machine.
-NISIP 0.0.0.0
-
-# NISPORT <port> default is 3551 as registered with the IANA
-#  port to use for sending STATUS and EVENTS data over the network.
-#  It is not used unless NETSERVER is on. If you change this port,
-#  you will need to change the corresponding value in the cgi directory
-#  and rebuild the cgi programs.
-NISPORT 3551
-
-# If you want the last few EVENTS to be available over the network
-# by the network information server, you must define an EVENTSFILE.
-EVENTSFILE /var/log/apcupsd.events
-
-# EVENTSFILEMAX <kilobytes>
-#  By default, the size of the EVENTSFILE will be not be allowed to exceed
-#  10 kilobytes.  When the file grows beyond this limit, older EVENTS will
-#  be removed from the beginning of the file (first in first out).  The
-#  parameter EVENTSFILEMAX can be set to a different kilobyte value, or set
-#  to zero to allow the EVENTSFILE to grow without limit.
-EVENTSFILEMAX 10
-
-#
-# ========== Configuration statements used if sharing =============
-#            a UPS with more than one machine
-
-# NETTIME <int>
-#   Interval (in seconds) at which the NIS client polls the server.
-#   Used only when this apcupsd is a network client (UPSTYPE net).
-#NETTIME 60
-
-#
-# Remaining items are for ShareUPS (APC expansion card) ONLY
-#
-
-# UPSCLASS [ standalone | shareslave | sharemaster ]
-#   Normally standalone unless you share an UPS using an APC ShareUPS
-#   card.
-UPSCLASS standalone
-
-# UPSMODE [ disable | share ]
-#   Normally disable unless you share an UPS using an APC ShareUPS card.
-UPSMODE disable
-
-#
-# ===== Configuration statements to control apcupsd system logging ========
-#
-
-# Time interval in seconds between writing the STATUS file; 0 disables
-STATTIME 0
-
-# Location of STATUS file (written to only if STATTIME is non-zero)
-STATFILE /var/log/apcupsd.status
-
-# LOGSTATS [ on | off ] on enables, off disables
-# Note! This generates a lot of output, so if         
-#       you turn this on, be sure that the
-#       file defined in syslog.conf for LOG_NOTICE is a named pipe.
-#  You probably do not want this on.
-LOGSTATS off
-
-# Time interval in seconds between writing the DATA records to
-#   the log file. 0 disables.
-DATATIME 0
-
-# FACILITY defines the logging facility (class) for logging to syslog. 
-#          If not specified, it defaults to "daemon". This is useful 
-#          if you want to separate the data logged by apcupsd from other
-#          programs.
-#FACILITY DAEMON
-
-#
-# ========== Configuration statements used in updating the UPS EPROM =========
-#
-
-#
-# These statements are used only by apctest when choosing "Set EEPROM with conf
-# file values" from the EEPROM menu. THESE STATEMENTS HAVE NO EFFECT ON APCUPSD.
-#
-
-# UPS name, max 8 characters 
-#UPSNAME UPS_IDEN
-
-# Battery date - 8 characters
-#BATTDATE mm/dd/yy
-
-# Sensitivity to line voltage quality (H cause faster transfer to batteries)  
-# SENSITIVITY H M L        (default = H)
-#SENSITIVITY H
-
-# UPS delay after power return (seconds)
-# WAKEUP 000 060 180 300   (default = 0)
-#WAKEUP 60
-
-# UPS Grace period after request to power off (seconds)
-# SLEEP 020 180 300 600    (default = 20)
-#SLEEP 180
-
-# Low line voltage causing transfer to batteries
-# The permitted values depend on your model as defined by last letter 
-#  of FIRMWARE or APCMODEL. Some representative values are:
-#    D 106 103 100 097
-#    M 177 172 168 182
-#    A 092 090 088 086
-#    I 208 204 200 196     (default = 0 => not valid)
-#LOTRANSFER  208
-
-# High line voltage causing transfer to batteries
-# The permitted values depend on your model as defined by last letter 
-#  of FIRMWARE or APCMODEL. Some representative values are:
-#    D 127 130 133 136
-#    M 229 234 239 224
-#    A 108 110 112 114
-#    I 253 257 261 265     (default = 0 => not valid)
-#HITRANSFER 253
-
-# Battery charge needed to restore power
-# RETURNCHARGE 00 15 50 90 (default = 15)
-#RETURNCHARGE 15
-
-# Alarm delay 
-# 0 = zero delay after pwr fail, T = power fail + 30 sec, L = low battery, N = never
-# BEEPSTATE 0 T L N        (default = 0)
-#BEEPSTATE T
-
-# Low battery warning delay in minutes
-# LOWBATT 02 05 07 10      (default = 02)
-#LOWBATT 2
-
-# UPS Output voltage when running on batteries
-# The permitted values depend on your model as defined by last letter 
-#  of FIRMWARE or APCMODEL. Some representative values are:
-#    D 115
-#    M 208
-#    A 100
-#    I 230 240 220 225     (default = 0 => not valid)
-#OUTPUTVOLTS 230
-
-# Self test interval in hours 336=2 weeks, 168=1 week, ON=at power on
-# SELFTEST 336 168 ON OFF  (default = 336)
-#SELFTEST 336
-

--- a/net/apcupsd/files/apcupsd.init
+++ /dev/null
@@ -1,13 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=50
-STOP=50
 
-start() {
-	/usr/sbin/apcupsd -f /etc/apcupsd/apcupsd.conf
-}
-
-stop() {
-	kill $(cat /var/run/apcupsd.pid)
-}
-

--- a/net/apcupsd/files/apcupsd_mail.conf
+++ /dev/null
@@ -1,7 +1,1 @@
-#!/bin/sh
 
-MAILPROG="/usr/sbin/smtp"
-MAILHOST="mail:25"
-FROM="OpenWrt"
-TO="apcups@example.com"
-HOSTNAME="OpenWrt"

--- a/net/apcupsd/files/changeme
+++ /dev/null
@@ -1,18 +1,1 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when apcupsd
-# detects that the battery should be replaced.
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
 
-MSG="$HOSTNAME UPS battery needs changing NOW."
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
-

--- a/net/apcupsd/files/commfailure
+++ /dev/null
@@ -1,18 +1,1 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when apcupsd
-# loses contact with the UPS (i.e. the serial connection is not responding).
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
 
-MSG="$HOSTNAME Communications with UPS lost"
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
-

--- a/net/apcupsd/files/commok
+++ /dev/null
@@ -1,18 +1,1 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when apcupsd
-# restores contact with the UPS (i.e. the serial connection is restored).
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
 
-MSG="$HOSTNAME Communications with UPS restored"
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
-

--- a/net/apcupsd/files/offbattery
+++ /dev/null
@@ -1,18 +1,1 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when the    
-# UPS goes back on to the mains after a power failure.
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
 
-MSG="$HOSTNAME Power has returned"
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
-

--- a/net/apcupsd/files/onbattery
+++ /dev/null
@@ -1,18 +1,1 @@
-#!/bin/sh
-#
-# This shell script if placed in /etc/apcupsd
-# will be called by /etc/apcupsd/apccontrol when the UPS
-# goes on batteries.
-# We send an email message to root to notify him.
-#
-. /etc/apcupsd/apcupsd_mail.conf
 
-MSG="$HOSTNAME Power Failure !!!"
-#
-(
-   echo "$MSG"
-   echo " "
-   /usr/sbin/apcaccess status
-) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO
-exit 0
-

--- a/net/apcupsd/patches/010-fix-include-paths.patch
+++ /dev/null
@@ -1,14 +1,1 @@
-diff --git a/autoconf/variables.mak.in b/autoconf/variables.mak.in
-index b67e467..6022434 100644
---- a/autoconf/variables.mak.in
-+++ b/autoconf/variables.mak.in
-@@ -65,7 +65,7 @@ DRVLIBS = @PTHREAD_LFLAGS@ @DRVLIBS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- 
--CPPFLAGS = @CPPFLAGS@ -I$(topdir)/include $(EXTRAINCS)
-+CPPFLAGS = -I$(topdir)/include @CPPFLAGS@ $(EXTRAINCS)
- CFLAGS = $(CPPFLAGS) @CFLAGS@ @PTHREAD_CFLAGS@
- CXXFLAGS = $(CPPFLAGS) @CXXFLAGS@ @PTHREAD_CFLAGS@
- LDFLAGS = @LDFLAGS@
 

--- a/net/atftp/Makefile
+++ b/net/atftp/Makefile
@@ -43,7 +43,7 @@
 CONFIGURE_VARS += \
 	LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_CFLAGS)"
 
-ifdef CONFIG_USE_EGLIBC
+ifdef CONFIG_USE_GLIBC
   TARGET_CFLAGS += -DHAVE_ARGZ=1
 
   define Build/Prepare

--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@@ -398,6 +398,7 @@
 		--enable-shared \
 		--enable-image \
 		--enable-libusb \
+		--disable-acl \
 		--disable-dbus \
 		--disable-dnssd \
 		--disable-launchd \

file:a/net/fakeidentd/Makefile (deleted)
--- a/net/fakeidentd/Makefile
+++ /dev/null
@@ -1,47 +1,1 @@
-#
-# 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:=fakeidentd
-PKG_VERSION:=2.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).c
-PKG_SOURCE_URL:=http://distfiles.gentoo.org/distfiles/
-PKG_MD5SUM:=d26693c1a7c883d1432e05fb6f7ead6e
-UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(1)/
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fakeidentd
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=A static, secure identd.
-  URL:=http://www.guru-group.fi/~too/sw/releases/
-endef
-
-define Package/fakeidentd/description
-	A static secure identd, only one source file.
-endef
-
-define Build/Compile
-	$(SHELL) "$(PKG_BUILD_DIR)/$(MAKE_PATH)/$(PKG_SOURCE)" \
-	CC="$(TARGET_CC)" TRG="$(PKG_BUILD_DIR)/$(MAKE_PATH)/$(PKG_NAME)" \
-	$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS) \
-	$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) -DUSE_UNIX_OS
-endef
-
-define Package/fakeidentd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-endef
-
-$(eval $(call BuildPackage,fakeidentd))
-

--- a/net/fakeidentd/files/fakeidentd.init
+++ /dev/null
@@ -1,13 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2012 OpenWrt.org
 
-START=85
-
-start() {
-	service_start /usr/sbin/fakeidentd -r
-}
-
-stop() {
-	service_stop /usr/sbin/fakeidentd
-}
-

--- a/net/l7-protocols/Makefile
+++ /dev/null
@@ -1,79 +1,1 @@
-include $(TOPDIR)/rules.mk
 
-PKG_NAME:=l7-protocols
-PKG_VERSION:=2009-05-28
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/l7-filter
-PKG_MD5SUM:=91be154d12134dcdbc560cc7aa7fe4ce
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/l7-protocols
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Protocols for layer7 filtering
-  URL:=http://l7-filter.sourceforge.net/
-  SUBMENU:=Firewall
-  DEPENDS:=iptables-mod-filter
-endef
-
-define Package/l7-protocols/description
-       l7-filter classifies packets based on patterns in application
-       layer data. This allows correct classification of P2P traffic that
-       uses unpredictable ports as well as standard protocols running on
-       non-standard ports.
-endef
-
-define Package/l7-protocols-testing
-	$(call Package/l7-protocols)
-	TITLE:=testing utilities for layer7
-	DEPENDS+=l7-protocols $(CXX_DEPENDS)
-endef
-
-define Package/l7-protocols-testing/description
-	testing utilities for layer 7 patterns
-endef
-
-define Build/Configure
-endef
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_l7-protocols-testing),)
-  define Build/Compile
-	cd $(PKG_BUILD_DIR)/testing && $(MAKE) $(CONFIGURE_VARS)
-  endef
-else
-  define Build/Compile
-  endef
-endif
-
-define Package/l7-protocols/install
-	$(INSTALL_DIR) $(1)/etc/l7-protocols
-	$(CP) $(PKG_BUILD_DIR)/example_traffic \
-		$(PKG_BUILD_DIR)/extra \
-		$(PKG_BUILD_DIR)/file_types \
-		$(PKG_BUILD_DIR)/groups.sh \
-		$(PKG_BUILD_DIR)/malware \
-		$(PKG_BUILD_DIR)/protocols \
-		$(1)/etc/l7-protocols
-endef
-
-define Package/l7-protocols-testing/install
-	$(INSTALL_DIR) $(1)/etc/l7-protocols/testing
-	$(CP) $(PKG_BUILD_DIR)/testing/data \
-		$(1)/etc/l7-protocols/testing
-	$(INSTALL_BIN) \
-		$(PKG_BUILD_DIR)/testing/rand{chars,printable} \
-		$(PKG_BUILD_DIR)/testing/test_speed-{kernel,userspace} \
-		$(PKG_BUILD_DIR)/testing/match_kernel \
-		$(PKG_BUILD_DIR)/testing/doallspeeds.sh \
-		$(PKG_BUILD_DIR)/testing/test_match.sh \
-		$(PKG_BUILD_DIR)/testing/timeit.sh \
-		$(1)/etc/l7-protocols/testing
-endef
-
-$(eval $(call BuildPackage,l7-protocols))
-$(eval $(call BuildPackage,l7-protocols-testing))
-

--- a/net/l7-protocols/patches/100-testing_crosscompile.patch
+++ /dev/null
@@ -1,28 +1,1 @@
---- a/testing/Makefile
-+++ b/testing/Makefile
-@@ -1,19 +1,19 @@
- all: randchars randprintable test_speed-kernel test_speed-userspace match_kernel
- 
- randchars: randchars.c
--	gcc -O2 -o randchars randchars.c
-+	$(CC) $(CFLAGS) -o randchars randchars.c
- 
- randprintable: randprintable.c
--	gcc -O2 -o randprintable randprintable.c
-+	$(CC) $(CFLAGS) -o randprintable randprintable.c
- 
- test_speed-kernel: test_speed-kernel.c
--	gcc -o test_speed-kernel test_speed-kernel.c
-+	$(CC) $(CFLAGS) -o test_speed-kernel test_speed-kernel.c
- 
- test_speed-userspace: test_speed-userspace.cpp l7-parse-patterns.cpp l7-parse-patterns.h
--	g++ -Wall -o test_speed-userspace test_speed-userspace.cpp l7-parse-patterns.cpp
-+	$(CXX) $(CXXFLAGS) -Wall -o test_speed-userspace test_speed-userspace.cpp l7-parse-patterns.cpp
- 
- match_kernel: match-kernel.c
--	gcc -O2 -o match_kernel match-kernel.c
-+	$(CC) $(CFLAGS) -o match_kernel match-kernel.c
- 
- clean:
- 	rm -f randprintable randchars test_speed-kernel test_speed-userspace match_kernel
 

--- a/net/l7-protocols/patches/101-testing-timeit.patch
+++ /dev/null
@@ -1,103 +1,1 @@
---- a/testing/timeit.sh
-+++ b/testing/timeit.sh
-@@ -1,11 +1,8 @@
- #!/bin/bash
- 
--# "man 1 time" for details
--export TIME="%U seconds"
--
- add()
- {
--	if ! dc -e ""; then
-+	if ! dc p >/dev/null 2>&1; then
- 	        echo you do not have dc, so I cannot add these numbers...
- 	        exit 1
- 	fi
-@@ -14,7 +11,7 @@ add()
- 	tot=0
- 
- 	while read n; do
--	        tot=`dc -e "$n $tot + pop" 2> /dev/null`
-+	        tot=`dc $n $tot + p 2> /dev/null`
- 	done
- 
- 	echo $tot seconds
-@@ -34,7 +31,7 @@ extract()
- 
- if [ ! $3 ] || [ $2 == "-h" ] || [ $2 == "--help" ]; then
- 	echo
--	echo Syntax: ./timeit.sh patternfile kernel\|userspace all\|print\|real [data_files]
-+	echo Syntax: .//usr/bin/timeit.sh patternfile kernel\|userspace all\|print\|real [data_files]
- 	echo
- 	echo \"kernel\" uses the kernel pattern and library
- 	echo \"userspace\" uses userspace pattern and library
-@@ -72,12 +69,12 @@ echo Timing $1
- if [ $3 == "all" ]; then
- 	echo Using all characters
- 	if [ $2 == "kernel" ]; then
--		if ! ./randchars | time $speedprog "`extract $1`" verbose; then
-+		if ! ./randchars | /usr/bin/time $speedprog "`extract $1`" verbose 2>&1 >/dev/null | grep user | cut -d\  -f2; then
- 			echo $speedprog failed. > /dev/stderr
- 			exit 1
- 		fi
- 	else
--		if ! ./randchars | time $speedprog -f "$1" -v; then
-+		if ! ./randchars | /usr/bin/time $speedprog -f "$1" -v 2>&1 >/dev/null | grep user | cut -d\  -f2; then
- 			echo $speedprog failed. > /dev/stderr
- 			exit 1
- 		fi
-@@ -85,12 +82,12 @@ if [ $3 == "all" ]; then
- elif [ $3 == "print" ]; then
- 	echo Using only printable characters
- 	if [ $2 == "kernel" ]; then
--		if ! ./randprintable | time $speedprog "`extract $1`" verbose; then
-+		if ! ./randprintable | /usr/bin/time $speedprog "`extract $1`" verbose 2>&1 >/dev/null | grep user | cut -d\  -f2; then
- 			echo $speedprog failed. > /dev/stderr
- 			exit 1
- 		fi
- 	else
--		if ! ./randprintable | time $speedprog -f "$1" -v; then
-+		if ! ./randprintable | /usr/bin/time $speedprog -f "$1" -v 2>&1 >/dev/null | grep user | cut -d\  -f2; then
- 			echo $speedprog failed. > /dev/stderr
- 			exit 1
- 		fi
-@@ -107,12 +104,12 @@ elif [ $3 == "real" ]; then
- 				printf $f\\t
- 				#echo `extract $1`
- 				if [ $2 == "kernel" ]; then
--					if ! cat $f | time $speedprog "`extract $1`" 2> /dev/stdout | tee -a tmp.$$; then
-+					if ! cat $f | /usr/bin/time $speedprog "`extract $1`" 2>&1 >/dev/null | grep user | cut -d\  -f2 | tee -a tmp.$$; then
- 						echo $speedprog failed. > /dev/stderr
- 						exit 1
- 					fi
- 				else
--					if ! cat $f | time $speedprog -f "$1" 2> /dev/stdout | tee -a tmp.$$; then
-+					if ! cat $f | /usr/bin/time $speedprog -f "$1" 2>&1 >/dev/null | grep user | cut -d\  -f2 | tee -a tmp.$$; then
- 						echo $speedprog failed. > /dev/stderr
- 						exit 1
- 					fi
-@@ -123,12 +120,12 @@ elif [ $3 == "real" ]; then
- 		for f in data/*; do
- 			printf $f\\t
- 			if [ $2 == "kernel" ]; then
--				if ! cat $f | time $speedprog "`extract $1`" 2> /dev/stdout | tee -a tmp.$$; then
-+				if ! cat $f | /usr/bin/time $speedprog "`extract $1`" 2>&1 >/dev/null | grep user | cut -d\  -f2 | tee -a tmp.$$; then
- 					echo $speedprog failed. > /dev/stderr
- 					exit 1
- 				fi
- 			else
--				if ! cat $f | time $speedprog -f "$1" 2> /dev/stdout | tee -a tmp.$$; then
-+				if ! cat $f | /usr/bin/time $speedprog -f "$1" 2>&1 >/dev/null | grep user | cut -d\  -f2 | tee -a tmp.$$; then
- 					echo $speedprog failed. > /dev/stderr
- 					exit 1
- 				fi
-@@ -137,7 +134,7 @@ elif [ $3 == "real" ]; then
- 	fi
- 
- 	printf Total:\ 
--	cat tmp.$$ | cut -d\  -f 2 | add
-+	cat tmp.$$ | cut -ds -f 1| add
- 
- 	rm tmp.$$
- else
 

--- a/net/l7-protocols/patches/102-testing-doallspeeds.patch
+++ /dev/null
@@ -1,17 +1,1 @@
---- a/testing/doallspeeds.sh
-+++ b/testing/doallspeeds.sh
-@@ -25,11 +25,11 @@ for f in ../*/*.pat; do 
- 	printf `basename $f .pat`
- 
- 	if [ $userspace ]; then 
--		gtime=`./timeit.sh $f userspace   real | grep Total | cut -d\  -f 2`
-+		gtime=`./timeit.sh $f userspace   real | grep Total | cut -d\  -f 2 | awk '{print $1}'`
- 		printf \\t$gtime
- 	fi
- 	if [ $kernel ]; then 
--		htime=`./timeit.sh $f kernel real | grep Total | cut -d\  -f 2`
-+		htime=`./timeit.sh $f kernel real | grep Total | cut -d\  -f 2 | awk '{print $1}'`
- 		printf \\t$htime
- 	fi
- 	printf \\n
 

--- a/net/netdiscover/Makefile
+++ /dev/null
@@ -1,42 +1,1 @@
-#
-# 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:=netdiscover
-PKG_VERSION:=0.3-beta6
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://nixgeneration.com/~jaime/netdiscover/releases/
-PKG_MD5SUM:=0919227a91ecaeeb2443cff249417be2
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/netdiscover
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpcap +libnet1 +libpthread
-  TITLE:=An active/passive address reconnaissance tool
-  URL:=http://nixgeneration.com/~jaime/netdiscover/
-  MAINTAINER:=Daniel Dickinson <openwrt@cshore.neomailbox.net>
-endef
-
-CONFIGURE_VARS+= \
-	CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.1.x/include" \
-	LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libnet-1.1.x/lib" \
-
-define Package/netdiscover/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdiscover $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,netdiscover))
-

--- a/net/netdiscover/patches/00-add-machine-ouput.patch
+++ /dev/null
@@ -1,468 +1,1 @@
-diff -Naur netdiscover-0.3-beta6.orig/src/ifaces.c netdiscover-0.3-beta6/src/ifaces.c
---- netdiscover-0.3-beta6.orig/src/ifaces.c	2009-06-24 18:21:11.000000000 -0400
-+++ netdiscover-0.3-beta6/src/ifaces.c	2009-06-24 21:44:05.000000000 -0400
-@@ -127,6 +127,7 @@
-       memcpy(type, packet + 20, 2); 		/* ARP Opcode */
-       new_arprep_l->header = new_header;	/* Add header */
-       new_arprep_l->count = 1;				/* Count      */
-+      new_arprep_l->printed = 0;
-       new_arprep_l->next = NULL;
-       
-       /* Source IP */
-diff -Naur netdiscover-0.3-beta6.orig/src/main.c netdiscover-0.3-beta6/src/main.c
---- netdiscover-0.3-beta6.orig/src/main.c	2009-06-24 18:21:11.000000000 -0400
-+++ netdiscover-0.3-beta6/src/main.c	2009-06-24 21:34:59.000000000 -0400
-@@ -30,6 +30,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <signal.h>
- #include "ifaces.h"
- #include "screen.h"
- 
-@@ -39,8 +40,17 @@
- 	char *disp;
- 	char *sip;
- 	int autos;
-+	int machine;
- };
- 
-+/* Injection Thread data structure */
-+struct t_inject {
-+  struct t_data *datos;
-+  pthread_t *sniffer;
-+  pthread_t *screen;
-+  pthread_t *keys;
-+  int scan_secs;
-+};
- 
- void *inject_arp(void *arg);
- void *screen_refresh(void *arg);
-@@ -77,7 +87,7 @@
- 
- 
- pthread_t injection, sniffer, screen, keys;
--int fastmode, pcount, node, ssleep;
-+int fastmode, pcount, node, ssleep, nokeywait;
- long sleept;
- 
- 
-@@ -86,7 +96,9 @@
- {
-     while ( 1 == 1 )
-     {
--        read_key();
-+	struct t_data *datos;
-+	datos = (struct t_data *)arg;
-+        read_key(datos->machine);
-     }
- }
- 
-@@ -97,20 +109,24 @@
- 	int c;
- 	int esniff = 0;
- 	int erange = 0;
-+	int scan_secs = 0;
- 	struct t_data datos;
--	
-+	struct t_inject injectdata;
-+
- 	datos.sip = NULL;
- 	datos.disp = NULL;
-+	datos.machine = 0;
- 	datos.autos = 0;
- 	sleept = 99;
- 	node = 67;
- 	pcount = 1;
-+	nokeywait = 0;
- 	
- 	current_network = (char *) malloc ((sizeof(char)) * 16);
- 	sprintf(current_network,"Starting.");
- 	
- 	/* Fetch parameters */
--	while ((c = getopt(argc, argv, "i:s:r:n:c:pSfh")) != EOF)
-+	while ((c = getopt(argc, argv, "i:s:r:n:c:t:pSfhkm")) != EOF)
- 	{
- 		switch (c)
- 		{
-@@ -138,12 +154,20 @@
- 			case  'n':
- 				node = atoi(optarg);
- 				break;
-+
-+            		case 't':
-+		                scan_secs = atoi(optarg);
-+                                break;
- 			
- 			case  'r':
- 				datos.sip = (char *) malloc (sizeof(char) * strlen(optarg));
- 				sprintf(datos.sip, "%s", optarg);
- 				erange = 1;
- 				break;
-+
-+			case 'm':
-+			       datos.machine = 1;
-+			       break;
- 			
- 			case  'f':
- 				fastmode = 1;
-@@ -153,6 +177,10 @@
- 				usage(argv[0]);
- 				exit(1);
- 				break;
-+
-+               		case 'k':
-+			        nokeywait = 1;
-+			        break;
- 			
- 			default:
- 				break;
-@@ -181,7 +209,7 @@
- 	/* Init some stuff */
- 	lnet_init(datos.disp);
- 	init_lists();
--	system("clear");
-+	if (!datos.machine) system("clear");
- 	
- 	/* If no mode was selected, enable auto scan */
- 	if ((erange != 1) && (esniff != 1))
-@@ -189,9 +217,15 @@
- 		datos.autos = 1;
- 	}
- 	
-+	
- 	/* Start the execution */
--	pthread_create(&screen, NULL, screen_refresh, (void *)NULL);
--	pthread_create(&keys, NULL, keys_thread, (void *)NULL);
-+	pthread_create(&screen, NULL, screen_refresh, (void *)&datos);
-+	if (!nokeywait) {
-+	  pthread_create(&keys, NULL, keys_thread, (void *)&datos);
-+	  injectdata.keys = &keys;
-+	} else {
-+	  injectdata.keys = NULL;
-+	}
- 	pthread_create(&sniffer, NULL, start_sniffer, (void *)&datos);
- 	
- 	if (esniff == 1)
-@@ -201,10 +235,19 @@
- 	}
- 	else
- 	{
--		if (pthread_create(&injection, NULL, inject_arp, (void *)&datos))
-+                injectdata.datos = &datos;
-+                injectdata.sniffer = &sniffer;
-+                injectdata.screen = &screen;
-+                injectdata.scan_secs = scan_secs;
-+
-+		if (pthread_create(&injection, NULL, inject_arp, (void *)&injectdata))
- 			perror("Could not create injection thread");
- 		
--		pthread_join(sniffer,NULL);
-+		if (scan_secs > 0) {
-+		  pthread_join(injection,NULL);
-+		} else {
-+		  pthread_join(sniffer,NULL);
-+		}
- 	}
- 	
- 	
-@@ -215,10 +258,11 @@
- /* Refresh screen function called by screen thread */
- void *screen_refresh(void *arg)
- {
--	
-+	struct t_data *datos;
-+	datos = (struct t_data *)arg;
- 	while (1==1)
- 	{
--		print_screen();
-+		print_screen(datos->machine);
- 		sleep(1);
- 	}
- 	
-@@ -228,9 +272,11 @@
- /* Inject ARP Replys to the network */
- void *inject_arp(void *arg)
- {	
-+        struct t_inject *inject;
- 	struct t_data *datos;
- 		
--	datos = (struct t_data *)arg;
-+	inject = (struct t_inject *)arg;
-+	datos = inject->datos;
- 	sleep(2);
- 	
- 	if ( datos->autos != 1 )
-@@ -251,6 +297,12 @@
- 	
- 	sprintf(current_network,"Finished!");
- 	lnet_destroy();
-+	if (inject->scan_secs > 0) {
-+ 		sleep(inject->scan_secs);  
-+		pthread_kill(*(inject->sniffer), SIGKILL);
-+		pthread_kill(*(inject->screen), SIGKILL);
-+		pthread_kill(*(inject->keys), SIGKILL);
-+	}
- 	
- 	return NULL;
- }
-@@ -400,6 +452,9 @@
- 		"  -n node: last ip octet used for scanning (from 2 to 253)\n"
- 		"  -S enable sleep time supression betwen each request (hardcore mode)\n"
- 		"  -f enable fastmode scan, saves a lot of time, recommended for auto\n\n"
-+	        "  -k nokeywait: Don't wait for keypress\n"
-+		"  -t time: maximum time to listen after last arp request sent (seconds)\n"
-+	        "  -m don't clear and format screen, just output replies\n"
- 		"If -p or -r arent enabled, netdiscover will scan for common lan addresses\n",
- 		VERSION, comando);
- }
-diff -Naur netdiscover-0.3-beta6.orig/src/screen.c netdiscover-0.3-beta6/src/screen.c
---- netdiscover-0.3-beta6.orig/src/screen.c	2009-06-24 18:21:11.000000000 -0400
-+++ netdiscover-0.3-beta6/src/screen.c	2009-06-25 19:15:24.000000000 -0400
-@@ -114,7 +114,7 @@
- 
- 
- /* Read input keys */
--void read_key()
-+void read_key(int machine)
- {
-     int ch;
-     ch = getchar();
-@@ -162,12 +162,12 @@
-        smode = 2;
-     }
- 	 
--	 print_screen();
-+	 print_screen(machine);
- }
- 
- 
- /* Clear and fill the screen */
--void print_screen()
-+void print_screen(int machine)
- {
- 	/* Get Console Size */
-    if (ioctl(0, TIOCGWINSZ, &win_sz) < 0)
-@@ -177,16 +177,16 @@
-    }
- 	 
- 	/* Flush and print screen */
--	fprintf( stderr, "\33[1;1H" );
--	fill_screen();
--	fprintf( stderr, "\33[J" );
-+        if (!machine) fprintf( stderr, "\33[1;1H" );
-+	fill_screen(machine);
-+	if (!machine) fprintf( stderr, "\33[J" );
- 	fflush(stdout);
- }
- 
- 
- /* Fills the screen using white spaces to avoid refresh problems  *
-  * not a very smart way, but it works :)                          */
--void fill_screen()
-+void fill_screen(int machine)
- {
-    int x, j;
-    struct arp_rep_l *arprep_l;
-@@ -196,40 +196,42 @@
-    
-    pthread_mutex_lock(listm);	
- 	
--   sprintf(line, " Currently scanning: %s   |   Our Mac is: %s - %i", 
--           current_network, ourmac, scroll);
--   printf("%s", line);
--	
--   /* Fill with spaces */
--   for (j=strlen(line); j<win_sz.ws_col - 1; j++)
--         printf(" ");
--   printf("\n");
--	
--	/* Print blank line with spaces */
--   for (j=0; j<win_sz.ws_col - 1; j++)
--         printf(" ");
--   printf("\n");
--
--
--   sprintf(line, " %d Captured ARP Req/Rep packets, from %d hosts.   Total size: %d", 
--           arprep_count->count, arprep_count->hosts, arprep_count->length);
--   printf("%s", line);
--	
--   /* Fill with spaces */
--   for (j=strlen(line); j<win_sz.ws_col - 1; j++)
--         printf(" ");
--   printf("\n");
--	
--	
--   /* Print Header and counters */
--   printf(" _____________________________________________________________________________\n");
--   if (smode == 0 || (oldmode == 0 && smode == 2))
--   	printf("   IP            At MAC Address      Count  Len   MAC Vendor                   \n");
--   else if (smode == 1 || (oldmode == 1 && smode == 2))
--   	printf("   IP            At MAC Address      Requests IP     Count                     \n");
--   printf(" ----------------------------------------------------------------------------- \n");
--
--
-+   
-+   if (!machine) {
-+     sprintf(line, " Currently scanning: %s   |   Our Mac is: %s - %i", 
-+	     current_network, ourmac, scroll);
-+     printf("%s", line);
-+	
-+     /* Fill with spaces */
-+     for (j=strlen(line); j<win_sz.ws_col - 1; j++)
-+       printf(" ");
-+     printf("\n");
-+     
-+     /* Print blank line with spaces */
-+     for (j=0; j<win_sz.ws_col - 1; j++)
-+       printf(" ");
-+     printf("\n");
-+     
-+
-+     sprintf(line, " %d Captured ARP Req/Rep packets, from %d hosts.   Total size: %d", 
-+	     arprep_count->count, arprep_count->hosts, arprep_count->length);
-+     printf("%s", line);
-+     
-+     /* Fill with spaces */
-+     for (j=strlen(line); j<win_sz.ws_col - 1; j++)
-+       printf(" ");
-+     printf("\n");
-+	
-+     
-+     /* Print Header and counters */
-+     printf(" _____________________________________________________________________________\n");
-+     if (smode == 0 || (oldmode == 0 && smode == 2))
-+       printf("   IP            At MAC Address      Count  Len   MAC Vendor                   \n");
-+     else if (smode == 1 || (oldmode == 1 && smode == 2))
-+       printf("   IP            At MAC Address      Requests IP     Count                     \n");
-+     printf(" ----------------------------------------------------------------------------- \n");
-+   }
-+   
-    /* Print each found station trough arp reply */
-    if (smode == 0)
-    {
-@@ -243,12 +245,12 @@
-             sprintf(tline, " ");
-             
-             /* Set IP */
--            sprintf(tline, "%s ", arprep_l->sip);
-+            sprintf(tline, "%s ", arprep_l->sip);	    
-             strcat(line, tline);
--            
--            /* Fill with spaces */
--            for (j=strlen(line); j<17; j++)
--               strcat(line, blank);
-+   
-+	    /* Fill with spaces */
-+	    for (j=strlen(line); j<17; j++)
-+	      strcat(line, blank);
-             
-             /* IP & MAC */
-             sprintf(tline, "%02x:%02x:%02x:%02x:%02x:%02x    ",
-@@ -260,21 +262,29 @@
-             /* Count, Length & Vendor */
-             sprintf(tline, "%02d    %03d   %s", arprep_l->count, 
-                     arprep_l->header->length, arprep_l->vendor );
--            strcat(line, tline);
--            
--            /* Fill again with spaces */
--            for (j=strlen(line); j<win_sz.ws_col - 1; j++)
--               strcat(line, blank);
-+	    strcat(line, tline);
-             
--            printf("%s\n", line);
-+	    /* Fill again with spaces */
-+	    for (j=strlen(line); j<win_sz.ws_col - 1; j++)
-+	      strcat(line, blank);
-+
-+	    if (!arprep_l->printed) {
-+	      printf("%s\n", line);	    
-+	      arprep_l->printed = 1;
-+	      if (!machine) {
-+		arprep_l->printed = 0;
-+	      }
-+	    }
-          }
-          
-          arprep_l = arprep_l->next;
-          x += 1;
--      
--         /* Check if end of screen was reached */
--         if (x >= ( (win_sz.ws_row + scroll) - 7))
--            break;
-+
-+	 if (!machine) {
-+	   /* Check if end of screen was reached */
-+	   if (x >= ( (win_sz.ws_row + scroll) - 7))
-+	     break;
-+	 }
-       }
-       
-    } /* Print only arp request */
-@@ -292,10 +302,10 @@
-             /* Get source IP */
-             sprintf(tline, "%s ", arprep_l->sip);
-             strcat(line, tline);
--            
--            /* Fill with spaces */
--            for (j=strlen(line); j<17; j++)
--               strcat(line, blank);
-+
-+	    /* Fill with spaces */
-+	    for (j=strlen(line); j<17; j++)
-+	      strcat(line, blank);
-             
-             /* Get source MAC */
-             sprintf(tline, "%02x:%02x:%02x:%02x:%02x:%02x   ",
-@@ -308,27 +318,29 @@
-             sprintf(tline, "%s", arprep_l->dip);
-             strcat(line, tline);
-             
--            /* Fill with spaces */
--            for (j=strlen(line); j<54; j++)
--               strcat(line, blank);
-+	    /* Fill with spaces */
-+	    for (j=strlen(line); j<54; j++)
-+	      strcat(line, blank);
-             
-             /* Count, Length & Vendor */
-             sprintf(tline, "%02d", arprep_l->count);
-             strcat(line, tline);
-             
--            /* Fill again with spaces */
--            for (j=strlen(line); j<win_sz.ws_col - 1; j++)
--               strcat(line, blank);
-+	    /* Fill again with spaces */
-+	    for (j=strlen(line); j<win_sz.ws_col - 1; j++)
-+	      strcat(line, blank);
-             
-             printf("%s\n", line);
-          }
-          
-          arprep_l = arprep_l->next;
-          x += 1;
--      
--         /* Check if end of screen was reached */
--         if (x >= ( (win_sz.ws_row + scroll) - 7))
--            break;
-+
-+	 if (!machine) {
-+	   /* Check if end of screen was reached */
-+	   if (x >= ( (win_sz.ws_row + scroll) - 7))
-+	     break;
-+	 }
-       }
-    }
-    else if(smode == 2)
-diff -Naur netdiscover-0.3-beta6.orig/src/screen.h netdiscover-0.3-beta6/src/screen.h
---- netdiscover-0.3-beta6.orig/src/screen.h	2009-06-24 18:21:11.000000000 -0400
-+++ netdiscover-0.3-beta6/src/screen.h	2009-06-24 21:42:13.000000000 -0400
-@@ -60,6 +60,7 @@
- 	char *vendor;
- 	short type;
- 	unsigned int count;
-+        int printed;
- 	struct arp_rep_l *next;
- };
- 
 

--- a/net/netdiscover/patches/01-initfix+end-fix.patch
+++ /dev/null
@@ -1,35 +1,1 @@
-diff -Naur netdiscover-0.3-beta6.01machine/src/main.c netdiscover-0.3-beta6/src/main.c
---- netdiscover-0.3-beta6.01machine/src/main.c	2009-06-25 18:19:18.000000000 -0400
-+++ netdiscover-0.3-beta6/src/main.c	2009-07-16 06:37:43.000000000 -0400
-@@ -121,6 +121,8 @@
- 	node = 67;
- 	pcount = 1;
- 	nokeywait = 0;
-+	fastmode = 0;
-+	ssleep = 0;
- 	
- 	current_network = (char *) malloc ((sizeof(char)) * 16);
- 	sprintf(current_network,"Starting.");
-@@ -250,7 +252,6 @@
- 		}
- 	}
- 	
--	
- 	return 0;
- }
- 
-@@ -299,9 +300,10 @@
- 	lnet_destroy();
- 	if (inject->scan_secs > 0) {
-  		sleep(inject->scan_secs);  
--		pthread_kill(*(inject->sniffer), SIGKILL);
--		pthread_kill(*(inject->screen), SIGKILL);
--		pthread_kill(*(inject->keys), SIGKILL);
-+		pthread_kill(*(inject->sniffer), SIGTERM);
-+		pthread_kill(*(inject->screen), SIGTERM);
-+		pthread_kill(*(inject->keys), SIGTERM);
-+		sighandler(SIGTERM);
- 	}
- 	
- 	return NULL;
 

file:a/net/netperf/Makefile (deleted)
--- a/net/netperf/Makefile
+++ /dev/null
@@ -1,48 +1,1 @@
-#
-# 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:=netperf
-PKG_VERSION:=2.6.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.netperf.org/netperf/
-PKG_MD5SUM:=9654ffdfd4c4f2c93ce3733cd9ed9236
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/netperf
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Network performance measurement tool
-  URL:=http://www.netperf.org/
-endef
-
-CONFIGURE_ARGS += --enable-demo
-
-define Package/netperf/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/netserver.init $(1)/etc/init.d/netserver
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/netperf $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/netserver $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/lib/netperf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/arr_script $(1)/lib/netperf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/packet_byte_script $(1)/lib/netperf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/sctp_stream_script $(1)/lib/netperf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/snapshot_script $(1)/lib/netperf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/tcp_range_script $(1)/lib/netperf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/tcp_rr_script $(1)/lib/netperf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/tcp_stream_script $(1)/lib/netperf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/udp_rr_script $(1)/lib/netperf
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/udp_stream_script $(1)/lib/netperf
-endef
-
-$(eval $(call BuildPackage,netperf))
-

--- a/net/netperf/files/netserver.init
+++ /dev/null
@@ -1,13 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-START=50
-
-start() {
-	service_start /usr/bin/netserver
-}
-
-stop() {
-	service_stop /usr/bin/netserver
-}
-

file:a/net/pptpd/Makefile (deleted)
--- a/net/pptpd/Makefile
+++ /dev/null
@@ -1,67 +1,1 @@
-#
-# Copyright (C) 2006-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:=pptpd
-PKG_VERSION:=1.4.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/poptop
-PKG_MD5SUM:=36f9f45c6ffa92bc3b6e24ae2d053505
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/pptpd
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+kmod-ppp +kmod-gre +kmod-mppe +ppp
-  TITLE:=PopTop pptp server
-  URL:=http://www.poptop.org/
-  SUBMENU:=VPN
-endef
-
-CONFIGURE_ARGS += \
-	--enable-bcrelay \
-
-CONFIGURE_VARS += \
-	ac_cv_header_libintl_h=no \
-
-MAKE_FLAGS += \
-	COPTS="$(TARGET_CFLAGS)" \
-	INSTALL="install" \
-
-define Package/pptpd/conffiles
-/etc/pptpd.conf
-/etc/ppp/options.pptpd
-/etc/config/pptpd
-endef
-
-define Package/pptpd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/sbin/bcrelay \
-		$(PKG_INSTALL_DIR)/usr/sbin/pptpctrl \
-		$(PKG_INSTALL_DIR)/usr/sbin/pptpd \
-		$(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/pptpd
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pptpd/* $(1)/usr/lib/pptpd/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/pptpd.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/pptpd.init $(1)/etc/init.d/pptpd
-	$(INSTALL_DIR) $(1)/etc/ppp
-	$(INSTALL_DATA) ./files/options.pptpd $(1)/etc/ppp/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/pptpd.config $(1)/etc/config/pptpd
-endef
-
-$(eval $(call BuildPackage,pptpd))
-

--- a/net/pptpd/files/options.pptpd
+++ /dev/null
@@ -1,23 +1,1 @@
-#debug
-#logfile /tmp/pptp-server.log
-auth
-name "pptp-server"
-lcp-echo-failure 3
-lcp-echo-interval 60
-default-asyncmap
-mtu 1482
-mru 1482
-nobsdcomp
-nodeflate
-#noproxyarp
-#nomppc
-mppe required,no40,no56,stateless
-require-mschap-v2
-refuse-chap
-refuse-mschap
-refuse-eap
-refuse-pap
-#ms-dns 172.16.1.1
-#plugin radius.so
-#radius-config-file /etc/radius.conf
 

--- a/net/pptpd/files/pptpd.conf
+++ /dev/null
@@ -1,6 +1,1 @@
-#debug
-option /etc/ppp/options.pptpd
-speed 115200
-stimeout 10
-#localip & remoteip are not needed, ip management is done by pppd
 

--- a/net/pptpd/files/pptpd.config
+++ /dev/null
@@ -1,9 +1,1 @@
-config service 'pptpd'
-	option 'enabled' '0'
-	option 'localip' '192.168.0.1'
-	option 'remoteip' '192.168.0.20-30'
 
-config 'login'
-	option 'username' 'youruser'
-	option 'password' 'yourpass'
-

--- a/net/pptpd/files/pptpd.init
+++ /dev/null
@@ -1,59 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
 
-START=60
-BIN=/usr/sbin/pptpd
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
-CONFIG=/var/etc/pptpd.conf
-CHAP_SECRETS=/var/etc/chap-secrets
-
-setup_login() {
-	local section="$1"
-
-	config_get username "$section" username
-	config_get password "$section" password
-	[ -n "$username" ] || return 0
-	[ -n "$password" ] || return 0
-
-	echo "$username pptp-server $password *" >> $CHAP_SECRETS
-}
-
-setup_config() {
-	local section="$1"
-
-	config_get enabled "$section" enabled
-	[ "$enabled" -eq 0 ] && return 1
-
-	mkdir -p /var/etc
-	cp /etc/pptpd.conf $CONFIG
-
-	config_get localip "$section" localip
-	config_get remoteip "$section" remoteip
-	[ -n "$localip" ] && echo "localip  $localip" >> $CONFIG
-	[ -n "$remoteip" ] && echo "remoteip  $remoteip" >> $CONFIG
-	return 0
-}
-
-start_pptpd() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	mkdir -p $RUN_D
-	for m in arc4 sha1_generic slhc crc-ccitt ppp_generic ppp_async ppp_mppe; do
-		insmod $m >/dev/null 2>&1
-	done
-	ln -sfn $CHAP_SECRETS /etc/ppp/chap-secrets
-	service_start $BIN $OPTIONS -c $CONFIG
-}
-
-start() {
-	config_load pptpd
-	setup_config pptpd || return
-	config_foreach setup_login login
-	start_pptpd
-}
-
-stop() {
-	service_stop $BIN
-}
-

--- a/net/pptpd/patches/001-bad_pqueue_debug.patch
+++ /dev/null
@@ -1,19 +1,1 @@
---- a/pqueue.c
-+++ b/pqueue.c
-@@ -7,13 +7,11 @@
- #include "pqueue.h"
- 
- #ifdef DEBUG_PQUEUE
--#define DEBUG_ON 1
-+#define DEBUG_CMD(_a) { _a }
- #else
--#define DEBUG_ON 0
-+#define DEBUG_CMD(_a)
- #endif
- 
--#define DEBUG_CMD(_a) if (DEBUG_ON) { _a }
--
- #define MIN_CAPACITY 128 /* min allocated buffer for a packet */
- 
- static int pqueue_alloc (int seq, unsigned char *packet, int packlen, pqueue_t **new);
 

--- a/net/pptpd/patches/002-makefile_fix.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -18,7 +18,7 @@ all:	$(PLUGINS)
- %.so: %.c
- 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
- 
--LIBDIR	?= $(DESTDIR)$(prefix)/lib/pptpd
-+LIBDIR	= $(DESTDIR)$(prefix)/lib/pptpd
- 
- install: $(PLUGINS)
- 	$(INSTALL) -d $(LIBDIR)
 

--- a/net/pptpd/patches/003-opt_flags.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -153,7 +153,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
-+CFLAGS = $(COPTS) -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
 

file:a/net/spawn-fcgi/Makefile (deleted)
--- a/net/spawn-fcgi/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
-#
-# Copyright (C) 2006-2009 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:=spawn-fcgi
-PKG_VERSION:=1.6.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.lighttpd.net/download/
-PKG_MD5SUM:=787ed2f88d2204bf1fe4fbd6e509d1d7
-
-PKG_INSTALL = 1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/spawn-fcgi
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Tool to spawn fastcgi applications
-  URL:=http://redmine.lighttpd.net/projects/spawn-fcgi
-endef
-
-define Package/spawn-fcgi/description
-	spawn-fcgi is used to spawn fastcgi applications
-endef
-
-define Package/spawn-fcgi/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/spawn-fcgi $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,spawn-fcgi))
-

file:a/net/stunnel/Makefile (deleted)
--- a/net/stunnel/Makefile
+++ /dev/null
@@ -1,66 +1,1 @@
-#
-# Copyright (C) 2006-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:=stunnel
-PKG_VERSION:=4.33
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://www.stunnel.org/download/stunnel/src/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=559a864066d8cc4afd8a97682c90d41c
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/stunnel
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl +libwrap
-  TITLE:=SSL TCP Wrapper
-  URL:=http://www.stunnel.org/
-endef
-
-define Package/stunnel/description
-	Stunnel is a program that allows you to encrypt arbitrary TCP
-	connections inside SSL (Secure Sockets Layer) available on both Unix
-	and Windows. Stunnel can allow you to secure non-SSL aware daemons and
-	protocols (like POP, IMAP, LDAP, etc) by having Stunnel provide the
-	encryption, requiring no changes to the daemon's code.
-endef
-
-define Package/stunnel/conffiles
-/etc/stunnel/stunnel.conf
-endef
-
-CONFIGURE_ARGS+= \
-	--with-random=/dev/urandom \
-	--with-threads=fork \
-	--with-ssl=$(STAGING_DIR)/usr \
-
-define Build/Compile
-	mkdir -p $(PKG_INSTALL_DIR)/etc/stunnel
-	echo '#dummy' > $(PKG_INSTALL_DIR)/etc/stunnel/stunnel.pem
-	$(call Build/Compile/Default)
-endef
-
-define Package/stunnel/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stunnel $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/stunnel
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/stunnel/libstunnel.so $(1)/usr/lib/stunnel/
-	$(INSTALL_DIR) $(1)/etc/stunnel
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/stunnel/stunnel.conf-sample $(1)/etc/stunnel/stunnel.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/stunnel.init $(1)/etc/init.d/stunnel
-endef
-
-$(eval $(call BuildPackage,stunnel))
-

--- a/net/stunnel/files/stunnel.init
+++ /dev/null
@@ -1,35 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2008 OpenWrt.org
 
-START=90
-RUN_D=/var
-PID_F=$RUN_D/stunnel.pid
-
-start() {
-	if [ -s "/etc/stunnel/stunnel.pem" ]; then
-		chmod og-rwx /etc/stunnel/stunnel.pem
-		[ ! -f $PID_F ] && stunnel
-	else
-		[ -e /etc/stunnel/config ] && \
-		. /etc/stunnel/config
-
-		X509_CN=${X509_CN:-"router"}
-		X509_O=${X509_O:-"openwrt.org"}
-		X509_OU=${X509_OU:-"open-source firmware"}
-
-		[ -x /sbin/keygen ] && {
-		(keygen "$X509_CN" "$X509_O" "$X509_OU" > /etc/stunnel/stunnel.pem;
-			chmod og-rwx /etc/stunnel/stunnel.pem;
-			stunnel) &
-		}
-	fi
-}
-
-stop() {
-	[ -f $PID_F ] && {
-		kill $(cat $PID_F)
-		kill -9 $(cat $PID_F)
-		rm -f $PID_F
-	}
-}
-

--- a/net/stunnel/patches/100-cross-compile.patch
+++ /dev/null
@@ -1,127 +1,1 @@
---- a/configure
-+++ b/configure
-@@ -21552,56 +21552,56 @@ _ACEOF
- fi
- rm -f conftest*
- 
--
--{ echo "$as_me:$LINENO: **************************************** PTY device files" >&5
--echo "$as_me: **************************************** PTY device files" >&6;}
--{ echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5
--echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6; }
--if test "${ac_cv_file___dev_ptmx_+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  test "$cross_compiling" = yes &&
--  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
--   { (exit 1); exit 1; }; }
--if test -r ""/dev/ptmx""; then
--  ac_cv_file___dev_ptmx_=yes
--else
--  ac_cv_file___dev_ptmx_=no
--fi
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5
--echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6; }
--if test $ac_cv_file___dev_ptmx_ = yes; then
-+#
-+#{ echo "$as_me:$LINENO: **************************************** PTY device files" >&5
-+#echo "$as_me: **************************************** PTY device files" >&6;}
-+#{ echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5
-+#echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6; }
-+#if test "${ac_cv_file___dev_ptmx_+set}" = set; then
-+#  echo $ECHO_N "(cached) $ECHO_C" >&6
-+#else
-+#  test "$cross_compiling" = yes &&
-+#  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-+#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-+#   { (exit 1); exit 1; }; }
-+#if test -r ""/dev/ptmx""; then
-+#  ac_cv_file___dev_ptmx_=yes
-+#else
-+#  ac_cv_file___dev_ptmx_=no
-+#fi
-+#fi
-+#{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5
-+#echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6; }
-+#if test $ac_cv_file___dev_ptmx_ = yes; then
-   cat >>confdefs.h <<\_ACEOF
--#define HAVE_DEV_PTMX 1
-+#define HAVE_DEV_PTMX 0
- _ACEOF
- 
--fi
-+#fi
- 
--{ echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5
--echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6; }
--if test "${ac_cv_file___dev_ptc_+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  test "$cross_compiling" = yes &&
--  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
--   { (exit 1); exit 1; }; }
--if test -r ""/dev/ptc""; then
--  ac_cv_file___dev_ptc_=yes
--else
--  ac_cv_file___dev_ptc_=no
--fi
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5
--echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6; }
--if test $ac_cv_file___dev_ptc_ = yes; then
-+#{ echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5
-+#echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6; }
-+#if test "${ac_cv_file___dev_ptc_+set}" = set; then
-+#  echo $ECHO_N "(cached) $ECHO_C" >&6
-+#else
-+#  test "$cross_compiling" = yes &&
-+#  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-+#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-+#   { (exit 1); exit 1; }; }
-+#if test -r ""/dev/ptc""; then
-+#  ac_cv_file___dev_ptc_=yes
-+#else
-+#  ac_cv_file___dev_ptc_=no
-+#fi
-+#fi
-+#{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5
-+#echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6; }
-+#if test $ac_cv_file___dev_ptc_ = yes; then
-   cat >>confdefs.h <<\_ACEOF
--#define HAVE_DEV_PTS_AND_PTC 1
-+#define HAVE_DEV_PTS_AND_PTC 0
- _ACEOF
- 
--fi
-+#fi
- 
- 
- { echo "$as_me:$LINENO: **************************************** entropy" >&5
-@@ -24049,8 +24049,8 @@ _ACEOF
- 
- 
- # Add SSL includes and libraries
--CFLAGS="$CFLAGS -I$ssldir/include"
--LIBS="$LIBS -L$ssldir/lib -lssl -lcrypto"
-+CFLAGS="$CFLAGS"
-+LIBS="$LIBS -lssl -lcrypto"
- 
- # Check for obsolete RSAref library
- { echo "$as_me:$LINENO: checking for obsolete RSAref library" >&5
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,10 +44,6 @@ AC_EGREP_HEADER(socklen_t, sys/socket.h,
-     AC_MSG_RESULT([no (defined as int)])
-     AC_DEFINE(socklen_t, int))
- 
--AC_MSG_NOTICE([**************************************** PTY device files])
--AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX))
--AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC))
--
- AC_MSG_NOTICE([**************************************** entropy])
- 
- AC_ARG_WITH(egd-socket,
 

--- a/net/stunnel/patches/101-no-comp.patch
+++ /dev/null
@@ -1,29 +1,1 @@
---- a/src/ssl.c
-+++ b/src/ssl.c
-@@ -72,14 +72,17 @@ int ssl_configure(void) { /* configure g
-     s_log(LOG_NOTICE, "FIPS mode %s",
-         global_options.option.fips ? "enabled" : "disabled");
- #endif /* USE_FIPS */
-+#ifndef OPENSSL_NO_COMP   
-     if(global_options.compression!=COMP_NONE && !init_compression())
-         return 0;
-+#endif
-     if(!init_prng())
-         return 0;
-     s_log(LOG_DEBUG, "PRNG seeded successfully");
-     return 1; /* SUCCESS */
- }
- 
-+#ifndef OPENSSL_NO_COMP
- static int init_compression(void) {
-     int id=0;
-     COMP_METHOD *cm=NULL;
-@@ -111,6 +114,7 @@ static int init_compression(void) {
-     s_log(LOG_INFO, "Compression enabled using %s method", name);
-     return 1;
- }
-+#endif
- 
- static int init_prng(void) {
-     int totbytes=0;
 

--- a/net/stunnel/patches/102-no-ssl2.patch
+++ /dev/null
@@ -1,14 +1,1 @@
---- a/src/options.c
-+++ b/src/options.c
-@@ -1234,8 +1234,10 @@ static char *parse_service_option(CMD cm
-             section->client_method=(SSL_METHOD *)SSLv23_client_method();
-             section->server_method=(SSL_METHOD *)SSLv23_server_method();
-         } else if(!strcasecmp(arg, "SSLv2")) {
-+#ifndef OPENSSL_NO_SSL2
-             section->client_method=(SSL_METHOD *)SSLv2_client_method();
-             section->server_method=(SSL_METHOD *)SSLv2_server_method();
-+#endif
-         } else if(!strcasecmp(arg, "SSLv3")) {
-             section->client_method=(SSL_METHOD *)SSLv3_client_method();
-             section->server_method=(SSL_METHOD *)SSLv3_server_method();
 

--- a/net/stunnel/patches/103-no-zlib-link.patch
+++ /dev/null
@@ -1,13 +1,1 @@
-Avoid linking with zlib, which is a dependency of openssl, not ours.
---- a/configure
-+++ b/configure
-@@ -23017,7 +23017,7 @@ if test $ac_cv_lib_z_inflateEnd = yes; t
- #define HAVE_LIBZ 1
- _ACEOF
- 
--  LIBS="-lz $LIBS"
-+#  LIBS="-lz $LIBS"
- 
- fi
- 
 

--- a/net/stunnel/patches/104-fix-paths.patch
+++ /dev/null
@@ -1,43 +1,1 @@
-## Do several path fixups, removing unneeded @prefix@s
---- a/tools/stunnel.conf-sample.in
-+++ b/tools/stunnel.conf-sample.in
-@@ -4,15 +4,15 @@
- ; please read the manual and make sure you understand them
- 
- ; certificate/key is needed in server mode and optional in client mode
--cert = @prefix@/etc/stunnel/mail.pem
--;key = @prefix@/etc/stunnel/mail.pem
-+cert = @sysconfdir@/stunnel/stunnel.pem
-+;key = @sysconfdir@/stunnel/stunnel.pem
- 
- ; protocol version (all, SSLv2, SSLv3, TLSv1)
- sslVersion = SSLv3
- 
- ; security enhancements for UNIX systems - comment them out on Win32
- ; for chroot a copy of some devices and files is needed within the jail
--chroot = @prefix@/var/lib/stunnel/
-+chroot = @localstatedir@
- setuid = nobody
- setgid = @DEFAULT_GROUP@
- ; PID is created inside the chroot jail
-@@ -33,16 +33,16 @@ socket = r:TCP_NODELAY=1
- ; CApath is located inside chroot jail
- ;CApath = /certs
- ; it's often easier to use CAfile
--;CAfile = @prefix@/etc/stunnel/certs.pem
-+;CAfile = @sysconfdir@/stunnel/certs.pem
- ; don't forget to c_rehash CRLpath
- ; CRLpath is located inside chroot jail
- ;CRLpath = /crls
- ; alternatively CRLfile can be used
--;CRLfile = @prefix@/etc/stunnel/crls.pem
-+;CRLfile = @sysconfdir@/stunnel/crls.pem
- 
- ; debugging stuff (may useful for troubleshooting)
- ;debug = 7
--;output = stunnel.log
-+;output = @localstatedir@/log/stunnel.log
- 
- ; SSL client mode
- ;client = yes
 

--- a/net/stunnel/patches/105-stunnel-conf.patch
+++ /dev/null
@@ -1,55 +1,1 @@
---- a/tools/stunnel.conf-sample.in
-+++ b/tools/stunnel.conf-sample.in
-@@ -8,7 +8,7 @@ cert = @sysconfdir@/stunnel/stunnel.pem
- ;key = @sysconfdir@/stunnel/stunnel.pem
- 
- ; protocol version (all, SSLv2, SSLv3, TLSv1)
--sslVersion = SSLv3
-+sslVersion = all
- 
- ; security enhancements for UNIX systems - comment them out on Win32
- ; for chroot a copy of some devices and files is needed within the jail
-@@ -49,21 +49,26 @@ socket = r:TCP_NODELAY=1
- 
- ; service-level configuration
- 
--[pop3s]
--accept  = 995
--connect = 110
--
--[imaps]
--accept  = 993
--connect = 143
--
--[ssmtp]
--accept  = 465
--connect = 25
--
--;[https]
--;accept  = 443
--;connect = 80
--;TIMEOUTclose = 0
-+;[pop3s]
-+;accept  = 995
-+;connect = 110
-+
-+;[imaps]
-+;accept  = 993
-+;connect = 143
-+
-+;[ssmtp]
-+;accept  = 465
-+;connect = 25
-+
-+[https]
-+accept  = 443
-+connect = 80
-+TIMEOUTclose = 0
-+
-+[chilli]
-+accept  = 3443
-+connect = 3442
-+TIMEOUTclose = 0
- 
- ; vim:ft=dosini
 

--- a/net/stunnel/patches/106-stunnel-xforwardedfor.patch
+++ /dev/null
@@ -1,249 +1,1 @@
---- a/doc/stunnel.8
-+++ b/doc/stunnel.8
-@@ -504,7 +504,10 @@ time to keep an idle connection
- .IP "\fBtransparent\fR = yes | no (Unix only)" 4
- .IX Item "transparent = yes | no (Unix only)"
- transparent proxy mode
--.Sp
-+.IP "\fBxforwardedfor\fR = yes | no" 4
-+.IX Item "xforwardedfor = yes | no"
-+append an 'X-Forwarded-For:' HTTP request header providing the
-+client's IP address to the server.
- Re-write address to appear as if wrapped daemon is connecting
- from the \s-1SSL\s0 client machine instead of the machine running \fBstunnel\fR.
- .Sp
---- a/doc/stunnel.fr.8
-+++ b/doc/stunnel.fr.8
-@@ -445,6 +445,10 @@ Cette option permet de relier une adress

- .Sp

-+.IP "\fBxforwardedfor\fR = yes | no" 4
-+.IX Item "xforwardedfor = yes | no"

-+au serveur l'adresse IP du client.
- .IP "\fBpty\fR = yes | no (Unix seulement)" 4
- .IX Item "pty = yes | no (Unix seulement)"

---- a/src/client.c
-+++ b/src/client.c
-@@ -86,6 +86,12 @@ CLI *alloc_client_session(SERVICE_OPTION
-         return NULL;
-     }
-     c->opt=opt;
-+    /* some options need space to add some information */
-+    if (c->opt->option.xforwardedfor)
-+        c->buffsize = BUFFSIZE - BUFF_RESERVED;
-+    else
-+        c->buffsize = BUFFSIZE;
-+    c->crlf_seen=0;
-     c->local_rfd.fd=rfd;
-     c->local_wfd.fd=wfd;
-     return c;
-@@ -376,6 +382,29 @@ static void init_ssl(CLI *c) {
-     }
- }
- 
-+/* Moves all data from the buffer <buffer> between positions <start> and <stop>
-+ * to insert <string> of length <len>. <start> and <stop> are updated to their
-+ * new respective values, and the number of characters inserted is returned.
-+ * If <len> is too long, nothing is done and -1 is returned.
-+ * Note that neither <string> nor <buffer> can be NULL.
-+*/
-+static int buffer_insert_with_len(char *buffer, int *start, int *stop, int limit, char *string, int len) {
-+    if (len > limit - *stop)
-+	return -1;
-+    if (*start > *stop)
-+	return -1;
-+    memmove(buffer + *start + len, buffer + *start, *stop - *start);
-+    memcpy(buffer + *start, string, len);
-+    *start += len;
-+    *stop += len;
-+    return len;
-+}
-+
-+static int buffer_insert(char *buffer, int *start, int *stop, int limit, char *string) {
-+    return buffer_insert_with_len(buffer, start, stop, limit, string, strlen(string));
-+}
-+
-+
- /****************************** some defines for transfer() */
- /* is socket/SSL open for read/write? */
- #define sock_rd (c->sock_rfd->rd)
-@@ -410,13 +439,16 @@ static void transfer(CLI *c) {
-         check_SSL_pending=0;
- 
-         SSL_read_wants_read=
--            ssl_rd && c->ssl_ptr<BUFFSIZE && !SSL_read_wants_write;
-+            //ssl_rd && c->ssl_ptr<BUFFSIZE && !SSL_read_wants_write;
-+            ssl_rd && c->ssl_ptr<c->buffsize && !SSL_read_wants_write;
-+            
-         SSL_write_wants_write=
-             ssl_wr && c->sock_ptr && !SSL_write_wants_read;
- 
-         /****************************** setup c->fds structure */
-         s_poll_init(&c->fds); /* initialize the structure */
--        if(sock_rd && c->sock_ptr<BUFFSIZE)
-+        //if(sock_rd && c->sock_ptr<BUFFSIZE)
-+        if(sock_rd && c->sock_ptr<c->buffsize)
-             s_poll_add(&c->fds, c->sock_rfd->fd, 1, 0);
-         if(SSL_read_wants_read ||
-                 SSL_write_wants_read ||
-@@ -515,7 +547,8 @@ static void transfer(CLI *c) {
-                 break;
-             default:
-                 memmove(c->ssl_buff, c->ssl_buff+num, c->ssl_ptr-num);
--                if(c->ssl_ptr==BUFFSIZE) /* buffer was previously full */
-+                //if(c->ssl_ptr==BUFFSIZE) /* buffer was previously full */
-+                if(c->ssl_ptr>=c->buffsize) /* buffer was previously full */
-                     check_SSL_pending=1; /* check for data buffered by SSL */
-                 c->ssl_ptr-=num;
-                 c->sock_bytes+=num;
-@@ -577,7 +610,8 @@ static void transfer(CLI *c) {
-         /****************************** read from socket */
-         if(sock_rd && sock_can_rd) {
-             num=readsocket(c->sock_rfd->fd,
--                c->sock_buff+c->sock_ptr, BUFFSIZE-c->sock_ptr);
-+                //c->sock_buff+c->sock_ptr, BUFFSIZE-c->sock_ptr);
-+                c->sock_buff+c->sock_ptr, c->buffsize-c->sock_ptr);
-             switch(num) {
-             case -1:
-                 parse_socket_error(c, "readsocket");
-@@ -597,10 +631,73 @@ static void transfer(CLI *c) {
-                 (SSL_read_wants_write && ssl_can_wr) ||
-                 (check_SSL_pending && SSL_pending(c->ssl))) {
-             SSL_read_wants_write=0;
--            num=SSL_read(c->ssl, c->ssl_buff+c->ssl_ptr, BUFFSIZE-c->ssl_ptr);
-+            //num=SSL_read(c->ssl, c->ssl_buff+c->ssl_ptr, BUFFSIZE-c->ssl_ptr);
-+            num=SSL_read(c->ssl, c->ssl_buff+c->ssl_ptr, c->buffsize-c->ssl_ptr);
-             switch(err=SSL_get_error(c->ssl, num)) {
-             case SSL_ERROR_NONE:
-+                //c->ssl_ptr+=num;
-+                if (c->buffsize != BUFFSIZE && c->opt->option.xforwardedfor) { /* some work left to do */
-+                    int last = c->ssl_ptr;
-+                    c->ssl_ptr += num;
-+             
-+                    /* Look for end of HTTP headers between last and ssl_ptr.
-+                     * To achieve this reliably, we have to count the number of
-+                     * successive [CR]LF and to memorize it in case it's spread
-+                     * over multiple segments. --WT.
-+                     */
-+                    while (last < c->ssl_ptr) {
-+                  if (c->ssl_buff[last] == '\n') {
-+                      if (++c->crlf_seen == 2)
-+                    break;
-+                  } else if (last < c->ssl_ptr - 1 &&
-+                             c->ssl_buff[last] == '\r' &&
-+                       c->ssl_buff[last+1] == '\n') {
-+                      if (++c->crlf_seen == 2)
-+                    break;
-+                      last++;
-+                  } else if (c->ssl_buff[last] != '\r')
-+                      /* don't refuse '\r' because we may get a '\n' on next read */
-+                      c->crlf_seen = 0;
-+                  last++;
-+                    }
-+                    if (c->crlf_seen >= 2) {
-+                  /* We have all the HTTP headers now. We don't need to
-+                   * reserve any space anymore. <ssl_ptr> points to the
-+                   * first byte of unread data, and <last> points to the
-+                   * exact location where we want to insert our headers,
-+                   * which is right before the empty line.
-+                   */
-+                  c->buffsize = BUFFSIZE;
-+             
-+                  if (c->opt->option.xforwardedfor) {
-+                      /* X-Forwarded-For: xxxx \r\n\0 */
-+                      char xforw[17 + IPLEN + 3];
-+             
-+                      /* We will insert our X-Forwarded-For: header here.
-+                       * We need to write the IP address, but if we use
-+                       * sprintf, it will pad with the terminating 0.
-+                       * So we will pass via a temporary buffer allocated
-+                       * on the stack.
-+                       */
-+                      memcpy(xforw, "X-Forwarded-For: ", 17);
-+                      if (getnameinfo(&c->peer_addr.addr[0].sa,
-+                          addr_len(c->peer_addr.addr[0]),
-+                          xforw + 17, IPLEN, NULL, 0,
-+                          NI_NUMERICHOST) == 0) {
-+                    strcat(xforw + 17, "\r\n");
-+                    buffer_insert(c->ssl_buff, &last, &c->ssl_ptr,
-+                            c->buffsize, xforw);
-+                      }
-+                      /* last still points to the \r\n and ssl_ptr to the
-+                       * end of the buffer, so we may add as many headers
-+                       * as wee need to.
-+                       */
-+                  }			
-+                    }
-+                }
-+                else
-                 c->ssl_ptr+=num;
-+
-                 watchdog=0; /* reset watchdog */
-                 break;
-             case SSL_ERROR_WANT_WRITE:
---- a/src/common.h
-+++ b/src/common.h
-@@ -53,6 +53,9 @@
- /* I/O buffer size */
- #define BUFFSIZE 16384
- 
-+/* maximum space reserved for header insertion in BUFFSIZE */
-+#define BUFF_RESERVED  1024
-+
- /* length of strings (including the terminating '\0' character) */
- /* it can't be lower than 256 bytes or NTLM authentication will break */
- #define STRLEN 256
---- a/src/options.c
-+++ b/src/options.c
-@@ -792,6 +792,28 @@ static char *parse_service_option(CMD cm
-     }
- #endif
- 
-+    /* xforwardedfor */
-+    switch(cmd) {
-+    case CMD_INIT:
-+        section->option.xforwardedfor=0;
-+        break;
-+    case CMD_EXEC:
-+        if(strcasecmp(opt, "xforwardedfor"))
-+            break;
-+        if(!strcasecmp(arg, "yes"))
-+            section->option.xforwardedfor=1;
-+        else if(!strcasecmp(arg, "no"))
-+            section->option.xforwardedfor=0;
-+        else
-+            return "argument should be either 'yes' or 'no'";
-+        return NULL; /* OK */
-+    case CMD_DEFAULT:
-+        break;
-+    case CMD_HELP:
-+        s_log("%-15s = yes|no append an HTTP X-Forwarded-For header","xforwardedfor");
-+        break;
-+    }
-+
-     /* exec */
-     switch(cmd) {
-     case CMD_INIT:
---- a/src/prototypes.h
-+++ b/src/prototypes.h
-@@ -177,6 +177,7 @@ typedef struct service_options_struct {
-         unsigned int remote:1;
-         unsigned int retry:1; /* loop remote+program */
-         unsigned int sessiond:1;
-+        unsigned int xforwardedfor:1;
-         unsigned int program:1;
- #ifndef USE_WIN32
-         unsigned int pty:1;
-@@ -351,6 +352,8 @@ typedef struct {
-     FD *ssl_rfd, *ssl_wfd; /* read and write SSL descriptors */
-     int sock_bytes, ssl_bytes; /* bytes written to socket and ssl */
-     s_poll_set fds; /* file descriptors */
-+    int buffsize;  /* current buffer size, may be lower than BUFFSIZE */
-+    int crlf_seen; /* the number of successive CRLF seen */
- } CLI;
- 
- extern int max_fds, max_clients;
 

file:a/net/tor-alpha/Makefile (deleted)
--- a/net/tor-alpha/Makefile
+++ /dev/null
@@ -1,123 +1,1 @@
-#
-# Copyright (C) 2008-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:=tor-alpha
-PKG_VERSION:=0.2.5.4
-PKG_RELEASE:=1
-
-PKG_SOURCE:=tor-$(PKG_VERSION)-alpha.tar.gz
-PKG_SOURCE_URL:=https://www.torproject.org/dist \
-	https://archive.torproject.org/tor-package-archive \
-	http://tor.mirror.tn/dist
-PKG_MD5SUM:=c913735a3527fec3e9bacf3a1e1a70bf
-
-PKG_BUILD_DEPENDS:=libminiupnpc libnatpmp
-PKG_BUILD_DIR:=$(BUILD_DIR)/tor-$(PKG_VERSION)-alpha
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tor-alpha/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=https://www.torproject.org/
-endef
-
-define Package/tor-alpha/Default/description
- Tor is a toolset for a wide range of organizations and people that want to
- improve their safety and security on the Internet. Using Tor can help you
- anonymize web browsing and publishing, instant messaging, IRC, SSH, and
- more. Tor also provides a platform on which software developers can build
- new applications with built-in anonymity, safety, and privacy features.
-endef
-
-define Package/tor-alpha
-$(call Package/tor-alpha/Default)
-  TITLE:=An anonymous Internet communication system
-  DEPENDS:=+libevent2 +libopenssl +libpthread +librt +SSP_SUPPORT:libssp
-endef
-
-define Package/tor-alpha/description
-$(call Package/tor-alpha/Default/description)
- This package contains the tor daemon.
-endef
-
-define Package/tor-alpha-fw-helper
-$(call Package/tor-alpha/Default)
-  TITLE:=Firewall helper for tor
-  DEPENDS:=+tor-alpha +libminiupnpc +libnatpmp
-endef
-
-define Package/tor-alpha-fw-helper/description
-$(call Package/tor-alpha/Default/description)
- This package contains a helper for automatically configuring port forwarding.
-endef
-
-define Package/tor-alpha-geoip
-$(call Package/tor-alpha/Default)
-  TITLE:=GeoIP db for tor
-  DEPENDS:=+tor-alpha
-endef
-
-define Package/tor-alpha-geoip/description
-$(call Package/tor-alpha/Default/description)
- This package contains a GeoIP database mapping IP addresses to countries.
-endef
-
-define Package/tor-alpha/conffiles
-/etc/tor/torrc
-endef
-
-CONFIGURE_ARGS += \
-	--with-libevent-dir="$(STAGING_DIR)/usr" \
-	--with-ssl-dir="$(STAGING_DIR)/usr" \
-	--enable-upnp \
-	--with-libminiupnpc-dir="$(STAGING_DIR)/usr" \
-	--enable-nat-pmp \
-	--with-libnatpmp-dir="$(STAGING_DIR)/usr" \
-	--disable-asciidoc \
-	--disable-threads
-
-ifneq ($(CONFIG_SSP_SUPPORT),y)
-	CONFIGURE_ARGS += \
-		--disable-gcc-hardening
-	MAKE_FLAGS += \
-		CFLAGS="$(TARGET_CFLAGS)"
-else
-	MAKE_FLAGS += \
-		CFLAGS="$(TARGET_CFLAGS) -fPIC"
-
-endif
-
-CONFIGURE_VARS += \
-	CROSS_COMPILE="yes"
-
-define Package/tor-alpha/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/tor.init $(1)/etc/init.d/tor
-	$(INSTALL_DIR) $(1)/etc/tor
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/tor/torrc.sample $(1)/etc/tor/torrc
-endef
-
-define Package/tor-alpha-fw-helper/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor-fw-helper $(1)/usr/bin/
-endef
-
-define Package/tor-alpha-geoip/install
-	$(INSTALL_DIR) $(1)/usr/share/tor
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/tor/geoip $(1)/usr/share/tor/
-endef
-
-$(eval $(call BuildPackage,tor-alpha))
-$(eval $(call BuildPackage,tor-alpha-fw-helper))
-$(eval $(call BuildPackage,tor-alpha-geoip))
-

--- a/net/tor-alpha/files/tor.init
+++ /dev/null
@@ -1,31 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-START=50
-STOP=50
-
-SERVICE_USE_PID=1
-
-start() {
-	user_exists tor 52 || user_add tor 52 52 /var/lib/tor
-	group_exists tor 52 || group_add tor 52
-	[ -f /var/run/tor.pid ] || {
-		touch /var/run/tor.pid
-		chown tor:tor /var/run/tor.pid
-	}
-	[ -d /var/lib/tor ] || {
-		mkdir -m 0755 -p /var/lib/tor
-		chmod 0700 /var/lib/tor
-		chown tor:tor /var/lib/tor
-	}
-	[ -d /var/log/tor ] || {
-		mkdir -m 0755 -p /var/log/tor
-		chown tor:tor /var/log/tor
-	}
-	service_start /usr/sbin/tor --PidFile /var/run/tor.pid
-}
-
-stop() {
-	service_stop /usr/sbin/tor
-}
-

--- a/net/tor-alpha/patches/001-torrc.patch
+++ /dev/null
@@ -1,22 +1,1 @@
---- a/src/config/torrc.sample.in
-+++ b/src/config/torrc.sample.in
-@@ -45,11 +45,11 @@
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line. This is ignored on Windows;
- ## see the FAQ entry if you want Tor to run as an NT service.
--#RunAsDaemon 1
-+RunAsDaemon 1
- 
- ## The directory for keeping all the keys/etc. By default, we store
- ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
--#DataDirectory @LOCALSTATEDIR@/lib/tor
-+DataDirectory @LOCALSTATEDIR@/lib/tor
- 
- ## The port on which Tor will listen for local connections from Tor
- ## controller applications, as documented in control-spec.txt.
-@@ -190,3 +190,4 @@
- ## address manually to your friends, uncomment this line:
- #PublishServerDescriptor 0
- 
-+User tor
 

--- a/net/uhub/Makefile
+++ b/net/uhub/Makefile
@@ -35,7 +35,7 @@
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libevent
 TARGET_LDFLAGS = -L$(STAGING_DIR)/usr/lib/libevent -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
 
-ifdef CONFIG_USE_EGLIBC
+ifdef CONFIG_USE_GLIBC
 TARGET_LDFLAGS += -lrt
 endif
 

file:a/net/usbip/Makefile (deleted)
--- a/net/usbip/Makefile
+++ /dev/null
@@ -1,108 +1,1 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=usbip
-PKG_RELEASE:=3
-
-# Since kernel 2.6.39.1 userspace tools are inside the kernel tree
-# Package Automatic match version in kernel
-# MD5SUM is not useful kernel package already check it
-PKG_VERSION:=$(shell  sed -n -e '/^AC_INIT/s/.*\[\([[:digit:]\.]*\)\].*/\1/gp' $(LINUX_DIR)/drivers/staging/usbip/userspace/configure.ac)
-PKG_SOURCE:=
-PKG_SOURCE_URL:=
-PKG_MD5SUM:=unknown
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-PATCH_DIR:=./patches-$(PKG_VERSION)
-
-define prepare_source_directory
-	rm -rf $(PKG_BUILD_DIR)
-	$(CP) $(LINUX_DIR)/drivers/staging/usbip/userspace $(PKG_BUILD_DIR)
-endef
-Hooks/Prepare/Pre += prepare_source_directory
-
-PKG_BUILD_DEPENDS:=glib2 sysfsutils
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/usbip/Common
-  TITLE:=USB-over-IP
-  URL:=http://usbip.sourceforge.net/
-  DEPENDS:=@USB_SUPPORT
-endef
-
-define Package/usbip/Default
-  $(call Package/usbip/Common)
-  SECTION:=net
-  CATEGORY:=Network
-endef
-
-define Package/usbip
-  $(call Package/usbip/Default)
-  TITLE+= (common)
-  DEPENDS+= +libsysfs +libwrap +kmod-usbip
-endef
-
-define Package/usbip-client
-  $(call Package/usbip/Default)
-  TITLE+= (client)
-  DEPENDS+= usbip +glib2 +kmod-usbip-client
-endef
-
-define Package/usbip-server
-  $(call Package/usbip/Default)
-  TITLE+= (server)
-  DEPENDS+= usbip +glib2 +kmod-usbip-server
-endef
-
-CONFIGURE_PATH:=.
-MAKE_PATH:=.
-LIBTOOL_PATHS:=.
-MAKE_FLAGS+=CFLAGS="-Wno-implicit-function-declaration"
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-CFLAGS+="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include"
-
-define Download/usb.ids
-  URL:=http://www.linux-usb.org/
-  FILE:=usb.ids
-  MD5SUM:=
-endef
-
-define Package/usbip/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbip.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/share/hwdata
-	$(CP) $(DL_DIR)/usb.ids $(1)/usr/share/hwdata/
-endef
-
-define Package/usbip-client/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbip $(1)/usr/sbin/
-endef
-
-define Package/usbip-server/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbipd $(1)/usr/sbin/
-endef
-
-$(eval $(call Download,usb.ids))
-$(eval $(call BuildPackage,usbip))
-$(eval $(call BuildPackage,usbip-client))
-$(eval $(call BuildPackage,usbip-server))
-

--- a/net/usbip/patches/001-upstream_svn_r99.diff
+++ /dev/null
@@ -1,12 +1,1 @@
-Index: trunk/src/cmd/Makefile.am
-===================================================================
---- trunk/src/cmd/Makefile.am	(revision 98)
-+++ trunk/src/cmd/Makefile.am	(revision 99)
-@@ -17,5 +17,5 @@
- INCLUDES = -I$(top_srcdir)/lib
- LDADD = ../lib/libusbip.la @PACKAGE_LIBS@
- EXTRA_CFLAGS = @EXTRA_CFLAGS@
--AM_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) @PACKAGE_CFLAGS@
-+AM_CFLAGS = -Wall -W -Wstrict-prototypes -std=gnu99 $(EXTRA_CFLAGS) @PACKAGE_CFLAGS@ -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
- 
 

--- a/net/usbip/patches/002-upstream_svn_r152.patch
+++ /dev/null
@@ -1,230 +1,1 @@
---- a/drivers/head/stub_dev.c
-+++ b/drivers/head/stub_dev.c
-@@ -398,7 +398,11 @@ static int stub_probe(struct usb_interfa
- {
- 	struct usb_device *udev = interface_to_usbdev(interface);
- 	struct stub_device *sdev = NULL;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- 	char *udev_busid = interface->dev.parent->bus_id;
-+#else
-+	char *udev_busid = dev_name(interface->dev.parent);
-+#endif
- 	int err = 0;
- 
- 	udbg("Enter\n");
---- a/drivers/head/stub_main.c
-+++ b/drivers/head/stub_main.c
-@@ -252,18 +252,17 @@ static int __init usb_stub_init(void)
- 		return -ENOMEM;
- 	}
- 
-+	info(DRIVER_DESC "" DRIVER_VERSION);
-+
-+	memset(busid_table, 0, sizeof(busid_table));
-+	spin_lock_init(&busid_table_lock);
-+
- 	ret = usb_register(&stub_driver);
- 	if (ret) {
- 		uerr("usb_register failed %d\n", ret);
- 		return ret;
- 	}
- 
--
--	info(DRIVER_DESC "" DRIVER_VERSION);
--
--	memset(busid_table, 0, sizeof(busid_table));
--	spin_lock_init(&busid_table_lock);
--
- 	ret = driver_create_file(&stub_driver.drvwrap.driver, &driver_attr_match_busid);
- 
- 	if (ret) {
---- a/drivers/head/stub_rx.c
-+++ b/drivers/head/stub_rx.c
-@@ -159,7 +159,11 @@ static int tweak_set_configuration_cmd(s
- 	 * A user may need to set a special configuration value before
- 	 * exporting the device.
- 	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- 	uinfo("set_configuration (%d) to %s\n", config, urb->dev->dev.bus_id);
-+#else
-+	uinfo("set_configuration (%d) to %s\n", config, dev_name(&urb->dev->dev));
-+#endif
- 	uinfo("but, skip!\n");
- 
- 	return 0;
-@@ -177,7 +181,11 @@ static int tweak_reset_device_cmd(struct
- 	value = le16_to_cpu(req->wValue);
- 	index = le16_to_cpu(req->wIndex);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- 	uinfo("reset_device (port %d) to %s\n", index, urb->dev->dev.bus_id);
-+#else
-+	uinfo("reset_device (port %d) to %s\n", index, dev_name(&urb->dev->dev));
-+#endif
- 
- 	/* all interfaces should be owned by usbip driver, so just reset it. */
- 	ret = usb_lock_device_for_reset(urb->dev, NULL);
-@@ -187,7 +195,11 @@ static int tweak_reset_device_cmd(struct
- 	}
- 
- 	/* try to reset the device */
--	ret = usb_reset_composite_device(urb->dev, NULL);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-+    ret = usb_reset_composite_device(urb->dev, NULL);
-+#else
-+	ret = usb_reset_device(urb->dev);
-+#endif
- 	if (ret < 0)
- 		uerr("device reset\n");
- 
---- a/drivers/head/usbip_common.c
-+++ b/drivers/head/usbip_common.c
-@@ -55,10 +55,7 @@ static ssize_t show_flag(struct device *
- static ssize_t store_flag(struct device *dev, struct device_attribute *attr,
- 		const char *buf, size_t count)
- {
--	unsigned long flag;
--
--	sscanf(buf, "%lx", &flag);
--	usbip_debug_flag = flag;
-+	sscanf(buf, "%lx", &usbip_debug_flag);
- 
- 	return count;
- }
-@@ -390,7 +387,7 @@ int usbip_thread(void *param)
- 	unlock_kernel();
- 
- 	/* srv.rb must wait for rx_thread starting */
--	complete(&ut->thread_done);
-+	complete(&ut->thread_started);
- 
- 	/* start of while loop */
- 	ut->loop_ops(ut);
-@@ -403,15 +400,21 @@ int usbip_thread(void *param)
- 
- void usbip_start_threads(struct usbip_device *ud)
- {
-+
- 	/*
- 	 * threads are invoked per one device (per one connection).
- 	 */
-+    INIT_COMPLETION(ud->tcp_rx.thread_started);
-+    INIT_COMPLETION(ud->tcp_tx.thread_started);
-+    INIT_COMPLETION(ud->tcp_rx.thread_done);
-+    INIT_COMPLETION(ud->tcp_tx.thread_done);
-+
- 	kernel_thread((int(*)(void *))usbip_thread, (void *)&ud->tcp_rx, 0);
- 	kernel_thread((int(*)(void *))usbip_thread, (void *)&ud->tcp_tx, 0);
- 
- 	/* confirm threads are starting */
--	wait_for_completion(&ud->tcp_rx.thread_done);
--	wait_for_completion(&ud->tcp_tx.thread_done);
-+	wait_for_completion(&ud->tcp_rx.thread_started);
-+	wait_for_completion(&ud->tcp_tx.thread_started);
- }
- EXPORT_SYMBOL(usbip_start_threads);
- 
-@@ -436,6 +439,7 @@ void usbip_task_init(struct usbip_task *
- 		void (*loop_ops)(struct usbip_task *))
- {
- 	ut->thread = NULL;
-+	init_completion(&ut->thread_started);
- 	init_completion(&ut->thread_done);
- 	ut->name = name;
- 	ut->loop_ops = loop_ops;
---- a/drivers/head/usbip_event.c
-+++ b/drivers/head/usbip_event.c
-@@ -38,7 +38,7 @@ void usbip_start_eh(struct usbip_device
- 
- 	kernel_thread((int(*)(void *)) usbip_thread, (void *) eh, 0);
- 
--	wait_for_completion(&eh->thread_done);
-+	wait_for_completion(&eh->thread_started);
- }
- EXPORT_SYMBOL(usbip_start_eh);
- 
---- a/drivers/head/vhci_hcd.c
-+++ b/drivers/head/vhci_hcd.c
-@@ -58,7 +58,7 @@ static void vhci_stop(struct usb_hcd *hc
- static int vhci_get_frame_number(struct usb_hcd *hcd);
- 
- static const char driver_name[] = "vhci_hcd";
--static const char driver_desc[] = "USB/IP Virtual Host Contoroller";
-+static const char driver_desc[] = "USB/IP Virtual Host Controller";
- 
- 
- 
-@@ -416,14 +416,6 @@ static int vhci_hub_control(struct usb_h
- 				case USB_PORT_FEAT_SUSPEND:
- 					dbg_vhci_rh(" SetPortFeature: USB_PORT_FEAT_SUSPEND\n");
- 					uerr(" not yet\n");
--#if 0
--					dum->port_status[rhport] |= (1 << USB_PORT_FEAT_SUSPEND);
--					if (dum->driver->suspend) {
--						spin_unlock (&dum->lock);
--						dum->driver->suspend (&dum->gadget);
--						spin_lock (&dum->lock);
--					}
--#endif
- 					break;
- 				case USB_PORT_FEAT_RESET:
- 					dbg_vhci_rh(" SetPortFeature: USB_PORT_FEAT_RESET\n");
-@@ -432,12 +424,6 @@ static int vhci_hub_control(struct usb_h
- 						dum->port_status[rhport] &= ~(USB_PORT_STAT_ENABLE
- 								| USB_PORT_STAT_LOW_SPEED
- 								| USB_PORT_STAT_HIGH_SPEED);
--#if 0
--						if (dum->driver) {
--							dev_dbg (hardware, "disconnect\n");
--							stop_activity (dum, dum->driver);
--						}
--#endif
- 
- 						/* FIXME test that code path! */
- 					}
-@@ -1060,7 +1046,7 @@ static int vhci_hcd_probe(struct platfor
- 	struct usb_hcd		*hcd;
- 	int			ret;
- 
--	uinfo("proving...\n");
-+	uinfo("probing...\n");
- 
- 	dbg_vhci_hc("name %s id %d\n", pdev->name, pdev->id);
- 
-@@ -1076,7 +1062,11 @@ static int vhci_hcd_probe(struct platfor
- 	 * Allocate and initialize hcd.
- 	 * Our private data is also allocated automatically.
- 	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- 	hcd = usb_create_hcd(&vhci_hc_driver, &pdev->dev, pdev->dev.bus_id);
-+#else
-+	hcd = usb_create_hcd(&vhci_hc_driver, &pdev->dev, dev_name(&pdev->dev));
-+#endif
- 	if (!hcd) {
- 		uerr("create hcd failed\n");
- 		return -ENOMEM;
---- a/drivers/head/vhci_sysfs.c
-+++ b/drivers/head/vhci_sysfs.c
-@@ -123,7 +123,11 @@ static ssize_t show_status(struct device
- 			out += sprintf(out, "%03u %08x ",
- 					vdev->speed, vdev->devid);
- 			out += sprintf(out, "%16p ", vdev->ud.tcp_socket);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- 			out += sprintf(out, "%s", vdev->udev->dev.bus_id);
-+#else
-+			out += sprintf(out, "%s", dev_name(&vdev->udev->dev));
-+#endif
- 
- 		} else
- 			out += sprintf(out, "000 000 000 0000000000000000 0-0");
---- a/drivers/head/usbip_common.h
-+++ b/drivers/head/usbip_common.h
-@@ -300,6 +300,7 @@ struct usbip_device;
- 
- struct usbip_task {
- 	struct task_struct *thread;
-+	struct completion thread_started;
- 	struct completion thread_done;
- 	char *name;
- 	void (*loop_ops)(struct usbip_task *);
 

file:a/net/wifidog/Makefile (deleted)
--- a/net/wifidog/Makefile
+++ /dev/null
@@ -1,60 +1,1 @@
-#
-# Copyright (C) 2006,2013 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:=wifidog
-PKG_VERSION:=20130917
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/wifidog/wifidog-gateway.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=440445db60b0c3aff528ea703a828b0567293387
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/wifidog
-  SUBMENU:=Captive Portals
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+iptables-mod-extra +iptables-mod-ipopt +iptables-mod-nat-extra +libpthread
-  TITLE:=A wireless captive portal solution
-  URL:=http://www.wifidog.org
-endef
-
-define Package/wifidog/description
-	The Wifidog project is a complete and embeddable captive
-	portal solution for wireless community groups or individuals
-	who wish to open a free Hotspot while still preventing abuse
-	of their Internet connection.
-endef
-
-define Package/wifidog/conffiles
-/etc/wifidog.conf
-endef
-
-define Package/wifidog/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(1)/usr/bin/wifidog-init
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wifidog $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/wdctl $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog.conf $(1)/etc/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/wifidog-msg.html $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/wifidog.init $(1)/etc/init.d/wifidog
-endef
-
-$(eval $(call BuildPackage,wifidog))
-

--- a/net/wifidog/files/wifidog.init
+++ /dev/null
@@ -1,17 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=65
-EXTRA_COMMANDS="status"
-EXTRA_HELP="        status Print the status of the service"
 
-start() {
-	/usr/bin/wifidog-init start
-}
-
-stop() {
-	/usr/bin/wifidog-init stop
-}
-
-status() {
-	/usr/bin/wifidog-init status
-}

--- a/net/yaddns/Makefile
+++ b/net/yaddns/Makefile
@@ -22,7 +22,7 @@
 define Package/yaddns
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+USE_EGLIBC:librt
+  DEPENDS:=+USE_GLIBC:librt
   SUBMENU:=IP Addresses and Names
   TITLE:=Yet Another DDNS client
   URL:=http://patatrac.info/yaddns

file:a/sound/ices/Makefile (deleted)
--- a/sound/ices/Makefile
+++ /dev/null
@@ -1,60 +1,1 @@
-#
-# Copyright (C) 2009 Freifunk Leipzig
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ices
-PKG_VERSION:=2.0.1
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ices/
-PKG_MD5SUM:=0d95ac34d59fed337028d5e7771076d8
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ices
-  SECTION:=sound
-  CATEGORY:=Sound
-  TITLE:=ices client for Icecast media streaming servers
-  URL:=http://xiph.org/
-  DEPENDS:=+libshout +libxml2 +zlib +libogg +libvorbis +alsa-lib
-endef
-
-define Package/ices/description
-  ices is a command line source client for Icecast media streaming servers.
-  It began as the successor of the old "shout" utility, and has since gained a
-  lot of useful features.
-endef
-
-define Package/ices/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-CONFIGURE_ARGS+= \
-    --with-ogg="$(STAGING_DIR)/usr/include" \
-    --with-vorbis="$(STAGING_DIR)/usr/include" \
-
-define Build/Configure
-    $(call Build/Configure/Default, \
-      LDFLAGS="$(TARGET_LDFLAGS) -lz -lm" \
-    )
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	  $(TARGET_CONFIGURE_OPTS) \
-	  CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-	  LDFLAGS="$(TARGET_LDFLAGS) -lz -lm"
-endef
-
-$(eval $(call BuildPackage,ices))
-

file:a/utils/acpid/Makefile (deleted)
--- a/utils/acpid/Makefile
+++ /dev/null
@@ -1,66 +1,1 @@
-#
-# 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:=acpid
-PKG_VERSION:=2.0.10
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://tedfelix.com/linux/
-PKG_MD5SUM:=d5dd88bcfaa4a0bf51905e95115da6df
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/acpid
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=The ACPI Daemon (acpid) With Netlink Support
-  URL:=http://tedfelix.com/linux/acpid-netlink.html
-  DEPENDS:=+kmod-input-evdev +kmod-acpi-button
-endef
-
-define Package/acpid/description
-  The ACPI Daemon (acpid) With Netlink Support
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		LD="$(TARGET_CC)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		all
-endef
-
-define Package/acpid/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/acpid $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/acpi_listen $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/acpi/events
-	$(INSTALL_CONF) ./files/default $(1)/etc/acpi/events/default
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_CONF) ./files/acpid.init $(1)/etc/init.d/acpid
-	chmod 0750 $(1)/etc/init.d/acpid
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/input/
-	$(INSTALL_CONF) ./files/acpid.hotplug $(1)/etc/hotplug.d/input/
-endef
-
-define Package/acpid/postinst
-#!/bin/sh
-[ -n "$${IPKG_INSTROOT}" ] || {
-	echo "waiting for input devices to come up"
-	/etc/init.d/acpid enable
-	sleep 5
-	/etc/init.d/acpid start
-	echo "please try the power button"
-	exit 0
-}
-endef
-
-$(eval $(call BuildPackage,acpid))
-

--- a/utils/acpid/files/acpid.hotplug
+++ /dev/null
@@ -1,8 +1,1 @@
-#!/bin/sh
 
-. /lib/functions.sh
-
-if [ "$ACTION" = add ] && [ "$DEVICENAME" = event0 ]; then
-        ( /etc/init.d/acpid/stop; sleep 3; /usr/sbin/acpid )&
-fi
-

--- a/utils/acpid/files/acpid.init
+++ /dev/null
@@ -1,26 +1,1 @@
-#!/bin/ash /etc/rc.common
-# Copyright (C) 2009-2010 OpenWrt.org
 
-START=99
-STOP=80
-
-ACPID_BIN="/usr/sbin/acpid"
-ACPID_PID="/var/run/acpid.pid"
-
-start() {
-    [ -x "$ACPID_BIN" ] || return 1
-    start-stop-daemon -S -x $ACPID_BIN -p $ACPID_PID
-}
-
-boot() {
-	# Do nothing on boot
-    	[ -x "$ACPID_BIN" ] || return 1
-	start-stop-daemon -S -x $ACPID_BIN -p $ACPID_PID
-	exit 0
-}
-
-stop() {
-	service_kill ${ACPID_BIN##*/} $ACPID_PID
-	rm -f $ACPID_PID
-}
-

--- a/utils/acpid/files/default
+++ /dev/null
@@ -1,6 +1,1 @@
-# This is a sample ACPID configuration
 
-event=button/power.*
-action=/sbin/poweroff 
-
-

file:a/utils/avrdude/Makefile (deleted)
--- a/utils/avrdude/Makefile
+++ /dev/null
@@ -1,62 +1,1 @@
-#
-# Copyright (C) 2008 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:=avrdude
-PKG_VERSION:=6.0.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/avrdude
-PKG_MD5SUM:=346ec2e46393a54ac152b95abf1d9850
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/avrdude
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=AVR Downloader/UploaDEr
-  URL:=http://www.bsdhome.com/avrdude/
-  DEPENDS:=+libncurses +libreadline +libusb-compat +libftdi
-endef
-
-define Package/avrdude/description
- AVRDUDE is a full featured program for programming Atmel's AVR CPU's.
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	chmod -R u+w $(PKG_BUILD_DIR)
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-doc \
-	--disable-parport \
-
-CONFIGURE_VARS += \
-	ac_cv_lib_elf_elf_begin=no \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install-exec
-endef
-
-define Package/avrdude/conffiles
-/etc/avrdude.conf
-endef
-
-define Package/avrdude/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/avrdude.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/avrdude $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,avrdude))
-

file:a/utils/bc/Makefile (deleted)
--- a/utils/bc/Makefile
+++ /dev/null
@@ -1,62 +1,1 @@
-#
-# Copyright (C) 2006-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:=bc
-PKG_VERSION:=1.06.95
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=ftp://ftp.debian.org/debian/pool/main/b/bc
-PKG_MD5SUM:=24d0831812d8262b6cac8316b0bac483
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bc/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  URL:=http://packages.debian.org/bc
-endef
-
-define Package/bc
-  $(call Package/bc/Default)
-  TITLE:=Arbitrary precision calculator language
-  DEPENDS:=+libreadline +libncurses
-endef
-
-define Package/bc/description
- bc is a language that supports arbitrary precision numbers with
- interactive execution of statements.
-endef
-
-define Package/dc
-  $(call Package/bc/Default)
-  TITLE:=Arbitrary precision reverse-polish calculator
-  DEPENDS:=bc
-endef
-
-define Package/dc/description
- dc is a reverse-polish desk calculator which supports unlimited
- precision arithmetic.
-endef
-
-CONFIGURE_ARGS += --with-readline
-
-define Package/bc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bc/bc $(1)/usr/bin/
-endef
-
-define Package/dc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dc/dc $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,bc))
-$(eval $(call BuildPackage,dc))
-

--- a/utils/bc/patches/001-disable-doc.patch
+++ /dev/null
@@ -1,22 +1,1 @@
---- bc-1.06.95/Makefile.in	2010-07-03 10:48:13.422725147 +0000
-+++ bc-1.06.95/Makefile.in	2010-07-03 10:50:09.714725197 +0000
-@@ -149,7 +149,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = lib bc dc doc
-+SUBDIRS = lib bc dc
- MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
- 			stamp-h $(distdir).tar.gz h/number.h depcomp missing
- 
---- bc-1.06.95/Makefile.am	2010-07-03 10:48:32.522725037 +0000
-+++ bc-1.06.95/Makefile.am	2010-07-03 10:48:38.114725024 +0000
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = lib bc dc doc
-+SUBDIRS = lib bc dc
- 
- MAINTAINERCLEANFILES =  aclocal.m4 config.h.in configure Makefile.in \
- 			stamp-h $(distdir).tar.gz h/number.h depcomp missing
 

--- a/utils/dosfstools/Makefile
+++ /dev/null
@@ -1,97 +1,1 @@
-#
-# 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:=dosfstools
-PKG_VERSION:=3.0.12
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://fossies.org/linux/misc
-PKG_MD5SUM:=4c1f1e72b82371704f93ebdd3c7b6259
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/dosfstools/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  URL:=http://www.daniel-baumann.ch/software/dosfstools/
-  SUBMENU:=Filesystem
-endef
-
-define Package/dosfsck
-  $(call Package/dosfstools/Default)
-  TITLE:=dosfsck
-endef
-
-define Package/dosfslabel
-  $(call Package/dosfstools/Default)
-  TITLE:=dosfslabel
-endef
-
-define Package/mkdosfs
-  $(call Package/dosfstools/Default)
-  TITLE:=mkdosfs
-endef
-
-define Package/dosfsck/description
-	Utilities to create and check MS-DOS FAT filesystems.
-	(fsck.vfat and fsck.msdos for checking integrity of FAT volumes)
-endef
-
-define Package/dosfslabel/description
-	Utilities to create and check MS-DOS FAT filesystems.
-	(dosfslabel for reading and writing labels of FAT volumes)
-endef
-
-define Package/mkdosfs/description
-	Utilities to create and check MS-DOS FAT filesystems.
-	(mkfs.vfat and mkfs.msdos for creating FAT volumes)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \
-		PREFIX="/usr" \
-		SBINDIR="/usr/sbin" \
-		all
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \
-		PREFIX="$(PKG_INSTALL_DIR)/usr" \
-		SBINDIR="$(PKG_INSTALL_DIR)/usr/sbin" \
-		install-bin
-endef
-
-define Package/dosfsck/install
-	$(INSTALL_DIR) $(1)/lib/functions/fsck
-	$(INSTALL_DATA) ./files/dosfsck.sh $(1)/lib/functions/fsck/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/
-	(cd $(1)/usr/sbin; ln -sf dosfsck fsck.msdos; ln -sf dosfsck fsck.vfat)
-endef
-
-define Package/dosfslabel/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfslabel $(1)/usr/sbin/
-endef
-
-define Package/mkdosfs/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/
-	(cd $(1)/usr/sbin; ln -sf mkdosfs mkfs.msdos; ln -sf mkdosfs mkfs.vfat)
-endef
-
-$(eval $(call BuildPackage,dosfsck))
-$(eval $(call BuildPackage,dosfslabel))
-$(eval $(call BuildPackage,mkdosfs))
-

--- a/utils/dosfstools/files/dosfsck.sh
+++ /dev/null
@@ -1,31 +1,1 @@
-#!/bin/sh
-# Copyright 2010 Vertical Communications
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-fsck_dosfsck() {
-	dosfsck -p "$device" 2>&1 | logger -t "fstab: dosfsck ($device)"
-	local status="$?"
-	case "$status" in
-		0|1) ;; #success
-		2) reboot;;
-		4) echo "dosfsck ($device): Warning! Uncorrected errors."| logger -t fstab
-			return 1
-			;;
-		*) echo "dosfsck ($device): Error $status. Check not complete."| logger -t fstab;;
-	esac
-	return 0
-}
-
-fsck_dos() {
-	fsck_dosfsck "$@"
-}
-
-fsck_vfat() {
-	fsck_dosfsck "$@"
-}
-
-append libmount_known_fsck "dos"
-append libmount_known_fsck "vfat"
-

--- a/utils/dosfstools/patches/002-linux_26_headers.patch
+++ /dev/null
@@ -1,55 +1,1 @@
---- a/src/common.h
-+++ b/src/common.h
-@@ -19,7 +19,7 @@
-    can be found in /usr/share/common-licenses/GPL-3 file.
- */
- 
--#include <asm/types.h>
-+#include <linux/types.h>
- 
- #ifndef _COMMON_H
- #define _COMMON_H
---- a/src/dosfsck.h
-+++ b/src/dosfsck.h
-@@ -31,7 +31,7 @@
- #define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h> */
- #define _LINUX_FS_H		/* hack to avoid inclusion of <linux/fs.h> */
- 
--#include <asm/types.h>
-+#include <linux/types.h>
- #include <asm/byteorder.h>
- 
- #include <linux/msdos_fs.h>
---- a/src/file.c
-+++ b/src/file.c
-@@ -33,7 +33,7 @@
- #define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h> */
- #define _LINUX_FS_H		/* hack to avoid inclusion of <linux/fs.h> */
- 
--#include <asm/types.h>
-+#include <linux/types.h>
- 
- #include <linux/msdos_fs.h>
- 
---- a/src/io.c
-+++ b/src/io.c
-@@ -39,6 +39,7 @@
- #include <sys/ioctl.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <linux/types.h>
- #include <linux/fd.h>
- 
- #include "dosfsck.h"
---- a/src/mkdosfs.c
-+++ b/src/mkdosfs.c
-@@ -63,7 +63,7 @@
- #include <time.h>
- #include <errno.h>
- 
--#include <asm/types.h>
-+#include <linux/types.h>
- 
- #if __BYTE_ORDER == __BIG_ENDIAN
- 
 

--- a/utils/i2c-tools/Makefile
+++ /dev/null
@@ -1,111 +1,1 @@
-#
-# Copyright (C) 2007-2013 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:=i2c-tools
-PKG_VERSION:=2013-12-15
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_URL:=http://lm-sensors.org/svn/i2c-tools/trunk
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=r6204
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=PACKAGE_python-smbus:python
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/i2c/Default
-  URL:=http://lm-sensors.org/wiki/I2CTools
-  TITLE:=I2C
-endef
-
-define Package/libi2c
-  $(call Package/i2c/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+=library
-endef
-
-define Package/i2c-tools
-  $(call Package/i2c/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE+=tools for Linux
-  DEPENDS:=+libi2c
-endef
-
-define Package/python-smbus
-  $(call Package/i2c/Default)
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Python bindings for the SMBUS
-  DEPENDS:=+PACKAGE_python-smbus:python-mini +i2c-tools
-endef
-
-define Package/i2c-tools/description
- This package contains an heterogeneous set of I2C tools for Linux. These tools
- were originally part of the lm-sensors package.
-endef
-
-define Package/python-smbus/description
- This package contain the python bindings for Linux SMBus access through i2c-dev.
-endef
-
-TARGET_CPPFLAGS += -I$(PKG_BUILD_DIR)/include
-
-ifdef CONFIG_PACKAGE_python-smbus
-  define Build/Compile/python-smbus
-	$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
-	$(call Build/Compile/PyMod,./py-smbus/, \
-		install --prefix="$(PKG_INSTALL_DIR)/usr", \
-	)
-  endef
-endif
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LINUX="$(LINUX_DIR)" \
-		CC="$(TARGET_CC)" \
-		STAGING_DIR="$(STAGING_DIR)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		CFLAGS="$(TARGET_CFLAGS)"
-	$(Build/Compile/python-smbus)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libi2c.so* $(1)/usr/lib/
-endef
-
-define Package/libi2c/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libi2c.so* $(1)/usr/lib/
-endef
-
-define Package/i2c-tools/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cdetect $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cdump $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cset $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/i2cget $(1)/usr/sbin/
-endef
-
-define PyPackage/python-smbus/filespec
-+|$(PYTHON_PKG_DIR)/smbus.so
-endef
-
-$(eval $(call BuildPackage,libi2c))
-$(eval $(call BuildPackage,i2c-tools))
-$(eval $(call PyPackage,python-smbus))
-$(eval $(call BuildPackage,python-smbus))
-

--- a/utils/lcd4linux/Config.in
+++ /dev/null
@@ -1,502 +1,1 @@
-if PACKAGE_lcd4linux-custom
 
-config LCD4LINUX_CUSTOM_NEEDS_libdbus
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libdpf
-	bool
-
-#config LCD4LINUX_CUSTOM_NEEDS_libftdi
-#	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libgd
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libiconv
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libjpeg
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libmpdclient
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libmysqlclient
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libncurses
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libnmeap
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libsqlite3
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libusb
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_libvncserver
-	bool
-
-#config LCD4LINUX_CUSTOM_NEEDS_libX11
-#	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_ppp
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_python
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_serdisplib
-	bool
-
-config LCD4LINUX_CUSTOM_NEEDS_st2205tool
-	bool
-
-
-comment "Drivers ---"
-
-config LCD4LINUX_CUSTOM_DRIVER_ASTUSB
-	bool
-	prompt "ASTUSB"
-
-config LCD4LINUX_CUSTOM_DRIVER_BeckmannEgle
-	bool
-	prompt "BeckmannEgle"
-
-config LCD4LINUX_CUSTOM_DRIVER_BWCT
-	bool
-	prompt "BWCT"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_CrystalFontz
-	bool
-	prompt "CrystalFontz"
-
-config LCD4LINUX_CUSTOM_DRIVER_Curses
-	bool
-	prompt "Curses"
-	select LCD4LINUX_CUSTOM_NEEDS_libncurses
-
-config LCD4LINUX_CUSTOM_DRIVER_Cwlinux
-	bool
-	prompt "Cwlinux"
-
-config LCD4LINUX_CUSTOM_DRIVER_D4D
-	bool
-	prompt "D4D"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_dpf
-	bool
-	prompt "dpf"
-	select LCD4LINUX_CUSTOM_NEEDS_libdpf
-
-config LCD4LINUX_CUSTOM_DRIVER_EA232graphic
-	bool
-	prompt "EA232graphic"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_EFN
-	bool
-	prompt "EFN"
-
-config LCD4LINUX_CUSTOM_DRIVER_FutabaVFD
-	bool
-	prompt "FutabaVFD"
-
-config LCD4LINUX_CUSTOM_DRIVER_FW8888
-	bool
-	prompt "FW8888"
-
-config LCD4LINUX_CUSTOM_DRIVER_G15
-	bool
-	prompt "G15"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_GLCD2USB
-	bool
-	prompt "GLCD2USB"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_HD44780
-	bool
-	prompt "HD44780"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_HD44780-I2C
-	bool
-	prompt "HD44780-I2C"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_IRLCD
-	bool
-	prompt "IRLCD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_LCD2USB
-	bool
-	prompt "LCD2USB"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_LCDLinux
-	bool
-	prompt "LCDLinux"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_LCDTerm
-	bool
-	prompt "LCDTerm"
-
-config LCD4LINUX_CUSTOM_DRIVER_LEDMatrix
-	bool
-	prompt "LEDMatrix"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_LPH7508
-	bool
-	prompt "LPH7508"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_LUIse
-	bool
-	prompt "LUIse"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	#select LCD4LINUX_CUSTOM_NEEDS_libluise
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_DRIVER_LW_ABP
-	bool
-	prompt "LW_ABP"
-
-config LCD4LINUX_CUSTOM_DRIVER_M50530
-	bool
-	prompt "M50530"
-
-config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbital
-	bool
-	prompt "MatrixOrbital"
-
-config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbitalGX
-	bool
-	prompt "MatrixOrbitalGX"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_mdm166a
-	bool
-	prompt "mdm166a"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_MilfordInstruments
-	bool
-	prompt "MilfordInstruments"
-
-config LCD4LINUX_CUSTOM_DRIVER_Newhaven
-	bool
-	prompt "Newhaven"
-
-config LCD4LINUX_CUSTOM_DRIVER_Noritake
-	bool
-	prompt "Noritake"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_NULL
-	bool
-	prompt "NULL"
-	default y
-
-config LCD4LINUX_CUSTOM_DRIVER_Pertelian
-	bool
-	prompt "Pertelian"
-
-config LCD4LINUX_CUSTOM_DRIVER_PHAnderson
-	bool
-	prompt "PHAnderson"
-
-config LCD4LINUX_CUSTOM_DRIVER_PICGraphic
-	bool
-	prompt "PICGraphic"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_picoLCD
-	bool
-	prompt "picoLCD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_picoLCDGraphic
-	bool
-	prompt "picoLCDGraphic"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_PNG
-	bool
-	prompt "PNG"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_PPM
-	bool
-	prompt "PPM"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_RouterBoard
-	bool
-	prompt "RouterBoard"
-	depends on TARGET_rb532
-
-config LCD4LINUX_CUSTOM_DRIVER_SamsungSPF
-	bool
-	prompt "SamsungSPF"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libjpeg
-
-config LCD4LINUX_CUSTOM_DRIVER_serdisplib
-	bool
-	prompt "serdisplib"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_serdisplib
-
-config LCD4LINUX_CUSTOM_DRIVER_ShuttleVFD
-	bool
-	prompt "ShuttleVFD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_SimpleLCD
-	bool
-	prompt "SimpleLCD"
-
-config LCD4LINUX_CUSTOM_DRIVER_st2205
-	bool
-	prompt "st2205"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_st2205tool
-
-config LCD4LINUX_CUSTOM_DRIVER_T6963
-	bool
-	prompt "T6963"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-
-config LCD4LINUX_CUSTOM_DRIVER_TeakLCM
-	bool
-	prompt "TeakLCM"
-
-config LCD4LINUX_CUSTOM_DRIVER_TEW673GRU
-	bool
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	depends on TARGET_ar71xx
-	default TARGET_ar71xx
-
-config LCD4LINUX_CUSTOM_DRIVER_Trefon
-	bool
-	prompt "Trefon"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-#config LCD4LINUX_CUSTOM_DRIVER_ULA200
-#	bool
-#	prompt "ULA200"
-#	select LCD4LINUX_CUSTOM_NEEDS_libftdi
-#	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_USBHUB
-	bool
-	prompt "USBHUB"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_USBLCD
-	bool
-	prompt "USBLCD"
-	select LCD4LINUX_CUSTOM_NEEDS_libusb
-
-config LCD4LINUX_CUSTOM_DRIVER_VNC
-	bool
-	prompt "VNC"
-	select LCD4LINUX_CUSTOM_NEEDS_libgd
-	select LCD4LINUX_CUSTOM_NEEDS_libvncserver
-
-config LCD4LINUX_CUSTOM_DRIVER_WincorNixdorf
-	bool
-	prompt "WincorNixdorf"
-
-#config LCD4LINUX_CUSTOM_DRIVER_X11
-#	bool
-#	prompt "X11"
-#	select LCD4LINUX_CUSTOM_NEEDS_libgd
-#	select LCD4LINUX_CUSTOM_NEEDS_libX11
-
-
-comment "Plugins ---"
-
-config LCD4LINUX_CUSTOM_PLUGIN_apm
-	bool
-	prompt "apm"
-
-config LCD4LINUX_CUSTOM_PLUGIN_asterisk
-	bool
-	prompt "asterisk"
-
-config LCD4LINUX_CUSTOM_PLUGIN_button_exec
-	bool
-	prompt "button_exec"
-
-config LCD4LINUX_CUSTOM_PLUGIN_cpuinfo
-	bool
-	prompt "cpuinfo"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_dbus
-	bool
-	prompt "dbus"
-	select LCD4LINUX_CUSTOM_NEEDS_libdbus
-
-config LCD4LINUX_CUSTOM_PLUGIN_diskstats
-	bool
-	prompt "diskstats"
-
-config LCD4LINUX_CUSTOM_PLUGIN_dvb
-	bool
-	prompt "dvb"
-
-config LCD4LINUX_CUSTOM_PLUGIN_event
-	bool
-	prompt "event"
-
-config LCD4LINUX_CUSTOM_PLUGIN_exec
-	bool
-	prompt "exec"
-
-config LCD4LINUX_CUSTOM_PLUGIN_fifo
-	bool
-	prompt "fifo"
-
-config LCD4LINUX_CUSTOM_PLUGIN_file
-	bool
-	prompt "file"
-
-config LCD4LINUX_CUSTOM_PLUGIN_gps
-	bool
-	prompt "gps"
-	select LCD4LINUX_CUSTOM_NEEDS_libnmeap
-
-config LCD4LINUX_CUSTOM_PLUGIN_hddtemp
-	bool
-	prompt "hddtemp"
-
-config LCD4LINUX_CUSTOM_PLUGIN_huawei
-	bool
-	prompt "huawei"
-
-config LCD4LINUX_CUSTOM_PLUGIN_i2c_sensors
-	bool
-	prompt "i2c_sensors"
-
-config LCD4LINUX_CUSTOM_PLUGIN_iconv
-	bool
-	prompt "iconv"
-	select LCD4LINUX_CUSTOM_NEEDS_libiconv
-
-config LCD4LINUX_CUSTOM_PLUGIN_imon
-	bool
-	prompt "imon"
-
-config LCD4LINUX_CUSTOM_PLUGIN_isdn
-	bool
-	prompt "isdn"
-
-config LCD4LINUX_CUSTOM_PLUGIN_kvv
-	bool
-	prompt "kvv"
-
-config LCD4LINUX_CUSTOM_PLUGIN_loadavg
-	bool
-	prompt "loadavg"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_meminfo
-	bool
-	prompt "meminfo"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_mpd
-	bool
-	prompt "mpd"
-	select LCD4LINUX_CUSTOM_NEEDS_libmpdclient
-
-config LCD4LINUX_CUSTOM_PLUGIN_mpris_dbus
-	bool
-	prompt "mpris_dbus"
-	select LCD4LINUX_CUSTOM_NEEDS_libdbus
-
-config LCD4LINUX_CUSTOM_PLUGIN_mysql
-	bool
-	prompt "mysql"
-	select LCD4LINUX_CUSTOM_NEEDS_libmysqlclient
-
-config LCD4LINUX_CUSTOM_PLUGIN_netdev
-	bool
-	prompt "netdev"
-
-config LCD4LINUX_CUSTOM_PLUGIN_netinfo
-	bool
-	prompt "netinfo"
-
-config LCD4LINUX_CUSTOM_PLUGIN_pop3
-	bool
-	prompt "pop3"
-
-config LCD4LINUX_CUSTOM_PLUGIN_ppp
-	bool
-	prompt "ppp"
-	select LCD4LINUX_CUSTOM_NEEDS_ppp
-
-config LCD4LINUX_CUSTOM_PLUGIN_proc_stat
-	bool
-	prompt "proc_stat"
-	default y
-
-#config LCD4LINUX_CUSTOM_PLUGIN_python
-#	bool
-#	prompt "python"
-#	select LCD4LINUX_CUSTOM_NEEDS_python
-
-config LCD4LINUX_CUSTOM_PLUGIN_qnaplog
-	bool
-	prompt "qnaplog"
-	select LCD4LINUX_CUSTOM_NEEDS_libsqlite3
-
-config LCD4LINUX_CUSTOM_PLUGIN_seti
-	bool
-	prompt "seti"
-
-config LCD4LINUX_CUSTOM_PLUGIN_statfs
-	bool
-	prompt "statfs"
-
-config LCD4LINUX_CUSTOM_PLUGIN_uname
-	bool
-	prompt "uname"
-
-config LCD4LINUX_CUSTOM_PLUGIN_uptime
-	bool
-	prompt "uptime"
-	default y
-
-config LCD4LINUX_CUSTOM_PLUGIN_w1retap
-	bool
-	prompt "w1retap"
-
-config LCD4LINUX_CUSTOM_PLUGIN_wireless
-	bool
-	prompt "wireless"
-	depends on BROKEN
-
-config LCD4LINUX_CUSTOM_PLUGIN_xmms
-	bool
-	prompt "xmms"
-
-endif
-

--- a/utils/lcd4linux/Makefile
+++ /dev/null
@@ -1,322 +1,1 @@
-#
-# Copyright (C) 2007-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:=lcd4linux
-PKG_REV:=1187
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/
-PKG_SOURCE_SUBDIR:=lcd4linux-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
-
-LCD4LINUX_DRIVERS:= \
-	ASTUSB \
-	BeckmannEgle \
-	BWCT \
-	CrystalFontz \
-	Curses \
-	Cwlinux \
-	D4D \
-	DPF \
-	EA232graphic \
-	EFN \
-	FutabaVFD \
-	FW8888 \
-	G15 \
-	GLCD2USB \
-	IRLCD \
-	$(if $(CONFIG_BROKEN),HD44780) \
-	$(if $(CONFIG_BROKEN),HD44780-I2C) \
-	LCD2USB \
-	$(if $(CONFIG_BROKEN),LCDLinux) \
-	LCDTerm \
-	LEDMatrix \
-	LPH7508 \
-	$(if $(CONFIG_BROKEN),LUIse) \
-	LW_ABP \
-	M50530 \
-	MatrixOrbital \
-	MatrixOrbitalGX \
-	MilfordInstruments \
-	Newhaven \
-	Noritake \
-	NULL \
-	Pertelian \
-	PHAnderson \
-	PICGraphic \
-	picoLCD \
-	picoLCDGraphic \
-	PNG \
-	PPM \
-	$(if $(CONFIG_TARGET_rb532),RouterBoard) \
-	$(if $(CONFIG_BROKEN),SamsungSPF) \
-	serdisplib \
-	ShuttleVFD \
-	SimpleLCD \
-	st2205 \
-	T6963 \
-	TeakLCM \
-	$(if $(CONFIG_TARGET_ar71xx),TEW673GRU) \
-	Trefon \
-	USBHUB \
-	USBLCD \
-	VNC \
-	WincorNixdorf \
-#	ULA200 \
-#	X11 \
-
-LCD4LINUX_PLUGINS:= \
-	apm \
-	asterisk \
-	button_exec \
-	cpuinfo \
-	dbus \
-	diskstats \
-	dvb \
-	event \
-	exec \
-	fifo \
-	file \
-	gps \
-	hddtemp \
-	huawei \
-	i2c_sensors \
-	iconv \
-	imon \
-	isdn \
-	kvv \
-	loadavg \
-	netdev \
-	netinfo \
-	meminfo \
-	mpd \
-	mpris_dbus \
-	mysql \
-	netdev \
-	pop3 \
-	ppp \
-	proc_stat \
-	qnaplog \
-	seti \
-	statfs \
-	uname \
-	uptime \
-	w1retap \
-	$(if $(CONFIG_BROKEN),wireless) \
-	xmms \
-#	python \
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:= \
-	libdbus \
-	libgd \
-	libmpdclient \
-	libmysqlclient \
-	libncurses \
-	libnmeap \
-	libsqlite3 \
-	libvncserver \
-	ppp \
-	serdisplib \
-	st2205tool \
-#	libftdi \
-#	libX11 \
-#	python \
-
-PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_DRIVER_%,$(LCD4LINUX_DRIVERS)) \
-	$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_PLUGIN_%,$(LCD4LINUX_PLUGINS)) \
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/lcd4linux/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-  TITLE:=LCD display utility
-  URL:=http://lcd4linux.bulix.org/
-endef
-
-define Package/lcd4linux/Default/description
- LCD4Linux is a small program that grabs information from the kernel and
- some subsystems and displays it on an external liquid crystal display.
-endef
-
-
-define Package/lcd4linux-custom
-$(call Package/lcd4linux/Default)
-  DEPENDS:= \
-	+LCD4LINUX_CUSTOM_NEEDS_libdbus:libdbus \
-	+LCD4LINUX_CUSTOM_NEEDS_libdpf:libdpf \
-	+LCD4LINUX_CUSTOM_NEEDS_libgd:libgd \
-	$(if $(ICONV_FULL),+LCD4LINUX_CUSTOM_NEEDS_libiconv:libiconv-full) \
-	+LCD4LINUX_CUSTOM_NEEDS_libjpeg:libjpeg \
-	+LCD4LINUX_CUSTOM_NEEDS_libmpdclient:libmpdclient \
-	+LCD4LINUX_CUSTOM_NEEDS_libmysqlclient:libmysqlclient \
-	+LCD4LINUX_CUSTOM_NEEDS_libncurses:libncurses \
-	+LCD4LINUX_CUSTOM_NEEDS_libsqlite3:libsqlite3 \
-	+LCD4LINUX_CUSTOM_NEEDS_libusb:libusb-compat \
-	+LCD4LINUX_CUSTOM_NEEDS_libvncserver:libvncserver \
-	+LCD4LINUX_CUSTOM_NEEDS_serdisplib:serdisplib \
-	+LCD4LINUX_CUSTOM_NEEDS_st2205tool:st2205tool \
-#	+LCD4LINUX_CUSTOM_NEEDS_libftdi:libftdi \
-#	+LCD4LINUX_CUSTOM_NEEDS_libX11:libX11 \
-#	+LCD4LINUX_CUSTOM_NEEDS_python:python
-  MENU:=1
-  PROVIDES:=lcd4linux
-  VARIANT=custom
-endef
-
-define Package/lcd4linux-custom/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/lcd4linux-custom/description
-$(call Package/lcd4linux/Default/description)
- .
- This package contains a customized version of LCD4Linux.
-endef
-
-
-define Package/lcd4linux-full
-$(call Package/lcd4linux/Default)
-  DEPENDS:= @DEVEL \
-	+libdbus \
-	+libdpf \
-	+libgd \
-	$(if $(ICONV_FULL),+libiconv-full) \
-	+libmpdclient \
-	+libmysqlclient \
-	+libncurses \
-	+libsqlite3 \
-	+libusb-compat \
-	+libvncserver \
-	+serdisplib \
-	+st2205tool \
-#	+libftdi \
-#	+libX11 \
-#	+python
-  PROVIDES:=lcd4linux
-  VARIANT=full
-endef
-
-define Package/lcd4linux-full/description
-$(call Package/lcd4linux/Default/description)
- .
- This package contains a version of LCD4Linux built with all supported
- drivers and plugins.
-endef
-
-
-CONFIGURE_ARGS+= \
-	--disable-rpath \
-
-EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-ifeq ($(BUILD_VARIANT),custom)
-
-  LCD4LINUX_CUSTOM_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \
-    $(if $(CONFIG_LCD4LINUX_CUSTOM_DRIVER_$(c)),$(c),) \
- ))
-  ifeq ($(LCD4LINUX_CUSTOM_DRIVERS),)
-    LCD4LINUX_CUSTOM_DRIVERS:=Sample
-  endif
-
-  LCD4LINUX_CUSTOM_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \
-    $(if $(CONFIG_LCD4LINUX_CUSTOM_PLUGIN_$(c)),$(c)) \
-  ))
-  ifeq ($(LCD4LINUX_CUSTOM_PLUGINS),)
-    LCD4LINUX_CUSTOM_PLUGINS:=sample
-  endif
-
-  CONFIGURE_ARGS+= \
-	--with-drivers="$(LCD4LINUX_CUSTOM_DRIVERS)" \
-	--with-plugins="$(LCD4LINUX_CUSTOM_PLUGINS)" \
-
-  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libiconv),)
-    CONFIGURE_ARGS+= --with-libiconv-prefix="$(ICONV_PREFIX)"
-  else
-    CONFIGURE_ARGS+= --without-libiconv-prefix
-  endif
-
-  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libmysqlclient),)
-    EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql
-  endif
-
-#  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_python),)
-#    CONFIGURE_ARGS+= --with-python
-#  else
-    CONFIGURE_ARGS+= --without-python
-#  endif
-
-#  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libX11),)
-#    CONFIGURE_ARGS+= --with-x
-#  else
-    CONFIGURE_ARGS+= --without-x
-#  endif
-
-endif
-
-ifeq ($(BUILD_VARIANT),full)
-
-  LCD4LINUX_FULL_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \
-    $(c) \
-  ))
-
-  LCD4LINUX_FULL_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \
-    $(c) \
-  ))
-
-  CONFIGURE_ARGS+= \
-	--with-drivers="$(LCD4LINUX_FULL_DRIVERS)" \
-	--with-plugins="$(LCD4LINUX_FULL_PLUGINS)" \
-	--with-libiconv-prefix="$(ICONV_PREFIX)" \
-	--without-python \
-	--without-x \
-
-  EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql
-
-endif
-
-
-define Package/lcd4linux/conffiles
-/etc/lcd4linux.conf
-endef
-
-define Package/lcd4linux/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/lcd4linux $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/lcd4linux.conf.sample $(1)/etc/lcd4linux.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/lcd4linux.init $(1)/etc/init.d/lcd4linux
-	$(SED) "s|^\(Display 'GLCD2USB'\)|#\1|g" \
-	    -e "s|^\(Layout 'TestLayer'\)|#\1|g" \
-	    -e "s|^#\(Display 'Image'\)|\1|g" \
-	    -e "s|^#\(Layout 'Default'\)|\1|g" \
-	     $(1)/etc/lcd4linux.conf
-endef
-
-Package/lcd4linux-custom/conffiles = $(Package/lcd4linux/conffiles)
-Package/lcd4linux-custom/install = $(Package/lcd4linux/install)
-
-Package/lcd4linux-full/conffiles = $(Package/lcd4linux/conffiles)
-Package/lcd4linux-full/install = $(Package/lcd4linux/install)
-
-$(eval $(call BuildPackage,lcd4linux-custom))
-$(eval $(call BuildPackage,lcd4linux-full))
-

--- a/utils/lcd4linux/files/lcd4linux.init
+++ /dev/null
@@ -1,16 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007-2011 OpenWrt.org
 
-START=98
-
-SERVICE_USE_PID=1
-
-start() {
-	service_start /usr/bin/lcd4linux -o /tmp/lcd4linux.png -q
-}
-
-stop() {
-	service_stop /usr/bin/lcd4linux
-}
-
-

--- a/utils/lcd4linux/patches/100-drv_RouterBoard.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/drv_RouterBoard.c
-+++ b/drv_RouterBoard.c
-@@ -106,7 +106,7 @@
- #include <string.h>
- #include <errno.h>
- #include <unistd.h>
--#include <sys/io.h>
-+#include <asm/io.h>
- 
- #include "debug.h"
- #include "cfg.h"
 

--- a/utils/lcd4linux/patches/110-uclibc-logarithm-fix.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/plugin_netinfo.c
-+++ b/plugin_netinfo.c
-@@ -264,7 +264,7 @@ static void my_netmask_short(RESULT * re
-     sin = get_netmask(arg1);
-     if (NULL != sin) {
- 	logval = (long double) (get_netmask(arg1)->sin_addr.s_addr);
--	netlen = (int) rint(log2l(logval) / log2l(2.0));
-+	netlen = (int) rint(log2f(logval) / log2f(2.0));
- 	qprintf(value, sizeof(value), "/%d", netlen);
-     } else {
- 	qprintf(value, sizeof(value), "/?");
 

--- a/utils/lcd4linux/patches/120-remove-as-needed-linker-option.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,7 +18,7 @@ ACLOCAL_AMFLAGS=-I m4
- # use this for lots of warnings
- #AM_CFLAGS = -D_GNU_SOURCE -std=c99 -m64 -Wall -W -pedantic -Wno-variadic-macros -fno-strict-aliasing
- 
--lcd4linux_LDFLAGS ="-Wl,--as-needed"
-+lcd4linux_LDFLAGS = 
- lcd4linux_LDADD   = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@
- lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@
- 
 

--- a/utils/lcd4linux/patches/140-no_repnop_T6963.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/drv_T6963.c
-+++ b/drv_T6963.c
-@@ -114,7 +114,9 @@ static void drv_T6_status1(void)
-     /* wait for STA0=1 and STA1=1 */
-     n = 0;
-     do {
-+#if 0
- 	rep_nop();
-+#endif
- 	if (++n > 1000) {
- 	    debug("hang in status1");
- 	    bug = 1;
-@@ -150,7 +152,9 @@ static void drv_T6_status2(void)
-     /* wait for STA3=1 */
-     n = 0;
-     do {
-+#if 0
- 	rep_nop();
-+#endif
- 	if (++n > 1000) {
- 	    debug("hang in status2");
- 	    bug = 1;
 

--- a/utils/lcd4linux/patches/150-addlibmpdclient.patch
+++ /dev/null
@@ -1,2625 +1,1 @@
---- /dev/null
-+++ b/libmpdclient.c
-@@ -0,0 +1,1957 @@
-+/* libmpdclient
-+   (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
-+   This project's homepage is: http://www.musicpd.org
-+
-+   Redistribution and use in source and binary forms, with or without
-+   modification, are permitted provided that the following conditions
-+   are met:
-+
-+   - Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+
-+   - Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+
-+   - Neither the name of the Music Player Daemon nor the names of its
-+   contributors may be used to endorse or promote products derived from
-+   this software without specific prior written permission.
-+
-+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#include "libmpdclient.h"
-+
-+#include <errno.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <sys/param.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <fcntl.h>
-+#include <limits.h>
-+
-+#ifdef WIN32
-+#  include <ws2tcpip.h>
-+#  include <winsock.h>
-+#else
-+#  include <netinet/in.h>
-+#  include <arpa/inet.h>
-+#  include <sys/socket.h>
-+#  include <netdb.h>
-+#endif
-+
-+/* (bits+1)/3 (plus the sign character) */
-+#define INTLEN      ((sizeof(int)       * CHAR_BIT + 1) / 3 + 1)
-+#define LONGLONGLEN ((sizeof(long long) * CHAR_BIT + 1) / 3 + 1)
-+
-+#define COMMAND_LIST    1
-+#define COMMAND_LIST_OK 2
-+
-+#ifndef MPD_NO_GAI
-+#  ifdef AI_ADDRCONFIG
-+#    define MPD_HAVE_GAI
-+#  endif
-+#endif
-+
-+#ifndef MSG_DONTWAIT
-+#  define MSG_DONTWAIT 0
-+#endif
-+
-+#ifdef WIN32
-+#  define SELECT_ERRNO_IGNORE   (errno == WSAEINTR || errno == WSAEINPROGRESS)
-+#  define SENDRECV_ERRNO_IGNORE SELECT_ERRNO_IGNORE
-+#else
-+#  define SELECT_ERRNO_IGNORE   (errno == EINTR)
-+#  define SENDRECV_ERRNO_IGNORE (errno == EINTR || errno == EAGAIN)
-+#  define winsock_dll_error(c)  0
-+#  define closesocket(s)        close(s)
-+#  define WSACleanup()          do { /* nothing */ } while (0)
-+#endif
-+
-+#ifdef WIN32
-+static int winsock_dll_error(mpd_Connection * connection)
-+{
-+    WSADATA wsaData;
-+    if ((WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0 || LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
-+	strcpy(connection->errorStr, "Could not find usable WinSock DLL.");
-+	connection->error = MPD_ERROR_SYSTEM;
-+	return 1;
-+    }
-+    return 0;
-+}
-+
-+static int do_connect_fail(mpd_Connection * connection, const struct sockaddr *serv_addr, int addrlen)
-+{
-+    int iMode = 1;		/* 0 = blocking, else non-blocking */
-+    ioctlsocket(connection->sock, FIONBIO, (u_long FAR *) & iMode);
-+    return (connect(connection->sock, serv_addr, addrlen) == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK);
-+}
-+#else				/* !WIN32 (sane operating systems) */
-+static int do_connect_fail(mpd_Connection * connection, const struct sockaddr *serv_addr, int addrlen)
-+{
-+    int flags = fcntl(connection->sock, F_GETFL, 0);
-+    fcntl(connection->sock, F_SETFL, flags | O_NONBLOCK);
-+    return (connect(connection->sock, serv_addr, addrlen) < 0 && errno != EINPROGRESS);
-+}
-+#endif				/* !WIN32 */
-+
-+#ifdef MPD_HAVE_GAI
-+static int mpd_connect(mpd_Connection * connection, const char *host, int port, float timeout)
-+{
-+    int error;
-+    char service[INTLEN + 1];
-+    struct addrinfo hints;
-+    struct addrinfo *res = NULL;
-+    struct addrinfo *addrinfo = NULL;
-+
-+	/**
-+	 * Setup hints
-+	 */
-+    hints.ai_flags = AI_ADDRCONFIG;
-+    hints.ai_family = PF_UNSPEC;
-+    hints.ai_socktype = SOCK_STREAM;
-+    hints.ai_protocol = IPPROTO_TCP;
-+    hints.ai_addrlen = 0;
-+    hints.ai_addr = NULL;
-+    hints.ai_canonname = NULL;
-+    hints.ai_next = NULL;
-+
-+    snprintf(service, sizeof(service), "%i", port);
-+
-+    error = getaddrinfo(host, service, &hints, &addrinfo);
-+
-+    if (error) {
-+	snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "host \"%s\" not found: %s", host, gai_strerror(error));
-+	connection->error = MPD_ERROR_UNKHOST;
-+	return -1;
-+    }
-+
-+    for (res = addrinfo; res; res = res->ai_next) {
-+	/* create socket */
-+	connection->sock = socket(res->ai_family, SOCK_STREAM, res->ai_protocol);
-+	if (connection->sock < 0) {
-+	    snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "problems creating socket: %s", strerror(errno));
-+	    connection->error = MPD_ERROR_SYSTEM;
-+	    freeaddrinfo(addrinfo);
-+	    return -1;
-+	}
-+
-+	mpd_setConnectionTimeout(connection, timeout);
-+
-+	/* connect stuff */
-+	if (do_connect_fail(connection, res->ai_addr, res->ai_addrlen)) {
-+	    /* try the next address family */
-+	    closesocket(connection->sock);
-+	    connection->sock = -1;
-+	    continue;
-+	}
-+    }
-+
-+    freeaddrinfo(addrinfo);
-+
-+    if (connection->sock < 0) {
-+	snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH,
-+		 "problems connecting to \"%s\" on port %i: %s", host, port, strerror(errno));
-+	connection->error = MPD_ERROR_CONNPORT;
-+
-+	return -1;
-+    }
-+
-+    return 0;
-+}
-+#else				/* !MPD_HAVE_GAI */
-+static int mpd_connect(mpd_Connection * connection, const char *host, int port, float timeout)
-+{
-+    struct hostent *he;
-+    struct sockaddr *dest;
-+    int destlen;
-+    struct sockaddr_in sin;
-+
-+    if (!(he = gethostbyname(host))) {
-+	snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "host \"%s\" not found", host);
-+	connection->error = MPD_ERROR_UNKHOST;
-+	return -1;
-+    }
-+
-+    memset(&sin, 0, sizeof(struct sockaddr_in));
-+    /*dest.sin_family = he->h_addrtype; */
-+    sin.sin_family = AF_INET;
-+    sin.sin_port = htons(port);
-+
-+    switch (he->h_addrtype) {
-+    case AF_INET:
-+	memcpy((char *) &sin.sin_addr.s_addr, (char *) he->h_addr, he->h_length);
-+	dest = (struct sockaddr *) &sin;
-+	destlen = sizeof(struct sockaddr_in);
-+	break;
-+    default:
-+	strcpy(connection->errorStr, "address type is not IPv4");
-+	connection->error = MPD_ERROR_SYSTEM;
-+	return -1;
-+	break;
-+    }
-+
-+    if ((connection->sock = socket(dest->sa_family, SOCK_STREAM, 0)) < 0) {
-+	strcpy(connection->errorStr, "problems creating socket");
-+	connection->error = MPD_ERROR_SYSTEM;
-+	return -1;
-+    }
-+
-+    mpd_setConnectionTimeout(connection, timeout);
-+
-+    /* connect stuff */
-+    if (do_connect_fail(connection, dest, destlen)) {
-+	snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH,
-+		 "problems connecting to \"%s\" on port" " %i", host, port);
-+	connection->error = MPD_ERROR_CONNPORT;
-+	return -1;
-+    }
-+
-+    return 0;
-+}
-+#endif				/* !MPD_HAVE_GAI */
-+
-+char *mpdTagItemKeys[MPD_TAG_NUM_OF_ITEM_TYPES] = {
-+    "Artist",
-+    "Album",
-+    "Title",
-+    "Track",
-+    "Name",
-+    "Genre",
-+    "Date",
-+    "Composer",
-+    "Performer",
-+    "Comment",
-+    "Disc",
-+    "Filename",
-+    "Any"
-+};
-+
-+static char *mpd_sanitizeArg(const char *arg)
-+{
-+    size_t i;
-+    char *ret;
-+    register const char *c;
-+    register char *rc;
-+
-+    /* instead of counting in that loop above, just
-+     * use a bit more memory and half running time
-+     */
-+    ret = malloc(strlen(arg) * 2 + 1);
-+
-+    c = arg;
-+    rc = ret;
-+    for (i = strlen(arg) + 1; i != 0; --i) {
-+	if (*c == '"' || *c == '\\')
-+	    *rc++ = '\\';
-+	*(rc++) = *(c++);
-+    }
-+
-+    return ret;
-+}
-+
-+static mpd_ReturnElement *mpd_newReturnElement(const char *name, const char *value)
-+{
-+    mpd_ReturnElement *ret = malloc(sizeof(mpd_ReturnElement));
-+
-+    ret->name = strdup(name);
-+    ret->value = strdup(value);
-+
-+    return ret;
-+}
-+
-+static void mpd_freeReturnElement(mpd_ReturnElement * re)
-+{
-+    free(re->name);
-+    free(re->value);
-+    free(re);
-+}
-+
-+void mpd_setConnectionTimeout(mpd_Connection * connection, float timeout)
-+{
-+    connection->timeout.tv_sec = (int) timeout;
-+    connection->timeout.tv_usec = (int) (timeout * 1e6 - connection->timeout.tv_sec * 1000000 + 0.5);
-+}
-+
-+static int mpd_parseWelcome(mpd_Connection * connection, const char *host, int port, char *rt, char *output)
-+{
-+    char *tmp;
-+    char *test;
-+    int i;
-+
-+    if (strncmp(output, MPD_WELCOME_MESSAGE, strlen(MPD_WELCOME_MESSAGE))) {
-+	snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH,
-+		 "mpd not running on port %i on host \"%s\"", port, host);
-+	connection->error = MPD_ERROR_NOTMPD;
-+	return 1;
-+    }
-+
-+    tmp = &output[strlen(MPD_WELCOME_MESSAGE)];
-+
-+    for (i = 0; i < 3; i++) {
-+	if (tmp)
-+	    connection->version[i] = strtol(tmp, &test, 10);
-+
-+	if (!tmp || (test[0] != '.' && test[0] != '\0')) {
-+	    snprintf(connection->errorStr,
-+		     MPD_ERRORSTR_MAX_LENGTH,
-+		     "error parsing version number at " "\"%s\"", &output[strlen(MPD_WELCOME_MESSAGE)]);
-+	    connection->error = MPD_ERROR_NOTMPD;
-+	    return 1;
-+	}
-+	tmp = ++test;
-+    }
-+
-+    return 0;
-+}
-+
-+mpd_Connection *mpd_newConnection(const char *host, int port, float timeout)
-+{
-+    int err;
-+    char *rt;
-+    char *output = NULL;
-+    mpd_Connection *connection = malloc(sizeof(mpd_Connection));
-+    struct timeval tv;
-+    fd_set fds;
-+    strcpy(connection->buffer, "");
-+    connection->buflen = 0;
-+    connection->bufstart = 0;
-+    strcpy(connection->errorStr, "");
-+    connection->error = 0;
-+    connection->doneProcessing = 0;
-+    connection->commandList = 0;
-+    connection->listOks = 0;
-+    connection->doneListOk = 0;
-+    connection->returnElement = NULL;
-+    connection->request = NULL;
-+
-+    if (winsock_dll_error(connection))
-+	return connection;
-+
-+    if (mpd_connect(connection, host, port, timeout) < 0)
-+	return connection;
-+
-+    while (!(rt = strstr(connection->buffer, "\n"))) {
-+	tv.tv_sec = connection->timeout.tv_sec;
-+	tv.tv_usec = connection->timeout.tv_usec;
-+	FD_ZERO(&fds);
-+	FD_SET(connection->sock, &fds);
-+	if ((err = select(connection->sock + 1, &fds, NULL, NULL, &tv)) == 1) {
-+	    int readed;
-+	    readed = recv(connection->sock,
-+			  &(connection->buffer[connection->buflen]), MPD_BUFFER_MAX_LENGTH - connection->buflen, 0);
-+	    if (readed <= 0) {
-+		snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH,
-+			 "problems getting a response from" " \"%s\" on port %i : %s", host, port, strerror(errno));
-+		connection->error = MPD_ERROR_NORESPONSE;
-+		return connection;
-+	    }
-+	    connection->buflen += readed;
-+	    connection->buffer[connection->buflen] = '\0';
-+	} else if (err < 0) {
-+	    if (SELECT_ERRNO_IGNORE)
-+		continue;
-+	    snprintf(connection->errorStr,
-+		     MPD_ERRORSTR_MAX_LENGTH, "problems connecting to \"%s\" on port" " %i", host, port);
-+	    connection->error = MPD_ERROR_CONNPORT;
-+	    return connection;
-+	} else {
-+	    snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH,
-+		     "timeout in attempting to get a response from" " \"%s\" on port %i", host, port);
-+	    connection->error = MPD_ERROR_NORESPONSE;
-+	    return connection;
-+	}
-+    }
-+
-+    *rt = '\0';
-+    output = strdup(connection->buffer);
-+    strcpy(connection->buffer, rt + 1);
-+    connection->buflen = strlen(connection->buffer);
-+
-+    if (mpd_parseWelcome(connection, host, port, rt, output) == 0)
-+	connection->doneProcessing = 1;
-+
-+    free(output);
-+
-+    return connection;
-+}
-+
-+void mpd_clearError(mpd_Connection * connection)
-+{
-+    connection->error = 0;
-+    connection->errorStr[0] = '\0';
-+}
-+
-+void mpd_closeConnection(mpd_Connection * connection)
-+{
-+    closesocket(connection->sock);
-+    if (connection->returnElement)
-+	free(connection->returnElement);
-+    if (connection->request)
-+	free(connection->request);
-+    free(connection);
-+    WSACleanup();
-+}
-+
-+static void mpd_executeCommand(mpd_Connection * connection, char *command)
-+{
-+    int ret;
-+    struct timeval tv;
-+    fd_set fds;
-+    char *commandPtr = command;
-+    int commandLen = strlen(command);
-+
-+    if (!connection->doneProcessing && !connection->commandList) {
-+	strcpy(connection->errorStr, "not done processing current command");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    mpd_clearError(connection);
-+
-+    FD_ZERO(&fds);
-+    FD_SET(connection->sock, &fds);
-+    tv.tv_sec = connection->timeout.tv_sec;
-+    tv.tv_usec = connection->timeout.tv_usec;
-+
-+    while ((ret = select(connection->sock + 1, NULL, &fds, NULL, &tv) == 1) || (ret == -1 && SELECT_ERRNO_IGNORE)) {
-+	ret = send(connection->sock, commandPtr, commandLen, MSG_DONTWAIT);
-+	if (ret <= 0) {
-+	    if (SENDRECV_ERRNO_IGNORE)
-+		continue;
-+	    snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "problems giving command \"%s\"", command);
-+	    connection->error = MPD_ERROR_SENDING;
-+	    return;
-+	} else {
-+	    commandPtr += ret;
-+	    commandLen -= ret;
-+	}
-+
-+	if (commandLen <= 0)
-+	    break;
-+    }
-+
-+    if (commandLen > 0) {
-+	perror("");
-+	snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "timeout sending command \"%s\"", command);
-+	connection->error = MPD_ERROR_TIMEOUT;
-+	return;
-+    }
-+
-+    if (!connection->commandList)
-+	connection->doneProcessing = 0;
-+    else if (connection->commandList == COMMAND_LIST_OK) {
-+	connection->listOks++;
-+    }
-+}
-+
-+static void mpd_getNextReturnElement(mpd_Connection * connection)
-+{
-+    char *output = NULL;
-+    char *rt = NULL;
-+    char *name = NULL;
-+    char *value = NULL;
-+    fd_set fds;
-+    struct timeval tv;
-+    char *tok = NULL;
-+    int readed;
-+    char *bufferCheck = NULL;
-+    int err;
-+    int pos;
-+
-+    if (connection->returnElement)
-+	mpd_freeReturnElement(connection->returnElement);
-+    connection->returnElement = NULL;
-+
-+    if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) {
-+	strcpy(connection->errorStr, "already done processing current command");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    bufferCheck = connection->buffer + connection->bufstart;
-+    while (connection->bufstart >= connection->buflen || !(rt = strchr(bufferCheck, '\n'))) {
-+	if (connection->buflen >= MPD_BUFFER_MAX_LENGTH) {
-+	    memmove(connection->buffer,
-+		    connection->buffer + connection->bufstart, connection->buflen - connection->bufstart + 1);
-+	    connection->buflen -= connection->bufstart;
-+	    connection->bufstart = 0;
-+	}
-+	if (connection->buflen >= MPD_BUFFER_MAX_LENGTH) {
-+	    strcpy(connection->errorStr, "buffer overrun");
-+	    connection->error = MPD_ERROR_BUFFEROVERRUN;
-+	    connection->doneProcessing = 1;
-+	    connection->doneListOk = 0;
-+	    return;
-+	}
-+	bufferCheck = connection->buffer + connection->buflen;
-+	tv.tv_sec = connection->timeout.tv_sec;
-+	tv.tv_usec = connection->timeout.tv_usec;
-+	FD_ZERO(&fds);
-+	FD_SET(connection->sock, &fds);
-+	if ((err = select(connection->sock + 1, &fds, NULL, NULL, &tv) == 1)) {
-+	    readed = recv(connection->sock,
-+			  connection->buffer + connection->buflen,
-+			  MPD_BUFFER_MAX_LENGTH - connection->buflen, MSG_DONTWAIT);
-+	    if (readed < 0 && SENDRECV_ERRNO_IGNORE) {
-+		continue;
-+	    }
-+	    if (readed <= 0) {
-+		strcpy(connection->errorStr, "connection" " closed");
-+		connection->error = MPD_ERROR_CONNCLOSED;
-+		connection->doneProcessing = 1;
-+		connection->doneListOk = 0;
-+		return;
-+	    }
-+	    connection->buflen += readed;
-+	    connection->buffer[connection->buflen] = '\0';
-+	} else if (err < 0 && SELECT_ERRNO_IGNORE)
-+	    continue;
-+	else {
-+	    strcpy(connection->errorStr, "connection timeout");
-+	    connection->error = MPD_ERROR_TIMEOUT;
-+	    connection->doneProcessing = 1;
-+	    connection->doneListOk = 0;
-+	    return;
-+	}
-+    }
-+
-+    *rt = '\0';
-+    output = connection->buffer + connection->bufstart;
-+    connection->bufstart = rt - connection->buffer + 1;
-+
-+    if (strcmp(output, "OK") == 0) {
-+	if (connection->listOks > 0) {
-+	    strcpy(connection->errorStr, "expected more list_OK's");
-+	    connection->error = 1;
-+	}
-+	connection->listOks = 0;
-+	connection->doneProcessing = 1;
-+	connection->doneListOk = 0;
-+	return;
-+    }
-+
-+    if (strcmp(output, "list_OK") == 0) {
-+	if (!connection->listOks) {
-+	    strcpy(connection->errorStr, "got an unexpected list_OK");
-+	    connection->error = 1;
-+	} else {
-+	    connection->doneListOk = 1;
-+	    connection->listOks--;
-+	}
-+	return;
-+    }
-+
-+    if (strncmp(output, "ACK", strlen("ACK")) == 0) {
-+	char *test;
-+	char *needle;
-+	int val;
-+
-+	strcpy(connection->errorStr, output);
-+	connection->error = MPD_ERROR_ACK;
-+	connection->errorCode = MPD_ACK_ERROR_UNK;
-+	connection->errorAt = MPD_ERROR_AT_UNK;
-+	connection->doneProcessing = 1;
-+	connection->doneListOk = 0;
-+
-+	needle = strchr(output, '[');
-+	if (!needle)
-+	    return;
-+	val = strtol(needle + 1, &test, 10);
-+	if (*test != '@')
-+	    return;
-+	connection->errorCode = val;
-+	val = strtol(test + 1, &test, 10);
-+	if (*test != ']')
-+	    return;
-+	connection->errorAt = val;
-+	return;
-+    }
-+
-+    tok = strchr(output, ':');
-+    if (!tok)
-+	return;
-+    pos = tok - output;
-+    value = ++tok;
-+    name = output;
-+    name[pos] = '\0';
-+
-+    if (value[0] == ' ') {
-+	connection->returnElement = mpd_newReturnElement(name, &(value[1]));
-+    } else {
-+	snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH, "error parsing: %s:%s", name, value);
-+	connection->error = 1;
-+    }
-+}
-+
-+void mpd_finishCommand(mpd_Connection * connection)
-+{
-+    while (!connection->doneProcessing) {
-+	if (connection->doneListOk)
-+	    connection->doneListOk = 0;
-+	mpd_getNextReturnElement(connection);
-+    }
-+}
-+
-+static void mpd_finishListOkCommand(mpd_Connection * connection)
-+{
-+    while (!connection->doneProcessing && connection->listOks && !connection->doneListOk) {
-+	mpd_getNextReturnElement(connection);
-+    }
-+}
-+
-+int mpd_nextListOkCommand(mpd_Connection * connection)
-+{
-+    mpd_finishListOkCommand(connection);
-+    if (!connection->doneProcessing)
-+	connection->doneListOk = 0;
-+    if (connection->listOks == 0 || connection->doneProcessing)
-+	return -1;
-+    return 0;
-+}
-+
-+void mpd_sendStatusCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "status\n");
-+}
-+
-+mpd_Status *mpd_getStatus(mpd_Connection * connection)
-+{
-+    mpd_Status *status;
-+
-+    /*mpd_executeCommand(connection,"status\n");
-+
-+       if(connection->error) return NULL; */
-+
-+    if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) {
-+	return NULL;
-+    }
-+
-+    if (!connection->returnElement)
-+	mpd_getNextReturnElement(connection);
-+
-+    status = malloc(sizeof(mpd_Status));
-+    status->volume = -1;
-+    status->repeat = 0;
-+    status->random = 0;
-+    status->playlist = -1;
-+    status->playlistLength = -1;
-+    status->state = -1;
-+    status->song = 0;
-+    status->songid = 0;
-+    status->elapsedTime = 0;
-+    status->totalTime = 0;
-+    status->bitRate = 0;
-+    status->sampleRate = 0;
-+    status->bits = 0;
-+    status->channels = 0;
-+    status->crossfade = -1;
-+    status->error = NULL;
-+    status->updatingDb = 0;
-+
-+    if (connection->error) {
-+	free(status);
-+	return NULL;
-+    }
-+    while (connection->returnElement) {
-+	mpd_ReturnElement *re = connection->returnElement;
-+	if (strcmp(re->name, "volume") == 0) {
-+	    status->volume = atoi(re->value);
-+	} else if (strcmp(re->name, "repeat") == 0) {
-+	    status->repeat = atoi(re->value);
-+	} else if (strcmp(re->name, "random") == 0) {
-+	    status->random = atoi(re->value);
-+	} else if (strcmp(re->name, "playlist") == 0) {
-+	    status->playlist = strtol(re->value, NULL, 10);
-+	} else if (strcmp(re->name, "playlistlength") == 0) {
-+	    status->playlistLength = atoi(re->value);
-+	} else if (strcmp(re->name, "bitrate") == 0) {
-+	    status->bitRate = atoi(re->value);
-+	} else if (strcmp(re->name, "state") == 0) {
-+	    if (strcmp(re->value, "play") == 0) {
-+		status->state = MPD_STATUS_STATE_PLAY;
-+	    } else if (strcmp(re->value, "stop") == 0) {
-+		status->state = MPD_STATUS_STATE_STOP;
-+	    } else if (strcmp(re->value, "pause") == 0) {
-+		status->state = MPD_STATUS_STATE_PAUSE;
-+	    } else {
-+		status->state = MPD_STATUS_STATE_UNKNOWN;
-+	    }
-+	} else if (strcmp(re->name, "song") == 0) {
-+	    status->song = atoi(re->value);
-+	} else if (strcmp(re->name, "songid") == 0) {
-+	    status->songid = atoi(re->value);
-+	} else if (strcmp(re->name, "time") == 0) {
-+	    char *tok = strchr(re->value, ':');
-+	    /* the second strchr below is a safety check */
-+	    if (tok && (strchr(tok, 0) > (tok + 1))) {
-+		/* atoi stops at the first non-[0-9] char: */
-+		status->elapsedTime = atoi(re->value);
-+		status->totalTime = atoi(tok + 1);
-+	    }
-+	} else if (strcmp(re->name, "error") == 0) {
-+	    status->error = strdup(re->value);
-+	} else if (strcmp(re->name, "xfade") == 0) {
-+	    status->crossfade = atoi(re->value);
-+	} else if (strcmp(re->name, "updating_db") == 0) {
-+	    status->updatingDb = atoi(re->value);
-+	} else if (strcmp(re->name, "audio") == 0) {
-+	    char *tok = strchr(re->value, ':');
-+	    if (tok && (strchr(tok, 0) > (tok + 1))) {
-+		status->sampleRate = atoi(re->value);
-+		status->bits = atoi(++tok);
-+		tok = strchr(tok, ':');
-+		if (tok && (strchr(tok, 0) > (tok + 1)))
-+		    status->channels = atoi(tok + 1);
-+	    }
-+	}
-+
-+	mpd_getNextReturnElement(connection);
-+	if (connection->error) {
-+	    free(status);
-+	    return NULL;
-+	}
-+    }
-+
-+    if (connection->error) {
-+	free(status);
-+	return NULL;
-+    } else if (status->state < 0) {
-+	strcpy(connection->errorStr, "state not found");
-+	connection->error = 1;
-+	free(status);
-+	return NULL;
-+    }
-+
-+    return status;
-+}
-+
-+void mpd_freeStatus(mpd_Status * status)
-+{
-+    if (status->error)
-+	free(status->error);
-+    free(status);
-+}
-+
-+void mpd_sendStatsCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "stats\n");
-+}
-+
-+mpd_Stats *mpd_getStats(mpd_Connection * connection)
-+{
-+    mpd_Stats *stats;
-+
-+    /*mpd_executeCommand(connection,"stats\n");
-+
-+       if(connection->error) return NULL; */
-+
-+    if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) {
-+	return NULL;
-+    }
-+
-+    if (!connection->returnElement)
-+	mpd_getNextReturnElement(connection);
-+
-+    stats = malloc(sizeof(mpd_Stats));
-+    stats->numberOfArtists = 0;
-+    stats->numberOfAlbums = 0;
-+    stats->numberOfSongs = 0;
-+    stats->uptime = 0;
-+    stats->dbUpdateTime = 0;
-+    stats->playTime = 0;
-+    stats->dbPlayTime = 0;
-+
-+    if (connection->error) {
-+	free(stats);
-+	return NULL;
-+    }
-+    while (connection->returnElement) {
-+	mpd_ReturnElement *re = connection->returnElement;
-+	if (strcmp(re->name, "artists") == 0) {
-+	    stats->numberOfArtists = atoi(re->value);
-+	} else if (strcmp(re->name, "albums") == 0) {
-+	    stats->numberOfAlbums = atoi(re->value);
-+	} else if (strcmp(re->name, "songs") == 0) {
-+	    stats->numberOfSongs = atoi(re->value);
-+	} else if (strcmp(re->name, "uptime") == 0) {
-+	    stats->uptime = strtol(re->value, NULL, 10);
-+	} else if (strcmp(re->name, "db_update") == 0) {
-+	    stats->dbUpdateTime = strtol(re->value, NULL, 10);
-+	} else if (strcmp(re->name, "playtime") == 0) {
-+	    stats->playTime = strtol(re->value, NULL, 10);
-+	} else if (strcmp(re->name, "db_playtime") == 0) {
-+	    stats->dbPlayTime = strtol(re->value, NULL, 10);
-+	}
-+
-+	mpd_getNextReturnElement(connection);
-+	if (connection->error) {
-+	    free(stats);
-+	    return NULL;
-+	}
-+    }
-+
-+    if (connection->error) {
-+	free(stats);
-+	return NULL;
-+    }
-+
-+    return stats;
-+}
-+
-+void mpd_freeStats(mpd_Stats * stats)
-+{
-+    free(stats);
-+}
-+
-+mpd_SearchStats *mpd_getSearchStats(mpd_Connection * connection)
-+{
-+    mpd_SearchStats *stats;
-+    mpd_ReturnElement *re;
-+
-+    if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) {
-+	return NULL;
-+    }
-+
-+    if (!connection->returnElement)
-+	mpd_getNextReturnElement(connection);
-+
-+    if (connection->error)
-+	return NULL;
-+
-+    stats = malloc(sizeof(mpd_SearchStats));
-+    stats->numberOfSongs = 0;
-+    stats->playTime = 0;
-+
-+    while (connection->returnElement) {
-+	re = connection->returnElement;
-+
-+	if (strcmp(re->name, "songs") == 0) {
-+	    stats->numberOfSongs = atoi(re->value);
-+	} else if (strcmp(re->name, "playtime") == 0) {
-+	    stats->playTime = strtol(re->value, NULL, 10);
-+	}
-+
-+	mpd_getNextReturnElement(connection);
-+	if (connection->error) {
-+	    free(stats);
-+	    return NULL;
-+	}
-+    }
-+
-+    if (connection->error) {
-+	free(stats);
-+	return NULL;
-+    }
-+
-+    return stats;
-+}
-+
-+void mpd_freeSearchStats(mpd_SearchStats * stats)
-+{
-+    free(stats);
-+}
-+
-+static void mpd_initSong(mpd_Song * song)
-+{
-+    song->file = NULL;
-+    song->artist = NULL;
-+    song->album = NULL;
-+    song->track = NULL;
-+    song->title = NULL;
-+    song->name = NULL;
-+    song->date = NULL;
-+    /* added by Qball */
-+    song->genre = NULL;
-+    song->composer = NULL;
-+    song->performer = NULL;
-+    song->disc = NULL;
-+    song->comment = NULL;
-+
-+    song->time = MPD_SONG_NO_TIME;
-+    song->pos = MPD_SONG_NO_NUM;
-+    song->id = MPD_SONG_NO_ID;
-+}
-+
-+static void mpd_finishSong(mpd_Song * song)
-+{
-+    if (song->file)
-+	free(song->file);
-+    if (song->artist)
-+	free(song->artist);
-+    if (song->album)
-+	free(song->album);
-+    if (song->title)
-+	free(song->title);
-+    if (song->track)
-+	free(song->track);
-+    if (song->name)
-+	free(song->name);
-+    if (song->date)
-+	free(song->date);
-+    if (song->genre)
-+	free(song->genre);
-+    if (song->composer)
-+	free(song->composer);
-+    if (song->disc)
-+	free(song->disc);
-+    if (song->comment)
-+	free(song->comment);
-+}
-+
-+mpd_Song *mpd_newSong(void)
-+{
-+    mpd_Song *ret = malloc(sizeof(mpd_Song));
-+
-+    mpd_initSong(ret);
-+
-+    return ret;
-+}
-+
-+void mpd_freeSong(mpd_Song * song)
-+{
-+    mpd_finishSong(song);
-+    free(song);
-+}
-+
-+mpd_Song *mpd_songDup(mpd_Song * song)
-+{
-+    mpd_Song *ret = mpd_newSong();
-+
-+    if (song->file)
-+	ret->file = strdup(song->file);
-+    if (song->artist)
-+	ret->artist = strdup(song->artist);
-+    if (song->album)
-+	ret->album = strdup(song->album);
-+    if (song->title)
-+	ret->title = strdup(song->title);
-+    if (song->track)
-+	ret->track = strdup(song->track);
-+    if (song->name)
-+	ret->name = strdup(song->name);
-+    if (song->date)
-+	ret->date = strdup(song->date);
-+    if (song->genre)
-+	ret->genre = strdup(song->genre);
-+    if (song->composer)
-+	ret->composer = strdup(song->composer);
-+    if (song->disc)
-+	ret->disc = strdup(song->disc);
-+    if (song->comment)
-+	ret->comment = strdup(song->comment);
-+    ret->time = song->time;
-+    ret->pos = song->pos;
-+    ret->id = song->id;
-+
-+    return ret;
-+}
-+
-+static void mpd_initDirectory(mpd_Directory * directory)
-+{
-+    directory->path = NULL;
-+}
-+
-+static void mpd_finishDirectory(mpd_Directory * directory)
-+{
-+    if (directory->path)
-+	free(directory->path);
-+}
-+
-+mpd_Directory *mpd_newDirectory(void)
-+{
-+    mpd_Directory *directory = malloc(sizeof(mpd_Directory));;
-+
-+    mpd_initDirectory(directory);
-+
-+    return directory;
-+}
-+
-+void mpd_freeDirectory(mpd_Directory * directory)
-+{
-+    mpd_finishDirectory(directory);
-+
-+    free(directory);
-+}
-+
-+mpd_Directory *mpd_directoryDup(mpd_Directory * directory)
-+{
-+    mpd_Directory *ret = mpd_newDirectory();
-+
-+    if (directory->path)
-+	ret->path = strdup(directory->path);
-+
-+    return ret;
-+}
-+
-+static void mpd_initPlaylistFile(mpd_PlaylistFile * playlist)
-+{
-+    playlist->path = NULL;
-+}
-+
-+static void mpd_finishPlaylistFile(mpd_PlaylistFile * playlist)
-+{
-+    if (playlist->path)
-+	free(playlist->path);
-+}
-+
-+mpd_PlaylistFile *mpd_newPlaylistFile(void)
-+{
-+    mpd_PlaylistFile *playlist = malloc(sizeof(mpd_PlaylistFile));
-+
-+    mpd_initPlaylistFile(playlist);
-+
-+    return playlist;
-+}
-+
-+void mpd_freePlaylistFile(mpd_PlaylistFile * playlist)
-+{
-+    mpd_finishPlaylistFile(playlist);
-+    free(playlist);
-+}
-+
-+mpd_PlaylistFile *mpd_playlistFileDup(mpd_PlaylistFile * playlist)
-+{
-+    mpd_PlaylistFile *ret = mpd_newPlaylistFile();
-+
-+    if (playlist->path)
-+	ret->path = strdup(playlist->path);
-+
-+    return ret;
-+}
-+
-+static void mpd_initInfoEntity(mpd_InfoEntity * entity)
-+{
-+    entity->info.directory = NULL;
-+}
-+
-+static void mpd_finishInfoEntity(mpd_InfoEntity * entity)
-+{
-+    if (entity->info.directory) {
-+	if (entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) {
-+	    mpd_freeDirectory(entity->info.directory);
-+	} else if (entity->type == MPD_INFO_ENTITY_TYPE_SONG) {
-+	    mpd_freeSong(entity->info.song);
-+	} else if (entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE) {
-+	    mpd_freePlaylistFile(entity->info.playlistFile);
-+	}
-+    }
-+}
-+
-+mpd_InfoEntity *mpd_newInfoEntity(void)
-+{
-+    mpd_InfoEntity *entity = malloc(sizeof(mpd_InfoEntity));
-+
-+    mpd_initInfoEntity(entity);
-+
-+    return entity;
-+}
-+
-+void mpd_freeInfoEntity(mpd_InfoEntity * entity)
-+{
-+    mpd_finishInfoEntity(entity);
-+    free(entity);
-+}
-+
-+static void mpd_sendInfoCommand(mpd_Connection * connection, char *command)
-+{
-+    mpd_executeCommand(connection, command);
-+}
-+
-+mpd_InfoEntity *mpd_getNextInfoEntity(mpd_Connection * connection)
-+{
-+    mpd_InfoEntity *entity = NULL;
-+
-+    if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) {
-+	return NULL;
-+    }
-+
-+    if (!connection->returnElement)
-+	mpd_getNextReturnElement(connection);
-+
-+    if (connection->returnElement) {
-+	if (strcmp(connection->returnElement->name, "file") == 0) {
-+	    entity = mpd_newInfoEntity();
-+	    entity->type = MPD_INFO_ENTITY_TYPE_SONG;
-+	    entity->info.song = mpd_newSong();
-+	    entity->info.song->file = strdup(connection->returnElement->value);
-+	} else if (strcmp(connection->returnElement->name, "directory") == 0) {
-+	    entity = mpd_newInfoEntity();
-+	    entity->type = MPD_INFO_ENTITY_TYPE_DIRECTORY;
-+	    entity->info.directory = mpd_newDirectory();
-+	    entity->info.directory->path = strdup(connection->returnElement->value);
-+	} else if (strcmp(connection->returnElement->name, "playlist") == 0) {
-+	    entity = mpd_newInfoEntity();
-+	    entity->type = MPD_INFO_ENTITY_TYPE_PLAYLISTFILE;
-+	    entity->info.playlistFile = mpd_newPlaylistFile();
-+	    entity->info.playlistFile->path = strdup(connection->returnElement->value);
-+	} else if (strcmp(connection->returnElement->name, "cpos") == 0) {
-+	    entity = mpd_newInfoEntity();
-+	    entity->type = MPD_INFO_ENTITY_TYPE_SONG;
-+	    entity->info.song = mpd_newSong();
-+	    entity->info.song->pos = atoi(connection->returnElement->value);
-+	} else {
-+	    connection->error = 1;
-+	    strcpy(connection->errorStr, "problem parsing song info");
-+	    return NULL;
-+	}
-+    } else
-+	return NULL;
-+
-+    mpd_getNextReturnElement(connection);
-+    while (connection->returnElement) {
-+	mpd_ReturnElement *re = connection->returnElement;
-+
-+	if (strcmp(re->name, "file") == 0)
-+	    return entity;
-+	else if (strcmp(re->name, "directory") == 0)
-+	    return entity;
-+	else if (strcmp(re->name, "playlist") == 0)
-+	    return entity;
-+	else if (strcmp(re->name, "cpos") == 0)
-+	    return entity;
-+
-+	if (entity->type == MPD_INFO_ENTITY_TYPE_SONG && strlen(re->value)) {
-+	    if (!entity->info.song->artist && strcmp(re->name, "Artist") == 0) {
-+		entity->info.song->artist = strdup(re->value);
-+	    } else if (!entity->info.song->album && strcmp(re->name, "Album") == 0) {
-+		entity->info.song->album = strdup(re->value);
-+	    } else if (!entity->info.song->title && strcmp(re->name, "Title") == 0) {
-+		entity->info.song->title = strdup(re->value);
-+	    } else if (!entity->info.song->track && strcmp(re->name, "Track") == 0) {
-+		entity->info.song->track = strdup(re->value);
-+	    } else if (!entity->info.song->name && strcmp(re->name, "Name") == 0) {
-+		entity->info.song->name = strdup(re->value);
-+	    } else if (entity->info.song->time == MPD_SONG_NO_TIME && strcmp(re->name, "Time") == 0) {
-+		entity->info.song->time = atoi(re->value);
-+	    } else if (entity->info.song->pos == MPD_SONG_NO_NUM && strcmp(re->name, "Pos") == 0) {
-+		entity->info.song->pos = atoi(re->value);
-+	    } else if (entity->info.song->id == MPD_SONG_NO_ID && strcmp(re->name, "Id") == 0) {
-+		entity->info.song->id = atoi(re->value);
-+	    } else if (!entity->info.song->date && strcmp(re->name, "Date") == 0) {
-+		entity->info.song->date = strdup(re->value);
-+	    } else if (!entity->info.song->genre && strcmp(re->name, "Genre") == 0) {
-+		entity->info.song->genre = strdup(re->value);
-+	    } else if (!entity->info.song->composer && strcmp(re->name, "Composer") == 0) {
-+		entity->info.song->composer = strdup(re->value);
-+	    } else if (!entity->info.song->performer && strcmp(re->name, "Performer") == 0) {
-+		entity->info.song->performer = strdup(re->value);
-+	    } else if (!entity->info.song->disc && strcmp(re->name, "Disc") == 0) {
-+		entity->info.song->disc = strdup(re->value);
-+	    } else if (!entity->info.song->comment && strcmp(re->name, "Comment") == 0) {
-+		entity->info.song->comment = strdup(re->value);
-+	    }
-+	} else if (entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) {
-+	} else if (entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE) {
-+	}
-+
-+	mpd_getNextReturnElement(connection);
-+    }
-+
-+    return entity;
-+}
-+
-+static char *mpd_getNextReturnElementNamed(mpd_Connection * connection, const char *name)
-+{
-+    if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) {
-+	return NULL;
-+    }
-+
-+    mpd_getNextReturnElement(connection);
-+    while (connection->returnElement) {
-+	mpd_ReturnElement *re = connection->returnElement;
-+
-+	if (strcmp(re->name, name) == 0)
-+	    return strdup(re->value);
-+	mpd_getNextReturnElement(connection);
-+    }
-+
-+    return NULL;
-+}
-+
-+char *mpd_getNextTag(mpd_Connection * connection, int type)
-+{
-+    if (type < 0 || type >= MPD_TAG_NUM_OF_ITEM_TYPES || type == MPD_TAG_ITEM_ANY)
-+	return NULL;
-+    if (type == MPD_TAG_ITEM_FILENAME)
-+	return mpd_getNextReturnElementNamed(connection, "file");
-+    return mpd_getNextReturnElementNamed(connection, mpdTagItemKeys[type]);
-+}
-+
-+char *mpd_getNextArtist(mpd_Connection * connection)
-+{
-+    return mpd_getNextReturnElementNamed(connection, "Artist");
-+}
-+
-+char *mpd_getNextAlbum(mpd_Connection * connection)
-+{
-+    return mpd_getNextReturnElementNamed(connection, "Album");
-+}
-+
-+void mpd_sendPlaylistInfoCommand(mpd_Connection * connection, int songPos)
-+{
-+    int len = strlen("playlistinfo") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "playlistinfo \"%i\"\n", songPos);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendPlaylistIdCommand(mpd_Connection * connection, int id)
-+{
-+    int len = strlen("playlistid") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "playlistid \"%i\"\n", id);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendPlChangesCommand(mpd_Connection * connection, long long playlist)
-+{
-+    int len = strlen("plchanges") + 2 + LONGLONGLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "plchanges \"%lld\"\n", playlist);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendPlChangesPosIdCommand(mpd_Connection * connection, long long playlist)
-+{
-+    int len = strlen("plchangesposid") + 2 + LONGLONGLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "plchangesposid \"%lld\"\n", playlist);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendListallCommand(mpd_Connection * connection, const char *dir)
-+{
-+    char *sDir = mpd_sanitizeArg(dir);
-+    int len = strlen("listall") + 2 + strlen(sDir) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "listall \"%s\"\n", sDir);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+    free(sDir);
-+}
-+
-+void mpd_sendListallInfoCommand(mpd_Connection * connection, const char *dir)
-+{
-+    char *sDir = mpd_sanitizeArg(dir);
-+    int len = strlen("listallinfo") + 2 + strlen(sDir) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "listallinfo \"%s\"\n", sDir);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+    free(sDir);
-+}
-+
-+void mpd_sendLsInfoCommand(mpd_Connection * connection, const char *dir)
-+{
-+    char *sDir = mpd_sanitizeArg(dir);
-+    int len = strlen("lsinfo") + 2 + strlen(sDir) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "lsinfo \"%s\"\n", sDir);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+    free(sDir);
-+}
-+
-+void mpd_sendCurrentSongCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "currentsong\n");
-+}
-+
-+void mpd_sendSearchCommand(mpd_Connection * connection, int table, const char *str)
-+{
-+    mpd_startSearch(connection, 0);
-+    mpd_addConstraintSearch(connection, table, str);
-+    mpd_commitSearch(connection);
-+}
-+
-+void mpd_sendFindCommand(mpd_Connection * connection, int table, const char *str)
-+{
-+    mpd_startSearch(connection, 1);
-+    mpd_addConstraintSearch(connection, table, str);
-+    mpd_commitSearch(connection);
-+}
-+
-+void mpd_sendListCommand(mpd_Connection * connection, int table, const char *arg1)
-+{
-+    char st[10];
-+    int len;
-+    char *string;
-+    if (table == MPD_TABLE_ARTIST)
-+	strcpy(st, "artist");
-+    else if (table == MPD_TABLE_ALBUM)
-+	strcpy(st, "album");
-+    else {
-+	connection->error = 1;
-+	strcpy(connection->errorStr, "unknown table for list");
-+	return;
-+    }
-+    if (arg1) {
-+	char *sanitArg1 = mpd_sanitizeArg(arg1);
-+	len = strlen("list") + 1 + strlen(sanitArg1) + 2 + strlen(st) + 3;
-+	string = malloc(len);
-+	snprintf(string, len, "list %s \"%s\"\n", st, sanitArg1);
-+	free(sanitArg1);
-+    } else {
-+	len = strlen("list") + 1 + strlen(st) + 2;
-+	string = malloc(len);
-+	snprintf(string, len, "list %s\n", st);
-+    }
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendAddCommand(mpd_Connection * connection, const char *file)
-+{
-+    char *sFile = mpd_sanitizeArg(file);
-+    int len = strlen("add") + 2 + strlen(sFile) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "add \"%s\"\n", sFile);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+    free(sFile);
-+}
-+
-+int mpd_sendAddIdCommand(mpd_Connection * connection, const char *file)
-+{
-+    int retval = -1;
-+    char *sFile = mpd_sanitizeArg(file);
-+    int len = strlen("addid") + 2 + strlen(sFile) + 3;
-+    char *string = malloc(len);
-+
-+    snprintf(string, len, "addid \"%s\"\n", sFile);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+    free(sFile);
-+
-+    string = mpd_getNextReturnElementNamed(connection, "Id");
-+    if (string) {
-+	retval = atoi(string);
-+	free(string);
-+    }
-+
-+    return retval;
-+}
-+
-+void mpd_sendDeleteCommand(mpd_Connection * connection, int songPos)
-+{
-+    int len = strlen("delete") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "delete \"%i\"\n", songPos);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendDeleteIdCommand(mpd_Connection * connection, int id)
-+{
-+    int len = strlen("deleteid") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "deleteid \"%i\"\n", id);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendSaveCommand(mpd_Connection * connection, const char *name)
-+{
-+    char *sName = mpd_sanitizeArg(name);
-+    int len = strlen("save") + 2 + strlen(sName) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "save \"%s\"\n", sName);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+    free(sName);
-+}
-+
-+void mpd_sendLoadCommand(mpd_Connection * connection, const char *name)
-+{
-+    char *sName = mpd_sanitizeArg(name);
-+    int len = strlen("load") + 2 + strlen(sName) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "load \"%s\"\n", sName);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+    free(sName);
-+}
-+
-+void mpd_sendRmCommand(mpd_Connection * connection, const char *name)
-+{
-+    char *sName = mpd_sanitizeArg(name);
-+    int len = strlen("rm") + 2 + strlen(sName) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "rm \"%s\"\n", sName);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+    free(sName);
-+}
-+
-+void mpd_sendRenameCommand(mpd_Connection * connection, const char *from, const char *to)
-+{
-+    char *sFrom = mpd_sanitizeArg(from);
-+    char *sTo = mpd_sanitizeArg(to);
-+    int len = strlen("rename") + 2 + strlen(sFrom) + 3 + strlen(sTo) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "rename \"%s\" \"%s\"\n", sFrom, sTo);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+    free(sFrom);
-+    free(sTo);
-+}
-+
-+void mpd_sendShuffleCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "shuffle\n");
-+}
-+
-+void mpd_sendClearCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "clear\n");
-+}
-+
-+void mpd_sendPlayCommand(mpd_Connection * connection, int songPos)
-+{
-+    int len = strlen("play") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "play \"%i\"\n", songPos);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendPlayIdCommand(mpd_Connection * connection, int id)
-+{
-+    int len = strlen("playid") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "playid \"%i\"\n", id);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendStopCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "stop\n");
-+}
-+
-+void mpd_sendPauseCommand(mpd_Connection * connection, int pauseMode)
-+{
-+    int len = strlen("pause") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "pause \"%i\"\n", pauseMode);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendNextCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "next\n");
-+}
-+
-+void mpd_sendMoveCommand(mpd_Connection * connection, int from, int to)
-+{
-+    int len = strlen("move") + 2 + INTLEN + 3 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "move \"%i\" \"%i\"\n", from, to);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendMoveIdCommand(mpd_Connection * connection, int id, int to)
-+{
-+    int len = strlen("moveid") + 2 + INTLEN + 3 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "moveid \"%i\" \"%i\"\n", id, to);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendSwapCommand(mpd_Connection * connection, int song1, int song2)
-+{
-+    int len = strlen("swap") + 2 + INTLEN + 3 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "swap \"%i\" \"%i\"\n", song1, song2);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendSwapIdCommand(mpd_Connection * connection, int id1, int id2)
-+{
-+    int len = strlen("swapid") + 2 + INTLEN + 3 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "swapid \"%i\" \"%i\"\n", id1, id2);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendSeekCommand(mpd_Connection * connection, int song, int time)
-+{
-+    int len = strlen("seek") + 2 + INTLEN + 3 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "seek \"%i\" \"%i\"\n", song, time);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendSeekIdCommand(mpd_Connection * connection, int id, int time)
-+{
-+    int len = strlen("seekid") + 2 + INTLEN + 3 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "seekid \"%i\" \"%i\"\n", id, time);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendUpdateCommand(mpd_Connection * connection, char *path)
-+{
-+    char *sPath = mpd_sanitizeArg(path);
-+    int len = strlen("update") + 2 + strlen(sPath) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "update \"%s\"\n", sPath);
-+    mpd_sendInfoCommand(connection, string);
-+    free(string);
-+    free(sPath);
-+}
-+
-+int mpd_getUpdateId(mpd_Connection * connection)
-+{
-+    char *jobid;
-+    int ret = 0;
-+
-+    jobid = mpd_getNextReturnElementNamed(connection, "updating_db");
-+    if (jobid) {
-+	ret = atoi(jobid);
-+	free(jobid);
-+    }
-+
-+    return ret;
-+}
-+
-+void mpd_sendPrevCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "previous\n");
-+}
-+
-+void mpd_sendRepeatCommand(mpd_Connection * connection, int repeatMode)
-+{
-+    int len = strlen("repeat") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "repeat \"%i\"\n", repeatMode);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendRandomCommand(mpd_Connection * connection, int randomMode)
-+{
-+    int len = strlen("random") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "random \"%i\"\n", randomMode);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendSetvolCommand(mpd_Connection * connection, int volumeChange)
-+{
-+    int len = strlen("setvol") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "setvol \"%i\"\n", volumeChange);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendVolumeCommand(mpd_Connection * connection, int volumeChange)
-+{
-+    int len = strlen("volume") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "volume \"%i\"\n", volumeChange);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendCrossfadeCommand(mpd_Connection * connection, int seconds)
-+{
-+    int len = strlen("crossfade") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "crossfade \"%i\"\n", seconds);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendPasswordCommand(mpd_Connection * connection, const char *pass)
-+{
-+    char *sPass = mpd_sanitizeArg(pass);
-+    int len = strlen("password") + 2 + strlen(sPass) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "password \"%s\"\n", sPass);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+    free(sPass);
-+}
-+
-+void mpd_sendCommandListBegin(mpd_Connection * connection)
-+{
-+    if (connection->commandList) {
-+	strcpy(connection->errorStr, "already in command list mode");
-+	connection->error = 1;
-+	return;
-+    }
-+    connection->commandList = COMMAND_LIST;
-+    mpd_executeCommand(connection, "command_list_begin\n");
-+}
-+
-+void mpd_sendCommandListOkBegin(mpd_Connection * connection)
-+{
-+    if (connection->commandList) {
-+	strcpy(connection->errorStr, "already in command list mode");
-+	connection->error = 1;
-+	return;
-+    }
-+    connection->commandList = COMMAND_LIST_OK;
-+    mpd_executeCommand(connection, "command_list_ok_begin\n");
-+    connection->listOks = 0;
-+}
-+
-+void mpd_sendCommandListEnd(mpd_Connection * connection)
-+{
-+    if (!connection->commandList) {
-+	strcpy(connection->errorStr, "not in command list mode");
-+	connection->error = 1;
-+	return;
-+    }
-+    connection->commandList = 0;
-+    mpd_executeCommand(connection, "command_list_end\n");
-+}
-+
-+void mpd_sendOutputsCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "outputs\n");
-+}
-+
-+mpd_OutputEntity *mpd_getNextOutput(mpd_Connection * connection)
-+{
-+    mpd_OutputEntity *output = NULL;
-+
-+    if (connection->doneProcessing || (connection->listOks && connection->doneListOk)) {
-+	return NULL;
-+    }
-+
-+    if (connection->error)
-+	return NULL;
-+
-+    output = malloc(sizeof(mpd_OutputEntity));
-+    output->id = -10;
-+    output->name = NULL;
-+    output->enabled = 0;
-+
-+    if (!connection->returnElement)
-+	mpd_getNextReturnElement(connection);
-+
-+    while (connection->returnElement) {
-+	mpd_ReturnElement *re = connection->returnElement;
-+	if (strcmp(re->name, "outputid") == 0) {
-+	    if (output != NULL && output->id >= 0)
-+		return output;
-+	    output->id = atoi(re->value);
-+	} else if (strcmp(re->name, "outputname") == 0) {
-+	    output->name = strdup(re->value);
-+	} else if (strcmp(re->name, "outputenabled") == 0) {
-+	    output->enabled = atoi(re->value);
-+	}
-+
-+	mpd_getNextReturnElement(connection);
-+	if (connection->error) {
-+	    free(output);
-+	    return NULL;
-+	}
-+
-+    }
-+
-+    return output;
-+}
-+
-+void mpd_sendEnableOutputCommand(mpd_Connection * connection, int outputId)
-+{
-+    int len = strlen("enableoutput") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "enableoutput \"%i\"\n", outputId);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_sendDisableOutputCommand(mpd_Connection * connection, int outputId)
-+{
-+    int len = strlen("disableoutput") + 2 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "disableoutput \"%i\"\n", outputId);
-+    mpd_executeCommand(connection, string);
-+    free(string);
-+}
-+
-+void mpd_freeOutputElement(mpd_OutputEntity * output)
-+{
-+    free(output->name);
-+    free(output);
-+}
-+
-+/**
-+ * mpd_sendNotCommandsCommand
-+ * odd naming, but it gets the not allowed commands
-+ */
-+
-+void mpd_sendNotCommandsCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "notcommands\n");
-+}
-+
-+/**
-+ * mpd_sendCommandsCommand
-+ * odd naming, but it gets the allowed commands
-+ */
-+void mpd_sendCommandsCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "commands\n");
-+}
-+
-+/**
-+ * Get the next returned command
-+ */
-+char *mpd_getNextCommand(mpd_Connection * connection)
-+{
-+    return mpd_getNextReturnElementNamed(connection, "command");
-+}
-+
-+void mpd_sendUrlHandlersCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "urlhandlers\n");
-+}
-+
-+char *mpd_getNextHandler(mpd_Connection * connection)
-+{
-+    return mpd_getNextReturnElementNamed(connection, "handler");
-+}
-+
-+void mpd_sendTagTypesCommand(mpd_Connection * connection)
-+{
-+    mpd_executeCommand(connection, "tagtypes\n");
-+}
-+
-+char *mpd_getNextTagType(mpd_Connection * connection)
-+{
-+    return mpd_getNextReturnElementNamed(connection, "tagtype");
-+}
-+
-+void mpd_startSearch(mpd_Connection * connection, int exact)
-+{
-+    if (connection->request) {
-+	strcpy(connection->errorStr, "search already in progress");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    if (exact)
-+	connection->request = strdup("find");
-+    else
-+	connection->request = strdup("search");
-+}
-+
-+void mpd_startStatsSearch(mpd_Connection * connection)
-+{
-+    if (connection->request) {
-+	strcpy(connection->errorStr, "search already in progress");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    connection->request = strdup("count");
-+}
-+
-+void mpd_startPlaylistSearch(mpd_Connection * connection, int exact)
-+{
-+    if (connection->request) {
-+	strcpy(connection->errorStr, "search already in progress");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    if (exact)
-+	connection->request = strdup("playlistfind");
-+    else
-+	connection->request = strdup("playlistsearch");
-+}
-+
-+void mpd_startFieldSearch(mpd_Connection * connection, int type)
-+{
-+    char *strtype;
-+    int len;
-+
-+    if (connection->request) {
-+	strcpy(connection->errorStr, "search already in progress");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    if (type < 0 || type >= MPD_TAG_NUM_OF_ITEM_TYPES) {
-+	strcpy(connection->errorStr, "invalid type specified");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    strtype = mpdTagItemKeys[type];
-+
-+    len = 5 + strlen(strtype) + 1;
-+    connection->request = malloc(len);
-+
-+    snprintf(connection->request, len, "list %c%s", tolower(strtype[0]), strtype + 1);
-+}
-+
-+void mpd_addConstraintSearch(mpd_Connection * connection, int type, const char *name)
-+{
-+    char *strtype;
-+    char *arg;
-+    int len;
-+    char *string;
-+
-+    if (!connection->request) {
-+	strcpy(connection->errorStr, "no search in progress");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    if (type < 0 || type >= MPD_TAG_NUM_OF_ITEM_TYPES) {
-+	strcpy(connection->errorStr, "invalid type specified");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    if (name == NULL) {
-+	strcpy(connection->errorStr, "no name specified");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    string = strdup(connection->request);
-+    strtype = mpdTagItemKeys[type];
-+    arg = mpd_sanitizeArg(name);
-+
-+    len = strlen(string) + 1 + strlen(strtype) + 2 + strlen(arg) + 2;
-+    connection->request = realloc(connection->request, len);
-+    snprintf(connection->request, len, "%s %c%s \"%s\"", string, tolower(strtype[0]), strtype + 1, arg);
-+
-+    free(string);
-+    free(arg);
-+}
-+
-+void mpd_commitSearch(mpd_Connection * connection)
-+{
-+    int len;
-+
-+    if (!connection->request) {
-+	strcpy(connection->errorStr, "no search in progress");
-+	connection->error = 1;
-+	return;
-+    }
-+
-+    len = strlen(connection->request) + 2;
-+    connection->request = realloc(connection->request, len);
-+    connection->request[len - 2] = '\n';
-+    connection->request[len - 1] = '\0';
-+    mpd_sendInfoCommand(connection, connection->request);
-+
-+    free(connection->request);
-+    connection->request = NULL;
-+}
-+
-+/**
-+ * @param connection a MpdConnection
-+ * @param path	the path to the playlist.
-+ *
-+ * List the content, with full metadata, of a stored playlist.
-+ *
-+ */
-+void mpd_sendListPlaylistInfoCommand(mpd_Connection * connection, char *path)
-+{
-+    char *arg = mpd_sanitizeArg(path);
-+    int len = strlen("listplaylistinfo") + 2 + strlen(arg) + 3;
-+    char *query = malloc(len);
-+    snprintf(query, len, "listplaylistinfo \"%s\"\n", arg);
-+    mpd_sendInfoCommand(connection, query);
-+    free(arg);
-+    free(query);
-+}
-+
-+/**
-+ * @param connection a MpdConnection
-+ * @param path	the path to the playlist.
-+ *
-+ * List the content of a stored playlist.
-+ *
-+ */
-+void mpd_sendListPlaylistCommand(mpd_Connection * connection, char *path)
-+{
-+    char *arg = mpd_sanitizeArg(path);
-+    int len = strlen("listplaylist") + 2 + strlen(arg) + 3;
-+    char *query = malloc(len);
-+    snprintf(query, len, "listplaylist \"%s\"\n", arg);
-+    mpd_sendInfoCommand(connection, query);
-+    free(arg);
-+    free(query);
-+}
-+
-+void mpd_sendPlaylistClearCommand(mpd_Connection * connection, char *path)
-+{
-+    char *sPath = mpd_sanitizeArg(path);
-+    int len = strlen("playlistclear") + 2 + strlen(sPath) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "playlistclear \"%s\"\n", sPath);
-+    mpd_executeCommand(connection, string);
-+    free(sPath);
-+    free(string);
-+}
-+
-+void mpd_sendPlaylistAddCommand(mpd_Connection * connection, char *playlist, char *path)
-+{
-+    char *sPlaylist = mpd_sanitizeArg(playlist);
-+    char *sPath = mpd_sanitizeArg(path);
-+    int len = strlen("playlistadd") + 2 + strlen(sPlaylist) + 3 + strlen(sPath) + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "playlistadd \"%s\" \"%s\"\n", sPlaylist, sPath);
-+    mpd_executeCommand(connection, string);
-+    free(sPlaylist);
-+    free(sPath);
-+    free(string);
-+}
-+
-+void mpd_sendPlaylistMoveCommand(mpd_Connection * connection, char *playlist, int from, int to)
-+{
-+    char *sPlaylist = mpd_sanitizeArg(playlist);
-+    int len = strlen("playlistmove") + 2 + strlen(sPlaylist) + 3 + INTLEN + 3 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "playlistmove \"%s\" \"%i\" \"%i\"\n", sPlaylist, from, to);
-+    mpd_executeCommand(connection, string);
-+    free(sPlaylist);
-+    free(string);
-+}
-+
-+void mpd_sendPlaylistDeleteCommand(mpd_Connection * connection, char *playlist, int pos)
-+{
-+    char *sPlaylist = mpd_sanitizeArg(playlist);
-+    int len = strlen("playlistdelete") + 2 + strlen(sPlaylist) + 3 + INTLEN + 3;
-+    char *string = malloc(len);
-+    snprintf(string, len, "playlistdelete \"%s\" \"%i\"\n", sPlaylist, pos);
-+    mpd_executeCommand(connection, string);
-+    free(sPlaylist);
-+    free(string);
-+}
---- /dev/null
-+++ b/libmpdclient.h
-@@ -0,0 +1,661 @@
-+/* libmpdclient
-+   (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
-+   This project's homepage is: http://www.musicpd.org
-+
-+   Redistribution and use in source and binary forms, with or without
-+   modification, are permitted provided that the following conditions
-+   are met:
-+
-+   - Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+
-+   - Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+
-+   - Neither the name of the Music Player Daemon nor the names of its
-+   contributors may be used to endorse or promote products derived from
-+   this software without specific prior written permission.
-+
-+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#ifndef LIBMPDCLIENT_H
-+#define LIBMPDCLIENT_H
-+
-+#ifdef WIN32
-+#  define __W32API_USE_DLLIMPORT__ 1
-+#endif
-+
-+#include <sys/time.h>
-+#include <stdarg.h>
-+#define MPD_BUFFER_MAX_LENGTH	50000
-+#define MPD_ERRORSTR_MAX_LENGTH	1000
-+#define MPD_WELCOME_MESSAGE	"OK MPD "
-+
-+#define MPD_ERROR_TIMEOUT	10	/* timeout trying to talk to mpd */
-+#define MPD_ERROR_SYSTEM	11	/* system error */
-+#define MPD_ERROR_UNKHOST	12	/* unknown host */
-+#define MPD_ERROR_CONNPORT	13	/* problems connecting to port on host */
-+#define MPD_ERROR_NOTMPD	14	/* mpd not running on port at host */
-+#define MPD_ERROR_NORESPONSE	15	/* no response on attempting to connect */
-+#define MPD_ERROR_SENDING	16	/* error sending command */
-+#define MPD_ERROR_CONNCLOSED	17	/* connection closed by mpd */
-+#define MPD_ERROR_ACK		18	/* ACK returned! */
-+#define MPD_ERROR_BUFFEROVERRUN	19	/* Buffer was overrun! */
-+
-+#define MPD_ACK_ERROR_UNK	-1
-+#define MPD_ERROR_AT_UNK	-1
-+
-+#define MPD_ACK_ERROR_NOT_LIST			1
-+#define MPD_ACK_ERROR_ARG			2
-+#define MPD_ACK_ERROR_PASSWORD			3
-+#define MPD_ACK_ERROR_PERMISSION		4
-+#define MPD_ACK_ERROR_UNKNOWN_CMD		5
-+
-+#define MPD_ACK_ERROR_NO_EXIST			50
-+#define MPD_ACK_ERROR_PLAYLIST_MAX		51
-+#define MPD_ACK_ERROR_SYSTEM			52
-+#define MPD_ACK_ERROR_PLAYLIST_LOAD		53
-+#define MPD_ACK_ERROR_UPDATE_ALREADY		54
-+#define MPD_ACK_ERROR_PLAYER_SYNC		55
-+#define MPD_ACK_ERROR_EXIST			56
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+    typedef enum mpd_TagItems {
-+	MPD_TAG_ITEM_ARTIST,
-+	MPD_TAG_ITEM_ALBUM,
-+	MPD_TAG_ITEM_TITLE,
-+	MPD_TAG_ITEM_TRACK,
-+	MPD_TAG_ITEM_NAME,
-+	MPD_TAG_ITEM_GENRE,
-+	MPD_TAG_ITEM_DATE,
-+	MPD_TAG_ITEM_COMPOSER,
-+	MPD_TAG_ITEM_PERFORMER,
-+	MPD_TAG_ITEM_COMMENT,
-+	MPD_TAG_ITEM_DISC,
-+	MPD_TAG_ITEM_FILENAME,
-+	MPD_TAG_ITEM_ANY,
-+	MPD_TAG_NUM_OF_ITEM_TYPES
-+    } mpd_TagItems;
-+
-+    extern char *mpdTagItemKeys[MPD_TAG_NUM_OF_ITEM_TYPES];
-+
-+/* internal stuff don't touch this struct */
-+    typedef struct _mpd_ReturnElement {
-+	char *name;
-+	char *value;
-+    } mpd_ReturnElement;
-+
-+/* mpd_Connection
-+ * holds info about connection to mpd
-+ * use error, and errorStr to detect errors
-+ */
-+    typedef struct _mpd_Connection {
-+	/* use this to check the version of mpd */
-+	int version[3];
-+	/* IMPORTANT, you want to get the error messages from here */
-+	char errorStr[MPD_ERRORSTR_MAX_LENGTH + 1];
-+	int errorCode;
-+	int errorAt;
-+	/* this will be set to MPD_ERROR_* if there is an error, 0 if not */
-+	int error;
-+	/* DON'T TOUCH any of the rest of this stuff */
-+	int sock;
-+	char buffer[MPD_BUFFER_MAX_LENGTH + 1];
-+	int buflen;
-+	int bufstart;
-+	int doneProcessing;
-+	int listOks;
-+	int doneListOk;
-+	int commandList;
-+	mpd_ReturnElement *returnElement;
-+	struct timeval timeout;
-+	char *request;
-+    } mpd_Connection;
-+
-+/* mpd_newConnection
-+ * use this to open a new connection
-+ * you should use mpd_closeConnection, when your done with the connection,
-+ * even if an error has occurred
-+ * _timeout_ is the connection timeout period in seconds
-+ */
-+    mpd_Connection *mpd_newConnection(const char *host, int port, float timeout);
-+
-+    void mpd_setConnectionTimeout(mpd_Connection * connection, float timeout);
-+
-+/* mpd_closeConnection
-+ * use this to close a connection and free'ing subsequent memory
-+ */
-+    void mpd_closeConnection(mpd_Connection * connection);
-+
-+/* mpd_clearError
-+ * clears error
-+ */
-+    void mpd_clearError(mpd_Connection * connection);
-+
-+/* STATUS STUFF */
-+
-+/* use these with status.state to determine what state the player is in */
-+#define MPD_STATUS_STATE_UNKNOWN	0
-+#define MPD_STATUS_STATE_STOP		1
-+#define MPD_STATUS_STATE_PLAY		2
-+#define MPD_STATUS_STATE_PAUSE		3
-+
-+/* us this with status.volume to determine if mpd has volume support */
-+#define MPD_STATUS_NO_VOLUME		-1
-+
-+/* mpd_Status
-+ * holds info return from status command
-+ */
-+    typedef struct mpd_Status {
-+	/* 0-100, or MPD_STATUS_NO_VOLUME when there is no volume support */
-+	int volume;
-+	/* 1 if repeat is on, 0 otherwise */
-+	int repeat;
-+	/* 1 if random is on, 0 otherwise */
-+	int random;
-+	/* playlist length */
-+	int playlistLength;
-+	/* playlist, use this to determine when the playlist has changed */
-+	long long playlist;
-+	/* use with MPD_STATUS_STATE_* to determine state of player */
-+	int state;
-+	/* crossfade setting in seconds */
-+	int crossfade;
-+	/* if a song is currently selected (always the case when state is
-+	 * PLAY or PAUSE), this is the position of the currently
-+	 * playing song in the playlist, beginning with 0
-+	 */
-+	int song;
-+	/* Song ID of the currently selected song */
-+	int songid;
-+	/* time in seconds that have elapsed in the currently playing/paused
-+	 * song
-+	 */
-+	int elapsedTime;
-+	/* length in seconds of the currently playing/paused song */
-+	int totalTime;
-+	/* current bit rate in kbs */
-+	int bitRate;
-+	/* audio sample rate */
-+	unsigned int sampleRate;
-+	/* audio bits */
-+	int bits;
-+	/* audio channels */
-+	int channels;
-+	/* 1 if mpd is updating, 0 otherwise */
-+	int updatingDb;
-+	/* error */
-+	char *error;
-+    } mpd_Status;
-+
-+    void mpd_sendStatusCommand(mpd_Connection * connection);
-+
-+/* mpd_getStatus
-+ * returns status info, be sure to free it with mpd_freeStatus()
-+ * call this after mpd_sendStatusCommand()
-+ */
-+    mpd_Status *mpd_getStatus(mpd_Connection * connection);
-+
-+/* mpd_freeStatus
-+ * free's status info malloc'd and returned by mpd_getStatus
-+ */
-+    void mpd_freeStatus(mpd_Status * status);
-+
-+    typedef struct _mpd_Stats {
-+	int numberOfArtists;
-+	int numberOfAlbums;
-+	int numberOfSongs;
-+	unsigned long uptime;
-+	unsigned long dbUpdateTime;
-+	unsigned long playTime;
-+	unsigned long dbPlayTime;
-+    } mpd_Stats;
-+
-+    typedef struct _mpd_SearchStats {
-+	int numberOfSongs;
-+	unsigned long playTime;
-+    } mpd_SearchStats;
-+
-+    void mpd_sendStatsCommand(mpd_Connection * connection);
-+
-+    mpd_Stats *mpd_getStats(mpd_Connection * connection);
-+
-+    void mpd_freeStats(mpd_Stats * stats);
-+
-+    mpd_SearchStats *mpd_getSearchStats(mpd_Connection * connection);
-+
-+    void mpd_freeSearchStats(mpd_SearchStats * stats);
-+
-+/* SONG STUFF */
-+
-+#define MPD_SONG_NO_TIME	-1
-+#define MPD_SONG_NO_NUM		-1
-+#define MPD_SONG_NO_ID		-1
-+
-+/* mpd_Song
-+ * for storing song info returned by mpd
-+ */
-+    typedef struct _mpd_Song {
-+	/* filename of song */
-+	char *file;
-+	/* artist, maybe NULL if there is no tag */
-+	char *artist;
-+	/* title, maybe NULL if there is no tag */
-+	char *title;
-+	/* album, maybe NULL if there is no tag */
-+	char *album;
-+	/* track, maybe NULL if there is no tag */
-+	char *track;
-+	/* name, maybe NULL if there is no tag; it's the name of the current
-+	 * song, f.e. the icyName of the stream */
-+	char *name;
-+	/* date */
-+	char *date;
-+
-+	/* added by qball */
-+	/* Genre */
-+	char *genre;
-+	/* Composer */
-+	char *composer;
-+	/* Performer */
-+	char *performer;
-+	/* Disc */
-+	char *disc;
-+	/* Comment */
-+	char *comment;
-+
-+	/* length of song in seconds, check that it is not MPD_SONG_NO_TIME  */
-+	int time;
-+	/* if plchanges/playlistinfo/playlistid used, is the position of the
-+	 * song in the playlist */
-+	int pos;
-+	/* song id for a song in the playlist */
-+	int id;
-+    } mpd_Song;
-+
-+/* mpd_newSong
-+ * use to allocate memory for a new mpd_Song
-+ * file, artist, etc all initialized to NULL
-+ * if your going to assign values to file, artist, etc
-+ * be sure to malloc or strdup the memory
-+ * use mpd_freeSong to free the memory for the mpd_Song, it will also
-+ * free memory for file, artist, etc, so don't do it yourself
-+ */
-+    mpd_Song *mpd_newSong(void);
-+
-+/* mpd_freeSong
-+ * use to free memory allocated by mpd_newSong
-+ * also it will free memory pointed to by file, artist, etc, so be careful
-+ */
-+    void mpd_freeSong(mpd_Song * song);
-+
-+/* mpd_songDup
-+ * works like strDup, but for a mpd_Song
-+ */
-+    mpd_Song *mpd_songDup(mpd_Song * song);
-+
-+/* DIRECTORY STUFF */
-+
-+/* mpd_Directory
-+ * used to store info fro directory (right now that just the path)
-+ */
-+    typedef struct _mpd_Directory {
-+	char *path;
-+    } mpd_Directory;
-+
-+/* mpd_newDirectory
-+ * allocates memory for a new directory
-+ * use mpd_freeDirectory to free this memory
-+ */
-+    mpd_Directory *mpd_newDirectory(void);
-+
-+/* mpd_freeDirectory
-+ * used to free memory allocated with mpd_newDirectory, and it frees
-+ * path of mpd_Directory, so be careful
-+ */
-+    void mpd_freeDirectory(mpd_Directory * directory);
-+
-+/* mpd_directoryDup
-+ * works like strdup, but for mpd_Directory
-+ */
-+    mpd_Directory *mpd_directoryDup(mpd_Directory * directory);
-+
-+/* PLAYLISTFILE STUFF */
-+
-+/* mpd_PlaylistFile
-+ * stores info about playlist file returned by lsinfo
-+ */
-+    typedef struct _mpd_PlaylistFile {
-+	char *path;
-+    } mpd_PlaylistFile;
-+
-+/* mpd_newPlaylistFile
-+ * allocates memory for new mpd_PlaylistFile, path is set to NULL
-+ * free this memory with mpd_freePlaylistFile
-+ */
-+    mpd_PlaylistFile *mpd_newPlaylistFile(void);
-+
-+/* mpd_freePlaylist
-+ * free memory allocated for freePlaylistFile, will also free
-+ * path, so be careful
-+ */
-+    void mpd_freePlaylistFile(mpd_PlaylistFile * playlist);
-+
-+/* mpd_playlistFileDup
-+ * works like strdup, but for mpd_PlaylistFile
-+ */
-+    mpd_PlaylistFile *mpd_playlistFileDup(mpd_PlaylistFile * playlist);
-+
-+/* INFO ENTITY STUFF */
-+
-+/* the type of entity returned from one of the commands that generates info
-+ * use in conjunction with mpd_InfoEntity.type
-+ */
-+#define MPD_INFO_ENTITY_TYPE_DIRECTORY		0
-+#define MPD_INFO_ENTITY_TYPE_SONG		1
-+#define MPD_INFO_ENTITY_TYPE_PLAYLISTFILE	2
-+
-+/* mpd_InfoEntity
-+ * stores info on stuff returned info commands
-+ */
-+    typedef struct mpd_InfoEntity {
-+	/* the type of entity, use with MPD_INFO_ENTITY_TYPE_* to determine
-+	 * what this entity is (song, directory, etc...)
-+	 */
-+	int type;
-+	/* the actual data you want, mpd_Song, mpd_Directory, etc */
-+	union {
-+	    mpd_Directory *directory;
-+	    mpd_Song *song;
-+	    mpd_PlaylistFile *playlistFile;
-+	} info;
-+    } mpd_InfoEntity;
-+
-+    mpd_InfoEntity *mpd_newInfoEntity(void);
-+
-+    void mpd_freeInfoEntity(mpd_InfoEntity * entity);
-+
-+/* INFO COMMANDS AND STUFF */
-+
-+/* use this function to loop over after calling Info/Listall functions */
-+    mpd_InfoEntity *mpd_getNextInfoEntity(mpd_Connection * connection);
-+
-+/* fetches the currently seeletect song (the song referenced by status->song
-+ * and status->songid*/
-+    void mpd_sendCurrentSongCommand(mpd_Connection * connection);
-+
-+/* songNum of -1, means to display the whole list */
-+    void mpd_sendPlaylistInfoCommand(mpd_Connection * connection, int songNum);
-+
-+/* songId of -1, means to display the whole list */
-+    void mpd_sendPlaylistIdCommand(mpd_Connection * connection, int songId);
-+
-+/* use this to get the changes in the playlist since version _playlist_ */
-+    void mpd_sendPlChangesCommand(mpd_Connection * connection, long long playlist);
-+
-+/**
-+ * @param connection: A valid and connected mpd_Connection.
-+ * @param playlist: The playlist version you want the diff with.
-+ * A more bandwidth efficient version of the mpd_sendPlChangesCommand.
-+ * It only returns the pos+id of the changes song.
-+ */
-+    void mpd_sendPlChangesPosIdCommand(mpd_Connection * connection, long long playlist);
-+
-+/* recursivel fetches all songs/dir/playlists in "dir* (no metadata is
-+ * returned) */
-+    void mpd_sendListallCommand(mpd_Connection * connection, const char *dir);
-+
-+/* same as sendListallCommand, but also metadata is returned */
-+    void mpd_sendListallInfoCommand(mpd_Connection * connection, const char *dir);
-+
-+/* non-recursive version of ListallInfo */
-+    void mpd_sendLsInfoCommand(mpd_Connection * connection, const char *dir);
-+
-+#define MPD_TABLE_ARTIST	MPD_TAG_ITEM_ARTIST
-+#define MPD_TABLE_ALBUM		MPD_TAG_ITEM_ALBUM
-+#define MPD_TABLE_TITLE		MPD_TAG_ITEM_TITLE
-+#define MPD_TABLE_FILENAME	MPD_TAG_ITEM_FILENAME
-+
-+    void mpd_sendSearchCommand(mpd_Connection * connection, int table, const char *str);
-+
-+    void mpd_sendFindCommand(mpd_Connection * connection, int table, const char *str);
-+
-+/* LIST TAG COMMANDS */
-+
-+/* use this function fetch next artist entry, be sure to free the returned
-+ * string.  NULL means there are no more.  Best used with sendListArtists
-+ */
-+    char *mpd_getNextArtist(mpd_Connection * connection);
-+
-+    char *mpd_getNextAlbum(mpd_Connection * connection);
-+
-+    char *mpd_getNextTag(mpd_Connection * connection, int type);
-+
-+/* list artist or albums by artist, arg1 should be set to the artist if
-+ * listing albums by a artist, otherwise NULL for listing all artists or albums
-+ */
-+    void mpd_sendListCommand(mpd_Connection * connection, int table, const char *arg1);
-+
-+/* SIMPLE COMMANDS */
-+
-+    void mpd_sendAddCommand(mpd_Connection * connection, const char *file);
-+
-+    int mpd_sendAddIdCommand(mpd_Connection * connection, const char *file);
-+
-+    void mpd_sendDeleteCommand(mpd_Connection * connection, int songNum);
-+
-+    void mpd_sendDeleteIdCommand(mpd_Connection * connection, int songNum);
-+
-+    void mpd_sendSaveCommand(mpd_Connection * connection, const char *name);
-+
-+    void mpd_sendLoadCommand(mpd_Connection * connection, const char *name);
-+
-+    void mpd_sendRmCommand(mpd_Connection * connection, const char *name);
-+
-+    void mpd_sendRenameCommand(mpd_Connection * connection, const char *from, const char *to);
-+
-+    void mpd_sendShuffleCommand(mpd_Connection * connection);
-+
-+    void mpd_sendClearCommand(mpd_Connection * connection);
-+
-+/* use this to start playing at the beginning, useful when in random mode */
-+#define MPD_PLAY_AT_BEGINNING	-1
-+
-+    void mpd_sendPlayCommand(mpd_Connection * connection, int songNum);
-+
-+    void mpd_sendPlayIdCommand(mpd_Connection * connection, int songNum);
-+
-+    void mpd_sendStopCommand(mpd_Connection * connection);
-+
-+    void mpd_sendPauseCommand(mpd_Connection * connection, int pauseMode);
-+
-+    void mpd_sendNextCommand(mpd_Connection * connection);
-+
-+    void mpd_sendPrevCommand(mpd_Connection * connection);
-+
-+    void mpd_sendMoveCommand(mpd_Connection * connection, int from, int to);
-+
-+    void mpd_sendMoveIdCommand(mpd_Connection * connection, int from, int to);
-+
-+    void mpd_sendSwapCommand(mpd_Connection * connection, int song1, int song2);
-+
-+    void mpd_sendSwapIdCommand(mpd_Connection * connection, int song1, int song2);
-+
-+    void mpd_sendSeekCommand(mpd_Connection * connection, int song, int time);
-+
-+    void mpd_sendSeekIdCommand(mpd_Connection * connection, int song, int time);
-+
-+    void mpd_sendRepeatCommand(mpd_Connection * connection, int repeatMode);
-+
-+    void mpd_sendRandomCommand(mpd_Connection * connection, int randomMode);
-+
-+    void mpd_sendSetvolCommand(mpd_Connection * connection, int volumeChange);
-+
-+/* WARNING: don't use volume command, its depreacted */
-+    void mpd_sendVolumeCommand(mpd_Connection * connection, int volumeChange);
-+
-+    void mpd_sendCrossfadeCommand(mpd_Connection * connection, int seconds);
-+
-+    void mpd_sendUpdateCommand(mpd_Connection * connection, char *path);
-+
-+/* returns the update job id, call this after a update command*/
-+    int mpd_getUpdateId(mpd_Connection * connection);
-+
-+    void mpd_sendPasswordCommand(mpd_Connection * connection, const char *pass);
-+
-+/* after executing a command, when your done with it to get its status
-+ * (you want to check connection->error for an error)
-+ */
-+    void mpd_finishCommand(mpd_Connection * connection);
-+
-+/* command list stuff, use this to do things like add files very quickly */
-+    void mpd_sendCommandListBegin(mpd_Connection * connection);
-+
-+    void mpd_sendCommandListOkBegin(mpd_Connection * connection);
-+
-+    void mpd_sendCommandListEnd(mpd_Connection * connection);
-+
-+/* advance to the next listOk
-+ * returns 0 if advanced to the next list_OK,
-+ * returns -1 if it advanced to an OK or ACK */
-+    int mpd_nextListOkCommand(mpd_Connection * connection);
-+
-+    typedef struct _mpd_OutputEntity {
-+	int id;
-+	char *name;
-+	int enabled;
-+    } mpd_OutputEntity;
-+
-+    void mpd_sendOutputsCommand(mpd_Connection * connection);
-+
-+    mpd_OutputEntity *mpd_getNextOutput(mpd_Connection * connection);
-+
-+    void mpd_sendEnableOutputCommand(mpd_Connection * connection, int outputId);
-+
-+    void mpd_sendDisableOutputCommand(mpd_Connection * connection, int outputId);
-+
-+    void mpd_freeOutputElement(mpd_OutputEntity * output);
-+
-+/**
-+ * @param connection a #mpd_Connection
-+ *
-+ * Queries mpd for the allowed commands
-+ */
-+    void mpd_sendCommandsCommand(mpd_Connection * connection);
-+
-+/**
-+ * @param connection a #mpd_Connection
-+ *
-+ * Queries mpd for the not allowed commands
-+ */
-+    void mpd_sendNotCommandsCommand(mpd_Connection * connection);
-+
-+/**
-+ * @param connection a #mpd_Connection
-+ *
-+ * returns the next supported command.
-+ *
-+ * @returns a string, needs to be free'ed
-+ */
-+    char *mpd_getNextCommand(mpd_Connection * connection);
-+
-+    void mpd_sendUrlHandlersCommand(mpd_Connection * connection);
-+
-+    char *mpd_getNextHandler(mpd_Connection * connection);
-+
-+    void mpd_sendTagTypesCommand(mpd_Connection * connection);
-+
-+    char *mpd_getNextTagType(mpd_Connection * connection);
-+
-+/**
-+ * @param connection a MpdConnection
-+ * @param path	the path to the playlist.
-+ *
-+ * List the content, with full metadata, of a stored playlist.
-+ *
-+ */
-+    void mpd_sendListPlaylistInfoCommand(mpd_Connection * connection, char *path);
-+
-+/**
-+ * @param connection a MpdConnection
-+ * @param path	the path to the playlist.
-+ *
-+ * List the content of a stored playlist.
-+ *
-+ */
-+    void mpd_sendListPlaylistCommand(mpd_Connection * connection, char *path);
-+
-+/**
-+ * @param connection a #mpd_Connection
-+ * @param exact if to match exact
-+ *
-+ * starts a search, use mpd_addConstraintSearch to add
-+ * a constraint to the search, and mpd_commitSearch to do the actual search
-+ */
-+    void mpd_startSearch(mpd_Connection * connection, int exact);
-+
-+/**
-+ * @param connection a #mpd_Connection
-+ * @param type
-+ * @param name
-+ */
-+    void mpd_addConstraintSearch(mpd_Connection * connection, int type, const char *name);
-+
-+/**
-+ * @param connection a #mpd_Connection
-+ */
-+    void mpd_commitSearch(mpd_Connection * connection);
-+
-+/**
-+ * @param connection a #mpd_Connection
-+ * @param type The type to search for
-+ *
-+ * starts a search for fields... f.e. get a list of artists would be:
-+ * @code
-+ * mpd_startFieldSearch(connection, MPD_TAG_ITEM_ARTIST);
-+ * mpd_commitSearch(connection);
-+ * @endcode
-+ *
-+ * or get a list of artist in genre "jazz" would be:
-+ * @code
-+ * mpd_startFieldSearch(connection, MPD_TAG_ITEM_ARTIST);
-+ * mpd_addConstraintSearch(connection, MPD_TAG_ITEM_GENRE, "jazz")
-+ * mpd_commitSearch(connection);
-+ * @endcode
-+ *
-+ * mpd_startSearch will return  a list of songs (and you need mpd_getNextInfoEntity)
-+ * this one will return a list of only one field (the one specified with type) and you need
-+ * mpd_getNextTag to get the results
-+ */
-+    void mpd_startFieldSearch(mpd_Connection * connection, int type);
-+
-+    void mpd_startPlaylistSearch(mpd_Connection * connection, int exact);
-+
-+    void mpd_startStatsSearch(mpd_Connection * connection);
-+
-+    void mpd_sendPlaylistClearCommand(mpd_Connection * connection, char *path);
-+
-+    void mpd_sendPlaylistAddCommand(mpd_Connection * connection, char *playlist, char *path);
-+
-+    void mpd_sendPlaylistMoveCommand(mpd_Connection * connection, char *playlist, int from, int to);
-+
-+    void mpd_sendPlaylistDeleteCommand(mpd_Connection * connection, char *playlist, int pos);
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
 

--- a/utils/lcd4linux/patches/160-uinput_defs.patch
+++ /dev/null
@@ -1,25 +1,1 @@
---- a/drv_G15.c
-+++ b/drv_G15.c
-@@ -42,6 +42,7 @@
- 
- #include <usb.h>
- #include <fcntl.h>
-+#include <linux/version.h>
- #include <linux/input.h>
- #include <linux/uinput.h>
- 
-@@ -269,8 +270,13 @@ void drv_G15_initKeyHandling(char *devic
-     }
-     memset(&device, 0, sizeof(device));
-     strncpy(device.name, "G15 Keys", UINPUT_MAX_NAME_SIZE);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-     device.id.bustype = BUS_USB;
-     device.id.version = 4;
-+#else
-+    device.idbus = BUS_USB;
-+    device.idversion = 4;
-+#endif
- 
-     ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY);
- 
 

--- a/utils/lcd4linux/patches/170-add-generic-spidev-driver.patch
+++ /dev/null
@@ -1,196 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -71,6 +71,8 @@ drv_generic_i2c.c             \
- drv_generic_i2c.h             \
- drv_generic_keypad.c          \
- drv_generic_keypad.h          \
-+drv_generic_spidev.c          \
-+drv_generic_spidev.h          \
- drv_ASTUSB.c                  \
- drv_BeckmannEgle.c            \
- drv_BWCT.c                    \
---- /dev/null
-+++ b/drv_generic_spidev.c
-@@ -0,0 +1,89 @@
-+/* $Id$
-+ * $URL$
-+ *
-+ * generic driver helper for displays connected via SPI bus
-+ *
-+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * This file is part of LCD4Linux.
-+ *
-+ * LCD4Linux 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.
-+ *
-+ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#include "config.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+
-+#include "debug.h"
-+#include "qprintf.h"
-+#include "cfg.h"
-+#include "drv_generic_spidev.h"
-+
-+static char *generic_spidev_section = "";
-+static char *generic_spidev_driver = "";
-+static int generic_spidev_fd;
-+
-+int drv_generic_spidev_open(const char *section, const char *driver)
-+{
-+    char *spidev;
-+
-+    udelay_init();
-+
-+    generic_spidev_section = (char *) section;
-+    generic_spidev_driver = (char *) driver;
-+
-+    spidev = cfg_get(generic_spidev_section, "Port", NULL);
-+
-+    info("%s: initializing SPI device %s", generic_spidev_driver, spidev);
-+    generic_spidev_fd = open(spidev, O_WRONLY);
-+    if (generic_spidev_fd < 0) {
-+	error("%s: unable to open SPI device %s!\n", generic_spidev_driver, spidev);
-+	goto exit_error;
-+    }
-+
-+    return 0;
-+
-+  exit_error:
-+    free(spidev);
-+    return -1;
-+}
-+
-+int drv_generic_spidev_close(void)
-+{
-+    close(generic_spidev_fd);
-+    return 0;
-+}
-+
-+int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr)
-+{
-+    int ret;
-+
-+    ret = ioctl(generic_spidev_fd, SPI_IOC_MESSAGE(count), tr);
-+    if (ret < count) {
-+	error("%s: can't send SPI message! (%s)\n",
-+		generic_spidev_driver, strerror(errno));
-+	return -1;
-+    }
-+
-+    return 0;
-+}
---- /dev/null
-+++ b/drv_generic_spidev.h
-@@ -0,0 +1,54 @@
-+/* $Id$
-+ * $URL$
-+ *
-+ * generic driver helper for displays connected via SPI bus
-+ *
-+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2012 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
-+ *
-+ * This file is part of LCD4Linux.
-+ *
-+ * LCD4Linux 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.
-+ *
-+ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+/*
-+ *
-+ * exported fuctions:
-+ *
-+ * int drv_generic_spidev_open (const char *section, const char *driver)
-+ *   reads 'Port' entry from config and opens
-+ *   the SPI device
-+ *   returns 0 if ok, -1 on failure
-+ *
-+ * int drv_generic_spidev_close (void)
-+ *   closes SPI device
-+ *   returns 0 if ok, -1 on failure
-+ *
-+ * void drv_generic_spidev_transfer (int count, struct spi_ioc_transfer *tr)
-+ *   transfer data to/from the SPI device
-+ *
-+ */
-+
-+#ifndef _DRV_GENERIC_SPIDEV_H_
-+#define _DRV_GENERIC_SPIDEV_H_
-+
-+#include <linux/spi/spidev.h>
-+
-+int drv_generic_spidev_open(const char *section, const char *driver);
-+int drv_generic_spidev_close(void);
-+int drv_generic_spidev_transfer(const int count, struct spi_ioc_transfer *tr);
-+
-+#endif /* _DRV_GENERIC_SPIDEV_H_ */
---- a/drivers.m4
-+++ b/drivers.m4
-@@ -301,6 +301,7 @@ PARPORT="no"
- SERIAL="no"
- I2C="no"
- KEYPAD="no"
-+SPIDEV="no"
- 
- # generic libraries
- LIBUSB="no"
-@@ -940,6 +941,12 @@ if test "$LIBJPEG" = "yes"; then
-    DRVLIBS="$DRVLIBS -ljpeg"
- fi
- 
-+# generic spidev driver
-+if test "$SPIDEV" = "yes"; then
-+   DRIVERS="$DRIVERS drv_generic_spidev.o"
-+   AC_DEFINE(WITH_SPIDEV, 1, [SPIDEV driver])
-+fi
-+
- # libusb
- if test "$LIBUSB" = "yes"; then
-    DRVLIBS="$DRVLIBS -lusb"
---- a/configure.in
-+++ b/configure.in
-@@ -118,6 +118,9 @@ AC_ARG_WITH(outb,
- 
- AC_CHECK_HEADERS([asm/io.h] [linux/parport.h linux/ppdev.h], [has_parport="true"], [has_parport="false"])
- 
-+# check for spidev
-+AC_CHECK_HEADERS([linux/spi/spidev.h], [has_spidev="true"], [has_spidev="false"])
-+
- # drivers
- sinclude(drivers.m4)
- 
 

--- a/utils/lcd4linux/patches/171-allow-to-specify-drv_generic_graphic_real_clear.patch
+++ /dev/null
@@ -1,46 +1,1 @@
---- a/drv_generic_graphic.c
-+++ b/drv_generic_graphic.c
-@@ -24,7 +24,7 @@
-  *
-  */
- 
--/* 
-+/*
-  *
-  * exported functions:
-  *
-@@ -98,6 +98,9 @@ static int INVERTED = 0;
- /* must be implemented by the real driver */
- void (*drv_generic_graphic_real_blit) () = NULL;
- 
-+/* can be implemented by the real driver */
-+void (*drv_generic_graphic_real_clear) () = NULL;
-+
- 
- /****************************************/
- /*** generic Framebuffer stuff        ***/
-@@ -691,7 +694,10 @@ int drv_generic_graphic_clear(void)
- 	for (i = 0; i < LCOLS * LROWS; i++)
- 	    drv_generic_graphic_FB[l][i] = NO_COL;
- 
--    drv_generic_graphic_blit(0, 0, LROWS, LCOLS);
-+    if (drv_generic_graphic_real_clear)
-+	drv_generic_graphic_real_clear(NO_COL);
-+    else
-+	drv_generic_graphic_blit(0, 0, LROWS, LCOLS);
- 
-     return 0;
- }
---- a/drv_generic_graphic.h
-+++ b/drv_generic_graphic.h
-@@ -40,6 +40,9 @@ extern RGBA NO_COL;		/* no color (comple
- /* these functions must be implemented by the real driver */
- extern void (*drv_generic_graphic_real_blit) (const int row, const int col, const int height, const int width);
- 
-+/* these functions can be implemented by the real driver */
-+void (*drv_generic_graphic_real_clear) (const RGBA rgba);
-+
- /* helper function to get pixel color or gray value */
- extern RGBA drv_generic_graphic_rgb(const int row, const int col);
- extern unsigned char drv_generic_graphic_gray(const int row, const int col);
 

--- a/utils/lcd4linux/patches/172-add-TEW673GRU-driver.patch
+++ /dev/null
@@ -1,553 +1,1 @@
---- a/drivers.m4
-+++ b/drivers.m4
-@@ -39,7 +39,7 @@ AC_ARG_WITH(
-   [                        Newhaven, Noritake, NULL, Pertelian, PHAnderson,]
-   [                        PICGraphic, picoLCD, picoLCDGraphic, PNG, PPM, RouterBoard,]
-   [                        Sample, SamsungSPF, serdisplib, ShuttleVFD, SimpleLCD, st2205, T6963,]
--  [                        TeakLCM, Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11],
-+  [                        TeakLCM, TEW673GRU, Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11],
-   drivers=$withval,
-   drivers=all
- )
-@@ -107,6 +107,7 @@ for driver in $drivers; do
- 	 SHUTTLEVFD="yes"
-          SIMPLELCD="yes"
-          T6963="yes"
-+         TEW673GRU="yes"
-          TeakLCM="yes"
-          Trefon="yes"
-          ULA200="yes"
-@@ -260,6 +261,9 @@ for driver in $drivers; do
-       TeakLCM)
-          TeakLCM=$val
-          ;;
-+      TEW673GRU)
-+         TEW673GRU=$val
-+         ;;
-       Trefon)
-          Trefon=$val
-          ;;
-@@ -801,6 +805,18 @@ if test "$TeakLCM" = "yes"; then
-    AC_DEFINE(WITH_TEAK_LCM,1,[TeakLCM driver])
- fi
- 
-+if test "$TEW673GRU" = "yes"; then
-+   if test "$has_spidev" = "true"; then
-+      GRAPHIC="yes"
-+      TEXT="yes"
-+      SPIDEV="yes"
-+      DRIVERS="$DRIVERS drv_TEW673GRU.o"
-+      AC_DEFINE(WITH_TEW673GRU,1,[TEW673GRU driver])
-+   else
-+      AC_MSG_WARN(linux/spi/spidev.h not found: TEW673GRU driver disabled)
-+   fi
-+fi
-+
- if test "$Trefon" = "yes"; then
-    if test "$has_usb" = "true"; then
-       TEXT="yes"
---- a/drv.c
-+++ b/drv.c
-@@ -92,6 +92,7 @@ extern DRIVER drv_serdisplib;
- extern DRIVER drv_ShuttleVFD;
- extern DRIVER drv_SimpleLCD;
- extern DRIVER drv_T6963;
-+extern DRIVER drv_TEW673GRU;
- extern DRIVER drv_TeakLCM;
- extern DRIVER drv_Trefon;
- extern DRIVER drv_ula200;
-@@ -248,6 +249,9 @@ DRIVER *Driver[] = {
- #ifdef WITH_TEAK_LCM
-     &drv_TeakLCM,
- #endif
-+#ifdef WITH_TEW673GRU
-+    &drv_TEW673GRU,
-+#endif
- #ifdef WITH_TREFON
-     &drv_Trefon,
- #endif
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -119,6 +119,7 @@ drv_ShuttleVFD.c              \
- drv_SimpleLCD.c               \
- drv_T6963.c                   \
- drv_TeakLCM.c                 \
-+drv_TEW673GRU.c               \
- drv_Trefon.c                  \
- drv_ula200.c                  \
- drv_USBHUB.c                  \
---- /dev/null
-+++ b/drv_TEW673GRU.c
-@@ -0,0 +1,457 @@
-+/* $Id$
-+ * $URL$
-+ *
-+ * TRENDnet TEW673GRU LCD4linux driver
-+ *
-+ * Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * based on the Sample driver which is:
-+ * Copyright (C) 2005 Michael Reinelt <michael@reinelt.co.at>
-+ * Copyright (C) 2005, 2006, 2007 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
-+ *
-+ * This file is part of LCD4Linux.
-+ *
-+ * LCD4Linux 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.
-+ *
-+ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+/*
-+ * exported fuctions:
-+ *
-+ * struct DRIVER drv_TEW673GRU
-+ */
-+
-+#include "config.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+#include "debug.h"
-+#include "cfg.h"
-+#include "qprintf.h"
-+#include "udelay.h"
-+#include "plugin.h"
-+#include "widget.h"
-+#include "widget_text.h"
-+#include "widget_icon.h"
-+#include "widget_bar.h"
-+#include "drv.h"
-+
-+#include "drv_generic_text.h"
-+#include "drv_generic_graphic.h"
-+#include "drv_generic_spidev.h"
-+
-+#ifdef WITH_DMALLOC
-+#include <dmalloc.h>
-+#endif
-+
-+#define TEW673GRU_NUM_COLS	220
-+#define TEW673GRU_NUM_ROWS	176
-+#define TEW673GRU_BPP		2	/* bytes per pixel */
-+
-+#define TEW673GRU_CMD_SIZE	9
-+#define TEW673GRU_NUM_ROW_BYTES (TEW673GRU_NUM_COLS * TEW673GRU_BPP)
-+
-+enum {
-+	CMD_SHOW_STRING		= 49,
-+	CMD_SHOW_IMAGE_DIR	= 52,
-+	CMD_SCREEN_COLOR	= 54,
-+};
-+
-+static char Name[] = "TEW673GRU";
-+
-+static char *drv_TEW673GRU_FB;
-+static long FB_SIZE;
-+static int MODE;
-+
-+static unsigned int RGBAto16(RGBA rgb)
-+{
-+    return (((rgb.R >> 3) << 11) | ((rgb.G >> 2) << 5) | (rgb.B >> 3));
-+}
-+
-+static unsigned char color_msb(unsigned int color)
-+{
-+    return color >> 8;
-+}
-+
-+static unsigned char color_lsb(unsigned int color)
-+{
-+    return color & 0xff;
-+}
-+
-+static void drv_TEW673GRU_hw_clear(const unsigned int color)
-+{
-+    unsigned char cmd[TEW673GRU_CMD_SIZE];
-+    struct spi_ioc_transfer tr[1];
-+
-+    memset(tr, '\0', sizeof(tr));
-+    memset(cmd, '\0', sizeof(cmd));
-+
-+    cmd[0] = CMD_SCREEN_COLOR;
-+    cmd[7] = color_msb(color);
-+    cmd[8] = color_lsb(color);
-+
-+    tr[0].tx_buf = (unsigned long) cmd;
-+    tr[0].len = sizeof(cmd);
-+
-+    drv_generic_spidev_transfer(1, tr);
-+}
-+
-+static void drv_TEW673GRU_hw_send_row(const int row, const int col, const char *data, const int width)
-+{
-+    unsigned char cmd[TEW673GRU_CMD_SIZE];
-+    struct spi_ioc_transfer tr[2];
-+    int datasize;
-+
-+    memset(tr, '\0', sizeof(tr));
-+    memset(cmd, '\0', sizeof(cmd));
-+
-+    datasize =  width * TEW673GRU_BPP;
-+
-+    cmd[0] = CMD_SHOW_IMAGE_DIR;
-+    cmd[1] = col;
-+    cmd[2] = col + width;
-+    cmd[3] = row;
-+    cmd[4] = row;
-+    cmd[5] = datasize >> 8;
-+    cmd[6] = datasize & 0xff;
-+
-+    tr[0].tx_buf = (unsigned long) cmd;
-+    tr[0].len = sizeof(cmd);
-+    tr[1].tx_buf = (unsigned long) data;
-+    tr[1].len = datasize;
-+
-+    drv_generic_spidev_transfer(2, tr);
-+}
-+
-+static void drv_TEW673GRU_hw_write_string(const int row, const int col, const char *data, const int datasize)
-+{
-+    unsigned char cmd[TEW673GRU_CMD_SIZE];
-+    struct spi_ioc_transfer tr[2];
-+    unsigned char len;
-+
-+    memset(tr, '\0', sizeof(tr));
-+    memset(cmd, '\0', sizeof(cmd));
-+
-+    len = datasize & 0xff;
-+    cmd[0] = CMD_SHOW_STRING;
-+    cmd[1] = col;
-+    cmd[2] = col + (XRES * len);
-+    cmd[3] = row;
-+    cmd[4] = row + YRES;
-+    cmd[7] = 0;
-+    cmd[8] = len;
-+
-+    tr[0].tx_buf = (unsigned long) cmd;
-+    tr[0].len = sizeof(cmd);
-+    tr[1].tx_buf = (unsigned long) data;
-+    tr[1].len = datasize;
-+
-+    drv_generic_spidev_transfer(2, tr);
-+}
-+
-+static void drv_TEW673GRU_FB_set_pixel(const int col, const unsigned int color)
-+{
-+    int pos;
-+
-+    pos = col * TEW673GRU_BPP;
-+    drv_TEW673GRU_FB[pos] = color_msb(color);
-+    drv_TEW673GRU_FB[pos + 1] = color_lsb(color);
-+}
-+
-+static void drv_TEW673GRU_blit(const int row, const int col, const int height, const int width)
-+{
-+    int r, c;
-+
-+    debug("%s: update area r:%d c:%d w:%d h:%d", Name, row, col, height, width);
-+
-+    for (r = row; r < row + height; r++) {
-+	for (c = col; c < col + width; c++) {
-+	    unsigned int color;
-+	    RGBA rgb;
-+
-+	    rgb = drv_generic_graphic_rgb(r, c);
-+	    color = RGBAto16(rgb);
-+            drv_TEW673GRU_FB_set_pixel(c, color);
-+	}
-+
-+	if (width) {
-+	    char *data;
-+
-+	    data = &drv_TEW673GRU_FB[col * TEW673GRU_BPP];
-+	    drv_TEW673GRU_hw_send_row(r, col, data, width);
-+	    udelay(100 + width * 50);
-+	}
-+    }
-+}
-+
-+static void drv_TEW673GRU_clear(RGBA rgba)
-+{
-+    unsigned int color;
-+
-+    color = RGBAto16(rgba);
-+    drv_TEW673GRU_hw_clear(color);
-+}
-+
-+static void drv_TEW673GRU_write(const int row, const int col, const char *data, const int len)
-+{
-+    int i;
-+
-+    for (i = 0; i < len; i++) {
-+	drv_TEW673GRU_hw_write_string(row * YRES, (col + i) * XRES, " ", 1);
-+	udelay(10000);
-+	drv_TEW673GRU_hw_write_string(row * YRES, 2 + (col + i) * XRES, " ", 1);
-+	udelay(10000);
-+	drv_TEW673GRU_hw_write_string(row * YRES, (col + i) * XRES, &data[i], 1);
-+	udelay(10000);
-+    }
-+}
-+
-+static int drv_TEW673GRU_open(const char *section)
-+{
-+    int err;
-+
-+    err = drv_generic_spidev_open(section, Name);
-+    if (err < 0)
-+	return err;
-+
-+    return 0;
-+}
-+
-+static int drv_TEW673GRU_close(void)
-+{
-+    drv_generic_spidev_close();
-+    return 0;
-+}
-+
-+static void drv_TEW673GRU_clear_screen(void)
-+{
-+    if (MODE) {
-+	drv_generic_graphic_clear();
-+    } else {
-+	memset(drv_TEW673GRU_FB, ' ', FB_SIZE);
-+	drv_TEW673GRU_hw_clear(0x0000);
-+    }
-+}
-+
-+static int drv_TEW673GRU_init_font(const char *section)
-+{
-+    char *font;
-+    int ret = -1;
-+
-+    font = cfg_get(section, "Font", "6x8");
-+    if (font == NULL) {
-+	error("%s: no '%s.Font' entry from %s", Name, section, cfg_source());
-+	goto out;
-+    }
-+
-+    if (*font == '\0') {
-+	error("%s: invalid '%s.Font' entry in %s", Name, section, cfg_source());
-+	goto out_free;
-+    }
-+
-+    XRES = -1;
-+    YRES = -1;
-+    if (sscanf(font, "%dx%d", &XRES, &YRES) != 2 ||
-+	XRES < 1 ||
-+	YRES < 1) {
-+	error("%s: bad Font '%s' from %s", Name, font, cfg_source());
-+	goto out_free;
-+    }
-+
-+    if (XRES != 6 && YRES != 8) {
-+	error("%s: bad Font '%s' from %s (only 6x8 at the moment)",
-+	      Name, font, cfg_source());
-+	goto out_free;
-+    }
-+
-+    error("%s: font '%s' selected", Name, font);
-+
-+    ret = 0;
-+
-+out_free:
-+    free(font);
-+out:
-+    return ret;
-+}
-+
-+static int drv_TEW673GRU_start(const char *section)
-+{
-+    int ret;
-+
-+    DCOLS = TEW673GRU_NUM_COLS;
-+    DROWS = TEW673GRU_NUM_ROWS;
-+
-+    if (MODE) {
-+	ret = drv_TEW673GRU_init_font(section);
-+	if (ret)
-+	    goto err;
-+
-+	FB_SIZE = DCOLS * TEW673GRU_BPP;
-+    } else {
-+	XRES = 10;
-+	YRES = 16;
-+	DCOLS = DCOLS / XRES;
-+	DROWS = DROWS / YRES;
-+
-+	FB_SIZE = DCOLS * DROWS;
-+    }
-+
-+    if (FB_SIZE) {
-+	drv_TEW673GRU_FB = malloc(FB_SIZE);
-+	if (drv_TEW673GRU_FB == NULL) {
-+	    error("%s: framebuffer could not be allocated", Name);
-+	    goto err;
-+	}
-+    }
-+
-+    ret = drv_TEW673GRU_open(section);
-+    if (ret < 0)
-+        goto err_free;
-+
-+    if (MODE == 0)
-+    	drv_TEW673GRU_clear_screen();
-+
-+    return 0;
-+
-+ err_free:
-+    if (drv_TEW673GRU_FB)
-+	free(drv_TEW673GRU_FB);
-+ err:
-+    return -1;
-+}
-+
-+static int drv_TEW673GRU_greet(const char *msg1, const char *msg2)
-+{
-+    if (MODE)
-+	return drv_generic_graphic_greet(msg1, msg2);
-+
-+    return drv_generic_text_greet(msg1, msg2);
-+}
-+
-+
-+/****************************************/
-+/***        widget callbacks          ***/
-+/****************************************/
-+
-+
-+/* using drv_generic_text_draw(W) */
-+/* using drv_generic_text_icon_draw(W) */
-+/* using drv_generic_text_bar_draw(W) */
-+/* using drv_generic_gpio_draw(W) */
-+
-+
-+/****************************************/
-+/***        exported functions        ***/
-+/****************************************/
-+
-+int drv_TEW673GRU_list(void)
-+{
-+    printf("TEW673GRU driver");
-+    return 0;
-+}
-+
-+int drv_TEW673GRU_init(const char *section, const int quiet)
-+{
-+    WIDGET_CLASS wc;
-+    int ret;
-+
-+    cfg_number(section, "Mode", 0, 0, 1, &MODE);
-+
-+    if (MODE) {
-+	drv_generic_graphic_real_blit = drv_TEW673GRU_blit;
-+	drv_generic_graphic_real_clear = drv_TEW673GRU_clear;
-+    } else {
-+	drv_generic_text_real_write = drv_TEW673GRU_write;
-+    }
-+
-+    ret = drv_TEW673GRU_start(section);
-+    if (ret)
-+	return ret;
-+
-+    if (MODE) {
-+	ret = drv_generic_graphic_init(section, Name);
-+	if (ret)
-+	    return ret;
-+    } else {
-+	ret = drv_generic_text_init(section, Name);
-+	if (ret)
-+	    return ret;
-+
-+	ret = drv_generic_text_icon_init();
-+	if (ret != 0)
-+	    return ret;
-+
-+	ret = drv_generic_text_bar_init(1);
-+	if (ret != 0)
-+	    return ret;
-+
-+	drv_generic_text_bar_add_segment(0, 0, 255, ' ');
-+	drv_generic_text_bar_add_segment(255, 255, 255, '#');
-+
-+	wc = Widget_Text;
-+	wc.draw = drv_generic_text_draw;
-+	widget_register(&wc);
-+
-+	wc = Widget_Icon;
-+	wc.draw = drv_generic_text_icon_draw;
-+	widget_register(&wc);
-+
-+	wc = Widget_Bar;
-+	wc.draw = drv_generic_text_bar_draw;
-+	widget_register(&wc);
-+    }
-+
-+    if (!quiet) {
-+	char buffer[40];
-+	qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
-+	drv_TEW673GRU_greet(buffer, "www.openwrt.org");
-+	sleep(3);
-+	drv_TEW673GRU_clear_screen();
-+    }
-+
-+    return 0;
-+}
-+
-+int drv_TEW673GRU_quit(const int quiet)
-+{
-+
-+    info("%s: shutting down.", Name);
-+
-+    drv_TEW673GRU_clear_screen();
-+
-+    if (!quiet)
-+	drv_TEW673GRU_greet("goodbye!", NULL);
-+
-+    if (MODE)
-+	drv_generic_graphic_quit();
-+    else
-+	drv_generic_text_quit();
-+
-+    debug("closing connection");
-+    drv_TEW673GRU_close();
-+
-+    return (0);
-+}
-+
-+DRIVER drv_TEW673GRU = {
-+    .name = Name,
-+    .list = drv_TEW673GRU_list,
-+    .init = drv_TEW673GRU_init,
-+    .quit = drv_TEW673GRU_quit,
-+};
---- a/lcd4linux.conf.sample
-+++ b/lcd4linux.conf.sample
-@@ -571,6 +571,11 @@ Display FutabaVFD {
-     }
- }
- 
-+Display TEW673GRU {
-+    Driver       'TEW673GRU'
-+    Font         '6x8'
-+    Port         '/dev/spidev1.0'
-+}
- 
- #Plugin KVV {
- #    StationID '12_701'
 

file:a/utils/less/Makefile (deleted)
--- a/utils/less/Makefile
+++ /dev/null
@@ -1,89 +1,1 @@
-#
-# 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:=less
-PKG_VERSION:=458
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.greenwoodsoftware.com/less
-PKG_MD5SUM:=935b38aa2e73c888c210dedf8fd94f49
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/less/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Pager program similar to more
-  URL:=http://www.greenwoodsoftware.com/less/
-endef
-
-define Package/less/Default/description
-  Full version of GNU less utility
-endef
-
-define Package/less
-  $(call Package/less/Default)
-  DEPENDS:=+libncurses
-  VARIANT:=narrow
-endef
-
-define Package/less/description
-  $(call Package/less/Default/description)
-endef
-
-define Package/less-wide
-  $(call Package/less/Default)
-  TITLE+= (Unicode)
-  DEPENDS:=+libncursesw
-  VARIANT:=wide
-endef
-
-define Package/less-wide/description
-  $(call Package/less/Default/description)
-  This package contains the Unicode enabled version of less.
-endef
-
-ifeq ($(BUILD_VARIANT),narrow)
-	CONFIGURE_VARS += \
-		ac_cv_lib_ncursesw_initscr=no		
-endif
-
-ifeq ($(BUILD_VARIANT),wide)
-	CONFIGURE_VARS += \
-		ac_cv_lib_ncursesw_initscr=yes
-endif
-
-define Package/less/install
-	$(INSTALL_DIR) $(1)/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/less $(1)/bin/less
-endef
-
-define Package/less/postinst
-#!/bin/sh
-[ -L "$${IPKG_INSTROOT}/usr/bin/less" ] && rm -f "$${IPKG_INSTROOT}/usr/bin/less"
-exit 0
-endef
-
-define Package/less/postrm
-#!/bin/sh
-/bin/busybox less -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/bin/less
-exit 0
-endef
-
-Package/less-wide/install = $(Package/less/install)
-Package/less-wide/postinst = $(Package/less/postinst)
-Package/less-wide/postrm = $(Package/less/postrm)
-
-$(eval $(call BuildPackage,less))
-$(eval $(call BuildPackage,less-wide))
-

file:a/utils/sysstat/Makefile (deleted)
--- a/utils/sysstat/Makefile
+++ /dev/null
@@ -1,60 +1,1 @@
-#
-# Copyright (C) 2008-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:=sysstat
-PKG_VERSION:=9.0.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://pagesperso-orange.fr/sebastien.godard
-PKG_MD5SUM:=e069daf192d259de905d7f8cdd85dc4e
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sysstat
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Sysstat performance monitoring tools
-  URL:=http://pagesperso-orange.fr/sebastien.godard/index.html
-endef
-
-define Package/sysstat/description
-  The sysstat utilities are a collection of performance monitoring tools for
-  Linux. These include sar, sadf, mpstat, iostat, pidstat and sa tools.
-endef
-
-define Package/sysstat/conffiles
-/etc/sysstat/sysstat.ioconf
-/etc/sysstat/config
-endef
-
-CONFIGURE_VARS+= \
-	sa_lib_dir="/usr/lib/sysstat" \
-	sa_dir="/var/log/sysstat" \
-	conf_dir="/etc/sysstat" \
-
-CONFIGURE_ARGS+= \
-	--disable-documentation \
-
-define Package/sysstat/install
-	$(INSTALL_DIR) $(1)/usr/lib/sysstat
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/sysstat/{sadc,sa1,sa2} $(1)/usr/lib/sysstat/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sar,sadf,iostat,mpstat,pidstat} $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/sysstat
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sysstat/sysstat.ioconf $(1)/etc/sysstat/
-	$(INSTALL_CONF) ./files/config $(1)/etc/sysstat/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/sysstat.init $(1)/etc/init.d/sysstat
-endef
-
-$(eval $(call BuildPackage,sysstat))
-

--- a/utils/sysstat/files/config
+++ /dev/null
@@ -1,5 +1,1 @@
-# How long to keep log files (days), maximum is a month
-# Used by sa2(8) script
-HISTORY=3
 
-

--- a/utils/sysstat/files/sysstat.init
+++ /dev/null
@@ -1,13 +1,1 @@
-#!/bin/sh /etc/rc.common
 
-# The init file runs the sadc command in order to write
-# the "LINUX RESTART" mark to the daily data file
-
-START=99
-
-start() {
-	mkdir -p /var/log/sysstat
-	/usr/lib/sysstat/sadc -S DISK -F -L -
-}
-
-

file:a/utils/tar/Makefile (deleted)
--- a/utils/tar/Makefile
+++ /dev/null
@@ -1,61 +1,1 @@
-#
-# Copyright (C) 2008-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:=tar
-PKG_VERSION:=1.23
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_MD5SUM:=41e2ca4b924ec7860e51b43ad06cdb7e
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tar
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+bzip2
-  TITLE:=GNU tar
-  URL:=http://www.gnu.org/software/tar/
-endef
-
-define Package/tar/description
-	Tar is a program for packaging a set of files as a
-	single archive in tar format.
-endef
-
-define Package/tar/postinst
-#!/bin/sh
-if [ -e $${IPKG_INSTROOT}/bin/tar ]; then
-  rm -r $${IPKG_INSTROOT}/bin/tar;
-fi
-ln -sf /usr/bin/tar $${IPKG_INSTROOT}/bin/tar
-endef
-
-define Package/tar/postrm
-#!/bin/sh
-rm $${IPKG_INSTROOT}/bin/tar
-ln -s busybox $${IPKG_INSTROOT}/bin/tar
-$${IPKG_INSTROOT}/bin/tar 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/bin/tar
-exit 0
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDLAGS)"
-
-define Package/tar/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,tar))
-

file:a/utils/watchcat/Makefile (deleted)
--- a/utils/watchcat/Makefile
+++ /dev/null
@@ -1,45 +1,1 @@
-#
-# Copyright (C) 2010 segal.di.ubi.pt
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=watchcat
-PKG_VERSION:=1
-PKG_RELEASE:=5
-
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/watchcat
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Enable the configuration of programed reboots
-endef
-
-define Package/watchcat/description
-Allows to configure a periodically reboot, or after loosing internet connectivity. Configured trough UCI /etc/config/system.
-endef
-
-define Package/watchcat/conffiles
-/etc/config/system
-endef
-
-define Build/Compile
-endef
-
-define Package/watchcat/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/initd_watchcat $(1)/etc/init.d/watchcat
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) ./files/watchcat.sh $(1)/usr/bin/watchcat.sh
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/uci_defaults_watchcat $(1)/etc/uci-defaults/50-watchcat
-endef
-
-$(eval $(call BuildPackage,watchcat))
-

--- a/utils/watchcat/files/initd_watchcat
+++ /dev/null
@@ -1,109 +1,1 @@
-#!/bin/sh /etc/rc.common
 
-START=97
-
-PIDFILE="/tmp/run/watchcat"
-
-append_string() {
-	local varname="$1"; local add="$2"; local separator="${3:- }"; local actual
-	eval "actual=\$$varname"
-
-	new="${actual:+$actual$separator}$add"
-	eval "$varname=\$new"
-}
-
-timetoseconds() {
-	local time=$1
-	unset seconds
-
-	{ [ "$time" -ge 1 ] 2> /dev/null && seconds="$time"; } || \
-	{ [ "${time%s}" -ge 1 ] 2> /dev/null && seconds="${time%s}"; } || \
-	{ [ "${time%m}" -ge 1 ] 2> /dev/null && seconds=$((${time%m}*60)); } || \
-	{ [ "${time%h}" -ge 1 ] 2> /dev/null && seconds=$((${time%h}*3600)); } || \
-	{ [ "${time%d}" -ge 1 ] 2> /dev/null && seconds=$((${time%d}*86400)); }
-}
-
-load_watchcat() {
-	config_get period	$1 period
-	config_get mode		$1 mode		"allways"
-	config_get pinghosts	$1 pinghosts	"8.8.8.8"
-	config_get pingperiod	$1 pingperiod
-	config_get forcedelay	$1 forcedelay	"0"
-
-	error=""
-
-	timetoseconds "$period"
-	period="$seconds"
-	[ "$period" -ge 1 ] \
-		|| append_string "error" 'period is not a valid time value (ex: "30"; "4m"; "6h"; "2d")' "; "
-	[ "$mode" = "allways" -o "$mode" = "ping" ] \
-		|| append_string "error" "mode must be 'allways' or 'ping'" "; "
-	[ -n "$pinghosts" -o "$mode" = "allways" ] \
-		|| append_string "error" "pinghosts must be set when in 'ping' mode" "; "
-	[ "$mode" = "ping" ] && {
-		if [ -n "$pingperiod" ]
-		then
-			timetoseconds "$pingperiod"
-			pingperiod="$seconds"
-			if [ "$pingperiod" -ge 0 ]
-			then
-				[ "$pingperiod" -le "$period" ] \
-					|| append_string "error" "pingperiod must be less than period" "; "
-			else
-				append_string "error" 'pingperiod is not a valid time value (ex: "30"; "4m"; "6h"; "2d")' "; "
-			fi
-		else
-			pingperiod="$((period/20))"
-		fi
-	}
-	[ "$pingperiod" -lt "$period" -o "$mode" = "allways" ] \
-		|| append_string "error" "pingperiod is not recognized" "; "
-	[ "$forcedelay" -ge 0 ] \
-		|| append_string "error" "forcedelay must be a integer greater or equal than 0, where 0 means disabled" "; "
-
-	[ -n "$error" ] && { logger -p user.err -t "watchcat" "reboot program $1 not started - $error"; return; }
-
-	if [ "$mode" = "allways" ]
-	then
-		/usr/bin/watchcat.sh "allways" "$period" "$forcedelay" &
-		logger -p user.info -t "wathchat" "started task (mode=$mode;period=$period;forcedelay=$forcedelay)" 
-	else
-		/usr/bin/watchcat.sh "period" "$period" "$forcedelay" "$pinghosts" "$pingperiod" &
-		logger -p user.info -t "wathchat" "started task (mode=$mode;period=$period;pinghosts=$pinghosts;pingperiod=$pingperiod;forcedelay=$forcedelay)" 
-	fi
-
-	echo $! >> "${PIDFILE}.pids"
-}
-
-stop() {
-	if [ -f "${PIDFILE}.pids" ]
-	then
-		logger -p user.info -t "watchcat" "stopping all tasks"
-
-		while read pid
-		do
-			kill "$pid"
-		done < "${PIDFILE}.pids"
-
-		rm "${PIDFILE}.pids"
-
-		logger -p user.info -t "watchcat" "all tasks stopped"
-	else
-		logger -p user.info -t "watchcat" "no tasks running"
-	fi
-}
-
-start() {
-	[ -f "${PIDFILE}.pids" ] && stop
-
-	config_load system
-	if [ -n "$(uci show system.@watchcat[0])" ] # at least one watchcat section exists
-	then
-		logger -p user.info -t "watchcat" "starting all tasks"
-		config_foreach load_watchcat watchcat
-		logger -p user.info -t "watchcat" "all tasks started"
-	else
-		logger -p user.info -t "watchcat" "no tasks defined"
-	fi
-}
-

--- a/utils/watchcat/files/uci_defaults_watchcat
+++ /dev/null
@@ -1,11 +1,1 @@
-#!/bin/sh
 
-uci -q show system.@watchcat[0] || {
-	uci add system watchcat
-	uci set system.@watchcat[0].period=6h
-	uci set system.@watchcat[0].mode=ping
-	uci set system.@watchcat[0].pinghosts=8.8.8.8
-	uci set system.@watchcat[0].forcedelay=30
-	uci commit
-}
-

--- a/utils/watchcat/files/watchcat.sh
+++ /dev/null
@@ -1,70 +1,1 @@
-#!/bin/sh 
 
-mode="$1"
-
-shutdown_now() {
-	local forcedelay="$1"
-
-	reboot &
-
-	[ "$forcedelay" -ge 1 ] && {
-		sleep "$forcedelay"
-
-		echo b > /proc/sysrq-trigger # Will immediately reboot the system without syncing or unmounting your disks.
-	}
-}
-
-watchcat_allways() {
-	local period="$1"; local forcedelay="$2"
-
-	sleep "$period" && shutdown_now "$forcedelay"
-}
-
-watchcat_ping() {
-	local period="$1"; local forcedelay="$2"; local pinghosts="$3"; local pingperiod="$4"
-
-	time_now="$(cat /proc/uptime)"
-	time_now="${time_now%%.*}"
-	time_lastcheck="$time_now"
-	time_lastcheck_withinternet="$time_now"
-
-	while true
-	do
-		# account for the time ping took to return. With a ping time of 5s, ping might take more than that, so it is important to avoid even more delay.
-		time_now="$(cat /proc/uptime)"
-		time_now="${time_now%%.*}"
-		time_diff="$((time_now-time_lastcheck))"
-
-		[ "$time_diff" -lt "$pingperiod" ] && {
-			sleep_time="$((pingperiod-time_diff))"
-			sleep "$sleep_time"
-		}
-
-		time_now="$(cat /proc/uptime)"
-		time_now="${time_now%%.*}"
-		time_lastcheck="$time_now"
-
-		for host in "$pinghosts"
-		do
-			if ping -c 1 "$host" &> /dev/null 
-			then 
-				time_lastcheck_withinternet="$time_now"
-			else
-				time_diff="$((time_now-time_lastcheck_withinternet))"
-				logger -p daemon.info -t "watchcat[$$]" "no internet connectivity for $time_diff seconds. Reseting when reaching $period"       
-			fi
-		done
-
-		time_diff="$((time_now-time_lastcheck_withinternet))"
-		[ "$time_diff" -ge "$period" ] && shutdown_now "$forcedelay"
-
-	done
-}
-
-	if [ "$mode" = "allways" ]
-	then
-		watchcat_allways "$2" "$3"
-	else
-		watchcat_ping "$2" "$3" "$4" "$5"
-	fi
-

file:a/utils/xz/Makefile (deleted)
--- a/utils/xz/Makefile
+++ /dev/null
@@ -1,135 +1,1 @@
-#
-# Copyright (C) 2013 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:=xz
-PKG_VERSION:=5.0.4
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://tukaani.org/xz
-PKG_MD5SUM:=741cd3a5f64b23b7bac56ec5b2258715
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-XZ_UTILS := \
-	lzcat lzcmp lzdiff lzegrep lzfgrep lzgrep lzless lzma lzmadec lzmainfo \
-	lzmore unlzma unxz xz xzcat xzcmp xzdec xzdiff xzegrep xzfgrep xzgrep \
-	xzless xzmore
-
-DEPENDS_lzmadec = +libpthread +liblzma
-DEPENDS_lzmainfo = +libpthread +liblzma
-DEPENDS_xz = +libpthread +liblzma
-DEPENDS_xzdec = +libpthread +liblzma
-
-XZ_DEPENDS_lzcat = xz
-XZ_DEPENDS_lzcmp = xzdiff
-XZ_DEPENDS_lzcat = xz
-XZ_DEPENDS_lzcmp = xzdiff
-XZ_DEPENDS_lzdiff = xzdiff
-XZ_DEPENDS_lzegrep = xzgrep
-XZ_DEPENDS_lzfgrep = xzgrep
-XZ_DEPENDS_lzgrep = xzgrep
-XZ_DEPENDS_lzless = xzless
-XZ_DEPENDS_lzma = xz
-XZ_DEPENDS_lzmore = xzmore
-XZ_DEPENDS_unlzma = xz
-XZ_DEPENDS_unxz = xz
-XZ_DEPENDS_xzcat = xz
-XZ_DEPENDS_xzcmp = xzdiff
-XZ_DEPENDS_xzegrep = xzgrep
-XZ_DEPENDS_xzfgrep = xzgrep
-
-define Package/xz/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-endef
-
-define Package/xz
-  $(call Package/xz/Default)
-  TITLE:=XZ Utils
-  MENU:=1
-endef
-
-define Package/liblzma
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libpthread
-  TITLE:=liblzma library from XZ Utils
-endef
-
-define GenPlugin
- define Package/$(1)
-   $(call Package/xz/Default)
-   DEPENDS:=xz +$(DEPENDS_$(2)) $(if $(XZ_DEPENDS_$(2)),+xz-$(XZ_DEPENDS_$(2)))
-   TITLE:=$(2) utility from XZ Utils
- endef
-endef
-
-$(foreach i,$(XZ_UTILS),$(eval $(call GenPlugin,xz-$(i),$(i))))
-
-CONFIGURE_ARGS += \
-	--enable-small \
-	--enable-assume-ram=4 \
-	--disable-assembler \
-	--disable-werror
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/lzma
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/lzma.h \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/lzma/*.h \
-		$(1)/usr/include/lzma/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/liblzma.pc \
-		$(1)/usr/lib/pkgconfig/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/liblzma.* \
-		$(1)/usr/lib/
-endef
-
-define Package/xz/install
-	true
-endef
-
-define BuildPlugin
-  define Package/$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/bin
-ifneq ($(XZ_DEPENDS_$(2)),)
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/$(2) \
-		$$(1)/usr/bin/
-else
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/$(2) \
-		$$(1)/usr/bin/
-endif
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-define Package/liblzma/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/liblzma.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,xz))
-$(eval $(call BuildPackage,liblzma))
-$(foreach i,$(XZ_UTILS),$(eval $(call BuildPlugin,xz-$(i),$(i))))
-

--- a/utils/xz/patches/010-compile.patch
+++ /dev/null
@@ -1,80 +1,1 @@
---- a/src/lzmainfo/Makefile.am
-+++ b/src/lzmainfo/Makefile.am
-@@ -20,7 +20,8 @@ lzmainfo_CPPFLAGS = \
- 	-DLOCALEDIR=\"$(localedir)\" \
- 	-I$(top_srcdir)/src/common \
- 	-I$(top_srcdir)/src/liblzma/api \
--	-I$(top_builddir)/lib
-+	-I$(top_builddir)/lib \
-+	-std=gnu99
- 
- lzmainfo_LDADD = $(top_builddir)/src/liblzma/liblzma.la
- 
---- a/src/liblzma/common/common.h
-+++ b/src/liblzma/common/common.h
-@@ -89,9 +89,9 @@ typedef lzma_ret (*lzma_init_function)(
- /// function prototype.
- typedef lzma_ret (*lzma_code_function)(
- 		lzma_coder *coder, lzma_allocator *allocator,
--		const uint8_t *restrict in, size_t *restrict in_pos,
--		size_t in_size, uint8_t *restrict out,
--		size_t *restrict out_pos, size_t out_size,
-+		const uint8_t *in, size_t *in_pos,
-+		size_t in_size, uint8_t *out,
-+		size_t *out_pos, size_t out_size,
- 		lzma_action action);
- 
- /// Type of a function to free the memory allocated for the coder
-@@ -235,9 +235,9 @@ extern void lzma_next_end(lzma_next_code
- 
- /// Copy as much data as possible from in[] to out[] and update *in_pos
- /// and *out_pos accordingly. Returns the number of bytes copied.
--extern size_t lzma_bufcpy(const uint8_t *restrict in, size_t *restrict in_pos,
--		size_t in_size, uint8_t *restrict out,
--		size_t *restrict out_pos, size_t out_size);
-+extern size_t lzma_bufcpy(const uint8_t *in, size_t *in_pos,
-+		size_t in_size, uint8_t *out,
-+		size_t *out_pos, size_t out_size);
- 
- 
- /// \brief      Return if expression doesn't evaluate to LZMA_OK
---- a/src/liblzma/common/common.c
-+++ b/src/liblzma/common/common.c
-@@ -70,9 +70,9 @@ lzma_free(void *ptr, lzma_allocator *all
- //////////
- 
- extern size_t
--lzma_bufcpy(const uint8_t *restrict in, size_t *restrict in_pos,
--		size_t in_size, uint8_t *restrict out,
--		size_t *restrict out_pos, size_t out_size)
-+lzma_bufcpy(const uint8_t *in, size_t *in_pos,
-+		size_t in_size, uint8_t *out,
-+		size_t *out_pos, size_t out_size)
- {
- 	const size_t in_avail = in_size - *in_pos;
- 	const size_t out_avail = out_size - *out_pos;
---- a/src/liblzma/Makefile.am
-+++ b/src/liblzma/Makefile.am
-@@ -23,7 +23,8 @@ liblzma_la_CPPFLAGS = \
- 	-I$(top_srcdir)/src/liblzma/delta \
- 	-I$(top_srcdir)/src/liblzma/simple \
- 	-I$(top_srcdir)/src/common \
--	-DTUKLIB_SYMBOL_PREFIX=lzma_
-+	-DTUKLIB_SYMBOL_PREFIX=lzma_ \
-+	-std=gnu99
- liblzma_la_LDFLAGS = -no-undefined -version-info 5:4:0
- 
- include $(srcdir)/common/Makefile.inc
---- a/src/xz/Makefile.am
-+++ b/src/xz/Makefile.am
-@@ -46,7 +46,8 @@ xz_CPPFLAGS = \
- 	-DLOCALEDIR=\"$(localedir)\" \
- 	-I$(top_srcdir)/src/common \
- 	-I$(top_srcdir)/src/liblzma/api \
--	-I$(top_builddir)/lib
-+	-I$(top_builddir)/lib \
-+	-std=gnu99
- 
- xz_LDADD = $(top_builddir)/src/liblzma/liblzma.la
- 
 

comments