taskwarrior: moved to github
taskwarrior: moved to github

Signed-off-by: Luka Perkov <luka@openwrt.org>

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

file:a/admin/sudo/Makefile (deleted)
--- a/admin/sudo/Makefile
+++ /dev/null
@@ -1,77 +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:=sudo
-PKG_VERSION:=1.7.10p8
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.sudo.ws/sudo/dist
-PKG_MD5SUM:=4620e31c28b387dd9582dfd42e930cfb
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sudo
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=Delegate authority to run commands
-  URL:=http://www.sudo.ws/
-endef
-
-define Package/sudo/description
- Sudo (su "do") allows a system administrator to delegate authority to
- give certain users (or groups of users) the ability to run some (or
- all) commands as root or another user while providing an audit trail of
- the commands and their arguments.
-endef
-
-define Package/sudo/conffiles
-/etc/sudoers
-endef
-
-CONFIGURE_ARGS+= \
-	--without-pam \
-	--disable-pam-session \
-	--with-editor=/bin/vi \
-	--without-lecture \
-	--disable-zlib
-
-CONFIGURE_VARS+= \
-	sudo_cv_uid_t_len=10 \
-	sudo_cv_func_unsetenv_void=no
-
-define Package/sudo/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/sudo $(1)/usr/bin/
-	chmod 4755 $(1)/usr/bin/sudo
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/visudo $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/sudoers $(1)/etc/
-	chmod 0440 $(1)/etc/sudoers
-	$(INSTALL_DIR) $(1)/etc/sudoers.d
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sudo_noexec.so $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/sudo.init $(1)/etc/init.d/sudo
-endef
-
-define Package/sudo/postinst
-#!/bin/sh
-
-[ -n "$$IPKG_INSTROOT" ] || {
-	/etc/init.d/sudo enable
-	/etc/init.d/sudo start
-}
-endef
-
-$(eval $(call BuildPackage,sudo))
-

--- a/admin/sudo/files/sudo.init
+++ /dev/null
@@ -1,12 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2011 OpenWrt.org
 
-START=99
-
-start() {
-	[ -d /var/lib/sudo ] || {
-		mkdir -m 0755 -p /var/lib/sudo
-		chmod 0700 /var/lib/sudo
-	}
-}
-

file:a/devel/perf/Makefile (deleted)
--- a/devel/perf/Makefile
+++ /dev/null
@@ -1,67 +1,1 @@
-#
-# Copyright (C) 2011-2013 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:=perf
-PKG_VERSION:=$(LINUX_VERSION)
-PKG_RELEASE:=2
-
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/perf
-  SECTION:=devel
-  CATEGORY:=Development
-  DEPENDS:= +libelf1 +libdw +libpthread +librt +binutils
-  TITLE:=Linux performance monitoring tool
-  VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
-  URL:=http://www.kernel.org
-endef
-
-define Package/perf/description
-  perf is the Linux performance monitoring tool
-endef
-
-# Perf's makefile and headers are not relocatable and must be built from the
-# Linux sources directory
-define Build/Prepare
-	$(RM) -r $(PKG_BUILD_DIR)
-	ln -s $(LINUX_DIR)/tools/perf $(PKG_BUILD_DIR)
-endef
-
-# MAKE_FLAGS should be passed again upon cleaning because Perf's makefile
-# always performs checks before processing any rule
-define Build/Clean
-	-$(MAKE) -C $(PKG_BUILD_DIR) \
-		NO_DWARF=1 \
-		$(MAKE_FLAGS) \
-		clean
-endef
-
-MAKE_FLAGS = \
-	ARCH="$(LINUX_KARCH)" \
-	NO_LIBPERL=1 \
-	NO_LIBPYTHON=1 \
-	NO_NEWT=1 \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	CC="$(TARGET_CC)" \
-	LD="$(TARGET_CROSS)ld" \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	V=1 \
-	prefix=/usr
-
-define Package/perf/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(LINUX_DIR)/tools/perf/perf $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,perf))
-

file:b/lang/php5/pecl.mk (new)
--- /dev/null
+++ b/lang/php5/pecl.mk
@@ -1,1 +1,48 @@
+#
+# Copyright (C) 2011-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
+define Package/php5-pecl/Default
+  SUBMENU:=PHP
+  SECTION:=lang
+  CATEGORY:=Languages
+  URL:=http://pecl.php.net/
+  MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
+  DEPENDS:=php5
+endef
+
+define Build/Configure
+	( cd $(PKG_BUILD_DIR); $(STAGING_DIR_HOST)/usr/bin/phpize )
+	$(Build/Configure/Default)
+endef
+
+CONFIGURE_ARGS+= \
+	--with-php-config=$(STAGING_DIR_HOST)/usr/bin/php-config
+
+define PECLPackage
+
+  define Package/php5-pecl-$(1)
+    $(call Package/php5-pecl/Default)
+    TITLE:=$(2)
+
+    ifneq ($(3),)
+      DEPENDS+=$(3)
+    endif
+  endef
+
+  define Package/php5-pecl-$(1)/install
+	$(INSTALL_DIR) $$(1)/usr/lib/php
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/
+	$(INSTALL_DIR) $$(1)/etc/php5
+    ifeq ($(4),zend)
+	echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini
+    else
+	echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini
+    endif
+  endef
+
+endef
+

--- a/lang/python-imaging-library/Makefile
+++ /dev/null
@@ -1,60 +1,1 @@
-#
-# Copyright (C) 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:=python-imaging-library
-PKG_VERSION:=1.1.7
-PKG_RELEASE:=2
-
-PKG_SOURCE:=Imaging-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://effbot.org/downloads
-PKG_MD5SUM:=fc14a54e1ce02a0225be8854bfba478e
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/Imaging-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=python
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/python-imaging-library
-  SECTION:=language-python
-  CATEGORY:=Languages
-  SUBMENU:=Python
-  TITLE:=Python Imaging Library (PIL)
-  URL:=http://www.pythonware.com/products/pil/
-  DEPENDS:=+python +libfreetype +libjpeg +zlib
-endef
-
-define Package/python-imaging-library/description
- The Python Imaging Library adds image processing capabilities to your
- Python interpreter.
- .
- This library provides extensive file format support, an efficient
- internal representation, and fairly powerful image processing
- capabilities.
- .
- The core image library is designed for fast access to data stored in a
- few basic pixel formats. It should provide a solid foundation for a
- general image processing tool.
-endef
-
-define Build/Compile
-	$(call Build/Compile/PyMod,., \
-		install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \
-	)
-endef
-
-define Package/python-imaging-library/install
-	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-	$(CP) \
-		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-		$(1)$(PYTHON_PKG_DIR)/
-endef
-
-$(eval $(call BuildPackage,python-imaging-library))
-

--- a/lang/python-imaging-library/patches/101-cross_compile.patch
+++ /dev/null
@@ -1,34 +1,1 @@
---- a/setup.py	2011-11-15 01:06:00.000000000 +0100
-+++ b/setup.py	2011-11-15 01:07:32.000000000 +0100
-@@ -147,7 +147,6 @@
-             add_directory(library_dirs, "/opt/local/lib")
-             add_directory(include_dirs, "/opt/local/include")
- 
--        add_directory(library_dirs, "/usr/local/lib")
-         # FIXME: check /opt/stuff directories here?
- 
-         prefix = sysconfig.get_config_var("prefix")
-@@ -199,22 +198,6 @@
-             add_directory(include_dirs, include_root)
- 
-         #
--        # add standard directories
--
--        # look for tcl specific subdirectory (e.g debian)
--        if _tkinter:
--            tcl_dir = "/usr/include/tcl" + TCL_VERSION
--            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
--                add_directory(include_dirs, tcl_dir)
--
--        # standard locations
--        add_directory(library_dirs, "/usr/local/lib")
--        add_directory(include_dirs, "/usr/local/include")
--
--        add_directory(library_dirs, "/usr/lib")
--        add_directory(include_dirs, "/usr/include")
--
--        #
-         # insert new dirs *before* default libs, to avoid conflicts
-         # between Python PYD stub libs and real libraries
- 
 

file:a/lang/python/Makefile (deleted)
--- a/lang/python/Makefile
+++ /dev/null
@@ -1,512 +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:=python
-PKG_VERSION:=2.7.3
-PKG_RELEASE:=2
-
-PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_MD5SUM:=62c4c1699170078c469f79ddfed21bc0
-
-PKG_LICENSE:=PSF
-PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-HOST_BUILD_PARALLEL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION)
-
-PKG_BUILD_DEPENDS:=python/host
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,./files/python-package.mk)
-
-define Package/python/Default
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Python $(PYTHON_VERSION) programming language
-  URL:=http://www.python.org/
-endef
-
-define Package/python/Default/description
- Python is a dynamic object-oriented programming language that can be used
- for many kinds of software development. It offers strong support for
- integration with other languages and tools, comes with extensive standard
- libraries, and can be learned in a few days. Many Python programmers
- report substantial productivity gains and feel the language encourages
- the development of higher quality, more maintainable code.
-endef
-
-define Package/python
-$(call Package/python/Default)
-  TITLE+= (full)
-  DEPENDS:=+libpthread +zlib +libffi +python-mini
-endef
-
-define Package/python/description
-$(call Package/python/Default/description)
- .
- This package contains the full Python install.
-endef
-
-define Package/python-mini
-$(call Package/python/Default)
-  TITLE+= (minimal)
-  DEPENDS:=+libpthread +zlib
-endef
-
-define Package/python-mini/description
-$(call Package/python/Default/description)
-  .
-  This package contains only a minimal Python install.
-endef
-
-define Package/python-doc
-$(call Package/python/Default)
-  TITLE:=Python interactive documentation
-  DEPENDS+=+python-mini
-endef
-
-define Package/python-bzip2
-$(call Package/python/Default)
-  TITLE:=Python support for Bzip2
-  DEPENDS+=+python-mini +libbz2
-endef
-
-define Package/python-expat
-$(call Package/python/Default)
-  TITLE:=Python support for expat
-  DEPENDS+=+python-mini +libexpat
-endef
-
-define Package/python-gzip
-$(call Package/python/Default)
-  TITLE:=Python support for gzip
-  DEPENDS+=+python-mini
-endef
-
-define Package/python-openssl
-$(call Package/python/Default)
- TITLE:=Python support for OpenSSL
- DEPENDS+=+python-mini +libopenssl
-endef
-
-define Package/python-shutil
-$(call Package/python/Default)
-  TITLE:=Python support for shutil
-  DEPENDS+=+python-mini
-endef
-
-# Needs datetime
-define Package/python-sqlite3
-$(call Package/python/Default)
- TITLE:=Python support for sqlite3
- DEPENDS+=+python +libsqlite3
-endef
-
-define Package/python-gdbm
-$(call Package/python/Default)
- TITLE:=Python support for gdbm
- DEPENDS+=+python-mini +libgdbm
-endef
-
-define Package/python-readline
-$(call Package/python/Default)
- TITLE:=Python support for readline
- DEPENDS+=+python-mini +libreadline +libncurses @BROKEN
-endef
-
-define Package/python-ncurses
-$(call Package/python/Default)
- TITLE:=Python support for readline
- DEPENDS+=+python-mini +libncurses
-endef
-
-MAKE_FLAGS:=\
-	$(TARGET_CONFIGURE_OPTS) \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	CROSS_COMPILE=yes \
-	CFLAGS="$(TARGET_CFLAGS) -DNDEBUG -fno-inline" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	LD="$(TARGET_CC)" \
-	HOSTPYTHON=./hostpython \
-	HOSTPGEN=./hostpgen
-
-ENABLE_IPV6:=
-ifeq ($(CONFIG_IPV6),y)
-	ENABLE_IPV6 += --enable-ipv6
-endif
-
-define Build/Configure
-	-$(MAKE) -C $(PKG_BUILD_DIR) distclean
-	(cd $(PKG_BUILD_DIR); autoreconf --force --install || exit 0)
-	# The python executable needs to stay in the rootdir since its location will
-	# be used to compute the path of the config files.
-	$(CP) $(STAGING_DIR_HOST)/bin/pgen $(PKG_BUILD_DIR)/hostpgen
-	$(CP) $(STAGING_DIR_HOST)/bin/python$(PYTHON_VERSION) $(PKG_BUILD_DIR)/hostpython
-	$(call Build/Configure/Default, \
-		--sysconfdir=/etc \
-		--disable-shared \
-		--without-cxx-main \
-		--with-threads \
-		--with-system-ffi="$(STAGING_DIR)/usr" \
-		$(ENABLE_IPV6) \
-		ac_cv_have_chflags=no \
-		ac_cv_have_lchflags=no \
-		ac_cv_py_format_size_t=no \
-		ac_cv_have_long_long_format=yes \
-		ac_cv_buggy_getaddrinfo=no \
-		OPT="$(TARGET_CFLAGS)" \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
-	$(INSTALL_DIR) $(STAGING_DIR)/mk/
-	$(INSTALL_DATA) ./files/python-package.mk $(STAGING_DIR)/mk/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
-		$(1)/usr/include/
-	$(CP) \
-		$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \
-		$(PKG_BUILD_DIR)/libpython$(PYTHON_VERSION).a \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
-		$(1)/usr/lib/python$(PYTHON_VERSION)/
-
-	$(CP) \
-		$(STAGING_DIR_HOST)/bin/python$(PYTHON_VERSION) \
-		$(1)/usr/bin/hostpython
-	(cd $(2)/bin; \
-	ln -sf ../../usr/bin/hostpython python$(PYTHON_VERSION); \
-	ln -sf python$(PYTHON_VERSION) python)
-
-	$(CP) \
-		$(STAGING_DIR_HOST)/bin/python$(PYTHON_VERSION)-config \
-		$(2)/bin/
-	$(SED) 's,^#!.*,#!/usr/bin/env python$(PYTHON_VERSION),g' $(2)/bin/python$(PYTHON_VERSION)-config
-
-	(cd $(2)/bin; \
-	ln -sf python$(PYTHON_VERSION)-config python-config;)
-endef
-
-define PyPackage/python/filespec
-+|/usr/lib/python$(PYTHON_VERSION)
--|/usr/lib/python$(PYTHON_VERSION)/bsddb/test
--|/usr/lib/python$(PYTHON_VERSION)/config
--|/usr/lib/python$(PYTHON_VERSION)/ctypes/test
--|/usr/lib/python$(PYTHON_VERSION)/distutils/command/wininst-*.exe
--|/usr/lib/python$(PYTHON_VERSION)/distutils/tests
--|/usr/lib/python$(PYTHON_VERSION)/email/test
--|/usr/lib/python$(PYTHON_VERSION)/idlelib
--|/usr/lib/python$(PYTHON_VERSION)/json/tests
--|/usr/lib/python$(PYTHON_VERSION)/lib-tk
--|/usr/lib/python$(PYTHON_VERSION)/sqlite3
--|/usr/lib/python$(PYTHON_VERSION)/test
--|/usr/lib/python$(PYTHON_VERSION)/lib2to3
--|/usr/lib/python$(PYTHON_VERSION)/lib-old
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/bz2.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/gdbm.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sqlite3.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ssl.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so
--|/usr/lib/python$(PYTHON_VERSION)/pydoc_data
--|/usr/lib/python$(PYTHON_VERSION)/pydoc.py
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ctypes_test.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_testcapi.so
--|/usr/lib/python$(PYTHON_VERSION)/__future__.py
--|/usr/lib/python$(PYTHON_VERSION)/_abcoll.py
--|/usr/lib/python$(PYTHON_VERSION)/abc.py
--|/usr/lib/python$(PYTHON_VERSION)/codecs.py
--|/usr/lib/python$(PYTHON_VERSION)/compileall.py
--|/usr/lib/python$(PYTHON_VERSION)/ConfigParser.py
--|/usr/lib/python$(PYTHON_VERSION)/copy.py
--|/usr/lib/python$(PYTHON_VERSION)/copy_reg.py
--|/usr/lib/python$(PYTHON_VERSION)/dis.py
--|/usr/lib/python$(PYTHON_VERSION)/encodings
--|/usr/lib/python$(PYTHON_VERSION)/fnmatch.py
--|/usr/lib/python$(PYTHON_VERSION)/genericpath.py
--|/usr/lib/python$(PYTHON_VERSION)/getopt.py
--|/usr/lib/python$(PYTHON_VERSION)/glob.py
--|/usr/lib/python$(PYTHON_VERSION)/hashlib.py
--|/usr/lib/python$(PYTHON_VERSION)/inspect.py
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/array.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/binascii.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/cStringIO.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_curses.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_curses_panel.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/dbm.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_bsddb.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/fcntl.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/grp.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/itertools.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/math.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_md5.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/operator.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_random.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/readline.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/select.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha256.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha512.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_socket.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/strop.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_struct.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/syslog.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/time.so
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/unicodedata.so
--|/usr/lib/python$(PYTHON_VERSION)/linecache.py
--|/usr/lib/python$(PYTHON_VERSION)/md5.py
--|/usr/lib/python$(PYTHON_VERSION)/new.py
--|/usr/lib/python$(PYTHON_VERSION)/opcode.py
--|/usr/lib/python$(PYTHON_VERSION)/optparse.py
--|/usr/lib/python$(PYTHON_VERSION)/os.py
--|/usr/lib/python$(PYTHON_VERSION)/pickle.py
--|/usr/lib/python$(PYTHON_VERSION)/pickle.py
--|/usr/lib/python$(PYTHON_VERSION)/pkgutil.py
--|/usr/lib/python$(PYTHON_VERSION)/popen2.py
--|/usr/lib/python$(PYTHON_VERSION)/posixpath.py
--|/usr/lib/python$(PYTHON_VERSION)/py_compile.py
--|/usr/lib/python$(PYTHON_VERSION)/random.py
--|/usr/lib/python$(PYTHON_VERSION)/repr.py
--|/usr/lib/python$(PYTHON_VERSION)/re.py
--|/usr/lib/python$(PYTHON_VERSION)/sha.py
--|/usr/lib/python$(PYTHON_VERSION)/site.py
--|/usr/lib/python$(PYTHON_VERSION)/socket.py
--|/usr/lib/python$(PYTHON_VERSION)/sre_compile.py
--|/usr/lib/python$(PYTHON_VERSION)/sre_constants.py
--|/usr/lib/python$(PYTHON_VERSION)/sre_parse.py
--|/usr/lib/python$(PYTHON_VERSION)/sre.py
--|/usr/lib/python$(PYTHON_VERSION)/stat.py
--|/usr/lib/python$(PYTHON_VERSION)/StringIO.py
--|/usr/lib/python$(PYTHON_VERSION)/stringprep.py
--|/usr/lib/python$(PYTHON_VERSION)/string.py
--|/usr/lib/python$(PYTHON_VERSION)/struct.py
--|/usr/lib/python$(PYTHON_VERSION)/subprocess.py
--|/usr/lib/python$(PYTHON_VERSION)/tempfile.py
--|/usr/lib/python$(PYTHON_VERSION)/textwrap.py
--|/usr/lib/python$(PYTHON_VERSION)/tokenize.py
--|/usr/lib/python$(PYTHON_VERSION)/token.py
--|/usr/lib/python$(PYTHON_VERSION)/traceback.py
--|/usr/lib/python$(PYTHON_VERSION)/types.py
--|/usr/lib/python$(PYTHON_VERSION)/UserDict.py
--|/usr/lib/python$(PYTHON_VERSION)/warnings.py
--|/usr/lib/python$(PYTHON_VERSION)/weakref.py
--|/usr/lib/python$(PYTHON_VERSION)/_weakrefset.py
--|/usr/lib/python$(PYTHON_VERSION)/sysconfig.py
--|/usr/lib/python$(PYTHON_VERSION)/functools.py
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_functools.so
--|/usr/lib/python$(PYTHON_VERSION)/collections.py
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_collections.so
--|/usr/lib/python$(PYTHON_VERSION)/keyword.py
--|/usr/lib/python$(PYTHON_VERSION)/heapq.py
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_heapq.so
--|/usr/lib/python$(PYTHON_VERSION)/bisect.py
--|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_bisect.so
-endef
-
-define PyPackage/python-mini/filespec
-+|/usr/bin/python$(PYTHON_VERSION)
-+|/usr/lib/python$(PYTHON_VERSION)/__future__.py
-+|/usr/lib/python$(PYTHON_VERSION)/_abcoll.py
-+|/usr/lib/python$(PYTHON_VERSION)/abc.py
-+|/usr/lib/python$(PYTHON_VERSION)/codecs.py
-+|/usr/lib/python$(PYTHON_VERSION)/compileall.py
-+|/usr/lib/python$(PYTHON_VERSION)/ConfigParser.py
-+|/usr/lib/python$(PYTHON_VERSION)/copy.py
-+|/usr/lib/python$(PYTHON_VERSION)/copy_reg.py
-+|/usr/lib/python$(PYTHON_VERSION)/dis.py
-+|/usr/lib/python$(PYTHON_VERSION)/encodings
-+|/usr/lib/python$(PYTHON_VERSION)/fnmatch.py
-+|/usr/lib/python$(PYTHON_VERSION)/genericpath.py
-+|/usr/lib/python$(PYTHON_VERSION)/getopt.py
-+|/usr/lib/python$(PYTHON_VERSION)/glob.py
-+|/usr/lib/python$(PYTHON_VERSION)/hashlib.py
-+|/usr/lib/python$(PYTHON_VERSION)/inspect.py
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/array.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/binascii.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/cStringIO.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/fcntl.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/grp.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/itertools.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/math.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_md5.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/operator.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_random.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/select.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha256.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sha512.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_socket.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/strop.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_struct.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/syslog.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/time.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/unicodedata.so
-+|/usr/lib/python$(PYTHON_VERSION)/linecache.py
-+|/usr/lib/python$(PYTHON_VERSION)/md5.py
-+|/usr/lib/python$(PYTHON_VERSION)/new.py
-+|/usr/lib/python$(PYTHON_VERSION)/opcode.py
-+|/usr/lib/python$(PYTHON_VERSION)/optparse.py
-+|/usr/lib/python$(PYTHON_VERSION)/os.py
-+|/usr/lib/python$(PYTHON_VERSION)/pickle.py
-+|/usr/lib/python$(PYTHON_VERSION)/pickle.py
-+|/usr/lib/python$(PYTHON_VERSION)/pkgutil.py
-+|/usr/lib/python$(PYTHON_VERSION)/popen2.py
-+|/usr/lib/python$(PYTHON_VERSION)/posixpath.py
-+|/usr/lib/python$(PYTHON_VERSION)/py_compile.py
-+|/usr/lib/python$(PYTHON_VERSION)/random.py
-+|/usr/lib/python$(PYTHON_VERSION)/repr.py
-+|/usr/lib/python$(PYTHON_VERSION)/re.py
-+|/usr/lib/python$(PYTHON_VERSION)/sha.py
-+|/usr/lib/python$(PYTHON_VERSION)/site.py
-+|/usr/lib/python$(PYTHON_VERSION)/socket.py
-+|/usr/lib/python$(PYTHON_VERSION)/sre_compile.py
-+|/usr/lib/python$(PYTHON_VERSION)/sre_constants.py
-+|/usr/lib/python$(PYTHON_VERSION)/sre_parse.py
-+|/usr/lib/python$(PYTHON_VERSION)/sre.py
-+|/usr/lib/python$(PYTHON_VERSION)/stat.py
-+|/usr/lib/python$(PYTHON_VERSION)/StringIO.py
-+|/usr/lib/python$(PYTHON_VERSION)/stringprep.py
-+|/usr/lib/python$(PYTHON_VERSION)/string.py
-+|/usr/lib/python$(PYTHON_VERSION)/struct.py
-+|/usr/lib/python$(PYTHON_VERSION)/subprocess.py
-+|/usr/lib/python$(PYTHON_VERSION)/tempfile.py
-+|/usr/lib/python$(PYTHON_VERSION)/textwrap.py
-+|/usr/lib/python$(PYTHON_VERSION)/tokenize.py
-+|/usr/lib/python$(PYTHON_VERSION)/token.py
-+|/usr/lib/python$(PYTHON_VERSION)/traceback.py
-+|/usr/lib/python$(PYTHON_VERSION)/types.py
-+|/usr/lib/python$(PYTHON_VERSION)/UserDict.py
-+|/usr/lib/python$(PYTHON_VERSION)/warnings.py
-+|/usr/lib/python$(PYTHON_VERSION)/weakref.py
-+|/usr/lib/python$(PYTHON_VERSION)/_weakrefset.py
-+|/usr/lib/python$(PYTHON_VERSION)/config/Makefile
-+|/usr/lib/python$(PYTHON_VERSION)/sysconfig.py
-+|/usr/lib/python$(PYTHON_VERSION)/functools.py
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_functools.so
-+|/usr/lib/python$(PYTHON_VERSION)/collections.py
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_collections.so
-+|/usr/lib/python$(PYTHON_VERSION)/keyword.py
-+|/usr/lib/python$(PYTHON_VERSION)/heapq.py
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_heapq.so
-+|/usr/lib/python$(PYTHON_VERSION)/bisect.py
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_bisect.so
-+|/usr/include/python$(PYTHON_VERSION)/pyconfig.h
-endef
-
-define PyPackage/python-mini/install
-	ln -sf python$(PYTHON_VERSION) $(1)/usr/bin/python
-endef
-
-define PyPackage/python-doc/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/pydoc_data
-+|/usr/lib/python$(PYTHON_VERSION)/pydoc.py
-endef
-
-define PyPackage/python-bzip2/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/bz2.so
-endef
-
-define PyPackage/python-expat/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so
-endef
-
-define PyPackage/python-gzip/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/gzip.py
-endef
-
-define PyPackage/python-openssl/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ssl.so
-endef
-
-define PyPackage/python-shutil/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/shutil.py
-endef
-
-define PyPackage/python-sqlite3/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/sqlite3
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sqlite3.so
-endef
-
-define PyPackage/python-gdbm/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/gdbm.so
-endef
-
-define PyPackage/python-readline/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/readline.so
-endef
-
-define PyPackage/python-ncurses/filespec
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_curses.so
-+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_curses_panel.so
-endef
-
-define Host/Configure
-	-$(MAKE) -C $(HOST_BUILD_DIR) distclean
-	(cd $(HOST_BUILD_DIR); autoreconf --force --install || exit 0)
-	(cd $(HOST_BUILD_DIR); \
-		rm -rf config.cache; \
-		CONFIG_SITE= \
-		OPT="$(HOST_CFLAGS)" \
-		./configure --without-cxx-main --with-threads --prefix=$(STAGING_DIR_HOST); \
-	)
-endef
-
-define Host/Compile
-	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
-		python Parser/pgen
-	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
-		HOSTPYTHON=$(HOST_BUILD_DIR)/python \
-		sharedmods
-endef
-
-define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
-	$(MAKE) -C $(HOST_BUILD_DIR) \
-		HOSTPYTHON=$(HOST_BUILD_DIR)/python \
-		install
-	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/
-endef
-
-
-$(eval $(call HostBuild))
-
-$(eval $(call PyPackage,python))
-$(eval $(call PyPackage,python-mini))
-$(eval $(call PyPackage,python-doc))
-$(eval $(call PyPackage,python-bzip2))
-$(eval $(call PyPackage,python-expat))
-$(eval $(call PyPackage,python-gzip))
-$(eval $(call PyPackage,python-openssl))
-$(eval $(call PyPackage,python-shutil))
-$(eval $(call PyPackage,python-sqlite3))
-$(eval $(call PyPackage,python-gdbm))
-$(eval $(call PyPackage,python-readline))
-$(eval $(call PyPackage,python-ncurses))
-
-$(eval $(call BuildPackage,python))
-$(eval $(call BuildPackage,python-mini))
-$(eval $(call BuildPackage,python-doc))
-$(eval $(call BuildPackage,python-bzip2))
-$(eval $(call BuildPackage,python-expat))
-$(eval $(call BuildPackage,python-gzip))
-$(eval $(call BuildPackage,python-openssl))
-$(eval $(call BuildPackage,python-shutil))
-$(eval $(call BuildPackage,python-sqlite3))
-$(eval $(call BuildPackage,python-gdbm))
-$(eval $(call BuildPackage,python-readline))
-$(eval $(call BuildPackage,python-ncurses))
-

--- a/lang/python/files/python-package.mk
+++ /dev/null
@@ -1,78 +1,1 @@
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-PYTHON_VERSION=2.7
-
-PYTHON_DIR:=$(STAGING_DIR)/usr
-PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin
-PYTHON_INC_DIR:=$(PYTHON_DIR)/include/python$(PYTHON_VERSION)
-PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib/python$(PYTHON_VERSION)
-
-PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
-
-PYTHON:=python$(PYTHON_VERSION)
-
-HOST_PYTHON_BIN:=$(STAGING_DIR)/usr/bin/hostpython
-
-define HostPython
-	(	export PYTHONPATH="$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR)"; \
-		export PYTHONOPTIMIZE=""; \
-		export PYTHONDONTWRITEBYTECODE=1; \
-		$(1) \
-		$(HOST_PYTHON_BIN) $(2); \
-	)
-endef
-
-define PyPackage
-  $(call shexport,PyPackage/$(1)/filespec)
-
-  define Package/$(1)/install
-	@$(SH_FUNC) getvar $$(call shvar,PyPackage/$(1)/filespec) | ( \
-		IFS='|'; \
-		while read fop fspec fperm; do \
-		  if [ "$$$$$$$$fop" = "+" ]; then \
-			dpath=`dirname "$$$$$$$$fspec"`; \
-			if [ -n "$$$$$$$$fperm" ]; then \
-			  dperm="-m$$$$$$$$fperm"; \
-			else \
-			  dperm=`stat -c "%a" $(PKG_INSTALL_DIR)$$$$$$$$dpath`; \
-			fi; \
-			mkdir -p $$$$$$$$$dperm $$(1)$$$$$$$$dpath; \
-			echo "copying: '$$$$$$$$fspec'"; \
-			cp -fpR $(PKG_INSTALL_DIR)$$$$$$$$fspec $$(1)$$$$$$$$dpath/; \
-			if [ -n "$$$$$$$$fperm" ]; then \
-			  chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
-			fi; \
-		  elif [ "$$$$$$$$fop" = "-" ]; then \
-			echo "removing: '$$$$$$$$fspec'"; \
-			rm -fR $$(1)$$$$$$$$fspec; \
-		  elif [ "$$$$$$$$fop" = "=" ]; then \
-			echo "setting permissions: '$$$$$$$$fperm' on '$$$$$$$$fspec'"; \
-			chmod -R $$$$$$$$fperm $$(1)$$$$$$$$fspec; \
-		  fi; \
-		done; \
-	)
-	$(call PyPackage/$(1)/install,$$(1))
-  endef
-endef
-
-# $(1) => build subdir
-# $(2) => additional arguments to setup.py
-# $(3) => additional variables
-define Build/Compile/PyMod
-	$(call HostPython, \
-		cd $(PKG_BUILD_DIR)/$(strip $(1)); \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		$(3) \
-		, \
-		./setup.py $(2) \
-	)
-	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f
-endef
-

--- a/lang/python/patches/000-cross-compile.patch
+++ /dev/null
@@ -1,113 +1,1 @@
----
- Makefile.pre.in |   25 +++++++++++++------------
- 1 file changed, 13 insertions(+), 12 deletions(-)
 
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -182,6 +182,7 @@ UNICODE_OBJS=   @UNICODE_OBJS@
- 
- PYTHON=		python$(EXE)
- BUILDPYTHON=	python$(BUILDEXE)
-+HOSTPYTHON=	$(BUILDPYTHON)
- 
- # The task to run while instrument when building the profile-opt target
- PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
-@@ -214,6 +215,7 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
- ##########################################################################
- # Parser
- PGEN=		Parser/pgen$(EXE)
-+HOSTPGEN=	$(PGEN)$(EXE)
- 
- POBJS=		\
- 		Parser/acceler.o \
-@@ -384,7 +386,7 @@ build_all_generate_profile:
- 	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
- 
- run_profile_task:
--	./$(BUILDPYTHON) $(PROFILE_TASK)
-+	$(HOSTPYTHON) $(PROFILE_TASK)
- 
- build_all_use_profile:
- 	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
-@@ -402,14 +404,14 @@ $(BUILDPYTHON):	Modules/python.o $(LIBRA
- 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
- 
- platform: $(BUILDPYTHON)
--	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-+	$(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
- 
- 
- # Build the shared modules
- sharedmods: $(BUILDPYTHON)
- 	@case $$MAKEFLAGS in \
--	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
--	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-+	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
-+	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
- 	esac
- 
- # Build static library
-@@ -543,7 +545,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
- $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
- Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
- 		-@$(INSTALL) -d Include
--		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
- 		-touch Parser/pgen.stamp
- 
- $(PGEN):	$(PGENOBJS)
-@@ -708,7 +710,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
- 
- TESTOPTS=	-l $(EXTRATESTOPTS)
- TESTPROG=	$(srcdir)/Lib/test/regrtest.py
--TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
-+TESTPYTHON=	$(RUNSHARED) $(HOSTPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
- test:		all platform
- 		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
- 		-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
-@@ -1062,7 +1064,7 @@ libainstall:	all python-config
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
--	$(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
-+	$(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
- 	   	--prefix=$(prefix) \
- 		--install-scripts=$(BINDIR) \
- 		--install-platlib=$(DESTSHARED) \
-@@ -1100,7 +1102,7 @@ frameworkinstallstructure:	$(LDLIBRARY)
- 		fi; \
- 	done
- 	$(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
--	sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
-+	sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
- 	$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
- 	$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
- 	$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
-@@ -1135,7 +1137,7 @@ frameworkinstallextras:
- # This installs a few of the useful scripts in Tools/scripts
- scriptsinstall:
- 	SRCDIR=$(srcdir) $(RUNSHARED) \
--	./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
-+	$(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
- 	--prefix=$(prefix) \
- 	--install-scripts=$(BINDIR) \
- 	--root=$(DESTDIR)/
-@@ -1157,7 +1159,7 @@ config.status:	$(srcdir)/configure
- 
- # Run reindent on the library
- reindent:
--	./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
-+	$(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
- 
- # Rerun configure with the same options as it was run last time,
- # provided the config.status script exists
-@@ -1260,7 +1262,7 @@ funny:
- 
- # Perform some verification checks on any modified files.
- patchcheck:
--	$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
-+	$(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
- 
- # Dependencies
- 
-

--- a/lang/python/patches/020-dont-compile-python-files.patch
+++ /dev/null
@@ -1,34 +1,1 @@
----
- Makefile.pre.in |   16 ----------------
- 1 file changed, 16 deletions(-)
 
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -940,26 +940,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
- 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
- 	fi
--	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
--		./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST) -f \
--		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
--		$(DESTDIR)$(LIBDEST)
--	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST) -f \
--		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
--		$(DESTDIR)$(LIBDEST)
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
--		./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST)/site-packages -f \
--		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST)/site-packages -f \
--		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
- 
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
-

--- a/lang/python/patches/030-fixup-include-dirs.patch
+++ /dev/null
@@ -1,51 +1,1 @@
----
- setup.py |   15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
 
---- a/setup.py
-+++ b/setup.py
-@@ -368,11 +368,6 @@ class PyBuildExt(build_ext):
-             os.unlink(tmpfile)
- 
-     def detect_modules(self):
--        # Ensure that /usr/local is always used
--        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
--        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
--        self.add_multiarch_paths()
--
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
-         # We must get the values from the Makefile and not the environment
-@@ -407,17 +402,6 @@ class PyBuildExt(build_ext):
-                     for directory in reversed(options.dirs):
-                         add_dir_to_list(dir_list, directory)
- 
--        if os.path.normpath(sys.prefix) != '/usr' \
--                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
--            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
--            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
--            # building a framework with different architectures than
--            # the one that is currently installed (issue #7473)
--            add_dir_to_list(self.compiler.library_dirs,
--                            sysconfig.get_config_var("LIBDIR"))
--            add_dir_to_list(self.compiler.include_dirs,
--                            sysconfig.get_config_var("INCLUDEDIR"))
--
-         try:
-             have_unicode = unicode
-         except NameError:
-@@ -426,11 +410,8 @@ class PyBuildExt(build_ext):
-         # lib_dirs and inc_dirs are used to search for files;
-         # if a file is found in one of those directories, it can
-         # be assumed that no additional -I,-L directives are needed.
--        lib_dirs = self.compiler.library_dirs + [
--            '/lib64', '/usr/lib64',
--            '/lib', '/usr/lib',
--            ]
--        inc_dirs = self.compiler.include_dirs + ['/usr/include']
-+        lib_dirs = self.compiler.library_dirs
-+        inc_dirs = self.compiler.include_dirs
-         exts = []
-         missing = []
- 
-

--- a/lang/python/patches/040-dont-import-cross-compiled-modules.patch
+++ /dev/null
@@ -1,44 +1,1 @@
----
- setup.py |   30 ------------------------------
- 1 file changed, 30 deletions(-)
 
---- a/setup.py
-+++ b/setup.py
-@@ -307,36 +307,6 @@ class PyBuildExt(build_ext):
-         ext_filename = os.path.join(
-             self.build_lib,
-             self.get_ext_filename(self.get_ext_fullname(ext.name)))
--        try:
--            imp.load_dynamic(ext.name, ext_filename)
--        except ImportError, why:
--            self.failed.append(ext.name)
--            self.announce('*** WARNING: renaming "%s" since importing it'
--                          ' failed: %s' % (ext.name, why), level=3)
--            assert not self.inplace
--            basename, tail = os.path.splitext(ext_filename)
--            newname = basename + "_failed" + tail
--            if os.path.exists(newname):
--                os.remove(newname)
--            os.rename(ext_filename, newname)
--
--            # XXX -- This relies on a Vile HACK in
--            # distutils.command.build_ext.build_extension().  The
--            # _built_objects attribute is stored there strictly for
--            # use here.
--            # If there is a failure, _built_objects may not be there,
--            # so catch the AttributeError and move on.
--            try:
--                for filename in self._built_objects:
--                    os.remove(filename)
--            except AttributeError:
--                self.announce('unable to remove files (ignored)')
--        except:
--            exc_type, why, tb = sys.exc_info()
--            self.announce('*** WARNING: importing extension "%s" '
--                          'failed with %s: %s' % (ext.name, exc_type, why),
--                          level=3)
--            self.failed.append(ext.name)
- 
-     def get_platform(self):
-         # Get value of sys.platform
-

--- a/lang/python/patches/070-dont-clean-ipkg-install.patch
+++ /dev/null
@@ -1,24 +1,1 @@
----
- Makefile.pre.in |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
 
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1169,12 +1169,12 @@ TAGS::
- # Sanitation targets -- clean leaves libraries, executables and tags
- # files, which clobber removes as well
- pycremoval:
--	find $(srcdir) -name '*.py[co]' -exec rm -f {} ';'
-+	find $(srcdir) ! -path './ipkg-install/*' -name '*.py[co]' -exec rm -f {} ';'
- 
- clean: pycremoval
--	find . -name '*.[oa]' -exec rm -f {} ';'
--	find . -name '*.s[ol]' -exec rm -f {} ';'
--	find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
-+	find . ! -path './ipkg-install/*' -name '*.[oa]' -exec rm -f {} ';'
-+	find . ! -path './ipkg-install/*' -name '*.s[ol]' -exec rm -f {} ';'
-+	find . ! -path './ipkg-install/*' -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
- 	find build -name 'fficonfig.h' -exec rm -f {} ';' || true
- 	find build -name 'fficonfig.py' -exec rm -f {} ';' || true
- 	-rm -f Lib/lib2to3/*Grammar*.pickle
-

--- a/lang/python/patches/080-distutils-dont_adjust_files.patch
+++ /dev/null
@@ -1,64 +1,1 @@
----
- Lib/distutils/command/build_scripts.py |   43 +++------------------------------
- 1 file changed, 4 insertions(+), 39 deletions(-)
 
---- a/Lib/distutils/command/build_scripts.py
-+++ b/Lib/distutils/command/build_scripts.py
-@@ -51,10 +51,7 @@ class build_scripts (Command):
- 
- 
-     def copy_scripts (self):
--        """Copy each script listed in 'self.scripts'; if it's marked as a
--        Python script in the Unix way (first line matches 'first_line_re',
--        ie. starts with "\#!" and contains "python"), then adjust the first
--        line to refer to the current Python interpreter as we copy.
-+        """Copy each script listed in 'self.scripts'
-         """
-         _sysconfig = __import__('sysconfig')
-         self.mkpath(self.build_dir)
-@@ -78,41 +75,9 @@ class build_scripts (Command):
-                 if not self.dry_run:
-                     raise
-                 f = None
--            else:
--                first_line = f.readline()
--                if not first_line:
--                    self.warn("%s is an empty file (skipping)" % script)
--                    continue
--
--                match = first_line_re.match(first_line)
--                if match:
--                    adjust = 1
--                    post_interp = match.group(1) or ''
--
--            if adjust:
--                log.info("copying and adjusting %s -> %s", script,
--                         self.build_dir)
--                if not self.dry_run:
--                    outf = open(outfile, "w")
--                    if not _sysconfig.is_python_build():
--                        outf.write("#!%s%s\n" %
--                                   (self.executable,
--                                    post_interp))
--                    else:
--                        outf.write("#!%s%s\n" %
--                                   (os.path.join(
--                            _sysconfig.get_config_var("BINDIR"),
--                           "python%s%s" % (_sysconfig.get_config_var("VERSION"),
--                                           _sysconfig.get_config_var("EXE"))),
--                                    post_interp))
--                    outf.writelines(f.readlines())
--                    outf.close()
--                if f:
--                    f.close()
--            else:
--                if f:
--                    f.close()
--                self.copy_file(script, outfile)
-+            if f:
-+                f.close()
-+            self.copy_file(script, outfile)
- 
-         if os.name == 'posix':
-             for file in outfiles:
-

--- a/lang/python/patches/110-enable-zlib.patch
+++ /dev/null
@@ -1,16 +1,1 @@
----
- Modules/Setup.dist |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/Modules/Setup.dist
-+++ b/Modules/Setup.dist
-@@ -460,7 +460,7 @@ GLHACK=-Dclear=__GLclear
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -lz
- 
- # Interface to the Expat XML parser
- #
-

--- a/lang/python/patches/120-force-internal-modules-for-hashlib.patch
+++ /dev/null
@@ -1,26 +1,1 @@
----
- setup.py |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
 
---- a/setup.py
-+++ b/setup.py
-@@ -704,8 +704,7 @@ class PyBuildExt(build_ext):
- 
-         min_openssl_ver = 0x00907000
-         have_any_openssl = ssl_incs is not None and ssl_libs is not None
--        have_usable_openssl = (have_any_openssl and
--                               openssl_ver >= min_openssl_ver)
-+        have_usable_openssl = False
- 
-         if have_any_openssl:
-             if have_usable_openssl:
-@@ -730,7 +729,7 @@ class PyBuildExt(build_ext):
-                             depends = ['md5.h']) )
- 
-         min_sha2_openssl_ver = 0x00908000
--        if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
-+        if True:
-             # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
-             exts.append( Extension('_sha256', ['sha256module.c']) )
-             exts.append( Extension('_sha512', ['sha512module.c']) )
-

--- a/lang/python/patches/130-readline-setup.patch
+++ /dev/null
@@ -1,37 +1,1 @@
---- a/setup.py
-+++ b/setup.py
-@@ -573,32 +573,7 @@ class PyBuildExt(build_ext):
-         # readline
-         do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
-         readline_termcap_library = ""
--        curses_library = ""
--        # Determine if readline is already linked against curses or tinfo.
--        if do_readline and find_executable('ldd'):
--            fp = os.popen("ldd %s" % do_readline)
--            ldd_output = fp.readlines()
--            ret = fp.close()
--            if ret is None or ret >> 8 == 0:
--                for ln in ldd_output:
--                    if 'curses' in ln:
--                        readline_termcap_library = re.sub(
--                            r'.*lib(n?cursesw?)\.so.*', r'\1', ln
--                        ).rstrip()
--                        break
--                    if 'tinfo' in ln: # termcap interface split out from ncurses
--                        readline_termcap_library = 'tinfo'
--                        break
--        # Issue 7384: If readline is already linked against curses,
--        # use the same library for the readline and curses modules.
--        if 'curses' in readline_termcap_library:
--            curses_library = readline_termcap_library
--        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
--            curses_library = 'ncursesw'
--        elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
--            curses_library = 'ncurses'
--        elif self.compiler.find_library_file(lib_dirs, 'curses'):
--            curses_library = 'curses'
-+        curses_library = "ncurses"
- 
-         if platform == 'darwin':
-             os_release = int(os.uname()[2].split('.')[0])
 

--- a/lang/python/patches/140-verbose-sharedmods.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -410,7 +410,7 @@ platform: $(BUILDPYTHON)
- # Build the shared modules
- sharedmods: $(BUILDPYTHON)
- 	@case $$MAKEFLAGS in \
--	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
-+	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
- 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
- 	esac
- 
 

--- a/lang/python/patches/150-no-sqlite-rpath.patch
+++ /dev/null
@@ -1,11 +1,1 @@
---- a/setup.py
-+++ b/setup.py
-@@ -1021,7 +1021,6 @@ class PyBuildExt(build_ext):
-                                   include_dirs=["Modules/_sqlite",
-                                                 sqlite_incdir],
-                                   library_dirs=sqlite_libdir,
--                                  runtime_library_dirs=sqlite_libdir,
-                                   extra_link_args=sqlite_extra_link_args,
-                                   libraries=["sqlite3",]))
-         else:
 

--- a/lang/simplejson/Makefile
+++ /dev/null
@@ -1,47 +1,1 @@
-#
-# Copyright (C) 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:=simplejson
-PKG_VERSION:=2.2.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/
-PKG_MD5SUM:=070c6467462bd63306f1756b01df6d70
-PKG_BUILD_DEPENDS:=python
-
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python-package.mk)
-
-define Package/simplejson
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=Simple, fast, extensible JSON encoder/decoder for Python
-  URL:=http://simplejson.readthedocs.org/
-  DEPENDS:=+python +distribute
-endef
-
-define Package/simplejson/description
-  Simple, fast, extensible JSON encoder/decoder for Python
-endef
-
-define Build/Compile
-	$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
-endef
-
-define Package/simplejson/install
-	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-	$(CP) \
-	    $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-	    $(1)$(PYTHON_PKG_DIR)
-endef
-
-$(eval $(call BuildPackage,simplejson))
-

file:a/lang/vala/Makefile (deleted)
--- a/lang/vala/Makefile
+++ /dev/null
@@ -1,72 +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:=vala
-PKG_VERSION:=0.16.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/vala/0.16/
-PKG_MD5SUM:=84b742e9cca4c90fde3026c3793c03c1
-
-PKG_BUILD_DEPENDS:=glib2/host vala/host
-HOST_BUILD_DEPENDS:=glib2/host
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-TARGET_LDFLAGS+=\
-        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Package/vala
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=C-sharp like language for the GObject system
-  URL:=http://live.gnome.org/Vala
-endef
-
-define Package/vala/description
-Vala is a C-sharp like language for the GObject system. This package contains
-the Vala-to-C compiler.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/share/vala-0.16/vapi \
-		$(1)/usr/lib \
-		$(1)/usr/share/pkgconfig \
-		$(1)/usr/bin
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/vala-0.16/vapi/* \
-		$(1)/usr/share/vala-0.16/vapi
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/libvala-0.16.{so*,la} \
-		$(1)/usr/lib
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/{vala,vala-0.16,valac,valac-0.16,vapicheck,vapicheck-0.16,vapigen,vapigen-0.16,vala-gen-introspect,vala-gen-introspect-0.16} \
-		$(1)/usr/bin
-
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/pkgconfig/*.pc \
-		$(1)/usr/share/pkgconfig
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,vala))
-

file:a/libs/confuse/Makefile (deleted)
--- a/libs/confuse/Makefile
+++ /dev/null
@@ -1,78 +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:=confuse
-PKG_VERSION:=2.6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://bzero.se/confuse
-PKG_MD5SUM:=0e883d66f0f58fc33585b430c652aa30
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/confuse
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libConfuse is a configuration file parser library
-  URL:=http://www.nongnu.org/confuse/
-endef
-
-define Package/confuse/description
-	libConfuse is a configuration file parser library, licensed under the
-	terms of the ISC license, and written in C. It supports sections and
-	(lists of) values (strings, integers, floats, booleans or other
-	sections), as well as some other features (such as single/double-quoted
-	strings, environment variable expansion, functions and nested include
-	statements). It makes it very easy to add configuration file capability
-	to a program using a simple API.
-
-	The goal of libConfuse is not to be the configuration file parser
-	library with a gazillion of features. Instead, it aims to be easy to use
-	and quick to integrate with your code. libConfuse was called libcfg
-	before, but was changed to not confuse with other similar libraries.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-rpath \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-
-MAKE_FLAGS += \
-	-C $(PKG_BUILD_DIR)/src \
-	DESTDIR="$(PKG_INSTALL_DIR)" \
-	all install \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/confuse.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libconfuse.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/*.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Build/UninstallDev
-	rm -rf \
-	$(STAGING_DIR)/usr/include/confuse.h \
-	$(STAGING_DIR)/usr/lib/libconfuse.{a,so*}
-endef
-
-define Package/confuse/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libconfuse.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,confuse))
-

--- a/libs/confuse/patches/001-no_werror.patch
+++ /dev/null
@@ -1,25 +1,1 @@
-diff -urN confuse-2.6/src/Makefile.am confuse-2.6.new/src/Makefile.am
---- confuse-2.6/src/Makefile.am	2007-10-13 13:18:28.000000000 +0200
-+++ confuse-2.6.new/src/Makefile.am	2009-06-18 18:00:02.000000000 +0200
-@@ -10,7 +10,7 @@
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- 
- if cc_is_gcc
--AM_CFLAGS=-Wall -Werror
-+AM_CFLAGS=-Wall
- endif
- 
- LIBS = @LIBS@
-diff -urN confuse-2.6/src/Makefile.in confuse-2.6.new/src/Makefile.in
---- confuse-2.6/src/Makefile.in	2007-12-29 11:56:12.000000000 +0100
-+++ confuse-2.6.new/src/Makefile.in	2009-06-18 17:59:55.000000000 +0200
-@@ -196,7 +196,7 @@
- libconfuse_la_SOURCES = confuse.c lexer.l
- libconfuse_la_LIBADD = $(LTLIBINTL)
- include_HEADERS = confuse.h
--@cc_is_gcc_TRUE@AM_CFLAGS = -Wall -Werror
-+@cc_is_gcc_TRUE@AM_CFLAGS = -Wall
- CLEANFILES = *~ \#*\#
- AM_LFLAGS = -Pcfg_yy -olex.yy.c
- all: all-am
 

file:a/libs/elfutils/Makefile (deleted)
--- a/libs/elfutils/Makefile
+++ /dev/null
@@ -1,77 +1,1 @@
-#
-# Copyright (C) 2010-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:=elfutils
-PKG_VERSION:=0.155
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://fedorahosted.org/releases/e/l/$(PKG_NAME)/$(PKG_VERSION)
-PKG_MD5SUM:=163a5712b86f6bdfebdf233cc6e2192d
-
-PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
-
-PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/elfutils/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=$(INTL_DEPENDS)
-  TITLE:=ELF manipulation libraries
-  URL:=https://fedorahosted.org/elfutils/
-endef
-
-define Package/libdw
-  $(call Package/elfutils/Default)
-  DEPENDS:=libelf1 +zlib +libbz2
-  TITLE+= (libdw)
-endef
-
-define Package/libelf1
-  $(call Package/elfutils/Default)
-  TITLE+= (libelf)
-endef
-
-ifeq ($(CONFIG_BUILD_NLS),y)
-TARGET_LDFLAGS += "-lintl"
-endif
-
-ifdef CONFIG_USE_UCLIBC
-CONFIGURE_VARS += \
-	LIBS="-largp"
-endif
-
-CONFIGURE_ARGS += \
-	--disable-werror \
-	--without-lzma
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdw/libdw.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/libelf/libelf.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libdw/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdw/libdw.so* $(1)/usr/lib/
-endef
-
-define Package/libelf1/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libelf/libelf.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdw))
-$(eval $(call BuildPackage,libelf1))
-

--- a/libs/elfutils/patches/001-elfutils-portability.patch
+++ /dev/null
@@ -1,1685 +1,1 @@
---- elfutils/backends/ChangeLog
-+++ elfutils/backends/ChangeLog
-@@ -135,6 +135,10 @@
- 	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
- 	GNU_Power_ABI_Struct_Return.
- 
-+2009-01-23  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
-+
- 2008-10-04  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -462,6 +466,11 @@
- 	* sparc_init.c: Likewise.
- 	* x86_64_init.c: Likewise.
- 
-+2005-11-22  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
-+	(libebl_%.so rule): Use it in place of -Wl,--as-needed.
-+
- 2005-11-19  Roland McGrath  <roland@redhat.com>
- 
- 	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -484,6 +493,9 @@
- 	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
- 	(CLEANFILES): Add libebl_$(m).so.
- 
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 	* ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
- 	* ppc64_reloc.def: Likewise.
- 
---- elfutils/backends/Makefile.am
-+++ elfutils/backends/Makefile.am
-@@ -111,7 +111,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
- 	$(LINK) -shared -o $(@:.map=.so) \
- 		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
- 		-Wl,--version-script,$(@:.so=.map) \
--		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
-+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
- 	$(textrel_check)
- 
- libebl_i386.so: $(cpu_i386)
---- elfutils/backends/Makefile.in
-+++ elfutils/backends/Makefile.in
-@@ -38,7 +38,8 @@ build_triplet = @build@
- host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
- subdir = backends
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -172,6 +173,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -201,6 +203,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -263,10 +266,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
- 	-I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
- 	-I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1)
-+	$(am__append_1) $(am__append_2)
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -725,7 +727,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
- 	$(LINK) -shared -o $(@:.map=.so) \
- 		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
- 		-Wl,--version-script,$(@:.so=.map) \
--		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
-+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
- 	$(textrel_check)
- 
- libebl_i386.so: $(cpu_i386)
---- elfutils/ChangeLog
-+++ elfutils/ChangeLog
-@@ -16,6 +16,8 @@
- 
- 2012-01-24  Mark Wielaard  <mjw@redhat.com>
- 
-+	* configure.ac: Wrap AC_COMPILE_IFELSE sources in AC_LANG_SOURCE.
-+
- 	* COPYING: Fix address. Updated version from gnulib.
- 
- 2012-01-23  Mark Wielaard  <mjw@redhat.com>
-@@ -34,6 +36,9 @@
- 
- 2011-10-08  Mike Frysinger  <vapier@gentoo.org>
- 
-+	* configure.ac (--disable-werror): Handle it, controlling BUILD_WERROR
-+	automake option.
-+
- 	* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
- 
- 2011-10-02  Ulrich Drepper  <drepper@gmail.com>
-@@ -55,6 +60,10 @@
- 
- 	* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
- 
-+2009-11-22  Roland McGrath  <roland@redhat.com>
-+
-+	* configure.ac: Use sed and expr instead of modern bash extensions.
-+
- 2009-09-21  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* configure.ac: Update for more modern autoconf.
-@@ -63,6 +72,10 @@
- 
- 	* configure.ac (zip_LIBS): Check for liblzma too.
- 
-+2009-08-17  Roland McGrath  <roland@redhat.com>
-+
-+	* configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.
-+
- 2009-04-19  Roland McGrath  <roland@redhat.com>
- 
- 	* configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -74,6 +87,8 @@
- 
- 2009-01-23  Roland McGrath  <roland@redhat.com>
- 
-+	* configure.ac: Check for __builtin_popcount.
-+
- 	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
- 
- 	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -154,6 +169,10 @@
- 	* configure.ac: Add dummy automake conditional to get dependencies
- 	for non-generic linker right.  See src/Makefile.am.
- 
-+2005-11-22  Roland McGrath  <roland@redhat.com>
-+
-+	* configure.ac: Check for --as-needed linker option.
-+
- 2005-11-18  Roland McGrath  <roland@redhat.com>
- 
- 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -201,6 +220,17 @@
- 	* Makefile.am (all_SUBDIRS): Add libdwfl.
- 	* configure.ac: Write libdwfl/Makefile.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* configure.ac (WEXTRA): Check for -Wextra and set this substitution.
-+
-+	* configure.ac: Check for struct stat st_?tim members.
-+	* src/strip.c (process_file): Use st_?time if st_?tim are not there.
-+
-+	* configure.ac: Check for futimes function.
-+	* src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.
-+	(handle_ar) [! HAVE_FUTIMES]: Likewise.
-+
- 2005-05-19  Roland McGrath  <roland@redhat.com>
- 
- 	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
---- elfutils/config/ChangeLog
-+++ elfutils/config/ChangeLog
-@@ -19,6 +19,10 @@
- 
- 	* known-dwarf.awk: Use gawk.
- 
-+2011-10-08  Mike Frysinger  <vapier@gentoo.org>
-+
-+	* eu.am [BUILD_WERROR]: Conditionalize -Werror use on this.
-+
- 2010-07-02  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* elfutils.spec.in: Add more BuildRequires.
---- elfutils/config/eu.am
-+++ elfutils/config/eu.am
-@@ -1,6 +1,6 @@
- ## Common automake fragments for elfutils subdirectory makefiles.
- ##
--## Copyright (C) 2010 Red Hat, Inc.
-+## Copyright (C) 2010-2011 Red Hat, Inc.
- ##
- ## This file is part of elfutils.
- ##
-@@ -29,14 +29,20 @@
- ## not, see <http://www.gnu.org/licenses/>.
- ##
- 
-+WEXTRA = @WEXTRA@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
-+
- DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
- INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
--	    $(if $($(*F)_no_Werror),,-Werror) \
--	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
-+	    $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
- 	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
- 	    $($(*F)_CFLAGS)
- 
-+if BUILD_WERROR
-+AM_CFLAGS += $(if $($(*F)_no_Werror),,-Werror)
-+endif
-+
- if MUDFLAP
- AM_CFLAGS += -fmudflap
- libmudflap = -lmudflap
---- elfutils/config/Makefile.in
-+++ elfutils/config/Makefile.in
-@@ -76,6 +76,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -105,6 +106,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
---- elfutils/config.h.in
-+++ elfutils/config.h.in
-@@ -6,6 +6,9 @@
- /* Defined if libdw should support GNU ref_alt FORM, dwz multi files. */
- #undef ENABLE_DWZ
- 
-+/* Have __builtin_popcount. */
-+#undef HAVE_BUILTIN_POPCOUNT
-+
- /* $libdir subdirectory containing libebl modules. */
- #undef LIBEBL_SUBDIR
- 
-@@ -64,4 +67,7 @@
- /* Define for large files, on AIX-style hosts. */
- #undef _LARGE_FILES
- 
-+/* Stubbed out if missing compiler support. */
-+#undef __thread
-+
- #include <eu-config.h>
---- elfutils/configure
-+++ elfutils/configure
-@@ -598,6 +598,8 @@ ZLIB_TRUE
- LIBEBL_SUBDIR
- TESTS_RPATH_FALSE
- TESTS_RPATH_TRUE
-+BUILD_WERROR_FALSE
-+BUILD_WERROR_TRUE
- BUILD_STATIC_FALSE
- BUILD_STATIC_TRUE
- GCOV_FALSE
-@@ -612,6 +614,8 @@ NEVER_TRUE
- base_cpu
- NATIVE_LD_FALSE
- NATIVE_LD_TRUE
-+LD_AS_NEEDED
-+WEXTRA
- LEXLIB
- LEX_OUTPUT_ROOT
- LEX
-@@ -726,6 +730,7 @@ enable_mudflap
- enable_debugpred
- enable_gprof
- enable_gcov
-+enable_werror
- enable_tests_rpath
- enable_libebl_subdir
- with_zlib
-@@ -1379,6 +1384,7 @@ Optional Features:
-                           prediction
-   --enable-gprof          build binaries with gprof support
-   --enable-gcov           build binaries with gcov support
-+  --disable-werror        do not build with -Werror
-   --enable-tests-rpath    build $ORIGIN-using rpath into tests
-   --enable-libebl-subdir=DIR
-                           install libebl_CPU modules in $(libdir)/DIR
-@@ -3920,6 +3926,130 @@ if test "x$ac_cv_c99" != xyes; then :
-   as_fn_error $? "gcc with C99 support required" "$LINENO" 5
- fi
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5
-+$as_echo_n "checking for -Wextra option to $CC... " >&6; }
-+if ${ac_cv_cc_wextra+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Wextra"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+void foo (void) { }
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_cc_wextra=yes
-+else
-+  ac_cv_cc_wextra=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS="$old_CFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5
-+$as_echo "$ac_cv_cc_wextra" >&6; }
-+
-+if test "x$ac_cv_cc_wextra" = xyes; then :
-+  WEXTRA=-Wextra
-+else
-+  WEXTRA=-W
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5
-+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
-+if ${ac_cv_cc_gnu89_inline+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+void foo (void)
-+{
-+  inline void bar (void) {}
-+  bar ();
-+}
-+extern inline void baz (void) {}
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_cc_gnu89_inline=yes
-+else
-+  ac_cv_cc_gnu89_inline=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS="$old_CFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5
-+$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
-+if test "x$ac_cv_cc_gnu89_inline" = xyes; then :
-+  WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5
-+$as_echo_n "checking for --as-needed linker option... " >&6; }
-+if ${ac_cv_as_needed+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-+			    -fPIC -shared -o conftest.so conftest.c
-+			    -Wl,--as-needed 1>&5'
-+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }
-+then
-+  ac_cv_as_needed=yes
-+else
-+  ac_cv_as_needed=no
-+fi
-+rm -f conftest*
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5
-+$as_echo "$ac_cv_as_needed" >&6; }
-+if test "x$ac_cv_as_needed" = xyes; then :
-+  LD_AS_NEEDED=-Wl,--as-needed
-+else
-+  LD_AS_NEEDED=
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5
-+$as_echo_n "checking for __builtin_popcount... " >&6; }
-+if ${ac_cv_popcount+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+exit (__builtin_popcount (127));
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_popcount=yes
-+else
-+  ac_cv_popcount=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5
-+$as_echo "$ac_cv_popcount" >&6; }
-+if test "x$ac_cv_popcount" = xyes; then :
-+
-+$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h
-+
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
- $as_echo_n "checking for __thread support... " >&6; }
- if ${ac_cv_tls+:} false; then :
-@@ -3956,7 +4086,13 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
- $as_echo "$ac_cv_tls" >&6; }
- if test "x$ac_cv_tls" != xyes; then :
--  as_fn_error $? "__thread support required" "$LINENO" 5
-+  if test "$use_locks" = yes; then :
-+  as_fn_error $? "--enable-thread-safety requires __thread support" "$LINENO" 5
-+else
-+
-+$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h
-+
-+fi
- fi
- 
- # Check whether --enable-largefile was given.
-@@ -4305,6 +4441,22 @@ else
- fi
- 
- 
-+# Check whether --enable-werror was given.
-+if test "${enable_werror+set}" = set; then :
-+  enableval=$enable_werror; enable_werror=$enableval
-+else
-+  enable_werror=yes
-+fi
-+
-+ if test "$enable_werror" = yes; then
-+  BUILD_WERROR_TRUE=
-+  BUILD_WERROR_FALSE='#'
-+else
-+  BUILD_WERROR_TRUE='#'
-+  BUILD_WERROR_FALSE=
-+fi
-+
-+
- # Check whether --enable-tests-rpath was given.
- if test "${enable_tests_rpath+set}" = set; then :
-   enableval=$enable_tests_rpath; tests_use_rpath=$enableval
-@@ -5025,7 +5177,7 @@ case "$eu_version" in
- esac
- 
- # Round up to the next release API (x.y) version.
--eu_version=$(( (eu_version + 999) / 1000 ))
-+eu_version=`expr \( $eu_version + 999 \) / 1000`
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -5188,6 +5340,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
-   as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${BUILD_WERROR_TRUE}" && test -z "${BUILD_WERROR_FALSE}"; then
-+  as_fn_error $? "conditional \"BUILD_WERROR\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then
-   as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
---- elfutils/configure.ac
-+++ elfutils/configure.ac
-@@ -90,6 +90,54 @@ CFLAGS="$old_CFLAGS"])
- AS_IF([test "x$ac_cv_c99" != xyes],
-       AC_MSG_ERROR([gcc with C99 support required]))
- 
-+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
-+old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Wextra"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([void foo (void) { }])],
-+		  ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)
-+CFLAGS="$old_CFLAGS"])
-+AC_SUBST(WEXTRA)
-+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
-+
-+AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl
-+old_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+void foo (void)
-+{
-+  inline void bar (void) {}
-+  bar ();
-+}
-+extern inline void baz (void) {}
-+])], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)
-+CFLAGS="$old_CFLAGS"])
-+AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],
-+      [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])
-+
-+AC_CACHE_CHECK([for --as-needed linker option],
-+	       ac_cv_as_needed, [dnl
-+cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-+			    -fPIC -shared -o conftest.so conftest.c
-+			    -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
-+then
-+  ac_cv_as_needed=yes
-+else
-+  ac_cv_as_needed=no
-+fi
-+rm -f conftest*])
-+AS_IF([test "x$ac_cv_as_needed" = xyes],
-+      [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
-+AC_SUBST(LD_AS_NEEDED)
-+
-+AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],
-+	       ac_cv_popcount=yes, ac_cv_popcount=no)])
-+AS_IF([test "x$ac_cv_popcount" = xyes],
-+      [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])
-+
- AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
- # Use the same flags that we use for our DSOs, so the test is representative.
- # Some old compiler/linker/libc combinations fail some ways and not others.
-@@ -105,7 +153,10 @@ static __thread int a; int foo (int b) {
- CFLAGS="$save_CFLAGS"
- LDFLAGS="$save_LDFLAGS"])
- AS_IF([test "x$ac_cv_tls" != xyes],
--      AC_MSG_ERROR([__thread support required]))
-+      [AS_IF([test "$use_locks" = yes],
-+	     [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],
-+	     [AC_DEFINE([__thread], [/* empty: no multi-thread support */],
-+			[Stubbed out if missing compiler support.])])])
- 
- dnl This test must come as early as possible after the compiler configuration
- dnl tests, because the choice of the file model can (in principle) affect
-@@ -193,6 +244,11 @@ AM_CONDITIONAL(GCOV, test "$use_gcov" =
- AM_CONDITIONAL(BUILD_STATIC, [dnl
- test "$use_mudflap" = yes -o "$use_gprof" = yes -o "$use_gcov" = yes])
- 
-+AC_ARG_ENABLE([werror],
-+AS_HELP_STRING([--disable-werror],[do not build with -Werror]),
-+	       [enable_werror=$enableval], [enable_werror=yes])
-+AM_CONDITIONAL(BUILD_WERROR, test "$enable_werror" = yes)
-+
- AC_ARG_ENABLE([tests-rpath],
- AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),
- 	       [tests_use_rpath=$enableval], [tests_use_rpath=no])
-@@ -304,6 +360,6 @@ case "$eu_version" in
- esac
- 
- # Round up to the next release API (x.y) version.
--eu_version=$(( (eu_version + 999) / 1000 ))
-+eu_version=`expr \( $eu_version + 999 \) / 1000`
- 
- AC_OUTPUT
---- elfutils/lib/ChangeLog
-+++ elfutils/lib/ChangeLog
-@@ -35,6 +35,9 @@
- 
- 2009-01-23  Roland McGrath  <roland@redhat.com>
- 
-+	* eu-config.h [! HAVE_BUILTIN_POPCOUNT]
-+	(__builtin_popcount): New inline function.
-+
- 	* eu-config.h: Add multiple inclusion protection.
- 
- 2009-01-17  Ulrich Drepper  <drepper@redhat.com>
-@@ -91,6 +94,11 @@
- 	* Makefile.am (libeu_a_SOURCES): Add it.
- 	* system.h: Declare crc32_file.
- 
-+2005-02-07  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-04-30  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* Makefile.am: Use -ffunction-sections for xmalloc.c.
---- elfutils/lib/eu-config.h
-+++ elfutils/lib/eu-config.h
-@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr
- /* This macro is used by the tests conditionalize for standalone building.  */
- #define ELFUTILS_HEADER(name) <lib##name.h>
- 
-+#ifndef HAVE_BUILTIN_POPCOUNT
-+# define __builtin_popcount hakmem_popcount
-+static inline unsigned int __attribute__ ((unused))
-+hakmem_popcount (unsigned int x)
-+{
-+  /* HAKMEM 169 */
-+  unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);
-+  return ((n + (n >> 3)) & 030707070707) % 63;
-+}
-+#endif	/* HAVE_BUILTIN_POPCOUNT */
-+
- 
- #ifdef SHARED
- # define OLD_VERSION(name, version) \
---- elfutils/lib/Makefile.in
-+++ elfutils/lib/Makefile.in
-@@ -37,7 +37,8 @@ build_triplet = @build@
- host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
- subdir = lib
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -100,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -129,6 +131,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -190,10 +193,9 @@ zip_LIBS = @zip_LIBS@
- INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- 	-I$(srcdir)/../libelf
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1) -fpic
-+	$(am__append_1) $(am__append_2) -fpic
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
---- elfutils/libasm/ChangeLog
-+++ elfutils/libasm/ChangeLog
-@@ -71,6 +71,11 @@
- 	* asm_error.c: Add new error ASM_E_IOERROR.
- 	* libasmP.h: Add ASM_E_IOERROR definition.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-02-15  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
---- elfutils/libasm/Makefile.in
-+++ elfutils/libasm/Makefile.in
-@@ -39,10 +39,11 @@ host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/eu.am ChangeLog
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
- @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
- @MUDFLAP_TRUE@am_libasm_pic_a_OBJECTS =
--@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_2 = -lpthread
-+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread
- subdir = libasm
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -153,6 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -182,6 +184,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -244,10 +247,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
- 	-I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
- 	-I$(top_srcdir)/libdw
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1)
-+	$(am__append_1) $(am__append_2)
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -276,7 +278,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
- 
- @MUDFLAP_FALSE@libasm_pic_a_SOURCES = 
- @MUDFLAP_FALSE@am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)
--@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_2)
-+@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_3)
- @MUDFLAP_FALSE@libasm_so_SOURCES = 
- noinst_HEADERS = libasmP.h symbolhash.h
- EXTRA_DIST = libasm.map
---- elfutils/libcpu/ChangeLog
-+++ elfutils/libcpu/ChangeLog
-@@ -38,6 +38,9 @@
- 
- 2009-01-23  Roland McGrath  <roland@redhat.com>
- 
-+	* i386_disasm.c (i386_disasm): Add abort after assert-constant for old
-+	compilers that don't realize it's noreturn.
-+
- 	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
- 	substitution that can produce leading whitespace.
- 
-@@ -367,6 +370,11 @@
- 	* defs/i386.doc: New file.
- 	* defs/x86_64: New file.
- 
-+2005-04-04  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it instead of -Wextra.
-+
- 2005-02-15  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
---- elfutils/libcpu/i386_disasm.c
-+++ elfutils/libcpu/i386_disasm.c
-@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con
- 
- 			default:
- 			  assert (! "INVALID not handled");
-+			  abort ();
- 			}
- 		    }
- 		  else
---- elfutils/libcpu/Makefile.in
-+++ elfutils/libcpu/Makefile.in
-@@ -39,7 +39,8 @@ host_triplet = @host@
- DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \
- 	i386_lex.c i386_parse.c
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
- @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)
- subdir = libcpu
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -117,6 +118,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
-@@ -146,6 +148,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -208,10 +211,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
- 	-I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- 	-I$(srcdir)/../libdw -I$(srcdir)/../libasm
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1) -fpic -fdollars-in-identifiers
-+	$(am__append_1) $(am__append_2) -fpic -fdollars-in-identifiers
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
---- elfutils/libdw/ChangeLog
-+++ elfutils/libdw/ChangeLog
-@@ -82,6 +82,10 @@
- 
- 	* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
- 
-+2011-07-20  Mark Wielaard  <mjw@redhat.com>
-+
-+	* dwarf_begin_elf.c: Add fallback for be64toh if not defined.
-+
- 2011-07-14  Mark Wielaard  <mjw@redhat.com>
- 
- 	* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
-@@ -441,6 +445,10 @@
- 
- 	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
- 
-+2009-08-17  Roland McGrath  <roland@redhat.com>
-+
-+	* libdw.h: Disable extern inlines for GCC 4.2.
-+
- 2009-08-10  Roland McGrath  <roland@redhat.com>
- 
- 	* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1209,6 +1217,11 @@
- 
- 2005-05-31  Roland McGrath  <roland@redhat.com>
- 
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
- 	* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
- 	formref offset.
- 
---- elfutils/libdw/dwarf_begin_elf.c
-+++ elfutils/libdw/dwarf_begin_elf.c
-@@ -48,6 +48,14 @@
- #if USE_ZLIB
- # include <endian.h>
- # define crc32		loser_crc32
-+# ifndef be64toh
-+#  include <byteswap.h>
-+#  if __BYTE_ORDER == __LITTLE_ENDIAN
-+#   define be64toh(x) bswap_64 (x)
-+#  else
-+#   define be64toh(x) (x)
-+#  endif
-+# endif
- # include <zlib.h>
- # undef crc32
- #endif
---- elfutils/libdw/libdw.h
-+++ elfutils/libdw/libdw.h
-@@ -831,7 +831,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
- 
- 
- /* Inline optimizations.  */
--#ifdef __OPTIMIZE__
-+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
- /* Return attribute code of given attribute.  */
- __libdw_extern_inline unsigned int
- dwarf_whatattr (Dwarf_Attribute *attr)
---- elfutils/libdw/Makefile.in
-+++ elfutils/libdw/Makefile.in
-@@ -39,8 +39,9 @@ host_triplet = @host@
- DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
- 	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
--@BUILD_STATIC_TRUE@am__append_2 = -fpic
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
-+@BUILD_STATIC_TRUE@am__append_3 = -fpic
- @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
- @MUDFLAP_TRUE@am_libdw_pic_a_OBJECTS =
- subdir = libdw
-@@ -198,6 +199,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -227,6 +229,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -288,10 +291,9 @@ zip_LIBS = @zip_LIBS@
- INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
- 	-I$(srcdir)/../libelf
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1) $(am__append_2)
-+	$(am__append_1) $(am__append_2) $(am__append_3)
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
---- elfutils/libdwfl/ChangeLog
-+++ elfutils/libdwfl/ChangeLog
-@@ -1420,6 +1420,11 @@
- 
- 2005-07-21  Roland McGrath  <roland@redhat.com>
- 
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
-+2005-07-21  Roland McGrath  <roland@redhat.com>
-+
- 	* Makefile.am (noinst_HEADERS): Add loc2c.c.
- 
- 	* test2.c (main): Check sscanf result to quiet warning.
---- elfutils/libdwfl/Makefile.in
-+++ elfutils/libdwfl/Makefile.in
-@@ -38,11 +38,12 @@ host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/eu.am ChangeLog
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
--@MUDFLAP_FALSE@am__append_2 = libdwfl_pic.a
--@ZLIB_TRUE@am__append_3 = gzip.c
--@BZLIB_TRUE@am__append_4 = bzip2.c
--@LZMA_TRUE@am__append_5 = lzma.c
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
-+@MUDFLAP_FALSE@am__append_3 = libdwfl_pic.a
-+@ZLIB_TRUE@am__append_4 = gzip.c
-+@BZLIB_TRUE@am__append_5 = bzip2.c
-+@LZMA_TRUE@am__append_6 = lzma.c
- @MUDFLAP_TRUE@am_libdwfl_pic_a_OBJECTS =
- subdir = libdwfl
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -188,6 +189,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -217,6 +219,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -279,10 +282,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
- 	-I$(srcdir)/../libelf -I$(srcdir)/../libebl \
- 	-I$(srcdir)/../libdw
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1)
-+	$(am__append_1) $(am__append_2)
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -290,7 +292,7 @@ COMPILE.os = $(filter-out -fprofile-arcs
- 
- CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)
- textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
--noinst_LIBRARIES = libdwfl.a $(am__append_2)
-+noinst_LIBRARIES = libdwfl.a $(am__append_3)
- pkginclude_HEADERS = libdwfl.h
- libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c \
- 	dwfl_version.c dwfl_module.c dwfl_report_elf.c relocate.c \
-@@ -311,8 +313,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
- 	dwfl_module_getsym.c dwfl_module_addrname.c \
- 	dwfl_module_addrsym.c dwfl_module_return_value_location.c \
- 	dwfl_module_register_names.c dwfl_segment_report_module.c \
--	link_map.c core-file.c open.c image-header.c $(am__append_3) \
--	$(am__append_4) $(am__append_5)
-+	link_map.c core-file.c open.c image-header.c $(am__append_4) \
-+	$(am__append_5) $(am__append_6)
- @MUDFLAP_FALSE@libdwfl = $(libdw)
- @MUDFLAP_TRUE@libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu)
- @MUDFLAP_FALSE@libdw = ../libdw/libdw.so
---- elfutils/libebl/ChangeLog
-+++ elfutils/libebl/ChangeLog
-@@ -658,6 +658,11 @@
- 	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
- 	tracking works right.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-21  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* libebl_x86_64.map: Add x86_64_core_note.
---- elfutils/libebl/Makefile.in
-+++ elfutils/libebl/Makefile.in
-@@ -38,7 +38,8 @@ host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/eu.am ChangeLog
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
- subdir = libebl
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -150,6 +151,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -179,6 +181,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -241,10 +244,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
- 	-I$(srcdir)/../libelf -I$(srcdir)/../libdw \
- 	-I$(srcdir)/../libasm
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1) -fpic
-+	$(am__append_1) $(am__append_2) -fpic
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
---- elfutils/libelf/ChangeLog
-+++ elfutils/libelf/ChangeLog
-@@ -34,6 +34,11 @@
- 
- 	* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
- 
-+2011-03-10  Roland McGrath  <roland@redhat.com>
-+
-+	* gnuhash_xlate.h (elf_cvt_gnuhash): Avoid post-increment in bswap_32
-+	argument, since some implementations are buggy macros.
-+
- 2011-02-26  Mark Wielaard  <mjw@redhat.com>
- 
- 	* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
-@@ -711,6 +716,11 @@
- 
- 	* elf.h: Update from glibc.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-08  Roland McGrath  <roland@redhat.com>
- 
- 	* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
---- elfutils/libelf/common.h
-+++ elfutils/libelf/common.h
-@@ -139,7 +139,7 @@ libelf_release_all (Elf *elf)
-   (Var) = (sizeof (Var) == 1						      \
- 	   ? (unsigned char) (Var)					      \
- 	   : (sizeof (Var) == 2						      \
--	      ? bswap_16 (Var)						      \
-+	      ? (unsigned short int) bswap_16 (Var)			      \
- 	      : (sizeof (Var) == 4					      \
- 		 ? bswap_32 (Var)					      \
- 		 : bswap_64 (Var))))
-@@ -148,7 +148,7 @@ libelf_release_all (Elf *elf)
-   (Dst) = (sizeof (Var) == 1						      \
- 	   ? (unsigned char) (Var)					      \
- 	   : (sizeof (Var) == 2						      \
--	      ? bswap_16 (Var)						      \
-+	      ? (unsigned short int) bswap_16 (Var)			      \
- 	      : (sizeof (Var) == 4					      \
- 		 ? bswap_32 (Var)					      \
- 		 : bswap_64 (Var))))
---- elfutils/libelf/gnuhash_xlate.h
-+++ elfutils/libelf/gnuhash_xlate.h
-@@ -1,5 +1,5 @@
- /* Conversion functions for versioning information.
--   Copyright (C) 2006, 2007 Red Hat, Inc.
-+   Copyright (C) 2006-2011 Red Hat, Inc.
-    This file is part of elfutils.
-    Written by Ulrich Drepper <drepper@redhat.com>, 2006.
- 
-@@ -68,7 +68,9 @@ elf_cvt_gnuhash (void *dest, const void
-   dest32 = (Elf32_Word *) &dest64[bitmask_words];
-   while (len >= 4)
-     {
--      *dest32++ = bswap_32 (*src32++);
-+      *dest32 = bswap_32 (*src32);
-+      ++dest32;
-+      ++src32;
-       len -= 4;
-     }
- }
---- elfutils/libelf/Makefile.in
-+++ elfutils/libelf/Makefile.in
-@@ -39,11 +39,12 @@ host_triplet = @host@
- DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
- 	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
--@BUILD_STATIC_TRUE@am__append_2 = -fpic
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
-+@BUILD_STATIC_TRUE@am__append_3 = -fpic
- @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
- @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =
--@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread
-+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_4 = -lpthread
- subdir = libelf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -195,6 +196,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -224,6 +226,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = 1
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -284,10 +287,9 @@ top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
- INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1) $(am__append_2)
-+	$(am__append_1) $(am__append_2) $(am__append_3)
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -352,7 +354,7 @@ libelf_a_SOURCES = elf_version.c elf_has
- 
- @MUDFLAP_FALSE@libelf_pic_a_SOURCES = 
- @MUDFLAP_FALSE@am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
--@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_3)
-+@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_4)
- @MUDFLAP_FALSE@libelf_so_SOURCES = 
- noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \
- 		 version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h
---- elfutils/m4/Makefile.in
-+++ elfutils/m4/Makefile.in
-@@ -75,6 +75,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -104,6 +105,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
---- elfutils/Makefile.in
-+++ elfutils/Makefile.in
-@@ -165,6 +165,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -194,6 +195,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
---- elfutils/src/addr2line.c
-+++ elfutils/src/addr2line.c
-@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
-       bool parsed = false;
-       int i, j;
-       char *name = NULL;
--      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
-+      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
- 	  && string[i] == '\0')
- 	parsed = adjust_to_section (name, &addr, dwfl);
--      switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
-+      switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
- 	{
- 	default:
- 	  break;
---- elfutils/src/ChangeLog
-+++ elfutils/src/ChangeLog
-@@ -606,8 +606,16 @@
- 	* readelf.c (attr_callback): Use print_block only when we don't use
- 	print_ops.
- 
-+2009-08-17  Roland McGrath  <roland@redhat.com>
-+
-+	* ld.h: Disable extern inlines for GCC 4.2.
-+
- 2009-08-14  Roland McGrath  <roland@redhat.com>
- 
-+	* strings.c (read_block): Conditionalize posix_fadvise use
-+	on [POSIX_FADV_SEQUENTIAL].
-+	From Petr Salinger <Petr.Salinger@seznam.cz>.
-+
- 	* ar.c (do_oper_extract): Use pathconf instead of statfs.
- 
- 2009-08-01  Ulrich Drepper  <drepper@redhat.com>
-@@ -771,6 +779,8 @@
- 	* readelf.c (print_debug_frame_section): Use t instead of j formats
- 	for ptrdiff_t OFFSET.
- 
-+	* addr2line.c (handle_address): Use %a instead of %m for compatibility.
-+
- 2009-01-21  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -954,6 +964,11 @@
- 	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
- 	is valid in RELRO.
- 
-+2008-03-01  Roland McGrath  <roland@redhat.com>
-+
-+	* readelf.c (dump_archive_index): Tweak portability hack
-+	to match [__GNUC__ < 4] too.
-+
- 2008-02-29  Roland McGrath  <roland@redhat.com>
- 
- 	* readelf.c (print_attributes): Add a cast.
-@@ -1205,6 +1220,8 @@
- 
- 	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
- 
-+	* Makefile.am (readelf_no_Werror): New variable.
-+
- 2007-10-15  Roland McGrath  <roland@redhat.com>
- 
- 	* make-debug-archive.in: New file.
-@@ -1644,6 +1661,10 @@
- 	* elflint.c (valid_e_machine): Add EM_ALPHA.
- 	Reported by Christian Aichinger <Greek0@gmx.net>.
- 
-+	* strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to
-+	MADV_SEQUENTIAL if undefined.  	Don't call posix_madvise
-+	if neither is defined.
-+
- 2006-08-08  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1720,6 +1741,10 @@
- 	* Makefile.am: Add hacks to create dependency files for non-generic
- 	linker.
- 
-+2006-04-05  Roland McGrath  <roland@redhat.com>
-+
-+	* strings.c (MAP_POPULATE): Define to 0 if undefined.
-+
- 2006-06-12  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -2068,6 +2093,11 @@
- 	* readelf.c (print_debug_loc_section): Fix indentation for larger
- 	address size.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-30  Roland McGrath  <roland@redhat.com>
- 
- 	* readelf.c (print_debug_line_section): Print section offset of each
---- elfutils/src/findtextrel.c
-+++ elfutils/src/findtextrel.c
-@@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void *
- 
- 
- static void
--check_rel (size_t nsegments, struct segments segments[nsegments],
-+check_rel (size_t nsegments, struct segments segments[
-+#if __GNUC__ >= 4
-+						      nsegments
-+#endif
-+	   ],
- 	   GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
- 	   const char *fname, bool more_than_one, void **knownsrcs)
- {
---- elfutils/src/ld.h
-+++ elfutils/src/ld.h
-@@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void);
- 
- /* Checked whether the symbol is undefined and referenced from a DSO.  */
- extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
-+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)
- #ifdef __GNUC_STDC_INLINE__
- __attribute__ ((__gnu_inline__))
- #endif
-@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scnin
- 
-   return sym->defined && sym->in_dso;
- }
-+#endif	/* Optimizing and not GCC 4.2.  */
- 
- #endif	/* ld.h */
---- elfutils/src/Makefile.am
-+++ elfutils/src/Makefile.am
-@@ -95,6 +95,9 @@ addr2line_no_Wformat = yes
- # XXX While the file is not finished, don't warn about this
- ldgeneric_no_Wunused = yes
- 
-+# Buggy old compilers.
-+readelf_no_Werror = yes
-+
- readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
- 	   $(demanglelib)
---- elfutils/src/Makefile.in
-+++ elfutils/src/Makefile.in
-@@ -40,7 +40,8 @@ host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \
- 	ldlex.c ldscript.c
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
- bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \
- 	strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \
- 	findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \
-@@ -49,9 +50,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE
- @NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
- # We never build this library but we need to get the dependency files
- # of all the linker backends that might be used in a non-generic linker.
--@NEVER_TRUE@am__append_2 = libdummy.a
-+@NEVER_TRUE@am__append_3 = libdummy.a
- # -ldl is always needed for libebl.
--@NATIVE_LD_TRUE@am__append_3 = libld_elf.a
-+@NATIVE_LD_TRUE@am__append_4 = libld_elf.a
- @NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS =
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -115,7 +116,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$
- 	versionhash.$(OBJEXT)
- ld_OBJECTS = $(am_ld_OBJECTS)
- ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \
--	$(am__append_3)
-+	$(am__append_4)
- ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \
- 	$@
- am_libld_elf_i386_so_OBJECTS =
-@@ -235,6 +236,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -264,6 +266,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -327,10 +330,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
- 	-I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
- 	-I$(srcdir)/../libasm
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1)
-+	$(am__append_1) $(am__append_2)
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -346,8 +348,8 @@ AM_LFLAGS = -Pld -olex.yy.c
- native_ld = @native_ld@
- ld_dsos = libld_elf_i386_pic.a
- @NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \
--@NATIVE_LD_FALSE@	$(am__append_2)
--@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_2)
-+@NATIVE_LD_FALSE@	$(am__append_3)
-+@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_3)
- @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)
- @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c
- ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
-@@ -376,6 +378,9 @@ strings_no_Wformat = yes
- addr2line_no_Wformat = yes
- # XXX While the file is not finished, don't warn about this
- ldgeneric_no_Wunused = yes
-+
-+# Buggy old compilers.
-+readelf_no_Werror = yes
- readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
- 	   $(demanglelib)
-@@ -383,7 +388,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)
- size_LDADD = $(libelf) $(libeu) $(libmudflap)
- strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
- ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
--	$(am__append_3)
-+	$(am__append_4)
- ld_LDFLAGS = -rdynamic
- elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
- findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
---- elfutils/src/readelf.c
-+++ elfutils/src/readelf.c
-@@ -3949,10 +3949,11 @@ struct listptr
- #define listptr_offset_size(p)	((p)->dwarf64 ? 8 : 4)
- #define listptr_address_size(p)	((p)->addr64 ? 8 : 4)
- 
-+static const char *listptr_name;
- static int
--compare_listptr (const void *a, const void *b, void *arg)
-+compare_listptr (const void *a, const void *b)
- {
--  const char *name = arg;
-+  const char *const name = listptr_name;
-   struct listptr *p1 = (void *) a;
-   struct listptr *p2 = (void *) b;
- 
-@@ -4033,8 +4034,11 @@ static void
- sort_listptr (struct listptr_table *table, const char *name)
- {
-   if (table->n > 0)
--    qsort_r (table->table, table->n, sizeof table->table[0],
--	     &compare_listptr, (void *) name);
-+    {
-+      listptr_name = name;
-+      qsort (table->table, table->n, sizeof table->table[0],
-+	     &compare_listptr);
-+    }
- }
- 
- static bool
-@@ -8442,7 +8446,7 @@ dump_archive_index (Elf *elf, const char
- 	  if (unlikely (elf_rand (elf, as_off) == 0)
- 	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
- 			   == NULL))
--#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7)
-+#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4
- 	    while (1)
- #endif
- 	      error (EXIT_FAILURE, 0,
---- elfutils/src/strings.c
-+++ elfutils/src/strings.c
-@@ -43,6 +43,10 @@
- 
- #include <system.h>
- 
-+#ifndef MAP_POPULATE
-+# define MAP_POPULATE 0
-+#endif
-+
- 
- /* Prototypes of local functions.  */
- static int read_fd (int fd, const char *fname, off64_t fdlen);
-@@ -483,8 +487,13 @@ map_file (int fd, off64_t start_off, off
- 		    fd, start_off);
-       if (mem != MAP_FAILED)
- 	{
-+#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL
-+# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL
-+#endif
-+#ifdef POSIX_MADV_SEQUENTIAL
- 	  /* We will go through the mapping sequentially.  */
- 	  (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);
-+#endif
- 	  break;
- 	}
-       if (errno != EINVAL && errno != ENOMEM)
-@@ -576,9 +585,11 @@ read_block (int fd, const char *fname, o
-       elfmap_off = from & ~(ps - 1);
-       elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
- 
-+#ifdef POSIX_FADV_SEQUENTIAL
-       if (unlikely (elfmap == MAP_FAILED))
- 	/* Let the kernel know we are going to read everything in sequence.  */
- 	(void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
-+#endif
-     }
- 
-   if (unlikely (elfmap == MAP_FAILED))
---- elfutils/src/strip.c
-+++ elfutils/src/strip.c
-@@ -45,6 +45,12 @@
- #include <libebl.h>
- #include <system.h>
- 
-+#ifdef HAVE_FUTIMES
-+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)
-+#else
-+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)
-+#endif
-+
- typedef uint8_t GElf_Byte;
- 
- /* Name and version of program.  */
-@@ -318,8 +324,18 @@ process_file (const char *fname)
- 
-       /* If we have to preserve the timestamp, we need it in the
- 	 format utimes() understands.  */
-+#ifdef HAVE_STRUCT_STAT_ST_ATIM
-       TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
-+#else
-+      tv[0].tv_sec = pre_st.st_atime;
-+      tv[0].tv_usec = 0;
-+#endif
-+#ifdef HAVE_STRUCT_STAT_ST_MTIM
-       TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
-+#else
-+      tv[1].tv_sec = pre_st.st_atime;
-+      tv[1].tv_usec = 0;
-+#endif
-     }
- 
-   /* Open the file.  */
-@@ -2055,7 +2071,7 @@ while computing checksum for debug infor
-   /* If requested, preserve the timestamp.  */
-   if (tvp != NULL)
-     {
--      if (futimes (fd, tvp) != 0)
-+      if (FUTIMES (fd, output_fname, tvp) != 0)
- 	{
- 	  error (0, errno, gettext ("\
- cannot set access and modification date of '%s'"),
-@@ -2112,7 +2128,7 @@ handle_ar (int fd, Elf *elf, const char
- 
-   if (tvp != NULL)
-     {
--      if (unlikely (futimes (fd, tvp) != 0))
-+      if (unlikely (FUTIMES (fd, fname, tvp) != 0))
- 	{
- 	  error (0, errno, gettext ("\
- cannot set access and modification date of '%s'"), fname);
---- elfutils/tests/ChangeLog
-+++ elfutils/tests/ChangeLog
-@@ -439,6 +439,8 @@
- 
- 2008-01-21  Roland McGrath  <roland@redhat.com>
- 
-+	* line2addr.c (main): Revert last change.
-+
- 	* testfile45.S.bz2: Add tests for cltq, cqto.
- 	* testfile45.expect.bz2: Adjust.
- 
-@@ -1147,6 +1149,11 @@
- 	* Makefile.am (TESTS): Add run-elflint-test.sh.
- 	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
- 
-+2005-05-31  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 2005-05-24  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* get-files.c (main): Use correct format specifier.
---- elfutils/tests/line2addr.c
-+++ elfutils/tests/line2addr.c
-@@ -124,7 +124,7 @@ main (int argc, char *argv[])
-     {
-       struct args a = { .arg = argv[cnt] };
- 
--      switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))
-+      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
- 	{
- 	default:
- 	case 0:
---- elfutils/tests/Makefile.in
-+++ elfutils/tests/Makefile.in
-@@ -35,14 +35,15 @@ build_triplet = @build@
- host_triplet = @host@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/eu.am ChangeLog
--@MUDFLAP_TRUE@am__append_1 = -fmudflap
--@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
-+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
-+@MUDFLAP_TRUE@am__append_2 = -fmudflap
-+@STANDALONE_FALSE@am__append_3 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
- @STANDALONE_FALSE@	    -I$(top_srcdir)/libdwfl \
- @STANDALONE_FALSE@	    -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
- @STANDALONE_FALSE@	    -I$(top_srcdir)/lib -I..
- 
--@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf
--@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILD_RPATH)
-+@STANDALONE_FALSE@am__append_4 = -Wl,-rpath-link,../libasm:../libdw:../libelf
-+@TESTS_RPATH_TRUE@am__append_5 = -Wl,-rpath,$(BUILD_RPATH)
- check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \
- 	newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \
- 	sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \
-@@ -92,12 +93,12 @@ TESTS = run-arextract.sh run-arsymtest.s
- 	run-readelf-gdb_index.sh run-unstrip-n.sh run-low_high_pc.sh \
- 	run-macro-test.sh run-elf_cntl_gelf_getshdr.sh \
- 	run-test-archive64.sh $(am__EXEEXT_1) $(am__EXEEXT_3) \
--	$(am__append_9)
--@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test
-+	$(am__append_10)
- @STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
--@HAVE_LIBASM_TRUE@am__append_7 = $(asm_TESTS)
-+@STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test
- @HAVE_LIBASM_TRUE@am__append_8 = $(asm_TESTS)
--@ENABLE_DWZ_TRUE@am__append_9 = run-readelf-dwz-multi.sh
-+@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)
-+@ENABLE_DWZ_TRUE@am__append_10 = run-readelf-dwz-multi.sh
- subdir = tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -412,6 +413,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -441,6 +443,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_015 = @XGETTEXT_015@
- XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -499,12 +502,11 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- zip_LIBS = @zip_LIBS@
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_3)
- AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
--	$($(*F)_no_Werror),,-Werror) $(if \
--	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
-+	$($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \
- 	$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
--	$(am__append_1)
-+	$(am__append_1) $(am__append_2)
- @MUDFLAP_FALSE@libmudflap = 
- @MUDFLAP_TRUE@libmudflap = -lmudflap
- COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -514,7 +516,7 @@ CLEANFILES = *.gcno *.gcda
- textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- @MUDFLAP_FALSE@BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
- @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends
--AM_LDFLAGS = $(am__append_3) $(am__append_4)
-+AM_LDFLAGS = $(am__append_4) $(am__append_5)
- @TESTS_RPATH_FALSE@tests_rpath = no
- @TESTS_RPATH_TRUE@tests_rpath = yes
- asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
 

--- a/libs/elfutils/patches/002-no_tests.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -31,7 +31,7 @@ pkginclude_HEADERS = version.h
- 
- # Add doc back when we have some real content.
- SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
--	  src po tests
-+	  src po
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -249,7 +249,7 @@ pkginclude_HEADERS = version.h
- 
- # Add doc back when we have some real content.
- SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
--	  src po tests
-+	  src po
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION
- 
 

--- a/libs/elfutils/patches/004-memcpy_def.patch
+++ /dev/null
@@ -1,15 +1,1 @@
---- a/libelf/libelf.h
-+++ b/libelf/libelf.h
-@@ -34,6 +34,11 @@
- /* Get the ELF types.  */
- #include <elf.h>
- 
-+#ifndef _LIBC
-+#ifndef __mempcpy
-+#define __mempcpy mempcpy
-+#endif
-+#endif
- 
- /* Known translation types.  */
- typedef enum
 

--- a/libs/elfutils/patches/005-only_libdw_libelf.patch
+++ /dev/null
@@ -1,25 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -23,8 +23,7 @@ ACLOCAL_AMFLAGS = -I m4
- pkginclude_HEADERS = version.h
- 
- # Add doc back when we have some real content.
--SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
--	  src po
-+SUBDIRS = config m4 lib libelf libebl libdwfl libdw
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -258,8 +258,7 @@ ACLOCAL_AMFLAGS = -I m4
- pkginclude_HEADERS = version.h
- 
- # Add doc back when we have some real content.
--SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
--	  src po
-+SUBDIRS = config m4 lib libelf libebl libdwfl libdw
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
- 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
 

--- a/libs/elfutils/patches/006-libdw_LIBS.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/libdw/Makefile.am
-+++ b/libdw/Makefile.am
-@@ -111,7 +111,7 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.
- 		-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
- 		-Wl,--version-script,$<,--no-undefined \
- 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
--		-ldl $(zip_LIBS)
-+		-ldl $(zip_LIBS) $(LIBS)
- 	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- 	ln -fs $@ $@.$(VERSION)
- 
---- a/libdw/Makefile.in
-+++ b/libdw/Makefile.in
-@@ -845,7 +845,7 @@ uninstall-am: uninstall-includeHEADERS u
- @MUDFLAP_FALSE@		-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
- @MUDFLAP_FALSE@		-Wl,--version-script,$<,--no-undefined \
- @MUDFLAP_FALSE@		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
--@MUDFLAP_FALSE@		-ldl $(zip_LIBS)
-+@MUDFLAP_FALSE@		-ldl $(zip_LIBS) $(LIBS)
- @MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
- 
 

--- a/libs/elfutils/patches/007-no_textrel_checks.patch
+++ /dev/null
@@ -1,61 +1,1 @@
---- a/libasm/Makefile.am
-+++ b/libasm/Makefile.am
-@@ -69,7 +69,6 @@ libasm.so: libasm_pic.a libasm.map
- 		-Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \
- 		-Wl,--soname,$@.$(VERSION) \
- 		../libebl/libebl.a ../libelf/libelf.so  $(libasm_so_LDLIBS)
--	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- 	ln -fs $@ $@.$(VERSION)
- 
- install: install-am libasm.so
---- a/libasm/Makefile.in
-+++ b/libasm/Makefile.in
-@@ -656,7 +656,6 @@ uninstall-am: uninstall-libLIBRARIES uni
- @MUDFLAP_FALSE@		-Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \
- @MUDFLAP_FALSE@		-Wl,--soname,$@.$(VERSION) \
- @MUDFLAP_FALSE@		../libebl/libebl.a ../libelf/libelf.so  $(libasm_so_LDLIBS)
--@MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
- 
- @MUDFLAP_FALSE@install: install-am libasm.so
---- a/libdw/Makefile.am
-+++ b/libdw/Makefile.am
-@@ -112,7 +112,6 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.
- 		-Wl,--version-script,$<,--no-undefined \
- 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
- 		-ldl $(zip_LIBS) $(LIBS)
--	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- 	ln -fs $@ $@.$(VERSION)
- 
- install: install-am libdw.so
---- a/libdw/Makefile.in
-+++ b/libdw/Makefile.in
-@@ -846,7 +846,6 @@ uninstall-am: uninstall-includeHEADERS u
- @MUDFLAP_FALSE@		-Wl,--version-script,$<,--no-undefined \
- @MUDFLAP_FALSE@		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
- @MUDFLAP_FALSE@		-ldl $(zip_LIBS) $(LIBS)
--@MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
- 
- @MUDFLAP_FALSE@install: install-am libdw.so
---- a/libelf/Makefile.am
-+++ b/libelf/Makefile.am
-@@ -106,7 +106,6 @@ libelf.so: libelf_pic.a libelf.map
- 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
- 		-Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
- 		-Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)
--	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- 	ln -fs $@ $@.$(VERSION)
- 
- install: install-am libelf.so
---- a/libelf/Makefile.in
-+++ b/libelf/Makefile.in
-@@ -832,7 +832,6 @@ uninstall-am: uninstall-includeHEADERS u
- @MUDFLAP_FALSE@	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
- @MUDFLAP_FALSE@		-Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
- @MUDFLAP_FALSE@		-Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)
--@MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
- @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
- 
- @MUDFLAP_FALSE@install: install-am libelf.so
 

file:a/libs/jansson/Makefile (deleted)
--- a/libs/jansson/Makefile
+++ /dev/null
@@ -1,44 +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:=jansson
-PKG_VERSION:=2.2.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.digip.org/jansson/releases/
-PKG_MD5SUM:=ebf4ebc7af47de27f7b9d79ad5853176
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/jansson
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=JSON library
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/{lib,include}
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson* $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-endef
-
-define Package/jansson/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson*so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,jansson))
-

--- a/libs/jansson/patches/01-jansson-add-jason_object_deep_update.patch
+++ /dev/null
@@ -1,51 +1,1 @@
-This patch adds a function which can be used to update
-json key values on all levels, not just one, automagically
-adding new keys to objects which do not exist in old object.
 
-Signed-off-by: Roman Yeryomin <roman@advem.lv>
-
---- a/src/value.c      2011-04-21 13:15:58.000000000 +0300
-+++ b/src/value.c      2011-07-01 00:23:05.105103308 +0300
-@@ -215,6 +215,41 @@
-     return 0;
- }
-
-+int json_object_deep_update(json_t *object, json_t *other)
-+{
-+    void *iter;
-+
-+    if(!json_is_object(object) || !json_is_object(other))
-+        return -1;
-+
-+    iter = json_object_iter(other);
-+    while(iter) {
-+        const char *key;
-+        json_t *value;
-+
-+        key = json_object_iter_key(iter);
-+        value = json_object_iter_value(iter);
-+
-+        if (!json_is_object(value)) {
-+            if ( json_object_set_nocheck( object, key, value ) )
-+                return -1;
-+        } else {
-+            json_t *subobj = json_object_get(object, key);
-+            if (!subobj) {
-+                json_object_set_nocheck( object, key, value );
-+                iter = json_object_iter_next(other, iter);
-+                continue;
-+            }
-+            if (json_object_deep_update( subobj, value ) == -1)
-+                return -1;
-+        }
-+
-+        iter = json_object_iter_next(other, iter);
-+    }
-+
-+    return 0;
-+}
-+
- void *json_object_iter(json_t *json)
- {
-     json_object_t *object;
-

--- a/libs/jansson/patches/100-add-jason_object_deep_update.patch
+++ /dev/null
@@ -1,11 +1,1 @@
---- a/src/jansson.h
-+++ b/src/jansson.h
-@@ -126,6 +126,7 @@ int json_object_set_new_nocheck(json_t *
- int json_object_del(json_t *object, const char *key);
- int json_object_clear(json_t *object);
- int json_object_update(json_t *object, json_t *other);
-+int json_object_deep_update(json_t *object, json_t *other);
- void *json_object_iter(json_t *object);
- void *json_object_iter_at(json_t *object, const char *key);
- void *json_object_iter_next(json_t *object, void *iter);
 

--- a/libs/libtorrent/Makefile
+++ /dev/null
@@ -1,72 +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:=libtorrent
-PKG_VERSION:=0.13.3-git
-PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/rakshasa/libtorrent.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=680576e23e7d5f642ee51486fdf301ac0195e188
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libtorrent
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Rakshasa's BitTorrent library
-  URL:=http://libtorrent.rakshasa.no/
-  DEPENDS:=+libopenssl +libsigcxx
-endef
-
-define Package/libtorrent/description
- LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on
- high performance and good code. The library differentiates itself from other
- implementations by transfering directly from file pages to the network stack.
- On high-bandwidth connections it is able to seed at 3 times the speed of the
- official client.
-endef
-
-TARGET_LDFLAGS += $(LIBGCC_S)
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--enable-aligned \
-	--disable-debug \
-	--enable-openssl \
-	--disable-instrumentation
-
-define Build/Configure
-	( cd $(PKG_BUILD_DIR); ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/torrent $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libtorrent/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libtorrent))
-

--- a/libs/libtorrent/patches/100-fix_cross_compile.patch
+++ /dev/null
@@ -1,42 +1,1 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO
- 
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS(config.h)
--AM_PATH_CPPUNIT(1.9.6)
- 
- AC_PROG_CXX
- 
---- a/scripts/checks.m4
-+++ b/scripts/checks.m4
-@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [
- AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
-   AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
- 
--  AC_RUN_IFELSE([AC_LANG_SOURCE([
-+  AC_LINK_IFELSE([AC_LANG_SOURCE([
-       #include <fcntl.h>
-       #include <stdlib.h>
-       #include <unistd.h>
---- a/scripts/common.m4
-+++ b/scripts/common.m4
-@@ -223,7 +223,7 @@ dnl   Need to fix this so that it uses t
- AC_DEFUN([TORRENT_CHECK_EXECINFO], [
-   AC_MSG_CHECKING(for execinfo.h)
- 
--  AC_RUN_IFELSE([AC_LANG_SOURCE([
-+  AC_LINK_IFELSE([AC_LANG_SOURCE([
-       #include <execinfo.h>
-       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
-       ])],
-@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
- AC_DEFUN([TORRENT_CHECK_ALIGNED], [
-   AC_MSG_CHECKING(the byte alignment)
- 
--  AC_RUN_IFELSE([AC_LANG_SOURCE([
-+  AC_LINK_IFELSE([AC_LANG_SOURCE([
-       #include <inttypes.h>
-       int main() {
-         char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
 

--- a/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch
+++ /dev/null
@@ -1,27 +1,1 @@
---- a/src/net/socket_datagram.cc
-+++ b/src/net/socket_datagram.cc
-@@ -73,6 +73,23 @@ SocketDatagram::write_datagram(const voi
-   int r;
- 
-   if (sa != NULL) {
-+#ifdef RAK_USE_INET6
-+    if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet) {
-+      uint32_t addr32[4];
-+      sockaddr_in6 mapped_addr;
-+      memset(&mapped_addr, 0, sizeof(mapped_addr));
-+      mapped_addr.sin6_family = AF_INET6;
-+      addr32[0] = 0;
-+      addr32[1] = 0;
-+      addr32[2] = htonl(0xffff);
-+      addr32[3] = sa->sa_inet()->address_n();
-+      memcpy(mapped_addr.sin6_addr.s6_addr, addr32, sizeof(uint32_t) * 4);
-+      mapped_addr.sin6_port = sa->sa_inet()->port_n();
-+      r = ::sendto(m_fileDesc, buffer, length, 0, (sockaddr*)&mapped_addr, sizeof(mapped_addr));
-+    } else if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet6) {
-+      r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet6()->c_sockaddr(), sizeof(rak::socket_address_inet6));
-+    } else
-+#endif
-     r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet()->c_sockaddr(), sizeof(rak::socket_address_inet));
-   } else {
-     r = ::send(m_fileDesc, buffer, length, 0);
 

--- a/libs/uclibc++/patches/001-do-not-set-make.patch
+++ /dev/null
@@ -1,9 +1,1 @@
-diff -Nur uClibc++-0.2.4.orig/Makefile uClibc++-0.2.4/Makefile
---- uClibc++-0.2.4.orig/Makefile	2012-05-25 23:15:31.000000000 +0200
-+++ uClibc++-0.2.4/Makefile	2013-03-11 11:50:03.000000000 +0100
-@@ -1,4 +1,3 @@
--MAKE    = make
- SUBDIRS = bin include src
- 
- # User defines:
 

file:a/libs/xmlrpc-c/Makefile (deleted)
--- a/libs/xmlrpc-c/Makefile
+++ /dev/null
@@ -1,219 +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:=xmlrpc-c
-PKG_REV:=2233
-PKG_VERSION:=advanced_r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.code.sf.net/p/xmlrpc-c/code/advanced
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xmlrpc-c/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=XML-RPC library
-  URL:=http://xmlrpc-c.sourceforge.net/
-endef
-
-define Package/xmlrpc-c-common
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - common
-endef
-
-define Package/xmlrpc-c-internal
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - (uses internal expat variant)
-  DEPENDS:=+xmlrpc-c-common
-#  PROVIDES:=xmlrpc-c
-  VARIANT:=internal
-endef
-
-define Package/xmlrpc-c
-  $(call Package/xmlrpc-c/Default)
-  DEPENDS:=+xmlrpc-c-internal
-endef
-
-define Package/xmlrpc-c-libxml2
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - (uses libxml2)
-  DEPENDS:=+xmlrpc-c-common +libxml2 @BROKEN
-#  PROVIDES:=xmlrpc-c
-  VARIANT:=libxml2
-endef
-
-define Package/xmlrpc-c-client
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - client
-  DEPENDS:=+xmlrpc-c +libcurl
-endef
-
-define Package/xmlrpc-c-server
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - server
-  DEPENDS:=+xmlrpc-c
-endef
-
-define Package/xmlrpc-c-abyss
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - abyss
-  DEPENDS:=+xmlrpc-c-common
-endef
-
-define Package/xmlrpc-c-server-abyss
-  $(call Package/xmlrpc-c/Default)
-  TITLE+= - abyss server
-  DEPENDS:=+xmlrpc-c-server +xmlrpc-c-abyss
-endef
-
-define Package/xmlrpc-c/description/Default
-    Programming library for writing an XML-RPC server or client in C or C++.
-    XML-RPC is a standard network protocol to allow a client program to make
-    a simple remote procedure call (RPC) type request of a server.
-endef
-
-Package/xmlrpc-c-common/description = $(Package/xmlrpc-c/description/Default)
-Package/xmlrpc-c-libxml2/description = $(Package/xmlrpc-c/description/Default)
-Package/xmlrpc-c-internal/description = $(Package/xmlrpc-c/description/Default)
-
-Package/xmlrpc-c-libxml2/description += Uses external libxml2 library (quite big)
-Package/xmlrpc-c-internal/description += Uses internal expat variant (stripped down)
-
-CONFIGURE_ARGS+= \
-	--disable-wininet-client \
-	--disable-libwww-client \
-	--enable-abyss-server \
-	--disable-cplusplus \
-	--disable-abyss-threads \
-	--disable-cgi-server
-
-ifeq ($(BUILD_VARIANT),libxml2)
-	CONFIGURE_ARGS += \
-		--enable-libxml2-backend
-endif
-
-ifeq ($(BUILD_VARIANT),internal)
-	CONFIGURE_ARGS += \
-		--disable-libxml2-backend
-endif
-
-define Build/Compile
-	( cd $(PKG_BUILD_DIR)/lib/expat/gennmtab && cc -I$(PKG_BUILD_DIR) -c gennmtab.c -o gennmtab.o && cc -o gennmtab  gennmtab.o )
-	$(call Build/Compile/Default)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/include \
-		$(1)/usr/lib \
-		$(1)/usr/bin \
-		$(2)/bin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc*.{a,so*} \
-		$(1)/usr/lib/
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/xmlrpc-c-config \
-		$(2)/bin/
-	$(SED) \
-		's,HEADERINST_DIR="/usr/include",HEADERINST_DIR="$(STAGING_DIR)/usr/include",g' \
-		$(2)/bin/xmlrpc-c-config
-	$(SED) \
-		's,LIBINST_DIR="/usr/lib",LIBINST_DIR="$(STAGING_DIR)/usr/lib",g' \
-		$(2)/bin/xmlrpc-c-config
-endef
-
-define Package/xmlrpc-c-libxml2/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-internal/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmltok.so* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmlparse.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-server/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-abyss/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_abyss.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-server-abyss/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server_abyss.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-client/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_client* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c-common/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_util.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/xmlrpc-c/install
-	true
-endef
-
-$(eval $(call BuildPackage,xmlrpc-c))
-$(eval $(call BuildPackage,xmlrpc-c-common))
-$(eval $(call BuildPackage,xmlrpc-c-libxml2))
-$(eval $(call BuildPackage,xmlrpc-c-internal))
-$(eval $(call BuildPackage,xmlrpc-c-server))
-$(eval $(call BuildPackage,xmlrpc-c-abyss))
-$(eval $(call BuildPackage,xmlrpc-c-server-abyss))
-$(eval $(call BuildPackage,xmlrpc-c-client))
-

--- a/libs/xmlrpc-c/patches/001-config.mk.in.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/config.mk.in
-+++ b/config.mk.in
-@@ -175,7 +175,7 @@ ifeq ($(patsubst linux-gnu%,linux-gnu,$(
-   shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
-   shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
- #  SHLIB_CLIB = -lc
--  LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
-+  LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB) $(LDFLAGS)
-   CFLAGS_SHLIB=-fPIC
- endif
- 
 

--- a/libs/xmlrpc-c/patches/002-automake-compat.patch
+++ /dev/null
@@ -1,14 +1,1 @@
---- a/configure.in
-+++ b/configure.in
-@@ -230,9 +230,7 @@ dnl Checks for programs.
- dnl =======================================================================
- 
- AC_PROG_CC
--if test x"$enable_cplusplus" != xno; then
--    AC_PROG_CXX
--fi
-+AC_PROG_CXX
- 
- 
- dnl =======================================================================
 

file:a/mail/ssmtp/Makefile (deleted)
--- a/mail/ssmtp/Makefile
+++ /dev/null
@@ -1,63 +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:=ssmtp
-PKG_VERSION:=2.64
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.bz2
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp
-PKG_MD5SUM:=65b4e0df4934a6cd08c506cabcbe584f
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(TARGET_CPPFLAGS)
-
-define Package/ssmtp
-  SECTION:=mail
-  CATEGORY:=Mail
-  DEPENDS:=+libopenssl
-  TITLE:=A minimal and secure mail sender
-  URL:=http://packages.debian.org/ssmtp
-endef
-
-define Package/ssmtp/description
- A secure, effective and simple way of getting mail off a system to your
- mail hub. It contains no suid-binaries or other dangerous things - no
- mail spool to poke around in, and no daemons running in the background.
- mail is simply forwarded to the configured mailhost. Extremely easy
- configuration.
-endef
-
-define Package/ssmtp/conffiles
-/etc/ssmtp/ssmtp.conf
-/etc/ssmtp/revaliases
-endef
-
-CONFIGURE_VARS += \
-	LIBS="$(TARGET_LDFLAGS) -lcrypto -lssl"
-
-CONFIGURE_ARGS += \
-	--enable-ssl
-
-define Package/ssmtp/install
-	$(INSTALL_DIR) $(1)/etc/ssmtp
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/ssmtp.conf $(1)/etc/ssmtp/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/revaliases $(1)/etc/ssmtp/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/
-endef
-
-define Package/ssmtp/postinst
-#!/bin/sh
-ln -sf ssmtp $${IPKG_INSTROOT}/usr/sbin/sendmail
-endef
-
-$(eval $(call BuildPackage,ssmtp))
-

--- a/net/coova-chilli/Config.in
+++ /dev/null
@@ -1,49 +1,1 @@
-# CoovaChilli avanced configuration
 
-menu "Configuration"
-	depends on PACKAGE_coova-chilli
-
-config COOVACHILLI_REDIR
-	bool "Enable support for redir server. Required for uamregex"
-	default n
-
-config COOVACHILLI_MINIPORTAL
-	bool "Enable support Coova miniportal"
-	default n
-
-config COOVACHILLI_USERAGENT
-	bool "Enable recording user-agent"
-	default n
-
-config COOVACHILLI_DNSLOG
-	bool "Enable support to log DNS name queries"
-	default n
-
-config COOVACHILLI_UAMDOMAINFILE
-	bool "Enable loading of mass uamdomains from file"
-	default n
-
-config COOVACHILLI_LARGELIMITS
-	bool "Enable larger limits for use with non-embedded systems"
-	default n
-
-choice
-	prompt "SSL library"
-	default COOVACHILLI_NOSSL
-
-config COOVACHILLI_NOSSL
-	bool "No SSL support"
-
-config COOVACHILLI_MATRIXSSL
-	bool "MatrixSSL"
-
-config COOVACHILLI_CYASSL
-	bool "CyaSSL"
-
-config COOVACHILLI_OPENSSL
-	bool "OpenSSL"
-
-endchoice
-
-endmenu
-

--- a/net/coova-chilli/Makefile
+++ /dev/null
@@ -1,91 +1,1 @@
-#
-# Copyright (C) 2007-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:=coova-chilli
-PKG_VERSION:=1.3.0
-PKG_RELEASE:=5
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ap.coova.org/chilli
-PKG_MD5SUM:=dc0037e3cdebcb60508081b4e42e984a
-
-PKG_INSTALL:=1
-
-PKG_CONFIG_DEPENDS := \
-  COOVACHILLI_MINIPORTAL \
-  COOVACHILLI_REDIR \
-  COOVACHILLI_USERAGENT \
-  COOVACHILLI_DNSLOG \
-  COOVACHILLI_UAMDOMAINFILE \
-  COOVACHILLI_LARGELIMITS \
-  COOVACHILLI_NOSSL \
-  COOVACHILLI_MATRIXSSL \
-  COOVACHILLI_CYASSL \
-  COOVACHILLI_OPENSSL
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/coova-chilli
-  SUBMENU:=Captive Portals
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+kmod-tun +librt +COOVACHILLI_MATRIXSSL:libmatrixssl +COOVACHILLI_CYASSL:libcyassl +COOVACHILLI_OPENSSL:libopenssl
-  TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version)
-  URL:=http://www.coova.org/CoovaChilli
-  MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-  MENU:=1
-endef
-
-define Package/coova-chilli/description
-	CoovaChilli is an open source access controller for wireless LAN
-	access points and is based on ChilliSpot. It is used for authenticating
-	users of a wireless (or wired) LAN. It supports web based login (UAM)
-	which is today's standard for public HotSpots and it supports Wireless
-	Protected Access (WPA) which is the standard of the future.
-	Authentication,	authorization and accounting (AAA) is handled by your
-	favorite radius server.
-endef
-
-define Package/coova-chilli/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-	$(if $(CONFIG_COOVACHILLI_REDIR),--enable,--disable)-chilliredir \
-	$(if $(CONFIG_COOVACHILLI_DNSLOG),--enable,--disable)-dnslog \
-	$(if $(CONFIG_COOVACHILLI_MINIPORTAL),--enable,--disable)-miniportal \
-	$(if $(CONFIG_COOVACHILLI_USERAGENT),--enable,--disable)-useragent \
-	$(if $(CONFIG_COOVACHILLI_LARGELIMITS),--enable,--disable)-largelimits \
-	$(if $(CONFIG_COOVACHILLI_UAMDOMAINFILE),--enable,--disable)-uamdomainfile \
-	$(if $(CONFIG_COOVACHILLI_MATRIXSSL),--with,--without)-matrixssl \
-	$(if $(CONFIG_COOVACHILLI_CYASSL),--with,--without)-cyaxssl \
-	$(if $(CONFIG_COOVACHILLI_OPENSSL),--with,--without)-openssl \
-	)
-endef
-
-define Package/coova-chilli/conffiles
-/etc/chilli.conf
-endef
-
-define Package/coova-chilli/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/chilli.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/chilli
-	$(CP) $(PKG_INSTALL_DIR)/etc/chilli/* $(1)/etc/chilli/
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DATA) ./files/chilli.hotplug $(1)/etc/hotplug.d/iface/30-chilli
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli* $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,coova-chilli))
-

--- a/net/coova-chilli/files/chilli.hotplug
+++ /dev/null
@@ -1,8 +1,1 @@
-#!/bin/sh
 
-[ "$ACTION" == "ifup" ] || exit 0
-
-[ "$INTERFACE" = "wan" ] && {
-	/etc/init.d/chilli restart
-}
-

--- a/net/coova-chilli/patches/100-fix-sysinfo-redeclaration.patch
+++ /dev/null
@@ -1,25 +1,1 @@
---- a/src/system.h
-+++ b/src/system.h
-@@ -76,10 +76,6 @@
- #include <sys/stat.h>
- #endif
- 
--#ifdef HAVE_SYS_SYSINFO_H
--#include <sys/sysinfo.h>
--#endif
--
- #ifdef HAVE_TIME_H
- #include <time.h>
- #endif
-@@ -132,6 +128,10 @@
- #include <linux/un.h>
- #endif
- 
-+#ifdef HAVE_SYS_SYSINFO_H
-+#include <sys/sysinfo.h>
-+#endif
-+
- #elif defined (__FreeBSD__)  || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__) 
- #include <net/if.h>
- #include <net/bpf.h>
 

file:a/net/kismet/Makefile (deleted)
--- a/net/kismet/Makefile
+++ /dev/null
@@ -1,126 +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:=kismet
-PKG_VERSION:=2010-07-R1
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.kismetwireless.net/code
-PKG_MD5SUM:=85e59186eb529889118b5635f35cf57d
-
-PKG_BUILD_DEPENDS:=libpcap libncurses libpcre
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/kismet/Default
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Kismet
-  DEPENDS:= $(CXX_DEPENDS) +libnl
-  URL:=http://www.kismetwireless.net/
-  SUBMENU:=wireless
-endef
-
-define Package/kismet/Default/description
- An 802.11 layer2 wireless network detector, sniffer, and intrusion
- detection system.
-endef
-
-define Package/kismet-client
-$(call Package/kismet/Default)
-  TITLE+= client
-  DEPENDS+= +libncurses
-endef
-
-define Package/kismet-client/conffiles
-/etc/kismet/kismet.conf
-endef
-
-define Package/kismet-client/description
-$(call Package/kismet/Default/description)
- This package contains the kismet text interface client.
-endef
-
-define Package/kismet-drone
-$(call Package/kismet/Default)
-  DEPENDS+= +libpcap +libpcre +libcap
-  TITLE+= drone
-endef
-
-define Package/kismet-drone/conffiles
-/etc/kismet/kismet_drone.conf
-endef
-
-define Package/kismet-drone/description
-$(call Package/kismet/Default/description)
- This package contains the kismet remote sniffing.and monitoring drone.
-endef
-
-define Package/kismet-server
-$(call Package/kismet/Default)
-  DEPENDS+= +libpcap +libpcre +libcap
-  TITLE+= server
-endef
-
-define Package/kismet-server/conffiles
-/etc/kismet/kismet.conf
-endef
-
-define Package/kismet-server/description
-$(call Package/kismet/Default/description)
- This package contains the kismet server.
-endef
-
-CONFIGURE_ARGS += \
-	--sysconfdir=/etc/kismet \
-
-CONFIGURE_VARS += \
-	CXXFLAGS="$$$$CXXFLAGS -fno-rtti"  \
-	LIBS="-lm" \
-	CLIENTCLIBS="-lm"
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LD="$(TARGET_CXX)" \
-		all
-endef
-
-#FIXME: remove this package?
-define Package/kismet/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/kismet $(1)/usr/bin/kismet
-endef
-
-define Package/kismet-client/install
-	$(INSTALL_DIR) $(1)/etc/kismet/
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_client $(1)/usr/bin/
-endef
-
-define Package/kismet-drone/install
-	$(INSTALL_DIR) $(1)/etc/kismet/
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet_drone.conf $(1)/etc/kismet/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_drone $(1)/usr/bin/
-endef
-
-define Package/kismet-server/install
-	$(INSTALL_DIR) $(1)/etc/kismet/
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_server $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,kismet-client))
-$(eval $(call BuildPackage,kismet-drone))
-$(eval $(call BuildPackage,kismet-server))
-

--- a/net/kismet/files/ap_manuf
+++ /dev/null
@@ -1,241 +1,1 @@
-00:00:0C:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:00:74:00:00:00/FF:FF:FF:00:00:00	Ricoh	Unknown	0
-00:00:92:00:00:00/FF:FF:FF:00:00:00	Cogent	Unknown	0
-00:00:AA:00:00:00/FF:FF:FF:00:00:00	Xerox	Unknown	0
-00:00:C5:00:00:00/FF:FF:FF:00:00:00	FarallonCo	Unknown	0
-00:00:CE:00:00:00/FF:FF:FF:00:00:00	Megadata	Unknown	0
-00:00:DE:00:00:00/FF:FF:FF:00:00:00	Unigraph	Unknown	0
-00:01:03:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:01:24:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	default	6	192.168.2.1
-00:01:24:24:00:00/FF:FF:FF:FF:00:00	SMC	SMC7004AWBR	default	6	192.168.2.1
-00:01:38:00:00:00/FF:FF:FF:00:00:00	XaviTechno	Unknown	0
-00:01:95:00:00:00/FF:FF:FF:00:00:00	Sena	Unknown	0
-00:01:E6:00:00:00/FF:FF:FF:00:00:00	Hewlett-Pa	Unknown	0
-00:01:F4:00:00:00/FF:FF:FF:00:00:00	EnterasysN	Unknown	0
-00:02:2D:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:02:44:00:00:00/FF:FF:FF:00:00:00	Surecom	Unknown	0
-00:02:6F:00:00:00/FF:FF:FF:00:00:00	Senao	Unknown		0	
-00:02:72:00:00:00/FF:FF:FF:00:00:00	Cc&C	Unknown	0
-00:02:8A:00:00:00/FF:FF:FF:00:00:00	AmbitMicro	Unknown	0
-00:02:A5:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:02:B3:00:00:00/FF:FF:FF:00:00:00	Intel	Unknown	0
-00:03:0A:00:00:00/FF:FF:FF:00:00:00	Argus	Unknown	0
-00:03:2F:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-00:03:52:00:00:00/FF:FF:FF:00:00:00	Colubris	Unknown	0
-00:03:93:00:00:00/FF:FF:FF:00:00:00	AppleCompu	Unknown	0
-00:04:23:00:00:00/FF:FF:FF:00:00:00	Intel	Unknown	0
-00:04:3A:3A:00:00/FF:FF:FF:FF:00:00	Avaya	ad-01444		0	
-00:04:5A:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:04:5A:0E:00:00/FF:FF:FF:FF:00:00	Linksys	WAP11	linksys	6	192.168.1.1
-00:04:5A:2E:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4	linksys	6	192.168.1.1
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4	linksys	6	192.168.1.1
-00:04:75:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:04:75:75:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE20096A AP2000 Version 1	3Com	0	169.254.0.1
-00:04:76:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown	0
-00:04:DB:00:00:00/FF:FF:FF:00:00:00	TellusGrou	Unknown	0
-00:04:E2:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown		0	
-00:04:E2:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	SMC	6	192.168.2.1
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	7004AWBR	default	6	192.168.2.1
-00:05:3C:00:00:00/FF:FF:FF:00:00:00	Xircom	Unknown	0
-00:05:4E:00:00:00/FF:FF:FF:00:00:00	PhilipsCom	Unknown	0
-00:05:5D:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-1000AP	default	6	
-00:05:87:00:00:00/FF:FF:FF:00:00:00	Locus	Unknown	0
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys-g	6	192.168.1.1
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4 v2	linksys	6	192.168.1.1
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WET11	linksys	6	192.168.1.225
-00:06:B1:00:00:00/FF:FF:FF:00:00:00	Sonicwall	Unknown	0
-00:07:0E:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:07:13:00:00:00/FF:FF:FF:00:00:00	IpOne	Unknown	0
-00:07:40:00:00:00/FF:FF:FF:00:00:00	Melco	Unknown	0
-00:07:50:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:07:85:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:07:EB:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:08:21:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:08:A1:00:00:00/FF:FF:FF:00:00:00	CnetTechno	Unknown	0
-00:09:43:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	NETGEAR	11	192.168.0.1
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	Wireless	11  192.168.0.2
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	NETGEAR	11	192.168.0.1
-00:09:7C:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:92:92:00:00/FF:FF:FF:FF:00:00	Sweex	LC000010	wireless	11	192.168.0.1
-00:09:B7:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:09:E8:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:04:00:00:00/FF:FF:FF:00:00:00	3comEurope	Unknown	0
-00:0A:41:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:8A:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:8A:8A:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-AP1200		0	
-00:0A:95:00:00:00/FF:FF:FF:00:00:00	AppleCompu	Unknown	0
-00:0A:B7:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0A:E9:00:00:00/FF:FF:FF:00:00:00	Airvast	Unknown	0
-00:0B:5F:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0B:6B:00:00:00/FF:FF:FF:00:00:00	WistronNew	Unknown	0
-00:0B:6C:00:00:00/FF:FF:FF:00:00:00	Sychip	Unknown	0
-00:0B:7D:00:00:00/FF:FF:FF:00:00:00	SolomonExt	Unknown	0
-00:0B:85:00:00:00/FF:FF:FF:00:00:00	Airespace	Unknown	0
-00:0B:86:00:00:00/FF:FF:FF:00:00:00	Aruba	Unknown	0
-00:0B:AC:00:00:00/FF:FF:FF:00:00:00	3comEurope	Unknown	0
-00:0B:BE:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0B:CD:00:00:00/FF:FF:FF:00:00:00	CompaqHp	Unknown	0
-00:0B:FD:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0C:30:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0C:41:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:0C:85:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0C:CE:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0C:E5:00:00:00/FF:FF:FF:00:00:00	MotorolaBc	Unknown	0
-00:0C:F1:00:00:00/FF:FF:FF:00:00:00	Intel	Unknown	0
-00:0D:0B:00:00:00/FF:FF:FF:00:00:00	Melco	Unknown	0
-00:0D:14:00:00:00/FF:FF:FF:00:00:00	VtechInnov	Unknown	0
-00:0D:28:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0D:29:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0D:3A:00:00:00/FF:FF:FF:00:00:00	Microsoft	Unknown	0
-00:0D:54:00:00:00/FF:FF:FF:00:00:00	3comEurope	Unknown	0
-00:0D:65:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0D:72:00:00:00/FF:FF:FF:00:00:00	2wire	Unknown	0
-00:0D:88:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	192.168.0.1
-00:0D:93:00:00:00/FF:FF:FF:00:00:00	AppleCompu	Unknown	0
-00:0D:97:00:00:00/FF:FF:FF:00:00:00	Tropos	Unknown	0
-00:0D:9D:00:00:00/FF:FF:FF:00:00:00	HewlettPac	Unknown	0
-00:0D:BD:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0D:ED:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0E:35:00:00:00/FF:FF:FF:00:00:00	Intel	Unknown	0
-00:0E:38:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0E:3B:00:00:00/FF:FF:FF:00:00:00	HawkingTec	Unknown	0
-00:0E:58:00:00:00/FF:FF:FF:00:00:00	RinconNetw	Unknown	0
-00:0E:6A:00:00:00/FF:FF:FF:00:00:00	3comEurope	Unknown	0
-00:0E:7F:00:00:00/FF:FF:FF:00:00:00	HewlettPac	Unknown	0
-00:0E:83:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0E:84:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0E:9B:00:00:00/FF:FF:FF:00:00:00	Private	Unknown	0
-00:0E:A6:00:00:00/FF:FF:FF:00:00:00	AsustekCom	Unknown	0
-00:0E:D7:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:23:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:24:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:34:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:3D:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	192.168.0.1
-00:0F:66:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:0F:8F:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:90:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:B5:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	NETGEAR	11	192.168.0.1
-00:0F:EA:00:00:00/FF:FF:FF:00:00:00	GigaByte	Unknown	0
-00:0F:F7:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:F8:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:10:C6:00:00:00/FF:FF:FF:00:00:00	Usi	Unknown	0
-00:10:E7:00:00:00/FF:FF:FF:00:00:00	Breezecom	Unknown	0
-00:11:09:00:00:00/FF:FF:FF:00:00:00	Micro-Star	Unknown	0
-00:11:0A:00:00:00/FF:FF:FF:00:00:00	HewlettPac	Unknown	0
-00:11:20:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:21:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:24:00:00:00/FF:FF:FF:00:00:00	AppleCompu	Unknown	0
-00:11:2F:00:00:00/FF:FF:FF:00:00:00	AsustekCom	Unknown	0
-00:11:50:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown	0
-00:17:3F:00:00:00/FF:FF:FF:00:00:00	Belkin54g	Unknown	0
-00:11:5C:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:88:00:00:00/FF:FF:FF:00:00:00	Enterasys	Unknown	0
-00:11:92:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:93:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:95:00:00:00/FF:FF:FF:00:00:00	AlphaNetwo	Unknown	0
-00:11:BB:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:D8:00:00:00/FF:FF:FF:00:00:00	AsustekCom	Unknown	0
-00:11:F5:00:00:00/FF:FF:FF:00:00:00	Askey	Unknown	0
-00:12:00:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:01:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:17:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:12:25:00:00:00/FF:FF:FF:00:00:00	MotorolaBc	Unknown	0
-00:12:43:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:7F:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:80:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:88:00:00:00/FF:FF:FF:00:00:00	2wire	Unknown	0
-00:12:D9:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:DA:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:F0:00:00:00/FF:FF:FF:00:00:00	IntelCorpo	Unknown	0
-00:13:10:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:13:19:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:1A:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:46:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	0
-00:13:60:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:7F:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:80:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:C4:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:20:00:00:00:00/FF:FF:FF:00:00:00	LexmarkInt	Unknown	0
-00:20:A6:00:00:00/FF:FF:FF:00:00:00	Proxim	Unknown	0
-00:20:D8:00:00:00/FF:FF:FF:00:00:00	Nortel	Unknown	0
-00:20:E0:00:00:00/FF:FF:FF:00:00:00	Actiontec	Unknown	0
-00:30:1A:00:00:00/FF:FF:FF:00:00:00	Smartbridge	Unknown	0
-00:30:65:00:00:00/FF:FF:FF:00:00:00	Apple	Unknown		0	
-00:30:65:65:00:00/FF:FF:FF:FF:00:00	Apple	Snow Base Station		1	
-00:30:6E:00:00:00/FF:FF:FF:00:00:00	HP	Unknown	0
-00:30:AB:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MR314NA	Wireless	1	192.168.0.1
-00:18:4D:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown		0	
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown	WLAN	11	0.0.0.0
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown	belkin54g	11  0.0.0.0
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6230-3		0	
-00:30:F1:00:00:00/FF:FF:FF:00:00:00	AcctonTech	Unknown	0
-00:40:01:00:00:00/FF:FF:FF:00:00:00	Zyxel	Unknown	0
-00:40:05:00:00:00/FF:FF:FF:00:00:00	ANI	Unknown	default	6	192.168.0.1
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DI-614+	default	6	192.168.0.1
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-900AP+	default	6	192.168.0.50
-00:40:26:00:00:00/FF:FF:FF:00:00:00	Buffalo	Unknown		0	
-00:40:26:26:00:00/FF:FF:FF:FF:00:00	Buffalo	WLAR-L11G-L		0	
-00:40:33:00:00:00/FF:FF:FF:00:00:00	Addtron	Unknown	0
-00:40:36:00:00:00/FF:FF:FF:00:00:00	TribeCompu	Unknown	0
-00:40:96:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	tsunami	6	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-AP342E2R	tsunami	6	192.168.1.1
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AP-350	tsunami	7	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	Aironet 350	tsunami	6	
-00:50:08:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:50:18:00:00:00/FF:FF:FF:00:00:00	Amit	Unknown	0
-00:50:8B:8B:00:00/FF:FF:FF:FF:00:00	Compaq	WL400 - ETSI region	compaq	11	
-00:50:DA:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:50:DA:DA:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE747A		0	
-00:50:F2:00:00:00/FF:FF:FF:00:00:00	Microsoft	Unknown	MSHOME	6	192.168.2.1
-00:50:F2:F2:00:00/FF:FF:FF:FF:00:00	Microsoft	MN-500	MSHOME	6	192.168.0.1
-00:50:FC:00:00:00/FF:FF:FF:00:00:00	Edimax	Unknown	0
-00:60:01:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:60:1D:00:00:00/FF:FF:FF:00:00:00	Orinoco	Unknown		0	
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Orinoco	RG1000		0	
-00:60:6D:00:00:00/FF:FF:FF:00:00:00	Cabletron	Unknown		0	
-00:60:B3:00:00:00/FF:FF:FF:00:00:00	Proxim	Unknown		0	
-00:80:37:37:00:00/FF:FF:FF:FF:00:00	Ericsson	A11 (AP-4121-105M-ER-EU)		0	
-00:80:48:00:00:00/FF:FF:FF:00:00:00	Compex	Unknown	0
-00:80:C6:00:00:00/FF:FF:FF:00:00:00	SOHOware	Unknown	
-00:80:C6:C6:00:00/FF:FF:FF:FF:00:00	SOHOware	NetBlaster II
-00:80:C8:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	192.168.0.1
-00:90:0E:00:00:00/FF:FF:FF:00:00:00	Handlink	Unknown	0
-00:90:4B:4B:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4	linksys	6	 192.168.1.1
-00:90:4B:00:00:00/FF:FF:FF:00:00:00	Motorola	Unknown	0
-00:90:4C:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	NETGEAR	11	192.168.0.1
-00:90:96:00:00:00/FF:FF:FF:00:00:00	Askey	Unknown	0
-00:90:D1:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	WLAN	11	
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	SMC	SMC2652W	WLAN	11	
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	SMC	SMC2682W	BRIDGE	11	
-00:A0:04:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown	
-00:A0:04:04:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE51196
-00:A0:C5:00:00:00/FF:FF:FF:00:00:00	Zyxel	Unknown	0
-00:A0:F8:00:00:00/FF:FF:FF:00:00:00	Symbol	Unknown	
-00:B0:64:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:C0:02:00:00:00/FF:FF:FF:00:00:00	Sercomm	Unknown	0
-00:C0:49:00:00:00/FF:FF:FF:00:00:00	USRobotics	Unknown	0
-00:D0:59:00:00:00/FF:FF:FF:00:00:00	AmbitMicro	Unknown	0
-00:E0:00:00:00:00/FF:FF:FF:00:00:00	Fujitsu	Unknown	0
-00:E0:29:00:00:00/FF:FF:FF:00:00:00	OEM	Unknown	
-00:E0:63:00:00:00/FF:FF:FF:00:00:00	Cabletron	Unknown	0
-00:E0:98:00:00:00/FF:FF:FF:00:00:00	Trend	Unknown	0
-00:E0:B8:00:00:00/FF:FF:FF:00:00:00	Gateway2000	Unknown	0
-08:00:46:00:00:00/FF:FF:FF:00:00:00	Sony	Unknown	
-00:14:BF:00:00:00/FF:FF:FF:00:00:00	linksys	Unknown	linksys	6	192.168.1.1
-00:14:6C:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	NETGEAR	11	192.168.0.1
-00:16:B6:00:00:00/FF:FF:FF:00:00:00	linksys	Unknown	linksys	6	192.168.1.1
-00:18:39:00:00:00/FF:FF:FF:00:00:00	linksys	Unknown	linksys	6	192.168.1.1
-00:18:F8:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-02:13:CE:00:00:00/FF:FF:FF:00:00:00	hpsetup	Unknown	0
-00:15:E9:00:00:00/FF:FF:FF:00:00:00     dlink     Unknown 0
-00:14:51:00:00:00/FF:FF:FF:00:00:00	AppleCompu	Unknown	0
-00:C0:A8:00:00:00/FF:FF:FF:00:00:00	AMX	Unknown	0
-00:16:CB:00:00:00/FF:FF:FF:00:00:00	Apple	Macbook Pro		0	
 

--- a/net/kismet/files/client_manuf
+++ /dev/null
@@ -1,456 +1,1 @@
-00:00:22:22:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver		0	
-00:00:8F:8F:00:00/FF:FF:FF:FF:00:00	BreezeCOM	Breezenet Pro SA-PC		0	
-00:01:03:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:01:03:03:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE62092A
-00:01:03:03:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE777A		0	
-00:01:24:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	default	6	192.168.2.1
-00:01:F4:F4:00:00/FF:FF:FF:FF:00:00	Entrasys	CSIBD-AB-S Roamabout		0	
-00:02:2D:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Agere	Orinoco Gold
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Agere	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Avaya	PC24E-H-ET
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Avaya	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Avaya	World Card Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Buffalo	WLI-PCM-L11
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Buffalo	WLI-PCM-L11
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Buffalo	WLI-PCM-L11GP		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Dell	TrueMobile 1150
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Dell	TrueMobile 1150 Mini-PCI		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Dell	Truemobile 1150		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Dell	true mobile 1150		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Gold
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Silver		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Silver (PC24E-H-FC)		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN-Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN/IEEE Version 01.01		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	MiniPCI Card (embedded in Sony Laptop)		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Orinoco Gold	wireless	3	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Orinoco Gold
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Orinoco Mini PCI Card		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	PC Card T2 Extended ORiNOCO Europe 128RC4 Kit Gold		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	PC24E-H-ET
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Silver
-00:02:6F:00:00:00/FF:FF:FF:00:00:00	Senao	Unknown		0	
-00:02:6F:6F:00:00/FF:FF:FF:FF:00:00	Senao	SL-2011 CD
-00:02:6F:6F:00:00/FF:FF:FF:FF:00:00	Senao	SL-2011CD		0	
-00:02:6F:6F:00:00/FF:FF:FF:FF:00:00	Senao	SL-2011CD
-00:02:6F:6F:00:00/FF:FF:FF:FF:00:00	Senao	SL-2511CD PLUS EXT2(F200)		0	
-00:02:A5:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:02:A5:A5:00:00/FF:FF:FF:FF:00:00	Compaq	WL110
-00:02:A5:A5:00:00/FF:FF:FF:FF:00:00	Compaq	WL110 REV.0A		0	
-00:02:B3:B3:00:00/FF:FF:FF:FF:00:00	Intel	WPC-2011BWW		0	
-00:03:2F:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-00:03:2F:2F:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11		0	
-00:03:2F:2F:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11
-00:03:2F:2F:00:00/FF:FF:FF:FF:00:00	Repotec	GL241101
-00:04:5A:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-00:04:5A:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	Linksys	6	192.168.1.1
-00:04:5A:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4	linksys	0	
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	WUSB11
-00:04:75:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:04:75:75:00:00/FF:FF:FF:FF:00:00	3Com	3CRSHPW696		0	
-00:04:75:75:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE62092B		0	
-00:04:75:75:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE62092B
-00:04:DB:DB:00:00/FF:FF:FF:FF:00:00	Tellus	TWL-C11		0	
-00:04:E2:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown		0	
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W		0	
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W
-00:05:3C:3C:00:00/FF:FF:FF:FF:00:00	Intel	Intel MiniPCI High Rate Wireless (ISL3874A)		0	
-00:05:5D:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown		0	
-00:05:5D:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	Compaq	HNW-100		0	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DCF-650W
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650		0	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650		0	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650		0	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650H
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-660 H/W:A1 F/W:4.04		0	
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	D-Link	DCF-650W
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Dell	True Mobile 1150		6	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4 v2	linksys	6	192.168.1.1
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF11		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF11
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF12		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF12
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF12
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WMP11		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WMP11 v2.5		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 V.3		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v2.5
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v2.5
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3.0		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 ver.3 (FCC-ID: PKW-WPC11-V31[suggests V3.1])		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WUSB11 v2.6		0	
-00:07:0E:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:07:0E:0E:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:07:0E:0E:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:07:50:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:07:50:50:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:07:50:50:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM350		0	
-00:08:21:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:08:21:21:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:08:21:21:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:08:21:21:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:08:21:21:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:09:43:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:43:43:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA401		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA401RA		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA401RA
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA701		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA701
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	ma101		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	wab501		0	
-00:09:7C:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:7C:7C:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:09:7C:7C:00:00/FF:FF:FF:FF:00:00	Cisco	Cisco Aironet 352 802.11b pcmcia card		0	
-00:09:92:92:00:00/FF:FF:FF:FF:00:00	Sweex	LC500010 ATMEL PCMCIA FastVNET (502A-D)		0	
-00:09:B7:B7:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352		0	
-00:09:B7:B7:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352		0	
-00:09:E8:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:E8:E8:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:0A:41:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352		0	
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352		0	
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352		0	
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:0A:8A:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:8A:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:8A:8A:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:0B:5F:5F:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-CB20A-A-K9		0	
-00:20:A6:A6:00:00/FF:FF:FF:FF:00:00	Proxim	Symphony (PC Card 4430)		0	
-00:20:D6:D6:00:00/FF:FF:FF:FF:00:00	BreezeCOM	Breezenet Pro.11 SA-PCR		0	
-00:30:65:00:00:00/FF:FF:FF:00:00:00	Apple	Unknown		0	
-00:30:65:00:00:00/FF:FF:FF:00:00:00	Apple	Unknown		0	
-00:30:65:65:00:00/FF:FF:FF:FF:00:00	Apple	Airport Card 2002
-00:16:CB:00:00:00/FF:FF:FF:00:00:00	Apple	Macbook Pro		0	
-00:30:AB:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401		0	
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MR314	Wireless	1	192.168.0.1
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	Netgear ma401		0	
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown		0	
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown		0	
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020		0	
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020		0	
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020 (Version 01.02)		0	
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020u		0	
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DI-614+	default	6	192.168.0.1
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DI-614+ 22Mbps router/AP/switch	default	6	192.168.0.1
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-520+		0	
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650		0	
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650	internet	8	
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650+	wireless	6	192.168.0.1
-00:40:26:00:00:00/FF:FF:FF:00:00:00	Buffalo	Unknown		0	
-00:40:96:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:40:96:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	tsunami	6	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	350
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PC4800
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340		0	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340		0	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340 (Dell Rebrand)		0	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	PC 4800 DS PCI Adapter		0	
-00:50:08:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:50:08:08:00:00/FF:FF:FF:FF:00:00	Compaq	WL100		0	
-00:50:08:08:00:00/FF:FF:FF:FF:00:00	Compaq	WL100
-00:50:8B:8B:00:00/FF:FF:FF:FF:00:00	Compaq	Compaq WL100	compaq	0	
-00:50:8B:8B:00:00/FF:FF:FF:FF:00:00	Compaq	WL200 - ETSI region		0	
-00:50:DA:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:50:DA:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:50:DA:DA:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE73796B
-00:50:F2:F2:00:00/FF:FF:FF:FF:00:00	Microsoft	MN-510		0	
-00:50:F2:F2:00:00/FF:FF:FF:FF:00:00	Microsoft	Wireless Notebook Adapter MN-520		0	
-00:60:01:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:60:01:01:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Silver
-00:60:1D:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:60:1D:00:00:00/FF:FF:FF:00:00:00	Orinoco	Unknown		0	
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	Lucent WaveLAN Turbo - Bronze, P/N: 011498/A		0	
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Gold
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	PC24E-00-FC		0	
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	Silver
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Bronze
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Gold
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	Wavelan Turbo Bronze		0	
-00:60:6D:00:00:00/FF:FF:FF:00:00:00	Cabletron	Unknown		0	
-00:60:6D:6D:00:00/FF:FF:FF:FF:00:00	Cabletron	CSIBB-AA
-00:60:6D:6D:00:00/FF:FF:FF:FF:00:00	Cabletron	CSIBB-AA
-00:60:6D:6D:00:00/FF:FF:FF:FF:00:00	Cabletron	RoamAbout 802.11DS		0	
-00:60:B3:00:00:00/FF:FF:FF:00:00:00	Proxim	Unknown		0	
-00:60:B3:6F:00:00/FF:FF:FF:FF:00:00	WMATA	WashingtonMetroAreaTA		0	
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	3Com	XI-815		0	
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	3Com	Zcom WL2000D		0	
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	Proxim	RangeLAN DS		0	
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	Proxim	RangeLan DS 8430
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	SMC	SMC2642W
-00:80:37:37:00:00/FF:FF:FF:FF:00:00	Ericsson	C11 (LA-4121-102M-ER-EU)		0	
-00:80:C6:00:00:00/FF:FF:FF:00:00:00	SOHOware	Unknown		0	
-00:90:4B:4B:00:00/FF:FF:FF:FF:00:00	Dell	1180 True Mobile PCI		0	
-00:90:96:96:00:00/FF:FF:FF:FF:00:00	Yakumo	WLAN PCMCIA Card 11 Mbps		0	
-00:90:D1:00:00:00/FF:FF:FF:00:00:00	LeArtery	Unknown		0	
-00:90:D1:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	WLAN	11	
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	LeArtery	SyncByAir LN101
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	SMC	2662W		0	
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W		0	
-00:A0:04:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:A0:65:65:00:00/FF:FF:FF:FF:00:00	Nexland	Zcom XI-300		0	
-00:A0:F8:00:00:00/FF:FF:FF:00:00:00	Symbol	Unknown		0	
-00:A0:F8:F8:00:00/FF:FF:FF:FF:00:00	Symbol	Spectrum 24 High Rate 11MBps wireless LAN adapter		0	
-00:A0:F8:F8:00:00/FF:FF:FF:FF:00:00	Symbol	Spectrum24
-00:C0:49:49:00:00/FF:FF:FF:FF:00:00	US Robotics	USR1120		0	
-00:E0:29:00:00:00/FF:FF:FF:00:00:00	OEM	Unknown		0	
-00:E0:29:29:00:00/FF:FF:FF:FF:00:00	OEM	OEM
-00:E0:29:29:00:00/FF:FF:FF:FF:00:00	SMC	2632W		0	
-00:E0:29:29:00:00/FF:FF:FF:FF:00:00	SMC	EZ-Connect Wireless		0	
-08:00:46:00:00:00/FF:FF:FF:00:00:00	Sony	Unknown		0	
-08:00:46:46:00:00/FF:FF:FF:FF:00:00	Sony	PCWA-C100
-00:00:0C:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:00:74:00:00:00/FF:FF:FF:00:00:00	Ricoh	Unknown	0
-00:00:92:00:00:00/FF:FF:FF:00:00:00	Cogent	Unknown	0
-00:00:AA:00:00:00/FF:FF:FF:00:00:00	Xerox	Unknown	0
-00:00:C5:00:00:00/FF:FF:FF:00:00:00	FarallonCo	Unknown	0
-00:00:CE:00:00:00/FF:FF:FF:00:00:00	Megadata	Unknown	0
-00:00:DE:00:00:00/FF:FF:FF:00:00:00	Unigraph	Unknown	0
-00:01:03:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:01:24:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	default	6	192.168.2.1
-00:01:38:00:00:00/FF:FF:FF:00:00:00	XaviTechno	Unknown	0
-00:01:95:00:00:00/FF:FF:FF:00:00:00	Sena	Unknown	0
-00:01:E6:00:00:00/FF:FF:FF:00:00:00	Hewlett-Pa	Unknown	0
-00:01:F4:00:00:00/FF:FF:FF:00:00:00	EnterasysN	Unknown	0
-00:02:2D:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:02:44:00:00:00/FF:FF:FF:00:00:00	Surecom	Unknown	0
-00:02:6F:00:00:00/FF:FF:FF:00:00:00	Senao	Unknown		0	
-00:02:72:00:00:00/FF:FF:FF:00:00:00	Cc&C	Unknown	0
-00:02:8A:00:00:00/FF:FF:FF:00:00:00	AmbitMicro	Unknown	0
-00:02:A5:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:02:B3:00:00:00/FF:FF:FF:00:00:00	Intel	Unknown	0
-00:03:0A:00:00:00/FF:FF:FF:00:00:00	Argus	Unknown	0
-00:03:2F:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-00:03:52:00:00:00/FF:FF:FF:00:00:00	Colubris	Unknown	0
-00:03:93:00:00:00/FF:FF:FF:00:00:00	AppleCompu	Unknown	0
-00:04:23:00:00:00/FF:FF:FF:00:00:00	Intel	Unknown	0
-00:04:5A:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:04:75:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:04:76:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown	0
-00:04:DB:00:00:00/FF:FF:FF:00:00:00	TellusGrou	Unknown	0
-00:04:E2:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown		0	
-00:04:E2:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	SMC	6	192.168.2.1
-00:05:3C:00:00:00/FF:FF:FF:00:00:00	Xircom	Unknown	0
-00:05:4E:00:00:00/FF:FF:FF:00:00:00	PhilipsCom	Unknown	0
-00:05:5D:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	
-00:05:87:00:00:00/FF:FF:FF:00:00:00	Locus	Unknown	0
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys-g	6	192.168.1.1
-00:06:B1:00:00:00/FF:FF:FF:00:00:00	Sonicwall	Unknown	0
-00:07:0E:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:07:13:00:00:00/FF:FF:FF:00:00:00	IpOne	Unknown	0
-00:07:40:00:00:00/FF:FF:FF:00:00:00	Melco	Unknown	0
-00:07:50:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:07:85:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:07:EB:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:08:21:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:08:A1:00:00:00/FF:FF:FF:00:00:00	CnetTechno	Unknown	0
-00:09:43:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	NETGEAR	11	192.168.0.1
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	Wireless	11  192.168.0.2
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	NETGEAR	11	192.168.0.1
-00:09:7C:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:B7:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:09:E8:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:04:00:00:00/FF:FF:FF:00:00:00	3comEurope	Unknown	0
-00:0A:41:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:8A:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:95:00:00:00/FF:FF:FF:00:00:00	AppleCompu	Unknown	0
-00:0A:B7:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0A:E9:00:00:00/FF:FF:FF:00:00:00	Airvast	Unknown	0
-00:0B:5F:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0B:6B:00:00:00/FF:FF:FF:00:00:00	WistronNew	Unknown	0
-00:0B:6C:00:00:00/FF:FF:FF:00:00:00	Sychip	Unknown	0
-00:0B:7D:00:00:00/FF:FF:FF:00:00:00	SolomonExt	Unknown	0
-00:0B:85:00:00:00/FF:FF:FF:00:00:00	Airespace	Unknown	0
-00:0B:86:00:00:00/FF:FF:FF:00:00:00	Aruba	Unknown	0
-00:0B:AC:00:00:00/FF:FF:FF:00:00:00	3comEurope	Unknown	0
-00:0B:BE:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0B:CD:00:00:00/FF:FF:FF:00:00:00	CompaqHp	Unknown	0
-00:0B:FD:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0C:30:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0C:41:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:0C:85:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0C:CE:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0C:E5:00:00:00/FF:FF:FF:00:00:00	MotorolaBc	Unknown	0
-00:0C:F1:00:00:00/FF:FF:FF:00:00:00	Intel	Unknown	0
-00:0D:0B:00:00:00/FF:FF:FF:00:00:00	Melco	Unknown	0
-00:0D:14:00:00:00/FF:FF:FF:00:00:00	VtechInnov	Unknown	0
-00:0D:28:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0D:29:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0D:3A:00:00:00/FF:FF:FF:00:00:00	Microsoft	Unknown	0
-00:0D:54:00:00:00/FF:FF:FF:00:00:00	3comEurope	Unknown	0
-00:0D:65:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0D:72:00:00:00/FF:FF:FF:00:00:00	2wire	Unknown	0
-00:0D:88:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	192.168.0.1
-00:0D:93:00:00:00/FF:FF:FF:00:00:00	AppleCompu	Unknown	0
-00:0D:97:00:00:00/FF:FF:FF:00:00:00	Tropos	Unknown	0
-00:0D:9D:00:00:00/FF:FF:FF:00:00:00	HewlettPac	Unknown	0
-00:0D:BD:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0D:ED:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0E:35:00:00:00/FF:FF:FF:00:00:00	Intel	Unknown	0
-00:0E:38:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0E:3B:00:00:00/FF:FF:FF:00:00:00	HawkingTec	Unknown	0
-00:0E:58:00:00:00/FF:FF:FF:00:00:00	RinconNetw	Unknown	0
-00:0E:6A:00:00:00/FF:FF:FF:00:00:00	3comEurope	Unknown	0
-00:0E:7F:00:00:00/FF:FF:FF:00:00:00	HewlettPac	Unknown	0
-00:0E:83:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0E:84:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0E:9B:00:00:00/FF:FF:FF:00:00:00	Private	Unknown	0
-00:0E:A6:00:00:00/FF:FF:FF:00:00:00	AsustekCom	Unknown	0
-00:0E:D7:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:23:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:24:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:34:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:3D:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	192.168.0.1
-00:0F:66:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:0F:8F:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:90:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:B5:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	NETGEAR	11	192.168.0.1
-00:0F:EA:00:00:00/FF:FF:FF:00:00:00	GigaByte	Unknown	0
-00:0F:F7:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:0F:F8:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:10:C6:00:00:00/FF:FF:FF:00:00:00	Usi	Unknown	0
-00:10:E7:00:00:00/FF:FF:FF:00:00:00	Breezecom	Unknown	0
-00:11:09:00:00:00/FF:FF:FF:00:00:00	Micro-Star	Unknown	0
-00:11:0A:00:00:00/FF:FF:FF:00:00:00	HewlettPac	Unknown	0
-00:11:20:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:21:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:24:00:00:00/FF:FF:FF:00:00:00	AppleCompu	Unknown	0
-00:11:2F:00:00:00/FF:FF:FF:00:00:00	AsustekCom	Unknown	0
-00:11:50:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown	0
-00:11:5C:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:88:00:00:00/FF:FF:FF:00:00:00	Enterasys	Unknown	0
-00:11:92:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:93:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:95:00:00:00/FF:FF:FF:00:00:00	AlphaNetwo	Unknown	0
-00:11:BB:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:11:D8:00:00:00/FF:FF:FF:00:00:00	AsustekCom	Unknown	0
-00:11:F5:00:00:00/FF:FF:FF:00:00:00	Askey	Unknown	0
-00:12:00:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:01:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:17:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:12:25:00:00:00/FF:FF:FF:00:00:00	MotorolaBc	Unknown	0
-00:12:43:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:7F:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:80:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:88:00:00:00/FF:FF:FF:00:00:00	2wire	Unknown	0
-00:12:D9:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:DA:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:12:F0:00:00:00/FF:FF:FF:00:00:00	IntelCorpo	Unknown	0
-00:13:10:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:13:19:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:1A:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:46:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	0
-00:13:60:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:7F:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:80:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:13:C4:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:20:00:00:00:00/FF:FF:FF:00:00:00	LexmarkInt	Unknown	0
-00:20:A6:00:00:00/FF:FF:FF:00:00:00	Proxim	Unknown	0
-00:20:D8:00:00:00/FF:FF:FF:00:00:00	Nortel	Unknown	0
-00:20:E0:00:00:00/FF:FF:FF:00:00:00	Actiontec	Unknown	0
-00:30:1A:00:00:00/FF:FF:FF:00:00:00	Smartbridge	Unknown	0
-00:30:65:00:00:00/FF:FF:FF:00:00:00	Apple	Unknown		0	
-00:30:6E:00:00:00/FF:FF:FF:00:00:00	HP	Unknown	0
-00:30:AB:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown		0	
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown	WLAN	11	0.0.0.0
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown	belkin54g	11  0.0.0.0
-00:30:F1:00:00:00/FF:FF:FF:00:00:00	AcctonTech	Unknown	0
-00:40:01:00:00:00/FF:FF:FF:00:00:00	Zyxel	Unknown	0
-00:40:05:00:00:00/FF:FF:FF:00:00:00	ANI	Unknown	default	6	192.168.0.1
-00:40:26:00:00:00/FF:FF:FF:00:00:00	Buffalo	Unknown		0	
-00:40:33:00:00:00/FF:FF:FF:00:00:00	Addtron	Unknown	0
-00:40:36:00:00:00/FF:FF:FF:00:00:00	TribeCompu	Unknown	0
-00:40:96:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	tsunami	6	
-00:50:08:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:50:18:00:00:00/FF:FF:FF:00:00:00	Amit	Unknown	0
-00:50:DA:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:50:F2:00:00:00/FF:FF:FF:00:00:00	Microsoft	Unknown	MSHOME	6	192.168.2.1
-00:50:FC:00:00:00/FF:FF:FF:00:00:00	Edimax	Unknown	0
-00:60:01:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:60:1D:00:00:00/FF:FF:FF:00:00:00	Orinoco	Unknown		0	
-00:60:6D:00:00:00/FF:FF:FF:00:00:00	Cabletron	Unknown		0	
-00:60:B3:00:00:00/FF:FF:FF:00:00:00	Proxim	Unknown		0	
-00:80:48:00:00:00/FF:FF:FF:00:00:00	Compex	Unknown	0
-00:80:C6:00:00:00/FF:FF:FF:00:00:00	SOHOware	Unknown	
-00:80:C8:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	192.168.0.1
-00:90:0E:00:00:00/FF:FF:FF:00:00:00	Handlink	Unknown	0
-00:90:4C:00:00:00/FF:FF:FF:00:00:00	Netgear/Epigram	Unknown	NETGEAR	11	192.168.0.1
-00:90:96:00:00:00/FF:FF:FF:00:00:00	Askey	Unknown	0
-00:90:D1:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	WLAN	11	
-00:A0:04:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown	
-00:A0:C5:00:00:00/FF:FF:FF:00:00:00	Zyxel	Unknown	0
-00:A0:F8:00:00:00/FF:FF:FF:00:00:00	Symbol	Unknown	
-00:B0:64:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	0
-00:C0:02:00:00:00/FF:FF:FF:00:00:00	Sercomm	Unknown	0
-00:C0:49:00:00:00/FF:FF:FF:00:00:00	USRobotics	Unknown	0
-00:D0:59:00:00:00/FF:FF:FF:00:00:00	AmbitMicro	Unknown	0
-00:E0:00:00:00:00/FF:FF:FF:00:00:00	Fujitsu	Unknown	0
-00:E0:29:00:00:00/FF:FF:FF:00:00:00	OEM	Unknown	
-00:E0:63:00:00:00/FF:FF:FF:00:00:00	Cabletron	Unknown	0
-00:E0:98:00:00:00/FF:FF:FF:00:00:00	Trend	Unknown	0
-00:E0:B8:00:00:00/FF:FF:FF:00:00:00	Gateway2000	Unknown	0
-08:00:46:00:00:00/FF:FF:FF:00:00:00	Sony	Unknown	
-00:14:BF:00:00:00/FF:FF:FF:00:00:00	linksys	Unknown	0
-00:14:6C:00:00:00/FF:FF:FF:00:00:00	NETGEAR	Unknown	0
-00:16:B6:00:00:00/FF:FF:FF:00:00:00	linksys	Unknown	linksys	6	192.168.1.1
-02:12:F0:00:00:00/FF:FF:FF:00:00:00	hpsetup	Unknown	0
-02:13:CE:00:00:00/FF:FF:FF:00:00:00	hpsetup	Unknown	0
-00:15:E9:00:00:00/FF:FF:FF:00:00:00     dlink     Unknown 0
-00:17:9A:00:00:00/FF:FF:FF:00:00:00     dlink     Unknown 0
-00:13:F7:00:00:00/FF:FF:FF:00:00:00     SMC     Unknown 0
 

--- a/net/kismet/files/kismet.conf
+++ /dev/null
@@ -1,288 +1,1 @@
-# Kismet config file
-# Most of the "static" configs have been moved to here -- the command line
-# config was getting way too crowded and cryptic.  We want functionality,
-# not continually reading --help!
 
-# Version of Kismet config
-version=2005.01.R1
-
-# Name of server (Purely for organiational purposes)
-servername=Kismet
-
-# User to setid to (should be your normal user)
-suiduser=nobody
-
-# Sources are defined as:
-# source=cardtype,interface,name[,initialchannel]
-# Card types and required drivers are listed in the README.
-# The initial channel is optional, if hopping is not enabled it can be used
-# to set the channel the interface listens on.
-# YOU MUST CHANGE THIS TO BE THE SOURCE YOU WANT TO USE
-source=wrt54g,eth1,wireless
-# For v1 hardware uncomment this:
-# source=wrt54g,eth2,wireless
-
-# Comma-separated list of sources to enable.  This is only needed if you defined
-# multiple sources and only want to enable some of them.  By default, all defined
-# sources are enabled.
-# For example:
-# enablesources=prismsource,ciscosource
-
-# Do we channelhop?
-channelhop=true
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=5
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Do we split channels between cards on the same spectrum?  This means if 
-# multiple 802.11b capture sources are defined, they will be offset to cover
-# the most possible spectrum at a given time.  This also controls splitting
-# fine-tuned sourcechannels lines which cover multiple interfaces (see below)
-channelsplit=true
-
-# Basic channel hopping control:
-# These define the channels the cards hop through for various frequency ranges
-# supported by Kismet.   More finegrain control is available via the 
-# "sourcechannels" configuration option.
-# 
-# Don't change the IEEE80211<x> identifiers or channel hopping won't work.
-
-# Users outside the US might want to use this list:
-# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12
-defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11g uses the same channels as 802.11b...
-defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11a channels are non-overlapping so sequential is fine.  You may want to
-# adjust the list depending on the channels your card actually supports.
-# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 
-defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64
-
-# Combo cards like Atheros use both 'a' and 'b/g' channels.  Of course, you
-# can also explicitly override a given source.  You can use the script 
-# extras/listchan.pl to extract all the channels your card supports.
-defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64
-
-# Fine-tuning channel hopping control:
-# The sourcechannels option can be used to set the channel hopping for 
-# specific interfaces, and to control what interfaces share a list of 
-# channels for split hopping.  This can also be used to easily lock
-# one card on a single channel while hopping with other cards.
-# Any card without a sourcechannel definition will use the standard hopping
-# list.
-# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN
-
-# ie, for us channels on the source 'prism2source' (same as normal channel
-# hopping behavior):
-# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10
-
-# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay
-# on channel 6 and prism2b to hop normally.  By not setting a sourcechannels 
-# line for prism2b, it will use the standard hopping.
-# sourcechannels=prism2a:6
-
-# To assign the same custom hop channel to multiple sources, or to split the 
-# same custom hop channel over two sources (if splitchannels is true), list
-# them all on the same sourcechannels line:
-# sourcechannels=prism2a,prism2b,prism2c:1,6,11
-
-# Port to serve GUI data
-tcpport=2501
-# People allowed to connect, comma seperated IP addresses or network/mask
-# blocks.  Netmasks can be expressed as dotted quad (/255.255.255.0) or as
-# numbers (/24)
-allowedhosts=127.0.0.1
-# Maximum number of concurrent GUI's
-maxclients=5
-
-# Do we have a GPS?
-gps=false
-# Host:port that GPSD is running on.  This can be localhost OR remote!
-gpshost=localhost:2947
-# Do we lock the mode?  This overrides coordinates of lock "0", which will
-# generate some bad information until you get a GPS lock, but it will 
-# fix problems with GPS units with broken NMEA that report lock 0
-gpsmodelock=false
-
-# Packet filtering options:
-# filter_tracker - Packets filtered from the tracker are not processed or
-#                  recorded in any way.
-# filter_dump    - Packets filtered at the dump level are tracked, displayed,
-#                  and written to the csv/xml/network/etc files, but not 
-#                  recorded in the packet dump
-# filter_export  - Controls what packets influence the exported CSV, network,
-#                  xml, gps, etc files.
-# All filtering options take arguments containing the type of address and
-# addresses to be filtered.  Valid address types are 'ANY', 'BSSID',
-# 'SOURCE', and 'DEST'.  Filtering can be inverted by the use of '!' before
-# the address.  For example,
-# filter_tracker=ANY(!00:00:DE:AD:BE:EF)
-# has the same effect as the previous mac_filter config file option.
-# filter_tracker=...
-# filter_dump=...
-# filter_export=...
-
-# Alerts to be reported and the throttling rates.
-# alert=name,throttle/unit,burst
-# The throttle/unit describes the number of alerts of this type that are
-# sent per time unit.  Valid time units are second, minute, hour, and day.
-# Burst describes the number of alerts sent before throttling takes place.
-# For example:
-# alert=FOO,10/min,5
-# Would allow 5 alerts through before throttling is enabled, and will then
-# limit the number of alerts to 10 per minute.
-# A throttle rate of 0 disables throttling of the alert.
-# See the README for a list of alert types.
-alert=NETSTUMBLER,5/min,2
-alert=WELLENREITER,5/min,2
-alert=LUCENTTEST,5/min,2
-alert=DEAUTHFLOOD,5/min,4
-alert=BCASTDISCON,5/min,4
-alert=CHANCHANGE,5/min,4
-alert=AIRJACKSSID,5/min,2
-alert=PROBENOJOIN,5/min,2
-alert=DISASSOCTRAFFIC,5/min,2
-alert=NULLPROBERESP,5/min,5
-alert=BSSTIMESTAMP,5/min,5
-alert=MSFBCOMSSID,10/min,1/sec
-alert=LONGSSID,10/min,1/sec
-alert=MSFDLINKRATE,10/min,1/sec
-alert=MSFNETGEARBEACON,10/min,1/sec
-alert=DISCONCODEINVALID,10/min,1/sec
-alert=DEAUTHCODEINVALID,10/min,1/sec
-
-# Known WEP keys to decrypt, bssid,hexkey.  This is only for networks where
-# the keys are already known, and it may impact throughput on slower hardware.
-# Multiple wepkey lines may be used for multiple BSSIDs.
-# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900
-
-# Is transmission of the keys to the client allowed?  This may be a security
-# risk for some.  If you disable this, you will not be able to query keys from
-# a client.
-allowkeytransmit=true
-
-# How often (in seconds) do we write all our data files (0 to disable)
-writeinterval=300
-
-# Where do we get our manufacturer fingerprints from?  Assumed to be in the
-# default config directory if an absolute path is not given.
-ap_manuf=ap_manuf
-client_manuf=client_manuf
-
-# Use metric measurements in the output?
-metric=false
-
-# Do we write waypoints for gpsdrive to load?  Note:  This is NOT related to
-# recent versions of GPSDrive's native support of Kismet.
-waypoints=false
-# GPSMap waypoint file.  This WILL be truncated.
-waypointdata=%h/.gpsdrive/way_kismet.txt
-
-# How many alerts do we backlog for new clients?  Only change this if you have
-# a -very- low memory system and need those extra bytes, or if you have a high
-# memory system and a huge number of alert conditions.
-alertbacklog=50
-
-# File types to log, comma seperated
-# dump    - raw packet dump
-# network - plaintext detected networks
-# csv     - plaintext detected networks in CSV format
-# xml     - XML formatted network and cisco log
-# weak    - weak packets (in airsnort format)
-# cisco   - cisco equipment CDP broadcasts
-# gps     - gps coordinates
-logtypes=dump,network,csv,xml,weak,cisco,gps
-
-# Do we track probe responses and merge probe networks into their owners?
-# This isn't always desireable, depending on the type of monitoring you're
-# trying to do.
-trackprobenets=true
-
-# Do we log "noise" packets that we can't decipher?  I tend to not, since 
-# they don't have anything interesting at all in them.
-noiselog=false
-
-# Do we log corrupt packets?  Corrupt packets have enough header information
-# to see what they are, but someting is wrong with them that prevents us from
-# completely dissecting them.  Logging these is usually not a bad idea.
-corruptlog=true
-
-# Do we log beacon packets or do we filter them out of the dumpfile
-beaconlog=true
-
-# Do we log PHY layer packets or do we filter them out of the dumpfile
-phylog=true
-
-# Do we mangle packets if we can decrypt them or if they're fuzzy-detected
-mangledatalog=true
-
-# Do we do "fuzzy" crypt detection?  (byte-based detection instead of 802.11
-# frame headers)
-# valid option: Comma seperated list of card types to perform fuzzy detection 
-#  on, or 'all'
-fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext
-
-# What type of dump do we generate? 
-# valid option: "wiretap" 
-dumptype=wiretap
-# Do we limit the size of dump logs?  Sometimes ethereal can't handle big ones.
-# 0 = No limit
-# Anything else = Max number of packets to log to a single file before closing
-# and opening a new one.
-dumplimit=0
-
-# Do we write data packets to a FIFO for an external data-IDS (such as Snort)?
-# See the docs before enabling this.
-#fifo=/tmp/kismet_dump
-
-# Default log title
-logdefault=Kismet
-
-# logtemplate - Filename logging template.
-# This is, at first glance, really nasty and ugly, but you'll hardly ever
-# have to touch it so don't complain too much.
-#
-# %n is replaced by the logging instance name
-# %d is replaced by the current date as Mon-DD-YYYY
-# %D is replaced by the current date as YYYYMMDD
-# %t is replaced by the starting log time
-# %i is replaced by the increment log in the case of multiple logs
-# %l is replaced by the log type (dump, status, crypt, etc)
-# %h is replaced by the home directory
-# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand
-# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and 
-# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated.
-# %h/netlots/%n-%d-%i.dump could expand to
-# /home/foo/netlogs/Pok-Dec-20-01-2.dump
-#
-# Other possibilities:  Sorting by directory
-# logtemplate=%l/%n-%d-%i
-# Would expand to, for example,
-# dump/Pok-Dec-20-01-1
-# crypt/Pok-Dec-20-01-1
-# and so on.  The "dump", "crypt", etc, dirs must exist before kismet is run
-# in this case.
-logtemplate=%n-%d-%i.%l
-
-# Where do we store the pid file of the server?
-piddir=/var/run/
-
-# Where state info, etc, is stored.  You shouldnt ever need to change this.
-# This is a directory.
-configdir=%h/.kismet/
-
-# cloaked SSID file.  You shouldn't ever need to change this.
-ssidmap=ssid_map
-
-# Group map file.  You shouldn't ever need to change this.
-groupmap=group_map
-
-# IP range map file.  You shouldn't ever need to change this.
-ipmap=ip_map
-
-

--- a/net/kismet/files/kismet_drone.conf
+++ /dev/null
@@ -1,122 +1,1 @@
-# Kismet drone config file
 
-version=2005.04.R1
-
-# Name of server (Purely for organiational purposes)
-servername=Kismet
-
-# User to setid to (should be your normal user)
-suiduser=nobody
-
-# Port to serve packet data... This probably shouldn't be the same as the port
-# you configured kismet_server for, or else you'll have problems running them 
-# on the same system.
-tcpport=3501
-# People allowed to connect, comma seperated IP addresses or network/mask
-# blocks.  Netmasks can be expressed as dotted quad (/255.255.255.0) or as
-# numbers (/24)
-allowedhosts=127.0.0.1
-# Maximum number of concurrent stream attachments
-maxclients=5
-
-# Packet sources:
-# source=capture_cardtype,capture_interface,capture_name
-# Card type - Specifies the type of device. It can be one of:
-#     cisco         - Cisco card with Linux Kernel drivers 
-#     cisco_cvs     - Cisco card with CVS Linux drivers
-#     cisco_bsd     - Cisco on *BSD
-#     prism2        - Prism2 using wlan-ng drivers with pcap support (all 
-#                      current versions support pcap)
-#     prism2_hostap - Prism2 using hostap drivers
-#     prism2_legacy - Prism2 using wlan-ng drivers without pcap support (0.1.9)
-#     prism2_bsd    - Prism2 on *BSD
-#     orinoco       - Orinoco cards using Snax's patched driers
-#     generic       - Generic card with no specific support.  You will have 
-#                      to put this into monitor mode yourself!
-#     wsp100        - WSP100 embedded remote sensor.  
-#     wtapfile      - Saved file of packets readable by libwiretap
-#     ar5k          - ar5k 802.11a using the vt_ar5k drivers
-# Capture interface - Specifies the network interface Kismet will watch for
-#  packets to come in on.  Typically "ethX" or "wlanX".  For the WSP100 capture
-#  engine, the WSP100 device sends packets via a UDP stream, so the capture
-#  interface should be in the form of host:port where 'host' is the WSP100 and 
-#  'port' is the local UDP port that it will send data to.
-# Capture Name      - The name Kismet uses for this capture source.  This is the 
-#   name used to specify what sources to enable.
-# 
-# To enable multiple sources, specify a source line for each and then use the
-# enablesources line to enable them.  For example:
-# source=prism2,wlan0,prism
-# source=cisco,eth0,cisco
-source=wrt54g,eth1,wireless
-# For v1 hardware uncomment this:
-# source=wrt54g,eth2,wireless
-
-# Comma-separated list of sources to enable.  This is only needed if you wish 
-# to selectively enable multiple sources.
-# enablesources=prism,cisco
-
-# Do we channelhop?
-channelhop=true
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=5
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Do we split channels between cards on the same spectrum?  This means if 
-# multiple 802.11b capture sources are defined, they will be offset to cover
-# the most possible spectrum at a given time.  This also controls splitting
-# fine-tuned sourcechannels lines which cover multiple interfaces (see below)
-splitchannels=true
-
-# Basic channel hopping control:
-# These define the channels the cards hop through for various frequency ranges
-# supported by Kismet.   More finegrain control is available via the 
-# "sourcechannels" configuration option.
-# 
-# Don't change the IEEE80211<x> identifiers or channel hopping won't work.
-
-# Users outside the US might want to use this list:
-# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12
-defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11g uses the same channels as 802.11b...
-defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11a channels are non-overlapping so sequential is fine.  You may want to
-# adjust the list depending on the channels your card actually supports.
-# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 
-defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64
-
-# Combo cards like Atheros use both 'a' and 'b/g' channels.  Of course, you
-# can also explicitly override a given source.  You can use the script 
-# extras/listchan.pl to extract all the channels your card supports.
-defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64
-
-# Fine-tuning channel hopping control:
-# The sourcechannels option can be used to set the channel hopping for 
-# specific interfaces, and to control what interfaces share a list of 
-# channels for split hopping.  This can also be used to easily lock
-# one card on a single channel while hopping with other cards.
-# Any card without a sourcechannel definition will use the standard hopping
-# list.
-# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN
-
-# ie, for us channels on the source 'prism2source' (same as normal channel
-# hopping behavior):
-# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10
-
-# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay
-# on channel 6 and prism2b to hop normally.  By not setting a sourcechannels 
-# line for prism2b, it will use the standard hopping.
-# sourcechannels=prism2a:6
-
-# To assign the same custom hop channel to multiple sources, or to split the 
-# same custom hop channel over two sources (if splitchannels is true), list
-# them all on the same sourcechannels line:
-# sourcechannels=prism2a,prism2b,prism2c:1,6,11
-
-

--- a/net/kismet/files/kismet_ui.conf
+++ /dev/null
@@ -1,62 +1,1 @@
-# Kismet GUI config file
 
-# Version of Kismet config
-version=2005.04.R1
-
-# Do we show the intro window?
-showintro=false
-
-# Gui type to use
-# Valid types: curses, panel
-gui=panel
-# Server to connect to (host:port)
-host=localhost:2501
-# Network traffic decay (active/recent/inactive) and packet click rate - increase
-# this if you are doing prism2 channel hopping.
-decay=3
-# What columns do we display?  Comma seperated.  Read the documentation for what 
-# columns are valid.
-columns=decay,name,type,wep,channel,packets,flags,ip,size
-# What columns do we display for clients?  Comma seperated.
-clientcolumns=decay,type,mac,manuf,data,crypt,size,ip,signal,quality,noise
-
-# Do we auotmatically make a group for probed networks or do we show them
-# amidst other networks?
-autogroup_probe=true
-# Do we autogroup data-only networks?
-autogroup_data=true
-
-# Display battery status?
-apm=false
-
-# Simple borders (use - and | instead of smooth vertical and horizontal
-# lines.  This is required on Zaurus, and might be needed elsewhere if your
-# terminal doesn't display the border characters correctly.
-simpleborders=false
-
-# Colors (front, back) of text in the panel front.  Valid colors are:
-# black, red, yellow, green, blue, magenta, cyan, white
-# optionally prefixed with "hi-" for bold/bright colors, ie
-# hi-red, hi-yellow, hi-green, etc.
-
-# Enable colors?  
-color=true
-# Background
-backgroundcolor=black
-# Default text
-textcolor=white
-# Window borders
-bordercolor=green
-# Titles
-titlecolor=hi-white
-# GPS and APM info
-monitorcolor=hi-white
-# WEP network color
-wepcolor=hi-green
-# Factory network color
-factorycolor=hi-red
-# Open color
-opencolor=hi-yellow
-# Decloaked network color
-cloakcolor=hi-blue
-

--- a/net/kismet/patches/010-dont-add-host-include-paths.patch
+++ /dev/null
@@ -1,15 +1,1 @@
-diff --git a/configure b/configure
-index 6936a47..9a85269 100755
---- a/configure
-+++ b/configure
-@@ -6980,9 +6980,6 @@ else
- fi
- 
- 
--# Add additional cflags since some distros bury panel.h
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
--
- termcontrol="none";
- 
- if test "$wantclient" = "yes"; then
 

file:a/net/lispmob/Makefile (deleted)
--- a/net/lispmob/Makefile
+++ /dev/null
@@ -1,57 +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
-
-PKG_NAME:=lispmob
-PKG_REV:=79d14028286c3f3a84283c461c85916a10dff4cb
-PKG_VERSION:=0.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=git://github.com/LISPmob/lispmob.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lispd/default
-  MAINTAINER:=Vasileios Lakafosis <lakafv@gmail.com>
-  URL:=http://lisp.cisco.com/
-endef
-
-define Package/lispd
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Locator/ID separation protocol (using TUN)
-  URL:=https://github.com/LISPmob
-  DEPENDS:= +librt +libopenssl +confuse +kmod-tun +uci +kmod-ipv6
-  $(call Package/lispd/default)
-endef
-
-define Package/lispd/description
-  This packet provides support for the Locator-ID Seperation Protocol.
-endef
-
-MAKE_FLAGS += \
-	platform=openwrt
-
-define Package/lispd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lispd/lispd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/openWRT/lispd.uci.example $(1)/etc/config/lispd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/openWRT/openwrt.init.script $(1)/etc/init.d/lisp
-endef
-
-$(eval $(call BuildPackage,lispd))
-

--- a/net/madwifi/Makefile
+++ b/net/madwifi/Makefile
@@ -162,7 +162,7 @@
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros wireless chipsets
   URL:=http://madwifi-project.org/
-  DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_brcm63xx||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) +@DRIVER_WEXT_SUPPORT +hostapd-common-old
+  DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_brcm63xx||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) +@DRIVER_WEXT_SUPPORT +hostapd-common-old @BROKEN
   FILES:=$(MADWIFI_FILES)
   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
   MENU:=1

file:a/net/mtr/Makefile (deleted)
--- a/net/mtr/Makefile
+++ /dev/null
@@ -1,68 +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:=mtr
-PKG_VERSION:=0.82
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr
-PKG_MD5SUM:=10601ea543fda3e51545c4bce195b64c
-
-PKG_INSTALL:=1
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mtr
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libncurses
-  TITLE:=Full screen ncurses traceroute tool
-  URL:=http://www.bitwizard.nl/mtr/
-endef
-
-define Package/mtr/description
-	mtr combines the functionality of the 'traceroute' and 'ping' programs
-	in a single network diagnostic tool.
-	As mtr starts, it investigates the network connection between the host
-	mtr runs on and a user-specified destination host. After it
-	determines the address of each network hop between the machines,
-	it sends a sequence ICMP ECHO requests to each one to determine the
-	quality of the link to each machine. As it does this, it prints
-	running statistics about each machine.
-endef
-
-CONFIGURE_ARGS += \
-	--without-gtk \
-
-#CONFIGURE_VARS += \
-#	ac_cv_lib_resolv_res_mkquery=no \
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); touch \
-		configure.in \
-		aclocal.m4 \
-		Makefile.in \
-		img/Makefile.in \
-		stamp-h.in \
-		config.h.in \
-		configure \
-	);
-	$(call Build/Configure/Default)
-endef
-
-define Package/mtr/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,mtr))
-

--- a/net/mtr/patches/501-dns.patch
+++ /dev/null
@@ -1,511 +1,1 @@
---- a/dns.c
-+++ b/dns.c
-@@ -880,6 +880,507 @@ void restell(char *s)
-   fputs("\r",stderr);
- }
- 
-+#ifdef __UCLIBC__
-+
-+static const char       digits[] = "0123456789";
-+#define __set_errno(e) (errno = (e))
-+
-+#define NS_PUT16(s, cp) do { \
-+        register u_int16_t t_s = (u_int16_t)(s); \
-+        register u_char *t_cp = (u_char *)(cp); \
-+        *t_cp++ = t_s >> 8; \
-+        *t_cp   = t_s; \
-+        (cp) += NS_INT16SZ; \
-+} while (0)
-+
-+
-+
-+#define NS_PUT32(l, cp) do { \
-+        register u_int32_t t_l = (u_int32_t)(l); \
-+        register u_char *t_cp = (u_char *)(cp); \
-+        *t_cp++ = t_l >> 24; \
-+        *t_cp++ = t_l >> 16; \
-+        *t_cp++ = t_l >> 8; \
-+        *t_cp   = t_l; \
-+        (cp) += NS_INT32SZ; \
-+} while (0)
-+
-+
-+void
-+ns_put16(u_int src, u_char *dst) {
-+        NS_PUT16(src, dst);
-+}
-+
-+void
-+ns_put32(u_long src, u_char *dst) {
-+        NS_PUT32(src, dst);
-+}
-+
-+void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
-+void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }
-+
-+int
-+mklower(int ch) {
-+        if (ch >= 0x41 && ch <= 0x5A)
-+                return (ch + 0x20);
-+        return (ch);
-+}
-+
-+
-+static int
-+dn_find(const u_char *domain, const u_char *msg,
-+        const u_char * const *dnptrs,
-+        const u_char * const *lastdnptr)
-+{
-+        const u_char *dn, *cp, *sp;
-+        const u_char * const *cpp;
-+        u_int n;
-+
-+        for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-+                sp = *cpp;
-+                /*
-+                 * terminate search on:
-+                 * root label
-+                 * compression pointer
-+                 * unusable offset
-+                 */
-+                while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 &&
-+                       (sp - msg) < 0x4000) {
-+                        dn = domain;
-+                        cp = sp;
-+                        while ((n = *cp++) != 0) {
-+                                /*
-+                                 * check for indirection
-+                                 */
-+                                switch (n & NS_CMPRSFLGS) {
-+                                case 0:         /* normal case, n == len */
-+                                        if (n != *dn++)
-+                                                goto next;
-+                                        for ((void)NULL; n > 0; n--)
-+                                                if (mklower(*dn++) !=
-+                                                    mklower(*cp++))
-+                                                        goto next;
-+                                        /* Is next root for both ? */
-+                                        if (*dn == '\0' && *cp == '\0')
-+                                                return (sp - msg);
-+                                        if (*dn)
-+                                                continue;
-+                                        goto next;
-+
-+                                case NS_CMPRSFLGS:      /* indirection */
-+                                        cp = msg + (((n & 0x3f) << 8) | *cp);
-+                                        break;
-+
-+                                default:        /* illegal type */
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                        }
-+ next:
-+                        sp += *sp + 1;
-+                }
-+        }
-+        __set_errno (ENOENT);
-+        return (-1);
-+}
-+
-+
-+int
-+ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
-+             const u_char **dnptrs, const u_char **lastdnptr)
-+{
-+        u_char *dstp;
-+        const u_char **cpp, **lpp, *eob, *msg;
-+        const u_char *srcp;
-+        int n, l, first = 1;
-+
-+        srcp = src;
-+        dstp = dst;
-+        eob = dstp + dstsiz;
-+        lpp = cpp = NULL;
-+        if (dnptrs != NULL) {
-+                if ((msg = *dnptrs++) != NULL) {
-+                        for (cpp = dnptrs; *cpp != NULL; cpp++)
-+                                (void)NULL;
-+                        lpp = cpp;      /* end of list to search */
-+                }
-+        } else
-+                msg = NULL;
-+
-+        /* make sure the domain we are about to add is legal */
-+        l = 0;
-+        do {
-+                n = *srcp;
-+                if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) {
-+                        __set_errno (EMSGSIZE);
-+                        return (-1);
-+                }
-+                if (n == 0x41)
-+                        n = *++srcp / 8;
-+                l += n + 1;
-+                if (l > MAXCDNAME) {
-+                        __set_errno (EMSGSIZE);
-+                        return (-1);
-+                }
-+                srcp += n + 1;
-+        } while (n != 0);
-+
-+        /* from here on we need to reset compression pointer array on error */
-+        srcp = src;
-+        do {
-+                /* Look to see if we can use pointers. */
-+                n = *srcp;
-+                if (n != 0 && n != 0x41 && msg != NULL) {
-+                        l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
-+                                    (const u_char * const *)lpp);
-+                        if (l >= 0) {
-+                                if (dstp + 1 >= eob) {
-+                                        goto cleanup;
-+                                }
-+                                *dstp++ = (l >> 8) | NS_CMPRSFLGS;
-+                                *dstp++ = l % 256;
-+                                return (dstp - dst);
-+                        }
-+                        /* Not found, save it. */
-+                        if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
-+                            (dstp - msg) < 0x4000 && first) {
-+                                *cpp++ = dstp;
-+                                *cpp = NULL;
-+                                first = 0;
-+                        }
-+                }
-+                /* copy label to buffer */
-+                if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) {             /* Should not happen. */
-+                        goto cleanup;
-+                }
-+                if (n == 0x41) {
-+                        n = *++srcp / 8;
-+                        if (dstp + 1 >= eob)
-+                                goto cleanup;
-+                        *dstp++ = 0x41;
-+                }
-+                if (dstp + 1 + n >= eob) {
-+                        goto cleanup;
-+                }
-+                memcpy(dstp, srcp, n + 1);
-+                srcp += n + 1;
-+                dstp += n + 1;
-+        } while (n != 0);
-+
-+        if (dstp > eob) {
-+cleanup:
-+                if (msg != NULL)
-+                        *lpp = NULL;
-+                __set_errno (EMSGSIZE);
-+                return (-1);
-+        }
-+        return (dstp - dst);
-+}
-+
-+
-+int
-+ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
-+        u_char *label, *bp, *eom;
-+        int c, n, escaped;
-+        char *cp;
-+
-+        escaped = 0;
-+        bp = dst;
-+        eom = dst + dstsiz;
-+        label = bp++;
-+
-+        while ((c = *src++) != 0) {
-+                if (escaped) {
-+                        if ((cp = strchr(digits, c)) != NULL) {
-+                                n = (cp - digits) * 100;
-+                                if ((c = *src++) == 0 ||
-+                                    (cp = strchr(digits, c)) == NULL) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                n += (cp - digits) * 10;
-+                                if ((c = *src++) == 0 ||
-+                                    (cp = strchr(digits, c)) == NULL) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                n += (cp - digits);
-+                                if (n > 255) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                c = n;
-+                        } else if (c == '[' && label == bp - 1 && *src == 'x') {
-+                                /* Theoretically we would have to handle \[o
-+                                   as well but we do not since we do not need
-+                                   it internally.  */
-+                                *label = 0x41;
-+                                label = bp++;
-+                                ++src;
-+                                while (isxdigit (*src)) {
-+                                        n = *src > '9' ? *src - 'a' + 10 : *src - '0';
-+                                        ++src;
-+                                        if (! isxdigit(*src)) {
-+                                                __set_errno (EMSGSIZE);
-+                                                return (-1);
-+                                        }
-+                                        n <<= 4;
-+                                        n += *src > '9' ? *src - 'a' + 10 : *src - '0';
-+                                        if (bp + 1 >= eom) {
-+                                                __set_errno (EMSGSIZE);
-+                                                return (-1);
-+                                        }
-+                                        *bp++ = n;
-+                                        ++src;
-+                                }
-+                                *label = (bp - label - 1) * 8;
-+                                if (*src++ != ']' || *src++ != '.') {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                escaped = 0;
-+                                label = bp++;
-+                                if (bp >= eom) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                continue;
-+                        }
-+                        escaped = 0;
-+                } else if (c == '\\') {
-+                        escaped = 1;
-+                        continue;
-+                } else if (c == '.') {
-+                        c = (bp - label - 1);
-+                        if ((c & NS_CMPRSFLGS) != 0) {  /* Label too big. */
-+                                __set_errno (EMSGSIZE);
-+                                return (-1);
-+                        }
-+                        if (label >= eom) {
-+                                __set_errno (EMSGSIZE);
-+                                return (-1);
-+                        }
-+                        *label = c;
-+                        /* Fully qualified ? */
-+                        if (*src == '\0') {
-+                                if (c != 0) {
-+                                        if (bp >= eom) {
-+                                                __set_errno (EMSGSIZE);
-+                                                return (-1);
-+                                        }
-+                                        *bp++ = '\0';
-+                                }
-+                                if ((bp - dst) > MAXCDNAME) {
-+                                        __set_errno (EMSGSIZE);
-+                                        return (-1);
-+                                }
-+                                return (1);
-+                        }
-+                        if (c == 0 || *src == '.') {
-+                                __set_errno (EMSGSIZE);
-+                                return (-1);
-+                        }
-+                        label = bp++;
-+                        continue;
-+                }
-+                if (bp >= eom) {
-+                        __set_errno (EMSGSIZE);
-+                        return (-1);
-+                }
-+                *bp++ = (u_char)c;
-+        }
-+        c = (bp - label - 1);
-+        if ((c & NS_CMPRSFLGS) != 0) {          /* Label too big. */
-+                __set_errno (EMSGSIZE);
-+                return (-1);
-+        }
-+        if (label >= eom) {
-+                __set_errno (EMSGSIZE);
-+                return (-1);
-+        }
-+        *label = c;
-+        if (c != 0) {
-+                if (bp >= eom) {
-+                        __set_errno (EMSGSIZE);
-+                        return (-1);
-+                }
-+                *bp++ = 0;
-+        }
-+        if ((bp - dst) > MAXCDNAME) {   /* src too big */
-+                __set_errno (EMSGSIZE);
-+                return (-1);
-+        }
-+        return (0);
-+}
-+
-+
-+
-+int
-+ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
-+                 const u_char **dnptrs, const u_char **lastdnptr)
-+{
-+        u_char tmp[NS_MAXCDNAME];
-+
-+        if (ns_name_pton(src, tmp, sizeof tmp) == -1)
-+                return (-1);
-+        return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
-+}
-+
-+
-+int
-+dn_comp(const char *src, u_char *dst, int dstsiz,
-+        u_char **dnptrs, u_char **lastdnptr)
-+{
-+        return (ns_name_compress(src, dst, (size_t)dstsiz,
-+                                 (const u_char **)dnptrs,
-+                                 (const u_char **)lastdnptr));
-+}
-+
-+
-+
-+
-+int
-+res_nmkquery(res_state statp,
-+             int op,                    /* opcode of query */
-+             const char *dname,         /* domain name */
-+             int class, int type,       /* class and type of query */
-+             const u_char *data,        /* resource record data */
-+             int datalen,               /* length of data */
-+             const u_char *newrr_in,    /* new rr for modify or append */
-+             u_char *buf,               /* buffer to put query */
-+             int buflen)                /* size of buffer */
-+{
-+        register HEADER *hp;
-+        register u_char *cp;
-+        register int n;
-+        u_char *dnptrs[20], **dpp, **lastdnptr;
-+
-+#ifdef DEBUG
-+        if (statp->options & RES_DEBUG)
-+                printf(";; res_nmkquery(%s, %s, %s, %s)\n",
-+                       _res_opcodes[op], dname, p_class(class), p_type(type));
-+#endif
-+        /*
-+         * Initialize header fields.
-+         */
-+        if ((buf == NULL) || (buflen < HFIXEDSZ))
-+                return (-1);
-+        memset(buf, 0, HFIXEDSZ);
-+        hp = (HEADER *) buf;
-+        /* We randomize the IDs every time.  The old code just
-+           incremented by one after the initial randomization which
-+           still predictable if the application does multiple
-+           requests.  */
-+#if 0
-+        hp->id = htons(++statp->id);
-+#else
-+        hp->id = htons(statp->id);
-+        int randombits;
-+        do
-+          {
-+#ifdef RANDOM_BITS
-+            RANDOM_BITS (randombits);
-+#else
-+            struct timeval tv;
-+            gettimeofday (&tv, NULL);
-+            randombits = (tv.tv_sec << 8) ^ tv.tv_usec;
-+#endif
-+          }
-+        while ((randombits & 0xffff) == 0);
-+        statp->id = (statp->id + randombits) & 0xffff;
-+#endif
-+        hp->opcode = op;
-+        hp->rd = (statp->options & RES_RECURSE) != 0;
-+        hp->rcode = NOERROR;
-+        cp = buf + HFIXEDSZ;
-+        buflen -= HFIXEDSZ;
-+        dpp = dnptrs;
-+        *dpp++ = buf;
-+        *dpp++ = NULL;
-+        lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-+        /*
-+         * perform opcode specific processing
-+         */
-+        switch (op) {
-+        case QUERY:     /*FALLTHROUGH*/
-+        case NS_NOTIFY_OP:
-+                if ((buflen -= QFIXEDSZ) < 0)
-+                        return (-1);
-+                if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-+                        return (-1);
-+                cp += n;
-+                buflen -= n;
-+                __putshort(type, cp);
-+                cp += INT16SZ;
-+                __putshort(class, cp);
-+                cp += INT16SZ;
-+                hp->qdcount = htons(1);
-+                if (op == QUERY || data == NULL)
-+                        break;
-+                /*
-+                 * Make an additional record for completion domain.
-+                 */
-+                buflen -= RRFIXEDSZ;
-+                n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
-+                if (n < 0)
-+                        return (-1);
-+                cp += n;
-+                buflen -= n;
-+                __putshort(T_NULL, cp);
-+                cp += INT16SZ;
-+                __putshort(class, cp);
-+                cp += INT16SZ;
-+                __putlong(0, cp);
-+                cp += INT32SZ;
-+                __putshort(0, cp);
-+                cp += INT16SZ;
-+                hp->arcount = htons(1);
-+                break;
-+
-+        case IQUERY:
-+                /*
-+                 * Initialize answer section
-+                 */
-+                if (buflen < 1 + RRFIXEDSZ + datalen)
-+                        return (-1);
-+                *cp++ = '\0';   /* no domain name */
-+                __putshort(type, cp);
-+                cp += INT16SZ;
-+                __putshort(class, cp);
-+                cp += INT16SZ;
-+                __putlong(0, cp);
-+                cp += INT32SZ;
-+                __putshort(datalen, cp);
-+                cp += INT16SZ;
-+                if (datalen) {
-+                        memcpy(cp, data, datalen);
-+                        cp += datalen;
-+                }
-+                hp->ancount = htons(1);
-+                break;
-+
-+        default:
-+                return (-1);
-+        }
-+        return (cp - buf);
-+}
-+
-+int
-+res_mkquery(int op,                     /* opcode of query */
-+            const char *dname,          /* domain name */
-+            int class, int type,        /* class and type of query */
-+            const u_char *data,         /* resource record data */
-+            int datalen,                /* length of data */
-+            const u_char *newrr_in,     /* new rr for modify or append */
-+            u_char *buf,                /* buffer to put query */
-+            int buflen)                 /* size of buffer */
-+{
-+        return (res_nmkquery(&_res, op, dname, class, type,
-+                             data, datalen,
-+                             newrr_in, buf, buflen));
-+}
-+
-+#endif
- 
- void dorequest(char *s,int type,word id)
- {
 

--- a/net/mtr/patches/502-fix-res_ninit.patch
+++ /dev/null
@@ -1,32 +1,1 @@
---- a/dns.c
-+++ b/dns.c
-@@ -1267,28 +1267,6 @@ res_nmkquery(res_state statp,
-                 return (-1);
-         memset(buf, 0, HFIXEDSZ);
-         hp = (HEADER *) buf;
--        /* We randomize the IDs every time.  The old code just
--           incremented by one after the initial randomization which
--           still predictable if the application does multiple
--           requests.  */
--#if 0
--        hp->id = htons(++statp->id);
--#else
--        hp->id = htons(statp->id);
--        int randombits;
--        do
--          {
--#ifdef RANDOM_BITS
--            RANDOM_BITS (randombits);
--#else
--            struct timeval tv;
--            gettimeofday (&tv, NULL);
--            randombits = (tv.tv_sec << 8) ^ tv.tv_usec;
--#endif
--          }
--        while ((randombits & 0xffff) == 0);
--        statp->id = (statp->id + randombits) & 0xffff;
--#endif
-         hp->opcode = op;
-         hp->rd = (statp->options & RES_RECURSE) != 0;
-         hp->rcode = NOERROR;
 

--- a/net/mtr/patches/520-libresolv_fix.patch
+++ /dev/null
@@ -1,18 +1,1 @@
---- a/configure.in
-+++ b/configure.in
-@@ -72,10 +72,10 @@ AC_CHECK_FUNC(gethostbyname, ,
- AC_CHECK_FUNCS(seteuid)
- #  AC_CHECK_FUNC(setuid, , AC_MSG_ERROR (I Need either seteuid or setuid))
- 
--AC_CHECK_FUNC(res_mkquery, , 
--  AC_CHECK_LIB(bind, res_mkquery, , 
--   AC_CHECK_LIB(resolv, res_mkquery, ,
--     AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
-+#AC_CHECK_FUNC(res_mkquery, ,
-+#  AC_CHECK_LIB(bind, res_mkquery, ,
-+#   AC_CHECK_LIB(resolv, res_mkquery, ,
-+#     AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
- # This next line would override the just detected-or-not -lresolv. 
- # This apparently hurts BSD. And it's bad practise. So it should go. 
- # However, it probably didn't get added for nothing..... Holler if
 

--- a/net/mtr/patches/521-gtk_fix.patch
+++ /dev/null
@@ -1,28 +1,1 @@
---- a/configure.in
-+++ b/configure.in
-@@ -48,16 +48,16 @@ AC_ARG_ENABLE(ipv6,
- [  --disable-ipv6          Do not enable IPv6],
- WANTS_IPV6=$enableval, WANTS_IPV6=yes)
-    
--if test "x$WANTS_GTK" = "xyes"; then
--        AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
--                           LIBS="$LIBS $GTK_LIBS -lm",
--                           AC_MSG_WARN(Building without GTK2 display support)
--                   AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
--                           GTK_OBJ="")
--else
-+#if test "x$WANTS_GTK" = "xyes"; then
-+#        AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
-+#                           LIBS="$LIBS $GTK_LIBS -lm",
-+#                           AC_MSG_WARN(Building without GTK2 display support)
-+#                   AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
-+#                           GTK_OBJ="")
-+#else
- 	AC_DEFINE(NO_GTK)
- 	GTK_OBJ=""
--fi
-+#fi
- 
- AC_CHECK_FUNC(socket, , 
-   AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
 

file:a/net/privoxy/Makefile (deleted)
--- a/net/privoxy/Makefile
+++ /dev/null
@@ -1,65 +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:=privoxy
-PKG_VERSION:=3.0.21
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz
-PKG_SOURCE_URL:=@SF/ijbswa
-PKG_MD5SUM:=79558f2545cfcf9731f7de611646d837
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/privoxy
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  DEPENDS:=+libpcre +libpthread +zlib
-  TITLE:=web proxy with advanced filtering capabilities
-  URL:=http://www.privoxy.org/
-endef
-
-define Package/privoxy/description
-	Privoxy is a web proxy with advanced filtering capabilities for
-	protecting privacy, modifying web page content, managing cookies,
-	controlling access, and removing ads, banners, pop-ups and other
-	obnoxious Internet junk. Privoxy has a very flexible configuration
-	and can be customized to suit individual needs and tastes. Privoxy
-	has application for both stand-alone systems and multi-user networks.
-endef
-
-CONFIGURE_ARGS += \
-	--sysconfdir=/etc/privoxy \
-
-MAKE_FLAGS :=
-
-define Package/privoxy/conffiles
-/etc/privoxy/config
-endef
-
-define Package/privoxy/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/privoxy $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/privoxy
-	$(CP) $(PKG_INSTALL_DIR)/etc/privoxy/* $(1)/etc/privoxy/
-	$(INSTALL_CONF) ./files/privoxy.config $(1)/etc/privoxy/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/privoxy.init $(1)/etc/init.d/privoxy
-endef
-
-$(eval $(call BuildPackage,privoxy))
-

--- a/net/privoxy/files/privoxy.config
+++ /dev/null
@@ -1,28 +1,1 @@
-confdir /etc/privoxy
-logdir /var/log
-filterfile default.filter
-logfile privoxy
-actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.
-actionsfile default.action   # Main actions file
-#actionsfile user.action      # User customizations
-listen-address  127.0.0.1:8118
-toggle  1
-enable-remote-toggle  1
-enable-remote-http-toggle  0
-enable-edit-actions 1
-enforce-blocks 0
-buffer-limit 4096
-forwarded-connect-retries  0
-accept-intercepted-requests 0
-allow-cgi-request-crunching 0
-split-large-forms 0
-keep-alive-timeout 300
-socket-timeout 300
-permit-access  192.168.1.0/24
-debug   1    # show each GET/POST/CONNECT request
-debug   4096 # Startup banner and warnings
-debug   8192 # Errors - *we highly recommended enabling this*
-#admin-address privoxy-admin@example.com
-#proxy-info-url http://www.example.com/proxy-service.html
 
-

--- a/net/privoxy/files/privoxy.init
+++ /dev/null
@@ -1,17 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-START=80
-STOP=80
-
-SERVICE_USE_PID=1
-
-start() {
-	service_start /usr/sbin/privoxy --pidfile /var/run/privoxy.pid \
-					/etc/privoxy/config
-}
-
-stop() {
-	service_stop /usr/sbin/privoxy
-}
-

file:a/net/smcroute/Makefile (deleted)
--- a/net/smcroute/Makefile
+++ /dev/null
@@ -1,51 +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:=smcroute
-PKG_VERSION:=0.92
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://www.cschill.de/smcroute
-PKG_MD5SUM:=2b50e7166606ec90e09682399e69c4a6
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/smcroute
-	SECTION:=net
-	CATEGORY:=Network
-	SUBMENU:=Routing and Redirection
-	TITLE:=Static multicast routing daemon
-	URL:=http://www.cschill.de/smcroute/
-endef
-
-define Package/smcroute/description
- SMCRoute is a command line tool to manipulate the multicast routes of the Linux kernel.
-endef
-
-
-ifeq ($(HOST_OS),FreeBSD)
-  TARGET_CFLAGS += -fno-builtin-log
-  TARGET_LDFLAGS += -fno-builtin-log
-endif
-
-define Build/Compile
-	 $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" -C $(PKG_BUILD_DIR)/src all
-endef
-
-define Package/smcroute/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/smcroute $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mcsender $(1)/usr/bin/
-	$(INSTALL_BIN) ./files/smcroute.init $(1)/etc/init.d/smcroute
-endef
-
-$(eval $(call BuildPackage,smcroute))
-

--- a/net/smcroute/files/smcroute.init
+++ /dev/null
@@ -1,12 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2010 OpenWrt.org
-START=50
 
-start() {
-	smcroute -d
-}
-
-stop() {
-	smcroute -k
-}
-

--- a/net/smcroute/patches/001-socket_path.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/src/ipc.c	2002-07-07 19:38:49.000000000 +0200
-+++ b/src/ipc.c	2010-10-01 21:44:26.000000000 +0200
-@@ -24,7 +24,7 @@
- 
- #include "mclab.h"
- 
--#define SOCKET_PATH "/var/lib/smcroute"
-+#define SOCKET_PATH "/tmp/smcroute"
- 
- // server's listen socket
- static int ListenSock; 
 

--- a/net/smcroute/patches/002-optimize_size.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,9 +1,6 @@
- 
- BINDIR=../bin
- 
--# CFLAGS=-g
--CFLAGS=-O
--
- default : build.h smcroute
- 
- all	: smcroute mcsender
 

--- a/utils/cryptsetup/Makefile
+++ /dev/null
@@ -1,76 +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:=cryptsetup
-PKG_VERSION:=1.6.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://cryptsetup.googlecode.com/files/
-PKG_MD5SUM:=cd834da49fbe92dd66df02cc5c61280f
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-define Package/cryptsetup/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Cryptsetup
-  DEPENDS:=+libblkid +libuuid +libpopt +lvm2 +libdevmapper +@KERNEL_DIRECT_IO
-  URL:=http://code.google.com/p/cryptsetup/
-endef
-
-define Package/cryptsetup
-$(call Package/cryptsetup/Default)
-  DEPENDS+=+libgcrypt
-  VARIANT:=gcrypt
-endef
-
-define Package/cryptsetup-openssl
-$(call Package/cryptsetup/Default)
-  TITLE+= (with openssl support)
-  DEPENDS+=+libopenssl
-  VARIANT:=openssl
-endef
-
-define Package/cryptsetup/Default/description
-	Cryptsetup-luks
-endef
-
-define Package/cryptsetup/description
-$(call Package/cryptsetup/Default/description)
-linked against libgcrypt
-endef
-
-
-define Package/cryptsetup-openssl/description
-$(call Package/cryptsetup/Default/description)
-linked against openssl
-endef
-
-ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS+= \
-        --with-crypto_backend=openssl
-endif
-
-define Package/cryptsetup/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/src/.libs/cryptsetup $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/.libs/libcryptsetup.so* $(1)/usr/lib
-endef
-
-Package/cryptsetup-openssl/install = $(Package/cryptsetup/install)
-
-$(eval $(call BuildPackage,cryptsetup))
-$(eval $(call BuildPackage,cryptsetup-openssl))
-

file:a/utils/hdparm/Makefile (deleted)
--- a/utils/hdparm/Makefile
+++ /dev/null
@@ -1,38 +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:=hdparm
-PKG_VERSION:=9.39
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=2bc17b72403885d4faf959682944243b
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/hdparm
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=disc
-  TITLE:=Hard disk drive configuration utilitity
-  URL:=http://sourceforge.net/projects/hdparm/
-endef
-
-define Package/hdparm/description
- get/set SATA/IDE device parameters
-endef
-
-define Package/hdparm/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/sbin
-endef
-
-$(eval $(call BuildPackage,hdparm))
-

file:a/utils/joe/Makefile (deleted)
--- a/utils/joe/Makefile
+++ /dev/null
@@ -1,50 +1,1 @@
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-# changes by David Kuehling <dvdkhlng TA gmx TOD de>:
-#
-#  - include support for all emulation modes jmacs jpico etc.
-#  - see patches/002-builtinrc.patch
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=joe
-PKG_VERSION:=3.7
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/joe-editor
-PKG_MD5SUM:=66de1b073e869ba12abbfcde3885c577
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/joe
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncurses
-  TITLE:=JOE - Joes own editor
-  URL:=http://sourceforge.net/projects/joe-editor/
-  SUBMENU:=Editors
-endef
-
-define Package/joe/description
-Joe is world-famous Wordstar like text editor, that also features
-Emacs and Pico emulation
-endef
-
-define Package/joe/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/joe $(1)/usr/bin/
-	for i in jmacs jstar rjoe jpico; do \
-	  ln -sf joe $(1)/usr/bin/$$$$i; \
-	done
-endef
-
-$(eval $(call BuildPackage,joe))
-

--- a/utils/joe/patches/001-mathaway.patch
+++ /dev/null
@@ -1,59 +1,1 @@
---- a/umath.c
-+++ b/umath.c
-@@ -378,7 +378,6 @@ double m_cos(double n) { return cos(n); 
- double m_tan(double n) { return tan(n); }
- double m_exp(double n) { return exp(n); }
- double m_sqrt(double n) { return sqrt(n); }
--double m_cbrt(double n) { return cbrt(n); }
- double m_log(double n) { return log(n); }
- double m_log10(double n) { return log10(n); }
- double m_asin(double n) { return asin(n); }
-@@ -387,19 +386,10 @@ double m_atan(double n) { return atan(n)
- double m_sinh(double n) { return sinh(n); }
- double m_cosh(double n) { return cosh(n); }
- double m_tanh(double n) { return tanh(n); }
--double m_asinh(double n) { return asinh(n); }
--double m_acosh(double n) { return acosh(n); }
--double m_atanh(double n) { return atanh(n); }
- double m_int(double n) { return (int)(n); }
- double m_floor(double n) { return floor(n); }
- double m_ceil(double n) { return ceil(n); }
- double m_fabs(double n) { return fabs(n); }
--double m_erf(double n) { return erf(n); }
--double m_erfc(double n) { return erfc(n); }
--double m_j0(double n) { return j0(n); }
--double m_j1(double n) { return j1(n); }
--double m_y0(double n) { return y0(n); }
--double m_y1(double n) { return y1(n); }
- 
- double calc(BW *bw, unsigned char *s)
- {
-@@ -414,7 +404,6 @@ double calc(BW *bw, unsigned char *s)
- 		v = get(USTR "tan"); v->func = m_tan;
- 		v = get(USTR "exp"); v->func = m_exp;
- 		v = get(USTR "sqrt"); v->func = m_sqrt;
--		v = get(USTR "cbrt"); v->func = m_cbrt;
- 		v = get(USTR "ln"); v->func = m_log;
- 		v = get(USTR "log"); v->func = m_log10;
- 		v = get(USTR "asin"); v->func = m_asin;
-@@ -425,19 +414,10 @@ double calc(BW *bw, unsigned char *s)
- 		v = get(USTR "sinh"); v->func = m_sinh;
- 		v = get(USTR "cosh"); v->func = m_cosh;
- 		v = get(USTR "tanh"); v->func = m_tanh;
--		v = get(USTR "asinh"); v->func = m_asinh;
--		v = get(USTR "acosh"); v->func = m_acosh;
--		v = get(USTR "atanh"); v->func = m_atanh;
- 		v = get(USTR "int"); v->func = m_int;
- 		v = get(USTR "floor"); v->func = m_floor;
- 		v = get(USTR "ceil"); v->func = m_ceil;
- 		v = get(USTR "abs"); v->func = m_fabs;
--		v = get(USTR "erf"); v->func = m_erf;
--		v = get(USTR "erfc"); v->func = m_erfc;
--		v = get(USTR "j0"); v->func = m_j0;
--		v = get(USTR "j1"); v->func = m_j1;
--		v = get(USTR "y0"); v->func = m_y0;
--		v = get(USTR "y1"); v->func = m_y1;
- 	}
- 
- 	v = get(USTR "top");
 

file:a/utils/lvm2/Makefile (deleted)
--- a/utils/lvm2/Makefile
+++ /dev/null
@@ -1,88 +1,1 @@
-#
-# Copyright (C) 2009-2010 Stefan Monnier
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v3+.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=LVM2
-PKG_VERSION:=2.02.105
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2
-PKG_MD5SUM:=b5b3540661fc70bf329b526c1cfbcf3a
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libdevmapper
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=The Linux Kernel Device Mapper userspace library
-  URL:=http://sourceware.org/dm/
-  DEPENDS:=+kmod-dm +libpthread
-endef
-
-define Package/libdevmapper/description
- The device-mapper is a component of the 2.6 linux kernel that supports logical
- volume management. It is required by LVM2 and EVMS.
-endef
-
-define Package/lvm2
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=disc
-  TITLE:=The Linux Logical Volume Manager
-  URL:=http://sourceware.org/lvm2/
-  DEPENDS:=+libdevmapper +libblkid +libreadline +libncurses
-endef
-
-define Package/lvm2/description
- LVM2 refers to a new userspace toolset that provide logical volume management
- facilities on linux. It is reasonably backwards-compatible with the original
- LVM toolset.
-endef
-
-CONFIGURE_ARGS += --disable-o_direct
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libdevmapper.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdevmapper.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_BUILD_DIR)/libdm/libdevmapper.pc $(1)/usr/lib/pkgconfig
-endef
-
-define Package/libdevmapper/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdevmapper.so.* $(1)/usr/lib
-endef
-
-define Package/lvm2/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/lvm $(1)/sbin
-	$(INSTALL_DIR) $(1)/etc/lvm
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/example.conf $(1)/etc/lvm/lvm.conf
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/lvm2.init $(1)/etc/init.d/lvm2
-endef
-
-define Package/lvm2/conffiles
-/etc/lvm/lvm.conf
-endef
-
-$(eval $(call BuildPackage,libdevmapper))
-$(eval $(call BuildPackage,lvm2))
-

--- a/utils/lvm2/files/lvm2.init
+++ /dev/null
@@ -1,13 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009 Stefan Monnier
-START=15
 
-start () {
-   /sbin/lvm vgscan --ignorelockingfailure --mknodes || :
-   /sbin/lvm vgchange -aly --ignorelockingfailure || return 2
-}
-
-stop () {
-    /sbin/lvm vgchange -aln --ignorelockingfailure || return 2
-}
-

--- a/utils/lvm2/patches/000-compile.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/make.tmpl.in
-+++ b/make.tmpl.in
-@@ -19,7 +19,7 @@
- 
- # Allow environment to override any built-in default value for CC.
- # If there is a built-in default, CC is NOT set to @CC@ here.
--CC ?= @CC@
-+CC = @CC@
- 
- # If $(CC) holds the usual built-in default value of 'cc' then replace it with
- # the configured value.
 

file:a/utils/mc/Config.in (deleted)
--- a/utils/mc/Config.in
+++ /dev/null
@@ -1,21 +1,1 @@
-menu "Configuration"
-	depends on PACKAGE_mc
 
-config MC_DIFF_VIEWER
-	bool "Compile with diff viewer"
-	default n
-
-config MC_EDITOR
-	bool "Enable internal editor"
-	default n
-
-config MC_SUBSHELL
-	bool "Compile in concurrent subshell"
-	default n
-
-config MC_DISABLE_VFS
-	bool "Disable VFS"
-	default y
-
-endmenu
-

file:a/utils/mc/Makefile (deleted)
--- a/utils/mc/Makefile
+++ /dev/null
@@ -1,97 +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:=mc
-PKG_VERSION:=4.8.10
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.midnight-commander.org/downloads/
-PKG_MD5SUM:=eb4bdc23abd4fdfa14911d53d65c8186
-
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/mc
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS)
-  TITLE:=midnight commander - a powerful file manager
-  URL:=http://www.midnight-commander.org/
-  SUBMENU:=filemanager
-  MENU:=1
-endef
-
-define Package/mc/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/mc/description
- GNU Midnight Commander is a visual file manager, licensed under GNU General
- Public License and therefore qualifies as Free Software. It's a feature rich
- full-screen text mode application that allows you to copy, move and delete
- files and whole directory trees, search for files and run commands in the
- subshell.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-utf8 \
-	--disable-doxygen-doc \
-	--disable-vfs-sftp \
-	--with-screen=ncurses \
-	--without-gpm-mouse \
-	--without-x \
-	ac_cv_search_addwstr=no
-
-ifeq ($(CONFIG_MC_DIFF_VIEWER),n)
-CONFIGURE_ARGS += \
-	--without-diff-viewer
-endif
-
-ifeq ($(CONFIG_MC_EDITOR),n)
-CONFIGURE_ARGS += \
-	--without-edit
-endif
-
-ifeq ($(CONFIG_MC_SUBSHELL),n)
-CONFIGURE_ARGS += \
-	--without-subshell
-endif
-
-ifeq ($(CONFIG_MC_DISABLE_VFS),y)
-CONFIGURE_ARGS += \
-	--without-vfs
-endif
-
-define Package/mc/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/etc/mc
-ifeq ($(CONFIG_MC_DIFF_VIEWER),y)
-	ln -sf mc $(1)/usr/bin/mcdiff
-endif
-ifeq ($(CONFIG_MC_EDITOR),y)
-	ln -sf mc $(1)/usr/bin/mcedit
-endif
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/mc.menu $(1)/etc/mc
-	$(INSTALL_DIR) $(1)/etc/mc/skins
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/skins/default.ini $(1)/etc/mc/skins
-	$(INSTALL_DIR) $(1)/root/.mc/cedit/Syntax
-endef
-
-define Package/mc/conffiles
-/etc/mc/mc.menu
-/etc/mc/skins/default.ini
-endef
-
-$(eval $(call BuildPackage,mc))
-

file:a/utils/mksh/Makefile (deleted)
--- a/utils/mksh/Makefile
+++ /dev/null
@@ -1,82 +1,1 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-# Copyright (c) 2009-2013 Thorsten Glaser <tg@mirbsd.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mksh
-PKG_VERSION:=47
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh
-PKG_MD5SUM:=71c7cbcd78306897801b8b6691091e66
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mksh
-  SECTION:=shells
-  CATEGORY:=Base system
-  TITLE:=MirBSD Korn Shell
-  DEPENDS:=$(DEP)
-  URL:=http://mirbsd.de/mksh
-endef
-
-define Package/mksh/description
-mksh is the MirBSD enhanced version of the Public Domain Korn
-shell (pdksh), a Bourne-compatible shell which is largely si-
-milar to the original AT&T Korn shell; mksh is the only pdksh
-derivate currently being actively developed.  It includes bug
-fixes and feature improvements, in order to produce a modern,
-robust shell good for interactive and especially script use.
-mksh has UTF-8 support (in substring operations and the Emacs
-editing mode) and - while R47 corresponds to OpenBSD 5.1-cur-
-rent ksh (without GNU bash-like PS1 and fancy character clas-
-ses) - adheres to SUSv4 and is much more robust. The code has
-been cleaned up and simplified, bugs fixed, standards compli-
-ance added, and several enhancements (for extended compatibi-
-lity to other modern shells - as well as a couple of its own)
-are available. It has sensible defaults as usual with BSD.
-endef
-
-define Build/Compile
-	# -DMKSH_SMALL=1 ⇒ reduce functionality quite a lot
-	# -DMKSH_ASSUME_UTF8=0 ⇒ never automatically enable
-	#	UTF-8 mode, neither use setlocale/nl_langinfo
-	#	nor look at $LC_* and $LANG (not recommended)
-	# HAVE_CAN_FSTACKPROTECTORALL=0 ⇒ nuke libssp dependency
-	cd $(PKG_BUILD_DIR); \
-		CC="$(TARGET_CC)" \
-		TARGET_OS="$(shell uname -s)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=0" \
-		HAVE_CAN_FSTACKPROTECTORALL=0 \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-			$(BASH) Build.sh -Q -r -c lto
-endef
-
-define Package/mksh/postinst
-#!/bin/sh
-grep mksh $${IPKG_INSTROOT}/etc/shells || \
-	echo "/bin/mksh" >> $${IPKG_INSTROOT}/etc/shells
-endef
-
-define Package/mksh/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/dot.mkshrc $(1)/etc/mkshrc
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mksh $(1)/bin/
-endef
-
-define Package/mksh/conffiles
-/etc/mkshrc
-endef
-
-$(eval $(call BuildPackage,mksh))
-

--- a/utils/mksh/patches/100-dot_mkshrc
+++ /dev/null
@@ -1,51 +1,1 @@
-From 2bee59bb9e6b142a78c94f5e77a54e4e2366c1b8 Mon Sep 17 00:00:00 2001
-From: Thorsten Glaser <tg@freewrt.org>
-Date: Thu, 25 Jul 2013 22:07:33 +0200
-Subject: [PATCH] Make default mkshrc file suitable for OpenWrt environment:
 
-* Part of the FreeWRT patches:
-  - no hostname(1)
-  - ls(1) has no -o option
-* OpenWrt and FreeWRT-1.0 fix:
-  - since this is not ~/.mkshrc make sure subshells find it
----
- dot.mkshrc | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/dot.mkshrc b/dot.mkshrc
-index c10b8fd..3a389b2 100644
---- a/dot.mkshrc
-+++ b/dot.mkshrc
-@@ -28,8 +28,8 @@ case $KSH_VERSION in
- *) return 0 ;;
- esac
- 
--PS1='#'; (( USER_ID )) && PS1='$'; [[ ${HOSTNAME:=$(ulimit -c 0; hostname -s \
--    2>/dev/null)} = *([	 ]|localhost) ]] && HOSTNAME=$(ulimit -c 0; hostname \
-+PS1='#'; (( USER_ID )) && PS1='$'; [[ ${HOSTNAME:=$(</proc/sys/kernel/hostname
-+    )} = *([	 ]|localhost) ]] && HOSTNAME=$(ulimit -c 0; hostname \
-     2>/dev/null); : ${EDITOR:=/bin/ed} ${HOSTNAME:=nil} ${TERM:=vt100}
- : ${MKSH:=$(whence -p mksh)}; PS4='[$EPOCHREALTIME] '; PS1=$'\001\r''${|
- 	local e=$?
-@@ -50,7 +50,7 @@ unalias ls
- alias l='ls -F'
- alias la='l -a'
- alias ll='l -l'
--alias lo='l -alo'
-+alias lo='l -al'
- alias doch='fc -ln -1 | sudo mksh -s'
- whence -p rot13 >/dev/null || alias rot13='tr \
-     abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \
-@@ -413,4 +413,8 @@ alias cls='print -n \\033c'
- 
- unset p
- 
-+# we need this in OpenWrt for subshells that are not login shells
-+: ${ENV=/etc/mkshrc}
-+[[ -z $ENV ]] || export ENV
-+
- : place customisations above this line
--- 
-1.8.3.2
-
-

file:a/utils/nut/Makefile (deleted)
--- a/utils/nut/Makefile
+++ /dev/null
@@ -1,303 +1,1 @@
-#
-# Copyright © 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:=nut
-PKG_VERSION:=2.6.5
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.6/
-PKG_MD5SUM:=e6eac4fa04baff0d0a827d64efe81a7e
-
-PKG_BUILD_DEPENDS:=libusb-compat libnetsnmp
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_BUILD_PARALLEL:=1
-
-define Package/nut/Default
-  URL:=http://www.networkupstools.org/
-  TITLE:= Network UPS Tools
-  DEPENDS:=@USB_SUPPORT +libnetsnmp +libpthread
-  SECTION:=utils
-  CATEGORY:=Utilities
-endef
-
-define Package/nut/description
-  Network UPS Tools (NUT) is a client/server monitoring system that
-  allows computers to share uninterruptible power supply (UPS) and
-  power distribution unit (PDU) hardware. Clients access the hardware
-  through the server, and are notified whenever the power status
-  changes.
-endef
-
-define Package/nut
-$(call Package/nut/Default)
-  MENU:=1
-#  TITLE+= (common)
-endef
-
-define Package/nut-server
-$(call Package/nut/Default)
-  TITLE+= (server)
-  DEPENDS+= nut
-endef
-
-define Package/nut-client
-$(call Package/nut/Default)
-  TITLE+= (client)
-  DEPENDS+= nut
-endef
-
-define Package/nut-logger
-$(call Package/nut/Default)
-  TITLE+= (logger)
-  DEPENDS+= nut
-endef
-
-define Package/nut-monitor
-$(call Package/nut/Default)
-  TITLE+= (monitor)
-  DEPENDS+= nut
-endef
-
-define Package/nut/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/etc/nut
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libupsclient.so* $(1)/usr/lib/
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/nut.conf.sample $(1)/etc/nut/nut.conf
-	ln -sf /var/run/ups.conf $(1)/etc/nut/ups.conf
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
-endef
-
-define Package/nut/conffiles
-/etc/nut/nut.conf
-endef
-
-define Package/nut-client/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upsc $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upsrw $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upscmd $(1)/usr/bin
-endef
-
-define Package/nut-server/install
-	$(INSTALL_DIR) $(1)/etc/nut
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/lib/nut
-	$(INSTALL_DIR) $(1)/usr/share/nut
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/ups.init $(1)/etc/init.d/ups
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upsd $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/nut/upsdrvctl $(1)/lib/nut
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upsd.conf.sample $(1)/etc/nut/upsd.conf
-	ln -sf /var/run/upsd.users $(1)/etc/nut/upsd.users
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/nut/cmdvartab $(1)/usr/share/nut/cmdvartab
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/nut/driver.list $(1)/usr/share/nut/driver.list
-endef
-
-define Package/nut-server/conffiles
-/etc/nut/upsd.conf
-endef
-
-define Package/nut-logger/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/upslog $(1)/usr/bin
-endef
-
-define Package/nut-monitor/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/nut
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/upsmon.init $(1)/etc/init.d/upsmon
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upsmon $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upssched $(1)/usr/sbin
-	ln -sf /var/run/upsmon.conf $(1)/etc/nut/upsmon.conf
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/nut/upssched.conf.sample $(1)/etc/nut/upssched.conf
-endef
-
-define Package/nut-monitor/conffiles
-/etc/nut/upssched.conf
-endef
-
-define DriverPackage
-  define Package/nut-driver-$(1)
-    $(call Package/nut/Default)
-    TITLE += ($(1) driver)
-    DEPENDS += nut nut-server
-    ifeq ($(1),$(filter $(1),$(USB_LIBUSB_DRIVERLIST)))
-      DEPENDS+=libusb-compat
-    endif
-    ifeq ($(1),$(filter $(1),$(SNMP_DRIVERLIST)))
-      DEPENDS+=libnetsnmp
-    endif
-  endef
-  # Deliberately empty (well, some spaces) in order to trigger a build
-  # failure. It should be overridden by the list below, and when updating
-  # to a new version of nut we will need to provide descriptions for any
-  # new drivers.
-  define Package/nut-driver-$(1)/description
-
-  endef
-  define Package/nut-driver-$(1)/install
-	$(INSTALL_DIR) $$(1)/lib/nut/
-	$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/lib/nut/$(1) $$(1)/lib/nut/
-    ifeq ($(1),clone)
-	# Bundle clone and clone-outlet together
-	$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/lib/nut/$(1)-outlet $$(1)/lib/nut/
-    endif
-  endef
-endef
-
-# These lists are lifted *directly* from drivers/Makefile.am in the nut
-# source tree. This it to make it simpler to keep in sync when updating
-# to a newer version of nut. Do not edit this manually.
-#
-# DO NOT EDIT (except to update with a fresh cut/paste)!
-SERIAL_DRIVERLIST = bcmxcp belkin belkinunv bestfcom    \
- bestfortress bestuferrups bestups dummy-ups etapro everups     \
- gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys  \
- oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino        \
- safenet skel solis tripplite tripplitesu upscode2 victronups powerpanel \
- blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old
-SNMP_DRIVERLIST = snmp-ups
-USB_LIBUSB_DRIVERLIST = usbhid-ups bcmxcp_usb tripplite_usb \
- blazer_usb richcomm_usb
-# END: DO NOT EDIT!
-
-NUT_DRIVERS := $(filter-out skel clone-outlet,$(SERIAL_DRIVERLIST)) \
-	$(USB_LIBUSB_DRIVERLIST) $(SNMP_DRIVERLIST)
-
-$(foreach d,$(NUT_DRIVERS),$(eval $(call DriverPackage,$(d))))
-
-define DriverDescription
-  define Package/nut-driver-$(1)/description
-    $(2)
-  endef
-endef
-
-$(eval $(call DriverDescription,apcsmart,\
-	Driver for American Power Conversion Smart Protocol UPS equipment))
-$(eval $(call DriverDescription,apcsmart-old,\
-	Driver for American Power Conversion Smart Protocol UPS equipment))
-$(eval $(call DriverDescription,bcmxcp,\
-	Driver for UPSes supporting the serial BCM/XCP protocol))
-$(eval $(call DriverDescription,bcmxcp_usb,\
-	Experimental driver for UPSes supporting the BCM/XCP protocol over USB))
-$(eval $(call DriverDescription,belkin,\
-	Driver for Belkin serial UPS equipment))
-$(eval $(call DriverDescription,belkinunv,\
-	Driver for Belkin "Universal UPS" and compatible))
-$(eval $(call DriverDescription,bestfcom,\
-	Driver for Best Power Fortress/Ferrups))
-$(eval $(call DriverDescription,bestfortress,\
-	Driver for old Best Fortress UPS equipment))
-$(eval $(call DriverDescription,bestuferrups,\
-	Driver for Best Power Micro-Ferrups))
-$(eval $(call DriverDescription,bestups,\
-	Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment))
-$(eval $(call DriverDescription,blazer_ser,\
-	Driver for Megatec/Q1 protocol serial))
-$(eval $(call DriverDescription,blazer_usb,\
-	Driver for Megatec/Q1 protocol USB))
-$(eval $(call DriverDescription,clone,\
-	UPS driver clone))
-$(eval $(call DriverDescription,dummy-ups,\
-	Driver for multi-purpose UPS emulation))
-$(eval $(call DriverDescription,etapro,\
-	Driver for ETA UPS equipment))
-$(eval $(call DriverDescription,everups,\
-	Driver for Ever UPS models))
-$(eval $(call DriverDescription,gamatronic,\
-	Driver for Gamatronic UPS equipment))
-$(eval $(call DriverDescription,genericups,\
-	Driver for contact-closure UPS equipment))
-$(eval $(call DriverDescription,isbmex,\
-	Driver for ISBMEX UPS equipment))
-$(eval $(call DriverDescription,ivtscd,\
-	driver for the IVT Solar Controller Device))
-$(eval $(call DriverDescription,liebert,\
-	Driver for Liebert contact-closure UPS equipment))
-$(eval $(call DriverDescription,liebert-esp2,\
-	Driver for Liebert UPS using the ESP-II protocol))
-$(eval $(call DriverDescription,masterguard,\
-	Driver for Masterguard UPS equipment))
-$(eval $(call DriverDescription,metasys,\
-	Driver for Meta System UPS equipment))
-$(eval $(call DriverDescription,mge-shut,\
-	Driver for SHUT Protocol UPS equipment))
-$(eval $(call DriverDescription,mge-utalk,\
-	Driver for MGE UPS SYSTEMS UTalk protocol equipment))
-$(eval $(call DriverDescription,microdowell,\
-	Driver for Microdowell Enterprise UPS series))
-$(eval $(call DriverDescription,oldmge-shut,\
-	Driver for SHUT Protocol UPS equipment))
-$(eval $(call DriverDescription,oneac,\
-	Driver for Oneac UPS equipment))
-$(eval $(call DriverDescription,optiups,\
-	Driver for Opti-UPS (Viewsonice) UPS and Zinto D (ONLINE-USV) equipment))
-$(eval $(call DriverDescription,powercom,\
-	UPS driver for Powercom/Trust/Advice UPS equipment))
-$(eval $(call DriverDescription,powerpanel,\
-	Driver for PowerPanel Plus compatible UPS equipment))
-$(eval $(call DriverDescription,rhino,\
-	Driver for Brazilian Microsol RHINO UPS equipment))
-$(eval $(call DriverDescription,richcomm_usb,\
-	Driver UPS equipment using Richcomm dry-contact to USB solution))
-$(eval $(call DriverDescription,safenet,\
-	Driver for SafeNet compatible UPS equipment))
-$(eval $(call DriverDescription,solis,\
-	Driver for Brazilian Microsol SOLIS UPS equipment))
-$(eval $(call DriverDescription,tripplite,\
-	Driver for Tripp-Lite SmartPro UPS equipment))
-$(eval $(call DriverDescription,tripplitesu,\
-	Driver for Tripp-Lite SmartOnline (SU) UPS equipment))
-$(eval $(call DriverDescription,tripplite_usb,\
-	Driver for older Tripp Lite USB UPSes (not PDC HID)))
-$(eval $(call DriverDescription,upscode2,\
-	Driver for UPScode II compatible UPS equipment))
-$(eval $(call DriverDescription,usbhid-ups,\
-	Driver for USB/HID UPS equipment))
-$(eval $(call DriverDescription,victronups,\
-	Driver for IMV/Victron UPS unit Match, Match Lite, NetUps))
-$(eval $(call DriverDescription,snmp-ups,\
-	Multi-MIB Driver for SNMP UPS equipment))
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_ARGS += \
-  --without-ssl \
-  --with-pidpath=/var/run \
-  --with-statepath=/var/run \
-  --with-altpidpath=/var/run \
-  --sysconfdir=/etc/nut \
-  --with-drvpath=/lib/nut \
-  --datadir=/usr/share/nut \
-  --with-user=root \
-  --with-group=root \
-  --with-usb \
-  --with-snmp \
-  --without-libltdl \
-  --with-dev
-
-
-$(eval $(call BuildPackage,nut))
-$(eval $(call BuildPackage,nut-client))
-$(eval $(call BuildPackage,nut-server))
-$(eval $(call BuildPackage,nut-monitor))
-$(eval $(call BuildPackage,nut-logger))
-$(foreach d,$(NUT_DRIVERS),$(eval $(call BuildPackage,nut-driver-$(d))))
-

--- a/utils/nut/files/ups.init
+++ /dev/null
@@ -1,88 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright © 2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-START=50
 
-DEFAULT=/etc/default/nut
-RUN_D=/var/run
-PID_F=$RUN_D/upsd.pid
-UPS_C=$RUN_D/ups.conf
-USERS_C=$RUN_D/upsd.users
-
-nut_user_add() {
-	local cfg="$1"
-	local a
-	local val
-
-	config_get val "$cfg" username "$1"
-	echo "[$val]" >> $USERS_C
-
-	config_get val "$cfg" password
-	echo "  password = $val" >> $USERS_C
-
-	config_get val "$cfg" actions
-	for a in $val; do
-	    echo "  actions = $a" >> $USERS_C
-	done
-
-	config_get val "$cfg" instcmds
-	for a in $val; do
-	    echo "  instcmds = $a" >> $USERS_C
-	done
-
-	config_get val "$cfg" upsmon
-	if [ -n "$val" ]; then
-	    echo "  upsmon $val" >> $USERS_C
-	fi
-}
-
-start() {
-        local in_driver have_drivers
-	config_cb() {
-	    if [ "$1" != "driver" ]; then
-		in_driver=
-	    else
-		echo "[$2]" >> $UPS_C
-		in_driver=true
-		have_drivers=true
-	    fi
-	}
-	option_cb() {
-	    if [ "$in_driver" = "true" ]; then
-		echo " $1 = $2" >> $UPS_C
-	    fi
-	}
-
-	[ -d $RUN_D ] || mkdir -p $RUN_D
-	echo "# Config file automatically generated from UCI config" > $UPS_C
-	echo "# Config file automatically generated from UCI config" > $USERS_C
-
-	config_load ups
-
-	config_foreach nut_user_add user
-
-	[ -f $DEFAULT ] && . $DEFAULT
-	if [ "$have_drivers" = "true" ]; then
-	    $DEBUG /usr/sbin/upsd $OPTIONS
-	    $DEBUG /lib/nut/upsdrvctl start
-	fi
-}
-
-nut_driver_stop() {
-	local cfg="$1"
-	local driver
-
-	config_get driver "$cfg" driver
-
-	[ -r /var/run/$driver-$cfg ] && /lib/nut/upsdrvctl stop $cfg
-}
-
-stop() {
-	[ -r $PID_F ] && /usr/sbin/upsd -c stop
-	config_load ups
-	config_foreach nut_driver_stop driver
-}
-

--- a/utils/nut/files/upsmon.init
+++ /dev/null
@@ -1,145 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright © 2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-START=51
 
-DEFAULT=/etc/default/nut
-RUN_D=/var/run
-PID_F=$RUN_D/upsmon.pid
-UPSMON_C=$RUN_D/upsmon.conf
-
-nut_upsmon_conf() {
-	local cfg="$1"
-
-	echo "# Config file automatically generated from UCI config" > $UPSMON_C
-
-	config_get val "$cfg" runas
-	[ -n "$val" ] && echo "RUN_AS_USER $val" >> $PSMON_C
-
-	config_get val "$cfg" minsupplies 1
-	echo "MINSUPPLIES $val" >> $UPSMON_C
-
-	config_get val "$cfg" shutdowncmd "/sbin/halt"
-	echo "SHUTDOWNCMD \"$val\"" >> $UPSMON_C
-
-	config_get val "$cfg" notifycmd
-	[ -n "$val" ] && echo "NOTIFYCMD \"$val\"" >> $UPSMON_C
-
-	config_get val "$cfg" pollfreq 5
-	echo "POLLFREQ $val" >> $UPSMON_C
-
-	config_get val "$cfg" pollfreqalert 5
-	echo "POLLFREQALERT $val" >> $UPSMON_C
-
-	config_get val "$cfg" hostsync 15
-	echo "HOSTSYNC $val" >> $UPSMON_C
-
-	config_get val "$cfg" deadtime 15
-	echo "DEADTIME $val" >> $UPSMON_C
-
-	config_get val "$cfg" powerdownflag /var/run/killpower
-	echo "POWERDOWNFLAG $val" >> $UPSMON_C
-
-	config_get val "$cfg" onlinemsg
-	[ -n "$val" ] && echo "NOTIFYMSG ONLINE \"$val\"" >> $UPSMON_C
-	config_get val "$cfg" onbattmsg
-	[ -n "$val" ] && echo "NOTIFYMSG ONBATT \"$val\"" >> $UPSMON_C
-	config_get val "$cfg" lowbattmsg
-	[ -n "$val" ] && echo "NOTIFYMSG LOWBATT \"$val\"" >> $UPSMON_C
-	config_get val "$cfg" fsdmsg
-	[ -n "$val" ] && echo "NOTIFYMSG FSD \"$val\"" >> $UPSMON_C
-	config_get val "$cfg" commokmsg
-	[ -n "$val" ] && echo "NOTIFYMSG COMMOK \"$val\"" >> $UPSMON_C
-	config_get val "$cfg" commbadmsg
-	[ -n "$val" ] && echo "NOTIFYMSG COMMBAD \"$val\"" >> $UPSMON_C
-	config_get val "$cfg" shutdownmsg
-	[ -n "$val" ] && echo "NOTIFYMSG SHUTDOWN \"$val\"" >> $UPSMON_C
-	config_get val "$cfg" replbattmsg
-	[ -n "$val" ] && echo "NOTIFYMSG REPLBATT \"$val\"" >> $UPSMON_C
-	config_get val "$cfg" nocommmsg
-	[ -n "$val" ] && echo "NOTIFYMSG NOCOMM \"$val\"" >> $UPSMON_C
-	config_get val "$cfg" noparentmsg
-	[ -n "$val" ] && echo "NOTIFYMSG NOPARENT \"$val\"" >> $UPSMON_C
-
-	local default
-	config_get default "$cfg" defaultnotify SYSLOG
-	config_get val "$cfg" onlinenotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG ONLINE $val" >> $UPSMON_C
-	config_get val "$cfg" onbattnotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG ONBATT $val" >> $UPSMON_C
-	config_get val "$cfg" lowbattnotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG LOWBATT $val" >> $UPSMON_C
-	config_get val "$cfg" fsdnotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG FSD $val" >> $UPSMON_C
-	config_get val "$cfg" commoknotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG COMMOK $val" >> $UPSMON_C
-	config_get val "$cfg" commbadnotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG COMMBAD $val" >> $UPSMON_C
-	config_get val "$cfg" shutdownnotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG SHUTDOWN $val" >> $UPSMON_C
-	config_get val "$cfg" replbattnotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG REPLBATT $val" >> $UPSMON_C
-	config_get val "$cfg" nocommnotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG NOCOMM $val" >> $UPSMON_C
-	config_get val "$cfg" noparentnotify "$default"
-	[ -n "$val" ] && echo "NOTIFYFLAG NOPARENT $val" >> $UPSMON_C
-
-	config_get val "$cfg" rbwarntime 43200
-	echo "RBWARNTIME $val" >> $UPSMON_C
-
-	config_get val "$cfg" nocommwarntime 300
-	echo "NOCOMMWARNTIME $val" >> $UPSMON_C
-
-	config_get val "$cfg" finaldelay 5
-	echo "FINALDELAY $val" >> $UPSMON_C
-}
-
-nut_upsmon_add() {
-	local cfg="$1"
-	local type="$2"
-	local upsname
-	local hostname
-	local port
-	local powervalue
-	local user
-	local pass
-	local system
-
-	# If no core config, use defaults
-	[ -r $UPSMON_C ] || nut_upsmon_conf ""
-
-	config_get upsname "$cfg" upsname
-	config_get hostname "$cfg" hostname localhost
-	config_get port "$cfg" port
-	config_get powervalue "$cfg" powervalue 1
-	config_get user "$cfg" user
-	config_get pass "$cfg" password
-	system="$upsname@$hostname"
-	if [ -n "$port" ]; then
-	    system="$system:$port";
-	fi
-	echo "MONITOR $system $powervalue $user $pass $type" >> $UPSMON_C
-}
-
-start() {
-	[ -d $RUN_D ] || mkdir -p $RUN_D
-	rm -f $UPSMON_C
-
-	config_load upsmon
-
-	config_foreach nut_upsmon_conf upsmon
-	config_foreach nut_upsmon_add master master
-	config_foreach nut_upsmon_add slave slave
-
-	[ -f $DEFAULT ] && . $DEFAULT
-	$DEBUG /usr/sbin/upsmon $UPSMON_OPTIONS
-}
-
-stop() {
-	[ -r $PID_F ] && /usr/sbin/upsmon -c stop
-	rm -f $UPSMON_C
-}
-

--- a/utils/nut/patches/001-fix-missing-libmath-flags.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- nut-2.6.3.orig/drivers/Makefile.am	2011-12-05 16:36:46.000000000 
-0100
-+++ nut-2.6.3/drivers/Makefile.am	2012-04-19 10:51:52.152059206 +0200
-@@ -165,7 +165,7 @@
- tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
 
- bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c
--bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS)
-+bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
-
- blazer_usb_SOURCES = blazer.c blazer_usb.c libusb.c usb-common.c
-

--- a/utils/nut/patches/002-minibox-openups-driver.patch
+++ /dev/null
@@ -1,529 +1,1 @@
-From f8546df4c18c087eac829d3dfc097c919abb6d1c Mon Sep 17 00:00:00 2001
-From: aquette <aquette@72a954d1-e00c-0410-aa02-d9c7bb700a61>
-Date: Wed, 28 Nov 2012 21:44:21 +0000
-Subject: [PATCH] Official support for Minibox openUPS Intelligent UPS
 
-Add a new usbhid-ups subdriver to handle Minibox openUPS Intelligent UPS
-(USB ID 0x04d8:0xd004) (patch from Nicu Pavel, Mini-Box.Com)
-
-git-svn-id: svn://anonscm.debian.org/nut/trunk@3791 72a954d1-e00c-0410-aa02-d9c7bb700a61
----
- data/driver.list.in                |   2 +
- drivers/Makefile.am                |   5 +-
- drivers/openups-hid.c              | 360 +++++++++++++++++++++++++++++++++++++
- drivers/openups-hid.h              |  38 ++++
- drivers/usbhid-ups.c               |   5 +-
- scripts/upower/95-upower-hid.rules |   4 +
- 6 files changed, 411 insertions(+), 3 deletions(-)
- create mode 100644 drivers/openups-hid.c
- create mode 100644 drivers/openups-hid.h
-
-diff --git a/data/driver.list.in b/data/driver.list.in
-index 11014d6..70b5e0f 100644
---- a/data/driver.list.in
-+++ b/data/driver.list.in
-@@ -645,6 +645,8 @@
- "Microsol"	"ups"	"5"	"Rhino 10.0"	"10000VA"	"rhino"
- "Microsol"	"ups"	"5"	"Rhino 20.0"	"20000VA"	"rhino"
- 
-+"Minibox"	"ups"	"5"	"openUPS Intelligent UPS"	"USB port"	"usbhid-ups"
-+
- "Mustek"	"ups"	"2"	"Powermust"	"400VA Plus"	"blazer_ser"
- "Mustek"	"ups"	"2"	"Powermust"	"600VA Plus"	"blazer_ser"
- "Mustek"	"ups"	"2"	"Powermust"	"800VA Pro"	"blazer_ser"
-diff --git a/drivers/Makefile.am b/drivers/Makefile.am
-index cd900cf..ad30874 100644
---- a/drivers/Makefile.am
-+++ b/drivers/Makefile.am
-@@ -162,7 +162,8 @@ skel_LDADD = $(LDADD_DRIVERS)
- 
- # USB
- USBHID_UPS_SUBDRIVERS = apc-hid.c belkin-hid.c cps-hid.c explore-hid.c \
-- liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c idowell-hid.c
-+ liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c idowell-hid.c \
-+ openups-hid.c
- usbhid_ups_SOURCES = usbhid-ups.c libhid.c libusb.c hidparser.c	\
-  usb-common.c $(USBHID_UPS_SUBDRIVERS)
- usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS)
-@@ -245,7 +246,7 @@ dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.h	\
-  powercom.h powerpanel.h powerp-bin.h powerp-txt.h powerware-mib.h raritan-pdu-mib.h	\
-  safenet.h serial.h snmp-ups.h solis.h tripplite.h tripplite-hid.h 			\
-  upshandler.h usb-common.h usbhid-ups.h powercom-hid.h compaq-mib.h idowell-hid.h \
-- apcsmart.h apcsmart_tabs.h apcsmart-old.h cyberpower-mib.h
-+ apcsmart.h apcsmart_tabs.h apcsmart-old.h cyberpower-mib.h openups-hid.h
- 
- # Define a dummy library so that Automake builds rules for the
- # corresponding object files.  This library is not actually built,
-diff --git a/drivers/openups-hid.c b/drivers/openups-hid.c
-new file mode 100644
-index 0000000..69a4a61
---- /dev/null
-+++ b/drivers/openups-hid.c
-@@ -0,0 +1,360 @@
-+/* openups-hid.c - subdriver to monitor Minibox openUPS USB/HID devices with NUT
-+ *
-+ *  Copyright (C)
-+ *  2003 - 2012	Arnaud Quette <ArnaudQuette@Eaton.com>
-+ *  2005 - 2006	Peter Selinger <selinger@users.sourceforge.net>
-+ *  2008 - 2009	Arjen de Korte <adkorte-guest@alioth.debian.org>
-+ *         2012	Nicu Pavel <npavel@mini-box.com>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ */
-+
-+#include "usbhid-ups.h"
-+#include "openups-hid.h"
-+#include "main.h"		/* for getval() */
-+#include "usb-common.h"
-+
-+#define OPENUPS_HID_VERSION	"openUPS HID 0.1"
-+
-+/* Minibox */
-+#define OPENUPS_VENDORID	0x04d8
-+
-+static char openups_scratch_buf[20];
-+
-+/* USB IDs device table */
-+static usb_device_id_t openups_usb_device_table[] = {
-+	/* openUPS Intelligent UPS (minimum required firmware 1.4) */
-+	{USB_DEVICE(OPENUPS_VENDORID, 0xd004), NULL},
-+
-+	/* Terminating entry */
-+	{-1, -1, NULL}
-+};
-+
-+/* Thermistor table used for temperature lookups 
-+ * taken from the windows monitoring application
-+ */
-+static unsigned int therm_tbl[] = 
-+{ 
-+	(unsigned int)0x31,
-+	(unsigned int)0x40,
-+	(unsigned int)0x53,
-+	(unsigned int)0x68,
-+	(unsigned int)0x82,
-+	(unsigned int)0xA0,
-+	(unsigned int)0xC3,
-+	(unsigned int)0xE9,
-+	(unsigned int)0x113,
-+	(unsigned int)0x13F,
-+	(unsigned int)0x16E,
-+	(unsigned int)0x19F,
-+	(unsigned int)0x1CF,
-+	(unsigned int)0x200,
-+	(unsigned int)0x22F,
-+	(unsigned int)0x25C,
-+	(unsigned int)0x286,
-+	(unsigned int)0x2AE,
-+	(unsigned int)0x2D3,
-+	(unsigned int)0x2F4,
-+	(unsigned int)0x312,
-+	(unsigned int)0x32D,
-+	(unsigned int)0x345,
-+	(unsigned int)0x35A,
-+	(unsigned int)0x36D,
-+	(unsigned int)0x37E,
-+	(unsigned int)0x38C,
-+	(unsigned int)0x399,
-+	(unsigned int)0x3A5,
-+	(unsigned int)0x3AF,
-+	(unsigned int)0x3B7,
-+	(unsigned int)0x3BF,
-+	(unsigned int)0x3C6,
-+	(unsigned int)0x3CC
-+};
-+
-+static unsigned int therm_tbl_size = sizeof(therm_tbl)/sizeof(therm_tbl[0]);
-+
-+static const char *openups_charging_fun(double value);
-+static const char *openups_discharging_fun(double value);
-+static const char *openups_online_fun(double value);
-+static const char *openups_nobattery_fun(double value);
-+static const char *openups_off_fun(double value);
-+
-+static const char *openups_scale_vin_fun(double value);
-+static const char *openups_scale_vout_fun(double value);
-+/* static const char *openups_scale_vbat_fun(double value); */
-+static const char *openups_scale_ccharge_fun(double value);
-+static const char *openups_scale_cdischarge_fun(double value);
-+static const char *openups_temperature_fun(double value);
-+
-+static info_lkp_t openups_charging_info[] = {
-+	{0, NULL, openups_charging_fun}
-+};
-+
-+static info_lkp_t openups_discharging_info[] = {
-+	{0, NULL, openups_discharging_fun}
-+};
-+
-+static info_lkp_t openups_online_info[] = {
-+	{0, NULL, openups_online_fun}
-+};
-+
-+static info_lkp_t openups_nobattery_info[] = {
-+	{0, NULL, openups_nobattery_fun}
-+};
-+
-+static info_lkp_t openups_off_info[] = {
-+	{0, NULL, openups_off_fun}
-+};
-+
-+static info_lkp_t openups_vin_info[] = {
-+	{0, NULL, openups_scale_vin_fun}
-+};
-+
-+static info_lkp_t openups_vout_info[] = {
-+	{0, NULL, openups_scale_vout_fun}
-+};
-+
-+/* static info_lkp_t openups_vbat_info[] = {
-+	{0, NULL, openups_scale_vbat_fun}
-+};*/
-+
-+static info_lkp_t openups_ccharge_info[] = {
-+	{0, NULL, openups_scale_ccharge_fun}
-+};
-+
-+static info_lkp_t openups_cdischarge_info[] = {
-+	{0, NULL, openups_scale_cdischarge_fun}
-+};
-+
-+static info_lkp_t openups_temperature_info[] = {
-+	{0, NULL, openups_temperature_fun}
-+};
-+
-+static const char *openups_charging_fun(double value)
-+{
-+	return value ? "chrg" : "!chrg";
-+}
-+
-+static const char *openups_discharging_fun(double value)
-+{
-+	return value ? "dischrg" : "!dischrg";
-+}
-+
-+static const char *openups_online_fun(double value)
-+{
-+	return value ? "online" : "!online";
-+}
-+
-+static const char *openups_nobattery_fun(double value)
-+{
-+	return value ? "nobattery" : "!nobattery";
-+}
-+
-+static const char *openups_off_fun(double value)
-+{
-+	return value ? "!off" : "off";
-+}
-+
-+static const char *openups_scale_vin_fun(double value)
-+{
-+	snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", value * vin_scale);
-+	return openups_scratch_buf;
-+}
-+
-+static const char *openups_scale_vout_fun(double value)
-+{
-+	snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", value * vout_scale);
-+	return openups_scratch_buf;
-+}
-+
-+/* static const char *openups_scale_vbat_fun(double value)
-+{
-+	snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", value * vbat_scale);
-+	return openups_scratch_buf;
-+}*/
-+
-+static const char *openups_scale_ccharge_fun(double value)
-+{
-+	snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.3f", value * ccharge_scale);
-+	return openups_scratch_buf;
-+}
-+
-+static const char *openups_scale_cdischarge_fun(double value)
-+{
-+	snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.3f", value * cdischarge_scale);
-+	return openups_scratch_buf;
-+}
-+
-+static const char *openups_temperature_fun(double value)
-+{
-+	int i;
-+	int pos = -1;
-+	unsigned int thermistor = value * 100;
-+
-+	if (thermistor <= therm_tbl[0]) {
-+		snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%d", -40);
-+	} else {
-+		if (thermistor >= therm_tbl[therm_tbl_size - 1]) {
-+			snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%d", 125);
-+		} else {
-+			for (i = therm_tbl_size - 1; i >= 0; i--) {
-+				if (thermistor >= therm_tbl[i]) {
-+					pos = i;
-+					break;
-+				}
-+			}
-+
-+			if (thermistor == therm_tbl[pos]) {
-+				snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%d", pos * 5 - 40);
-+			} else {
-+				int t1 = pos * 5 - 40;
-+				int t2 = (pos + 1) * 5 - 40;
-+
-+				unsigned int d1 = therm_tbl[pos];
-+				unsigned int d2 = therm_tbl[pos + 1];
-+
-+				float temp = (float) (thermistor - d1) * (t2 - t1) / (d2 - d1) + t1;
-+				snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", temp);
-+			}
-+		}
-+	}
-+
-+	return openups_scratch_buf;
-+}
-+
-+/* --------------------------------------------------------------- */
-+/*      Vendor-specific usage table */
-+/* --------------------------------------------------------------- */
-+
-+/* OPENUPS usage table */
-+static usage_lkp_t openups_usage_lkp[] = {
-+	{"Cell1", 0x00000001},	/* Battery cell 1 on J6 pin 1 */
-+	{"Cell2", 0x00000002},	/* Battery cell 2 on J6 pin 2 */
-+	{"Cell3", 0x00000003},	/* Battery cell 3 on J6 pin 3 */
-+	{"Cell4", 0x00000004},	/* Battery cell 4 on J6 pin 4 */
-+	{"Cell5", 0x00000005},	/* Battery cell 5 on J6 pin 5 */
-+	{"Cell6", 0x00000006},	/* Battery cell 6 on J4 pin 1 */
-+	/* Usage table for windows monitoring app only updates when 
-+	 * certain request codes are written to USB endpoint */
-+	/*{ "OpenUPSExtra", 0xff000001 }, */
-+	{NULL, 0}
-+};
-+
-+static usage_tables_t openups_utab[] = {
-+	openups_usage_lkp,
-+	hid_usage_lkp,
-+	NULL,
-+};
-+
-+/* --------------------------------------------------------------- */
-+/* HID2NUT lookup table                                            */
-+/* --------------------------------------------------------------- */
-+
-+static hid_info_t openups_hid2nut[] = {
-+	{"ups.serial", 0, 0, "UPS.PowerSummary.iSerialNumber", NULL, "%s", 0, stringid_conversion},
-+
-+	/* Battery */
-+	{"battery.type", 0, 0, "UPS.PowerSummary.iDeviceChemistry", NULL, "%s", HU_FLAG_STATIC, stringid_conversion},
-+	{"battery.mfr.date", 0, 0, "UPS.PowerSummary.iOEMInformation", NULL, "%s", 0, stringid_conversion},
-+	{"battery.voltage", 0, 0, "UPS.PowerSummary.Voltage", NULL, "%.2f", HU_FLAG_QUICK_POLL, NULL},
-+	/* { "battery.voltage.nominal", 0, 0, "UPS.PowerSummary.ConfigVoltage", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info }, */
-+	{"battery.current", 0, 0, "UPS.PowerSummary.Current", NULL, "%.3f", HU_FLAG_QUICK_POLL, NULL},
-+	{"battery.capacity", 0, 0, "UPS.PowerSummary.DesignCapacity", NULL, "%.0f", HU_FLAG_STATIC, NULL},
-+	{"battery.charge", 0, 0, "UPS.PowerSummary.RemainingCapacity", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL},
-+	{"battery.charge.low", 0, 0, "UPS.PowerSummary.RemainingCapacityLimit", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL},
-+	{"battery.charge.warning", 0, 0, "UPS.PowerSummary.WarningCapacityLimit", NULL, "%.0f", 0, NULL},
-+	{"battery.runtime", 0, 0, "UPS.PowerSummary.RunTimeToEmpty", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL},
-+	{"battery.temperature", 0, 0, "UPS.PowerSummary.Temperature", NULL, NULL, HU_FLAG_QUICK_POLL, openups_temperature_info},
-+/*	{"battery.cell1.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell1", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info},
-+	{"battery.cell2.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell2", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info},
-+	{"battery.cell3.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell3", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info},
-+	{"battery.cell4.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell4", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info},
-+	{"battery.cell5.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell5", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info},
-+	{"battery.cell6.voltage", 0, 0, "UPS.PowerSummary.Battery.Cell6", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vbat_info},
-+*/
-+	/* Output */
-+	{"output.voltage", 0, 0, "UPS.PowerSummary.Output.Voltage", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vout_info},
-+	{"output.current", 0, 0, "UPS.PowerSummary.Output.Current", NULL, NULL, HU_FLAG_QUICK_POLL, openups_cdischarge_info},
-+
-+	/* Input */
-+	{"input.voltage", 0, 0, "UPS.PowerSummary.Input.Voltage", NULL, NULL, HU_FLAG_QUICK_POLL, openups_vin_info},
-+	{"input.current", 0, 0, "UPS.PowerSummary.Input.Current", NULL, NULL, HU_FLAG_QUICK_POLL, openups_ccharge_info},
-+
-+	/* Status */
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Good", NULL, NULL, HU_FLAG_QUICK_POLL, openups_off_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.InternalFailure", NULL, NULL, HU_FLAG_QUICK_POLL, commfault_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Overload", NULL, NULL, HU_FLAG_QUICK_POLL, overload_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.OverTemperature", NULL, NULL, HU_FLAG_QUICK_POLL, overheat_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ShutdownImminent", NULL, NULL, HU_FLAG_QUICK_POLL, shutdownimm_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.BelowRemainingCapacityLimit", NULL, NULL, HU_FLAG_QUICK_POLL, lowbatt_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.RemainingTimeLimitExpired", NULL, NULL, HU_FLAG_QUICK_POLL, timelimitexpired_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Charging", NULL, NULL, HU_FLAG_QUICK_POLL, openups_charging_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Discharging", NULL, NULL, HU_FLAG_QUICK_POLL, openups_discharging_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.NeedReplacement", NULL, NULL, 0, replacebatt_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ACPresent", NULL, NULL, HU_FLAG_QUICK_POLL, openups_online_info},
-+	{"BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.BatteryPresent", NULL, NULL, HU_FLAG_QUICK_POLL, openups_nobattery_info},
-+
-+	/* end of structure. */
-+	{NULL, 0, 0, NULL, NULL, NULL, 0, NULL}
-+};
-+
-+static const char *openups_format_model(HIDDevice_t * hd)
-+{
-+	return hd->Product;
-+}
-+
-+static const char *openups_format_mfr(HIDDevice_t * hd)
-+{
-+	return hd->Vendor ? hd->Vendor : "openUPS";
-+}
-+
-+static const char *openups_format_serial(HIDDevice_t * hd)
-+{
-+	return hd->Serial;
-+}
-+
-+/* this function allows the subdriver to "claim" a device: return 1 if
-+ * the device is supported by this subdriver, else 0. */
-+static int openups_claim(HIDDevice_t * hd)
-+{
-+	int status = is_usb_device_supported(openups_usb_device_table, hd);
-+
-+	switch (status) {
-+	case POSSIBLY_SUPPORTED:
-+		/* by default, reject, unless the productid option is given */
-+		if (getval("productid")) {
-+			return 1;
-+		}
-+		possibly_supported("openUPS", hd);
-+		return 0;
-+
-+	case SUPPORTED:
-+		return 1;
-+
-+	case NOT_SUPPORTED:
-+	default:
-+		return 0;
-+	}
-+}
-+
-+subdriver_t openups_subdriver = {
-+	OPENUPS_HID_VERSION,
-+	openups_claim,
-+	openups_utab,
-+	openups_hid2nut,
-+	openups_format_model,
-+	openups_format_mfr,
-+	openups_format_serial,
-+};
-diff --git a/drivers/openups-hid.h b/drivers/openups-hid.h
-new file mode 100644
-index 0000000..c87b3d1
---- /dev/null
-+++ b/drivers/openups-hid.h
-@@ -0,0 +1,38 @@
-+/* openups-hid.h - subdriver to monitor Minibox openUPS USB/HID devices with NUT
-+ *
-+ *  Copyright (C)
-+ *  2003 - 2009	Arnaud Quette <ArnaudQuette@Eaton.com>
-+ *  2005 - 2006	Peter Selinger <selinger@users.sourceforge.net>
-+ *  2008 - 2009	Arjen de Korte <adkorte-guest@alioth.debian.org>
-+ *         2012	Nicu Pavel <npavel@mini-box.com>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ */
-+
-+#ifndef OPENUPS_HID_H
-+#define OPENUPS_HID_H
-+
-+#include "usbhid-ups.h"
-+
-+/* constants for converting HID read values to real values */
-+static const float vin_scale = 0.03545 * 100;
-+static const float vout_scale = 0.02571 * 100;
-+static const float vbat_scale = 0.00857 * 100;
-+static const float ccharge_scale = 0.8274 / 10;
-+static const float cdischarge_scale = 16.113 / 10;
-+
-+extern subdriver_t openups_subdriver;
-+
-+#endif /* OPENUPS_HID_H */
-diff --git a/drivers/usbhid-ups.c b/drivers/usbhid-ups.c
-index 2d254c4..fcf628d 100644
---- a/drivers/usbhid-ups.c
-+++ b/drivers/usbhid-ups.c
-@@ -27,7 +27,7 @@
-  */
- 
- #define DRIVER_NAME	"Generic HID driver"
--#define DRIVER_VERSION		"0.37"
-+#define DRIVER_VERSION		"0.38"
- 
- #include "main.h"
- #include "libhid.h"
-@@ -37,6 +37,7 @@
- 
- /* include all known subdrivers */
- #include "mge-hid.h"
-+
- #ifndef SHUT_MODE
- 	#include "explore-hid.h"
- 	#include "apc-hid.h"
-@@ -46,6 +47,7 @@
- 	#include "powercom-hid.h"
- 	#include "tripplite-hid.h"
- 	#include "idowell-hid.h"
-+	#include "openups-hid.h"
- #endif
- 
- /* master list of avaiable subdrivers */
-@@ -62,6 +64,7 @@ static subdriver_t *subdriver_list[] = {
- 	&powercom_subdriver,
- 	&tripplite_subdriver,
- 	&idowell_subdriver,
-+	&openups_subdriver,
- #endif
- 	NULL
- };
-diff --git a/scripts/upower/95-upower-hid.rules b/scripts/upower/95-upower-hid.rules
-index a9e18fe..c57ef75 100644
---- a/scripts/upower/95-upower-hid.rules
-+++ b/scripts/upower/95-upower-hid.rules
-@@ -15,6 +15,7 @@ ENV{DEVTYPE}=="usb_interface", GOTO="up_hid_end"
- ATTRS{idVendor}=="03f0", ENV{UPOWER_VENDOR}="Hewlett Packard"
- ATTRS{idVendor}=="0463", ENV{UPOWER_VENDOR}="Eaton"
- ATTRS{idVendor}=="047c", ENV{UPOWER_VENDOR}="Dell"
-+ATTRS{idVendor}=="04d8", ENV{UPOWER_VENDOR}="Minibox"
- ATTRS{idVendor}=="050d", ENV{UPOWER_VENDOR}="Belkin"
- ATTRS{idVendor}=="051d", ENV{UPOWER_VENDOR}="APC"
- ATTRS{idVendor}=="0592", ENV{UPOWER_VENDOR}="Powerware"
-@@ -47,6 +48,9 @@ ATTRS{idVendor}=="0463", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups
- # Dell
- ATTRS{idVendor}=="047c", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups"
- 
-+# Minibox
-+ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="d004", ENV{UPOWER_BATTERY_TYPE}="ups"
-+
- # Belkin
- ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0375", ENV{UPOWER_BATTERY_TYPE}="ups"
- ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0551", ENV{UPOWER_BATTERY_TYPE}="ups"
--- 
-1.8.0
-
-

--- a/utils/nut/patches/003-openups-backport.patch
+++ /dev/null
@@ -1,36 +1,1 @@
---- nut-2.6.5/drivers/openups-hid.c~	2012-12-06 15:07:29.000000000 +0000
-+++ nut-2.6.5/drivers/openups-hid.c	2012-12-06 15:14:45.541936770 +0000
-@@ -329,24 +329,18 @@ static const char *openups_format_serial
-  * the device is supported by this subdriver, else 0. */
- static int openups_claim(HIDDevice_t * hd)
- {
--	int status = is_usb_device_supported(openups_usb_device_table, hd);
--
--	switch (status) {
--	case POSSIBLY_SUPPORTED:
--		/* by default, reject, unless the productid option is given */
--		if (getval("productid")) {
--			return 1;
--		}
--		possibly_supported("openUPS", hd);
-+	if (hd->VendorID != OPENUPS_VENDORID)
- 		return 0;
- 
--	case SUPPORTED:
-+	if (hd->ProductID == 0xd004)
- 		return 1;
- 
--	case NOT_SUPPORTED:
--	default:
--		return 0;
--	}
-+	/* by default, reject, unless the productid option is given */
-+	if (getval("productid"))
-+		return 1;
-+
-+	possibly_supported("openUPS", hd);
-+	return 0;
- }
- 
- subdriver_t openups_subdriver = {
 

--- a/utils/open-plc-utils/Makefile
+++ /dev/null
@@ -1,99 +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:=open-plc-utils
-PKG_VERSION:=2013-01-29
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/qca/open-plc-utils.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6beeb6fe6ce2b16b14284c26e1b9220b68044591
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/open-plc-utils/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Qualcomm Atheros Power Line Communication utilities
-  URL:=https://github.com/qca/open-plc-utils/blob/master/README
-endef
-
-define Package/open-plc-utils
-  $(call Package/open-plc-utils/Default)
-  MENU:=1
-endef
-
-define GenPlugin
-  define Package/$(addprefix open-plc-utils-,$(1))
-    $(call Package/open-plc-utils/Default)
-    DEPENDS:=open-plc-utils
-    TITLE:=Utility $(2) from the Open PLC utilities
-  endef
-
-   define Package/$(addprefix open-plc-utils-,$(1))/description
-     Utility $(2) from the Open PLC utilities package.
-   endef
-endef
-
-OPEN_PLC_UTILS_APPS:=efbu efeu efru efsu edru edsu nics \
-		     hpavkey hpavkeys rkey mac2pw mac2pwd \
-		     mdioblock mdioblock2 mdiodump mdiogen \
-		     hpav mme \
-		     chknvm chknvm2 nvmsplit nvmmerge \
-		     chkpib chkpib2 setpib getpib modpib pib2xml \
-		     pibcomp pibdump pibruin xml2pib psin psout pskey \
-		     psgraph psnotch pibrump \
-		     int6k int6kboot int6keth int6kf int6khost \
-		     int64host int6kid int6klist int6klog int6kmdio \
-		     int6kmdio2 int6kmod int6kstat int6ktest int6krate \
-		     int6krule int6ktone int6kwait CMEncrypt sada \
-		     coqos_add coqos_info coqos_man coqos_mod coqos_rel \
-		     mdustats ampboot amphost ampID amplist amprate \
-		     ampstat amptest amptool amptone ampwait \
-		     plcboot plchost plcID plclist plcrate plcrule \
-		     plcstat plctest plctool plctone \
-		     plcwait plchostd plcget plcset plcotst plcfwd \
-		     plcdevs plclog plcmdio16 plcmdio32 \
-		     config2cfg sdram \
-		     int6kuart int6kbaud ttysig ptsctl weeder ttysend \
-		     ttyrecv ttycat int6kdetect
-
-$(foreach a,$(OPEN_PLC_UTILS_APPS),$(eval $(call GenPlugin,$(a))))
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		EXTRA_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
-		CROSS="$(TARGET_CROSS)" \
-		ROOTFS="$(PKG_INSTALL_DIR)" \
-		OWNER="$(shell id -u $(shell whoami))" \
-		GROUP="$(shell id -g $(shell whoami))" \
-		all install
-endef
-
-define Package/open-plc-utils/install
-endef
-
-define BuildPlugin
-  define Package/$(1)/install
-  	$(INSTALL_DIR) $$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/$(subst open-plc-utils-,,$(1)) \
-		$$(1)/usr/bin/
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-$(eval $(call BuildPackage,open-plc-utils))
-$(foreach a,$(OPEN_PLC_UTILS_APPS),$(eval $(call BuildPlugin,open-plc-utils-$(a))))
-

file:a/utils/procps/Makefile (deleted)
--- a/utils/procps/Makefile
+++ /dev/null
@@ -1,84 +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:=procps
-PKG_VERSION:=3.2.8
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://procps.sourceforge.net
-PKG_MD5SUM:=9532714b6846013ca9898984ba4cd7e0
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-PROCPS_APPLETS := \
-    ps free pgrep pkill pmap pwdx skill w \
-    slabtop snice tload top vmstat watch
-
-define Package/procps/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncurses
-  TITLE:=proc utilities
-  URL:=http://procps.sourceforge.net/
-endef
-
-define Package/procps
-  $(call Package/procps/Default)
-  MENU:=1
-endef
-
-define Package/procps/description
- procps is the package that has a bunch of small useful utilities that give
- information about processes using the /proc filesystem. The package
- includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill.
-endef
-
-define GenPlugin
- define Package/$(1)
-   $(call Package/procps/Default)
-   DEPENDS:=procps
-   TITLE:=Applet $(2) from the procps package
-   DEFAULT:=y
- endef
-
- define Package/$(1)/description
-  Installs the applet $(2).
- endef
-endef
-
-$(foreach a,$(PROCPS_APPLETS),$(eval $(call GenPlugin,procps-$(a),$(a))))
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CPPFLAGS="$(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-
-define Package/procps/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/proc/libproc-$(PKG_VERSION).so $(1)/usr/lib/
-endef
-
-AUXDIR_ps := "ps/"
-
-define BuildPlugin
-  define Package/$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(AUXDIR_$(2))$(2) $$(1)/usr/bin/
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-$(foreach a,$(PROCPS_APPLETS),$(eval $(call BuildPlugin,procps-$(a),$(a))))
-$(eval $(call BuildPackage,procps))
-

--- a/utils/procps/patches/010-make_fix.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES)
- # want this rule first, use := on ALL, and ALL not filled in yet
- all: do_all
- 
---include */module.mk
-+-include proc/module.mk ps/module.mk 
- 
- do_all:    $(ALL)
- 
 

--- a/utils/procps/patches/020_hz_fix.patch
+++ /dev/null
@@ -1,42 +1,1 @@
---- a/proc/sysinfo.c
-+++ b/proc/sysinfo.c
-@@ -209,7 +209,12 @@ static int check_for_privs(void){
-   return !!rc;
- }
- 
-+#if __GNUC__ < 4 || __GNUC_MINOR__ < 3
- static void init_libproc(void) __attribute__((constructor));
-+#else
-+static void init_libproc(void) __attribute__((constructor(200)));
-+#endif
-+
- static void init_libproc(void){
-   have_privs = check_for_privs();
-   // ought to count CPUs in /proc/stat instead of relying
---- a/proc/version.c
-+++ b/proc/version.c
-@@ -33,7 +33,12 @@ void display_version(void) {
- 
- int linux_version_code;
- 
-+#if __GNUC__ < 4 || __GNUC_MINOR__ < 3
- static void init_Linux_version(void) __attribute__((constructor));
-+#else
-+static void init_Linux_version(void) __attribute__((constructor(100)));
-+#endif
-+
- static void init_Linux_version(void) {
-     static struct utsname uts;
-     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
---- a/proc/module.mk
-+++ b/proc/module.mk
-@@ -76,7 +76,7 @@ proc/$(ANAME): $(LIBOBJ)
- 
- #proc/$(SONAME): proc/library.map
- proc/$(SONAME): $(LIBOBJ)
--	$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -shared -Wl,-soname,$(SONAME) -Wl,--version-script=proc/library.map -o $@ $^ -lc
-+	$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -shared -Wl,-soname,$(SONAME) -Wl,--version-script=proc/library.map -o $@ $(sort $^) -lc
- 
- 
- # AUTOMATIC DEPENDENCY GENERATION -- GCC AND GNUMAKE DEPENDENT
 

--- a/utils/procps/patches/030-fix-string-problems.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/proc/sig.c
-+++ b/proc/sig.c
-@@ -214,7 +214,7 @@ void pretty_print_signals(void){
-   while(++i <= number_of_signals){
-     int n;
-     n = printf("%2d %s", i, signal_number_to_name(i));
--    if(i%7) printf("           \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
-+    if(i%7) printf("%s", "           \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
-     else printf("\n");
-   }
-   if((i-1)%7) printf("\n");
 

file:a/utils/sispmctl/Makefile (deleted)
--- a/utils/sispmctl/Makefile
+++ /dev/null
@@ -1,51 +1,1 @@
-#
-# Copyright (C) 2008-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:=sispmctl
-PKG_VERSION:=3.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=eca3d5803a29617432ef9f609be59bad
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sispmctl
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Silver Shield PM Control for Linux
-  URL:=http://sispmctl.sourceforge.net/
-  DEPENDS:=+libusb-compat
-endef
-
-define Package/sispmctl/description
- The sispmctl tool can control Gembird SIS-PM Silver Shield
- programmable power outlet strips (also known under the name
- Revolt Intelli-Plug) from the command line.
- .
- It can be used to switch on or off any of the programmable
- power sockets of the SIS-PM via USB. It can also show the
- current status of each power socket, and it can handle
- multiple SIS-PM devices, too.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-webless \
-	--disable-dependency-tracking
-
-define Package/sispmctl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,sispmctl))
-

--- a/utils/taskwarrior/Makefile
+++ /dev/null
@@ -1,46 +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:=taskwarrior
-PKG_VERSION:=2.3.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=task-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.taskwarrior.org/download/
-PKG_MD5SUM:=2c1d2c64311855f3519ad038ebd372ac
-
-PKG_INSTALL:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/task-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/taskwarrior
-  TITLE:=taskwarrior
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncurses +libstdcpp +liblua +libuuid +libreadline +libgnutls
-  URL:=http://taskwarrior.org/projects/show/taskwarrior
-  MAINTAINER:=Xiangfu Liu <xiangfu@sharism.cc>
-endef
-
-TARGET_LDFLAGS += -ldl
-
-define Package/taskwarrior/description
- taskwarrior is a command-line todo list manager
-endef
-
-define Package/taskwarrior/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/task $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,taskwarrior))
-

file:a/utils/zoneinfo/Makefile (deleted)
--- a/utils/zoneinfo/Makefile
+++ /dev/null
@@ -1,255 +1,1 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# Author: Michael Geddes
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zoneinfo
-PKG_VERSION:=2011n
-PKG_VERSION_CODE:=2011i
-PKG_RELEASE:=1
-
-PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz
-PKG_SOURCE_CODE:=tzcode$(PKG_VERSION_CODE).tar.gz
-PKG_SOURCE_URL:=http://www.iana.org/time-zones/repository/releases
-PKG_MD5SUM:=20dbfb28efa008ddbf6dd34601ea40fa
-
-include $(INCLUDE_DIR)/package.mk
-
-define Download/tzcode
-   FILE=$(PKG_SOURCE_CODE)
-   URL=$(PKG_SOURCE_URL)
-   MD5SUM=cf7f4335b7c8682899fa2814e711c1b2
-endef
-
-$(eval $(call Download,tzcode))
-
-define Package/zoneinfo/Default
-  SUBMENU:=zoneinfo
-  TITLE:=Zone Information
-  SECTION:=utils
-  CATEGORY:=Utilities
-endef
-
-define Package/zoneinfo-core
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (core)
-endef
-
-define Package/zoneinfo-simple
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (simple)
-endef
-
-define Package/zoneinfo-africa
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Africa)
-endef
-
-define Package/zoneinfo-northamerica
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (NorthAmerica)
-endef
-
-define Package/zoneinfo-southamerica
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (SouthAmerica)
-endef
-
-define Package/zoneinfo-poles
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Arctic, Antarctic)
-endef
-
-define Package/zoneinfo-asia
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Asia)
-endef
-
-define Package/zoneinfo-atlantic
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Atlantic)
-endef
-
-define Package/zoneinfo-australia-nz
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Australia-NZ)
-endef
-
-define Package/zoneinfo-pacific
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Pacific)
-endef
-
-define Package/zoneinfo-europe
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (Europe)
-endef
-
-define Package/zoneinfo-india
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (India)
-endef
-
-define Package/zoneinfo-middleeast
-$(call Package/zoneinfo/Default)
-  TITLE:=Zone Information (MiddleEast)
-endef
-
-define Build/Prepare
-	(cd $(PKG_BUILD_DIR) && tar -xzf $(DL_DIR)/$(PKG_SOURCE_CODE) && tar -xzf $(DL_DIR)/$(PKG_SOURCE))
-endef
-
-define Build/Compile
-	CFLAGS="$(HOST_CFLAGS)" \
-	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile \
-		$(HOST_CONFIGURE_OPTS) \
-		CC="$(HOSTCC)" \
-		LD="\$$$$(CC)" \
-		CPPFLAGS="$(HOST_CPPFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" \
-		TOPDIR="$(PKG_INSTALL_DIR)" \
-		TZDIR="$(PKG_INSTALL_DIR)/zoneinfo" \
-		install
-endef
-
-
-define Package/zoneinfo-core/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in \
-		CET CST6CDT EET EST EST5EDT GB-Eire Eire \
-		GB    GMT   GMT+0 GMT-0 GMT0  Greenwich  \
-		HST   MET   MST   MST7MDT                \
-		PRC   PST8PDT ROC ROK     UCT   UTC      \
-		Universal W-SU WET Zulu Etc/* zone.tab ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-simple/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Pacific/Honolulu     \
-		America/Anchorage   America/Los_Angeles America/Denver   \
-		America/Chicago     America/New_York    America/Caracas  \
-		America/Sao_Paulo   Europe/London       Europe/Paris     \
-		Africa/Cairo        Europe/Moscow       Asia/Dubai       \
-		Asia/Karachi        Asia/Dhaka          Asia/Bankok      \
-		Asia/Hong_Kong      Asia/Tokyo          Australia/Darwin \
-		Australia/Adelaide  Australia/Brisbane  Australia/Sydney \
-		Australia/Perth     Pacific/Noumea ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-africa/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo/Africa
-	$(CP) $(PKG_INSTALL_DIR)/zoneinfo/Africa/* \
-	      $(1)/usr/share/zoneinfo/Africa
-endef
-
-define Package/zoneinfo-northamerica/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in US America Canada Mexico Cuba Jamaica Navajo ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-	rm  -rf $(1)/usr/share/zoneinfo/America/Argentina
-endef
-
-define Package/zoneinfo-southamerica/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Brazil Chile ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo/America/Argentina
-	$(CP) $(PKG_INSTALL_DIR)/zoneinfo/America/Argentina/* \
-	      $(1)/usr/share/zoneinfo/America/Argentina
-endef
-
-define Package/zoneinfo-poles/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Antarctica Arctic ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-asia/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Asia Japan Singapore Hongkong ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-atlantic/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Atlantic Iceland ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-australia-nz/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in NZ NZ-CHAT Australia ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-pacific/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Pacific Kwajalein ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-europe/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Europe Portugal Poland ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-
-define Package/zoneinfo-india/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Indian ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-define Package/zoneinfo-middleeast/install
-	$(INSTALL_DIR) $(1)/usr/share/zoneinfo
-	for i in Egypt Libya Iran Israel Turkey Mideast ; do \
-	  $(CP) $(PKG_INSTALL_DIR)/zoneinfo/$$$$i \
-	      $(1)/usr/share/zoneinfo ; \
-	done
-endef
-
-$(eval $(call BuildPackage,zoneinfo-simple))
-$(eval $(call BuildPackage,zoneinfo-core))
-$(eval $(call BuildPackage,zoneinfo-africa))
-$(eval $(call BuildPackage,zoneinfo-northamerica))
-$(eval $(call BuildPackage,zoneinfo-southamerica))
-$(eval $(call BuildPackage,zoneinfo-poles))
-$(eval $(call BuildPackage,zoneinfo-asia))
-$(eval $(call BuildPackage,zoneinfo-atlantic))
-$(eval $(call BuildPackage,zoneinfo-australia-nz))
-$(eval $(call BuildPackage,zoneinfo-pacific))
-$(eval $(call BuildPackage,zoneinfo-europe))
-$(eval $(call BuildPackage,zoneinfo-india))
-$(eval $(call BuildPackage,zoneinfo-middleeast))
-
-

file:a/utils/zsh/Makefile (deleted)
--- a/utils/zsh/Makefile
+++ /dev/null
@@ -1,77 +1,1 @@
-#
-# Copyright (C) 2013-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zsh
-PKG_VERSION:=5.0.2
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/zsh
-PKG_MD5SUM:=b8f2ad691acf58b3252225746480dcad
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/zsh
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=The Z shell
-  DEPENDS:=+libncurses +librt
-  URL:=http://www.zsh.org/
-endef
-
-define Package/zsh/description
-        Zsh is a UNIX command interpreter (shell) usable as an interactive
-        login  shell  and  as a shell script command processor. Of the standard
-        shells, zsh most closely resembles ksh but includes many enhancements.
-        Zsh has command line editing, builtin spelling correction, programmable
-        command completion, shell functions (with autoloading), a history
-        mechanism, and a host of other features.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--bindir=/bin \
-		--disable-etcdir \
-		--disable-gdbm \
-		--with-term-lib="ncurses", \
-		zsh_cv_sys_nis=no \
-		zsh_cv_sys_nis_plus=no \
-	)
-	# Do not install these functions:
-	$(SED) 's, Completion/AIX/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/BSD/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Cygwin/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Darwin/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Debian/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Mandriva/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Redhat/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/Solaris/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/X/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	$(SED) 's, Completion/openSUSE/\*/\*,,g' $(PKG_BUILD_DIR)/config.modules
-	# After mucking with 'config.modules', one must call
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" prep
-endef
-
-define Package/zsh/postinst
-#!/bin/sh
-grep zsh $${IPKG_INSTROOT}/etc/shells || \
-	echo "/bin/zsh" >> $${IPKG_INSTROOT}/etc/shells
-endef
-
-define Package/zsh/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/zsh $(1)/bin/
-	$(INSTALL_DIR) $(1)/usr/share/zsh/$(PKG_VERSION)
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/zsh/$(PKG_VERSION)/* $(1)/usr/share/zsh/$(PKG_VERSION)/
-endef
-
-$(eval $(call BuildPackage,zsh))
-

comments