jansson: moved to github
jansson: moved to github

Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@43726 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
-	}
-}
-

--- 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
- 
 

--- 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/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:
 

--- 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>
 

--- 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/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
-}
-

--- 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/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");
 

comments