smartmontools: moved to github
smartmontools: moved to github

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

--- a/admin/debootstrap/Makefile
+++ /dev/null
@@ -1,55 +1,1 @@
-#
-# Copyright (C) 2010 Gianluigi Tiesi <sherpya@netfarm.it>
-# 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
-
-PKG_NAME:=debootstrap
-PKG_VERSION:=1.0.60~bpo70+1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb
-PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/d/debootstrap
-PKG_MD5SUM:=6d4e3b97981b9e0bb86f49d8edac91af
-
-UNPACK_CMD=ar -p "$(DL_DIR)/$(PKG_SOURCE)" data.tar.xz | xzcat | tar -C $(1) -xf -
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/debootstrap
-  SECTION:=admin
-  CATEGORY:=Administration
-  TITLE:=Bootstrap a basic Debian system
-  URL:=http://wiki.debian.org/Debootstrap
-  DEPENDS:= +coreutils +coreutils-chroot +coreutils-sha1sum
-endef
-
-define Package/debootstrap/description
- debootstrap is used to create a Debian base system from scratch, without
- requiring the availability of dpkg or apt. It does this by downloading .deb
- files from a mirror site, and carefully unpacking them into a directory which
- can eventually be chrooted into.
-endef
-
-define Build/Compile
-# file pkgdetails.c was imported from debian package base-installer version 1.130
-	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) ./files/pkgdetails.c -o $(PKG_BUILD_DIR)/usr/share/debootstrap/pkgdetails
-endef
-
-define Package/debootstrap/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/usr/sbin/$(PKG_NAME) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/share/debootstrap
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/usr/share/debootstrap/pkgdetails $(1)/usr/share/debootstrap
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usr/share/debootstrap/functions $(1)/usr/share/debootstrap
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usr/share/debootstrap/devices.tar.gz $(1)/usr/share/debootstrap
-	$(INSTALL_DIR) $(1)/usr/share/debootstrap/scripts
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/usr/share/debootstrap/scripts/* $(1)/usr/share/debootstrap/scripts
-endef
-
-$(eval $(call BuildPackage,debootstrap))
-

--- a/admin/debootstrap/files/pkgdetails.c
+++ /dev/null
@@ -1,348 +1,1 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <errno.h>
 
-#define MAX_LINE 1000
-#define MAX_PKGS 100
-
-char *checksum_field=NULL;
-
-static void oom_die(void)
-{
-    fputs("Out of memory!\n", stderr);
-    exit(1);
-}
-
-static char *xvasprintf(const char *fmt, va_list ap) {
-    char *ret;
-
-    if (vasprintf (&ret, fmt, ap) < 0) {
-        if (errno == ENOMEM)
-            oom_die();
-        return NULL;
-    }
-    return ret;
-}
-
-static char *xasprintf(const char *fmt, ...) {
-    va_list ap;
-    char *ret;
-
-    va_start(ap, fmt);
-    ret = xvasprintf(fmt, ap);
-    va_end(ap);
-    return ret;
-}
-
-static char *fieldcpy(char *dst, char *fld) {
-    while (*fld && *fld != ':') 
-        fld++;
-    if (!*(fld++)) 
-        return NULL;
-    while (isspace(*fld)) fld++;
-    return strcpy(dst, fld);
-}
-
-static void outputdeps(char *deps) {
-    char *pch = deps;
-
-    while (1) {
-        while (isspace(*pch)) pch++;
-        if (!*pch) break;
-
-        while (*pch && *pch != '(' && *pch != '|' && *pch != ','
-               && !isspace(*pch))
-        {
-            fputc(*pch++, stdout);
-        }
-        fputc('\n', stdout);
-        while (*pch && *pch++ != ',') (void)NULL;
-    }
-}
-
-static void dogetdeps(char *pkgsfile, char **in_pkgs, int pkgc) {
-    char buf[MAX_LINE];
-    char cur_pkg[MAX_LINE];
-    char cur_deps[MAX_LINE];
-    char cur_predeps[MAX_LINE];
-    char prev_pkg[MAX_LINE];
-    char *pkgs[MAX_PKGS];
-    int i;
-    int skip;
-    FILE *f;
-    int output_pkg = -1;
-
-    cur_pkg[0] = cur_deps[0] = cur_predeps[0] = prev_pkg[0] = '\0';
-
-    for (i = 0; i < pkgc; i++) pkgs[i] = in_pkgs[i];
-
-    f = fopen(pkgsfile, "r");
-    if (f == NULL) {
-        perror(pkgsfile);
-        exit(1);
-    }
-
-    skip = 1;
-    while (fgets(buf, sizeof(buf), f)) {
-        if (*buf && buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = '\0';
-        if (strncasecmp(buf, "Package:", 8) == 0) {
-            int any = 0;
-            skip = 1;
-            fieldcpy(cur_pkg, buf);
-            if (strcmp(cur_pkg, prev_pkg) != 0) {
-                if (output_pkg != -1)
-                    pkgs[output_pkg] = NULL;
-                if (cur_deps[0])
-                    outputdeps(cur_deps);
-                if (cur_predeps[0])
-                    outputdeps(cur_predeps);
-                strcpy(prev_pkg, cur_pkg);
-            }
-            cur_deps[0] = cur_predeps[0] = '\0';
-            output_pkg = -1;
-	    for (i = 0; i < pkgc; i++) {
-		if (!pkgs[i]) continue;
-		any = 1;
-                if (strcmp(cur_pkg, pkgs[i]) == 0) {
-                    skip = 0;
-                    output_pkg = i;
-                    break;
-                }
-            }
-            if (!any) break;
-        } else if (!skip && strncasecmp(buf, "Depends:", 8) == 0)
-            fieldcpy(cur_deps, buf);
-        else if (!skip && strncasecmp(buf, "Pre-Depends:", 12) == 0)
-            fieldcpy(cur_predeps, buf);
-    }
-    if (cur_deps[0])
-        outputdeps(cur_deps);
-    if (cur_predeps[0])
-        outputdeps(cur_predeps);
-    fclose(f);
-}
-
-static void dopkgmirrorpkgs(int uniq, char *mirror, char *pkgsfile, 
-        char *fieldname, char **in_pkgs, int pkgc) 
-{
-    char buf[MAX_LINE];
-    char cur_field[MAX_LINE];
-    char cur_pkg[MAX_LINE];
-    char cur_ver[MAX_LINE];
-    char cur_arch[MAX_LINE];
-    char cur_size[MAX_LINE];
-    char cur_checksum[MAX_LINE];
-    char cur_filename[MAX_LINE];
-    char prev_pkg[MAX_LINE];
-    char *pkgs[MAX_PKGS];
-    int i;
-    FILE *f;
-    char *output = NULL;
-    int output_pkg = -1;
-
-    cur_field[0] = cur_pkg[0] = cur_ver[0] = cur_arch[0] = cur_filename[0] = prev_pkg[0] = '\0';
-
-    for (i = 0; i < pkgc; i++) pkgs[i] = in_pkgs[i];
-
-    f = fopen(pkgsfile, "r");
-    if (f == NULL) {
-        perror(pkgsfile);
-        exit(1);
-    }
-    while (fgets(buf, sizeof(buf), f)) {
-        if (*buf && buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = '\0';
-        if (strncasecmp(buf, fieldname, strlen(fieldname)) == 0) {
-            fieldcpy(cur_field, buf);
-	}
-        if (strncasecmp(buf, "Package:", 8) == 0) {
-            fieldcpy(cur_pkg, buf);
-            if (strcmp(cur_pkg, prev_pkg) != 0) {
-                if (output)
-                    fputs(output, stdout);
-                if (uniq && output_pkg != -1)
-                    pkgs[output_pkg] = NULL;
-                strcpy(prev_pkg, cur_pkg);
-            }
-            free(output);
-            output = NULL;
-            output_pkg = -1;
-        } else if (strncasecmp(buf, "Version:", 8) == 0) {
-            fieldcpy(cur_ver, buf);
-        } else if (strncasecmp(buf, "Architecture:", 13) == 0) {
-            fieldcpy(cur_arch, buf);
-        } else if (strncasecmp(buf, "Size:", 5) == 0) {
-            fieldcpy(cur_size, buf);
-        } else if (strncasecmp(buf, checksum_field, strlen(checksum_field)) == 0
-	           && buf[strlen(checksum_field)] == ':') {
-            fieldcpy(cur_checksum, buf);
-        } else if (strncasecmp(buf, "Filename:", 9) == 0) {
-            fieldcpy(cur_filename, buf);
-        } else if (!*buf) {
-	    int any = 0;
-	    for (i = 0; i < pkgc; i++) {
-		if (!pkgs[i]) continue;
-		any = 1;
-                if (strcmp(cur_field, pkgs[i]) == 0) {
-                    free(output);
-                    output = xasprintf("%s %s %s %s %s %s %s\n", cur_pkg, cur_ver, cur_arch, mirror, cur_filename, cur_checksum, cur_size);
-                    output_pkg = i;
-		    break;
-		}
-            }
-	    if (!any) break;
-            cur_field[0] = '\0';
-        }
-    }
-    if (output)
-        fputs(output, stdout);
-    if (uniq && output_pkg != -1)
-        pkgs[output_pkg] = NULL;
-    fclose(f);
-
-    /* any that weren't found are returned as "pkg -" */
-    if (uniq) {
-        for (i = 0; i < pkgc; i++) {
-            if (pkgs[i]) {
-                printf("%s -\n", pkgs[i]);
-            }
-        }
-    }
-}
-
-static void dopkgstanzas(char *pkgsfile, char **pkgs, int pkgc)
-{
-    char buf[MAX_LINE];
-    char *accum;
-    size_t accum_size = 0, accum_alloc = MAX_LINE * 2;
-    char cur_pkg[MAX_LINE];
-    FILE *f;
-
-    accum = malloc(accum_alloc);
-    if (!accum)
-        oom_die();
-
-    f = fopen(pkgsfile, "r");
-    if (f == NULL) {
-        perror(pkgsfile);
-        free(accum);
-        exit(1);
-    }
-    while (fgets(buf, sizeof(buf), f)) {
-        if (*buf) {
-	    size_t len = strlen(buf);
-            if (accum_size + len + 1 > accum_alloc) {
-                accum_alloc = (accum_size + len + 1) * 2;
-                accum = realloc(accum, accum_alloc);
-                if (!accum)
-                    oom_die();
-            }
-            strcpy(accum + accum_size, buf);
-	    accum_size += len;
-        }
-        if (*buf && buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = '\0';
-        if (strncasecmp(buf, "Package:", 8) == 0) {
-            fieldcpy(cur_pkg, buf);
-        } else if (!*buf) {
-            int i;
-            for (i = 0; i < pkgc; i++) {
-                if (!pkgs[i]) continue;
-                if (strcmp(cur_pkg, pkgs[i]) == 0) {
-                    fputs(accum, stdout);
-		    if (accum[accum_size - 1] != '\n')
-			fputs("\n\n", stdout);
-		    else if (accum[accum_size - 2] != '\n')
-			fputc('\n', stdout);
-                    break;
-                }
-            }
-            *accum = '\0';
-            accum_size = 0;
-        }
-    }
-    fclose(f);
-
-    free(accum);
-}
-
-static int dotranslatewgetpercent(int low, int high, int end, char *str) {
-    int ch;
-    int val, lastval;
-
-    /* print out anything that looks like a % on its own line, appropriately
-     * scaled */
-
-    lastval = val = 0;
-    while ( (ch = getchar()) != EOF ) {
-        if (isdigit(ch)) {
-	    val *= 10; val += ch - '0';
-	} else if (ch == '%') {
-	    float f = (float) val / 100.0 * (high - low) + low;
-	    if (str) {
-	    	printf("P: %d %d %s\n", (int) f, end, str);
-	    } else {
-	    	printf("P: %d %d\n", (int) f, end);
-	    }
-	    lastval = val;
-	} else {
-	    val = 0;
-	}
-    }
-    return lastval == 100;
-}
-
-int main(int argc, char *argv[]) {
-    checksum_field=getenv("DEBOOTSTRAP_CHECKSUM_FIELD");
-    if (checksum_field == NULL) {
-        checksum_field="MD5sum";
-    }
-
-    if ((argc == 6 || argc == 5) && strcmp(argv[1], "WGET%") == 0) {
-	if (dotranslatewgetpercent(atoi(argv[2]), atoi(argv[3]), 
-	                           atoi(argv[4]), argc == 6 ? argv[5] : NULL))
-	{
-	    exit(0);
-	} else {
-	    exit(1);
-	}
-    } else if (argc >= 4 && strcmp(argv[1], "GETDEPS") == 0) {
-        int i;
-        for (i = 3; argc - i > MAX_PKGS; i += MAX_PKGS) {
-	    dogetdeps(argv[2], argv+i, MAX_PKGS);
-	}
-	dogetdeps(argv[2], argv+i, argc-i);
-	exit(0);
-    } else if (argc >= 5 && strcmp(argv[1], "PKGS") == 0) {
-        int i;
-        for (i = 4; argc - i > MAX_PKGS; i += MAX_PKGS) {
-	    dopkgmirrorpkgs(1, argv[2], argv[3], "Package:", argv+i, MAX_PKGS);
-	}
-	dopkgmirrorpkgs(1, argv[2], argv[3], "Package:", argv+i, argc-i);
-	exit(0);
-    } else if (argc >= 6 && strcmp(argv[1], "FIELD") == 0) {
-        int i;
-        for (i = 5; argc - i > MAX_PKGS; i += MAX_PKGS) {
-	    dopkgmirrorpkgs(0, argv[3], argv[4], argv[2], argv+i, MAX_PKGS);
-	}
-	dopkgmirrorpkgs(0, argv[3], argv[4], argv[2], argv+i, argc-i);
-	exit(0);
-    } else if (argc >= 4 && strcmp(argv[1], "STANZAS") == 0) {
-	int i;
-	for (i = 3; argc - i > MAX_PKGS; i += MAX_PKGS) {
-	    dopkgstanzas(argv[2], argv+i, MAX_PKGS);
-	}
-	dopkgstanzas(argv[2], argv+i, argc-i);
-	exit(0);
-    } else {
-        fprintf(stderr, "usage: %s PKGS mirror packagesfile pkgs..\n", argv[0]);
-        fprintf(stderr, "   or: %s FIELD field mirror packagesfile pkgs..\n", 
-                argv[0]);
-        fprintf(stderr, "   or: %s GETDEPS packagesfile pkgs..\n", argv[0]);
-        fprintf(stderr, "   or: %s STANZAS packagesfile pkgs..\n", argv[0]);
-	fprintf(stderr, "   or: %s WGET%% low high end reason\n", argv[0]);
-        exit(1);
-    }
-}
-

--- a/admin/debootstrap/patches/100-busybox_fix.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/usr/share/debootstrap/functions
-+++ b/usr/share/debootstrap/functions
-@@ -859,8 +859,6 @@ choose_extractor () {
- 
- 	if [ -n "$EXTRACTOR_OVERRIDE" ]; then
- 		extractor="$EXTRACTOR_OVERRIDE"
--	elif type dpkg-deb >/dev/null 2>&1; then
--		extractor="dpkg-deb"
- 	else
- 		extractor="ar"
- 	fi
 

file:a/libs/curl/Config.in (deleted)
--- a/libs/curl/Config.in
+++ /dev/null
@@ -1,113 +1,1 @@
-menu "Configuration"
-	depends on PACKAGE_libcurl
 
-choice
-	prompt "SSL library"
-	default LIBCURL_POLARSSL
-
-config LIBCURL_POLARSSL
-	bool "PolarSSL"
-
-config LIBCURL_CYASSL
-	bool "CyaSSL"
-
-config LIBCURL_AXTLS
-	bool "axTLS"
-
-config LIBCURL_OPENSSL
-	bool "OpenSSL"
-
-config LIBCURL_GNUTLS
-	bool "GNUTLS"
-
-config LIBCURL_NOSSL
-	bool "No SSL support"
-
-endchoice
-
-config LIBCURL_COOKIES
-	bool "Enable cookies support"
-	default y
-
-config LIBCURL_CRYPTO_AUTH
-	bool "Enable cryptographic authentication"
-	default n
-
-config LIBCURL_DICT
-	bool "Enable DICT support"
-	default n
-
-config LIBCURL_FILE
-	bool "Enable FILE support"
-	default y
-
-config LIBCURL_FTP
-	bool "Enable FTP support"
-	default y
-
-config LIBCURL_GOPHER
-	bool "Enable Gopher support"
-	default n
-
-config LIBCURL_HTTP
-	bool "Enable HTTP support"
-	default y
-
-config LIBCURL_IMAP
-	bool "Enable IMAP support"
-	default n
-
-config LIBCURL_LDAP
-	bool "Enable LDAP support"
-	default n
-
-config LIBCURL_LDAPS
-	bool "Enable LDAPS support"
-	default n
-
-config LIBCURL_LIBCURL_OPTION
-	bool "Enable --libcurl C code generation support"
-	default n
-
-config LIBCURL_POP3
-	bool "Enable POP3 support"
-	default n
-
-config LIBCURL_PROXY
-	bool "Enable proxy support"
-	default n
-
-config LIBCURL_RTSP
-	bool "Enable RTSP support"
-	default n
-
-config LIBCURL_SMTP
-	bool "Enable SMTP support"
-	default n
-
-config LIBCURL_SSPI
-	bool "Enable SSPI"
-	default n
-
-config LIBCURL_TELNET
-	bool "Enable TELNET support"
-	default n
-
-config LIBCURL_TFTP
-	bool "Enable TFTP support"
-	default n
-
-config LIBCURL_THREADED_RESOLVER
-	bool "Enable threaded resolver"
-	default n
-
-config LIBCURL_TLS-SRP
-	bool "Enable TLS-SRP authentication"
-	default n
-
-config LIBCURL_ZLIB
-	bool "Use zlib"
-	default n
-
-endmenu
-

file:a/libs/curl/Makefile (deleted)
--- a/libs/curl/Makefile
+++ /dev/null
@@ -1,162 +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:=curl
-PKG_VERSION:=7.36.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
-	http://www.mirrorspace.org/curl/ \
-	ftp://ftp.sunet.se/pub/www/utilities/curl/ \
-	ftp://ftp.planetmirror.com/pub/curl/ \
-	http://www.mirrormonster.com/curl/download/ \
-	http://curl.mirrors.cyberservers.net/download/
-PKG_MD5SUM:=e6d1f9d1b59da5062109ffe14e0569a4
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-
-PKG_CONFIG_DEPENDS := \
-  LIBCURL_AXTLS \
-  LIBCURL_COOKIES \
-  LIBCURL_CRYPTO_AUTH \
-  LIBCURL_CYASSL \
-  LIBCURL_DICT \
-  LIBCURL_FILE \
-  LIBCURL_FTP \
-  LIBCURL_GNUTLS \
-  LIBCURL_GOPHER \
-  LIBCURL_HTTP \
-  LIBCURL_IMAP \
-  LIBCURL_LDAP \
-  LIBCURL_LDAPS \
-  LIBCURL_LIBCURL_OPTION \
-  LIBCURL_NOSSL \
-  LIBCURL_OPENSSL \
-  LIBCURL_POLARSSL \
-  LIBCURL_POP3 \
-  LIBCURL_PROXY \
-  LIBCURL_RTSP \
-  LIBCURL_SMTP \
-  LIBCURL_SSPI \
-  LIBCURL_TELNET \
-  LIBCURL_TFTP \
-  LIBCURL_THREADED_RESOLVER \
-  LIBCURL_TLS-SRP \
-  LIBCURL_ZLIB
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/curl/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://curl.haxx.se/
-  MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-endef
-
-define Package/curl
-  $(call Package/curl/Default)
-  SUBMENU:=File Transfer
-  DEPENDS:=+libcurl
-  TITLE:=A client-side URL transfer utility
-endef
-
-define Package/libcurl
-  $(call Package/curl/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+LIBCURL_POLARSSL:libpolarssl +LIBCURL_CYASSL:libcyassl +LIBCURL_AXTLS:libaxtls +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread
-  TITLE:=A client-side URL transfer library using $(if $(CONFIG_LIBCURL_POLARSSL),PolarSSL)$(if $(CONFIG_LIBCURL_OPENSSL),OpenSSL)$(if $(CONFIG_LIBCURL_GNUTLS),GNUTLS)$(if $(CONFIG_LIBCURL_NOSSL),no SSL)
-  MENU:=1
-endef
-
-
-define Package/libcurl/config
-  source "$(SOURCE)/Config.in"
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-thread \
-	--enable-nonblocking \
-	--disable-ares \
-	--disable-debug \
-	--disable-manual \
-	--disable-verbose \
-	--without-ca-bundle \
-	--without-krb4 \
-	--without-libidn \
-	--without-nss \
-	--without-libssh2 \
-	$(call autoconf_bool,CONFIG_IPV6,ipv6) \
-	$(if $(CONFIG_LIBCURL_AXTLS),--with-axtls="$(STAGING_DIR)/usr",--without-axtls) \
-	$(if $(CONFIG_LIBCURL_COOKIES),--enable,--disable)-cookies \
-	$(if $(CONFIG_LIBCURL_CRYPTO-AUTH),--enable,--disable)-crypto-auth \
-	$(if $(CONFIG_LIBCURL_CYASSL),--with-cyassl="$(STAGING_DIR)/usr",--without-cyassl) \
-	$(if $(CONFIG_LIBCURL_DICT),--enable,--disable)-dict \
-	$(if $(CONFIG_LIBCURL_FILE),--enable,--disable)-file \
-	$(if $(CONFIG_LIBCURL_FTP),--enable,--disable)-ftp \
-	$(if $(CONFIG_LIBCURL_GOPHER),--enable,--disable)-gopher \
-	$(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \
-	$(if $(CONFIG_LIBCURL_HTTP),--enable,--disable)-http \
-	$(if $(CONFIG_LIBCURL_IMAP),--enable,--disable)-imap \
-	$(if $(CONFIG_LIBCURL_LDAP),--enable,--disable)-ldap \
-	$(if $(CONFIG_LIBCURL_LDAPS),--enable,--disable)-ldaps \
-	$(if $(CONFIG_LIBCURL_LIBCURL-OPTION),--enable,--disable)-libcurl-option \
-	$(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \
-	$(if $(CONFIG_LIBCURL_POLARSSL),--with-polarssl="$(STAGING_DIR)/usr",--without-polarssl) \
-	$(if $(CONFIG_LIBCURL_POP3),--enable,--disable)-pop3 \
-	$(if $(CONFIG_LIBCURL_PROXY),--enable,--disable)-proxy \
-	$(if $(CONFIG_LIBCURL_RTSP),--enable,--disable)-rtsp \
-	$(if $(CONFIG_LIBCURL_TELNET),--enable,--disable)-telnet \
-	$(if $(CONFIG_LIBCURL_TFTP),--enable,--disable)-tftp \
-	$(if $(CONFIG_LIBCURL_SMTP),--enable,--disable)-smtp \
-	$(if $(CONFIG_LIBCURL_SSPI),--enable,--disable)-sspi \
-	$(if $(CONFIG_LIBCURL_THREADED_RESOLVER),--enable,--disable)-threaded-resolver \
-	$(if $(CONFIG_LIBCURL_TLS-SRP),--enable,--disable)-tls-srp \
-	$(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CC="$(TARGET_CC)" \
-		install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/
-	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config
-	[ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc || true
-	ln -sf $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/
-endef
-
-define Package/curl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
-endef
-
-define Package/libcurl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,curl))
-$(eval $(call BuildPackage,libcurl))
-

--- a/libs/curl/patches/001-cyassl-Use-error-ssl.h-when-available.patch
+++ /dev/null
@@ -1,46 +1,1 @@
-From 0204e17bc656e6c59b4010283e67f9251eb12c41 Mon Sep 17 00:00:00 2001
-From: Dan Fandrich <dan@coneharvesters.com>
-Date: Wed, 23 Apr 2014 11:01:30 +0200
-Subject: [PATCH] cyassl: Use error-ssl.h when available
 
-Versions since at least 2.9.4 renamed error.h to error-ssl.h, so use
-whichever one is available.
----
- configure.ac      |    3 +++
- lib/vtls/cyassl.c |    9 +++++++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -2003,6 +2003,9 @@ if test "$curl_ssl_msg" = "$init_ssl_msg
-       dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined!
-       AC_CHECK_SIZEOF(long long)
- 
-+      dnl Versions since at least 2.9.4 renamed error.h to error-ssl.h
-+      AC_CHECK_HEADERS(cyassl/error-ssl.h)
-+
-       LIBS="-lcyassl -lm $LIBS"
- 
-       if test -n "$cyassllib"; then
---- a/lib/vtls/cyassl.c
-+++ b/lib/vtls/cyassl.c
-@@ -47,11 +47,16 @@
- #define _MPRINTF_REPLACE /* use our functions only */
- #include <curl/mprintf.h>
- #include "curl_memory.h"
--/* The last #include file should be: */
--#include "memdebug.h"
-+
- #include <cyassl/ssl.h>
-+#ifdef HAVE_CYASSL_ERROR_SSL_H
-+#include <cyassl/error-ssl.h>
-+#else
- #include <cyassl/error.h>
-+#endif
- 
-+/* The last #include file should be: */
-+#include "memdebug.h"
- 
- static Curl_recv cyassl_recv;
- static Curl_send cyassl_send;
-

--- a/libs/curl/patches/100-check_long_long.patch
+++ /dev/null
@@ -1,11 +1,1 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2904,6 +2904,7 @@ CURL_VERIFY_RUNTIMELIBS
- 
- AC_CHECK_SIZEOF(size_t)
- AC_CHECK_SIZEOF(long)
-+AC_CHECK_SIZEOF(long long)
- AC_CHECK_SIZEOF(int)
- AC_CHECK_SIZEOF(short)
- CURL_CONFIGURE_LONG
 

--- a/libs/curl/patches/200-no_docs_tests.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -66,7 +66,7 @@ CLEANFILES = $(VC6LIBDSP) $(VC8LIBPRJ)
- bin_SCRIPTS = curl-config
- 
- SUBDIRS = lib src include
--DIST_SUBDIRS = $(SUBDIRS) tests packages docs
-+DIST_SUBDIRS = $(SUBDIRS) packages
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libcurl.pc
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -506,7 +506,7 @@ EXTRA_DIST = CHANGES COPYING maketgz Mak
- CLEANFILES = $(VC6LIBDSP) $(VC8LIBPRJ)
- bin_SCRIPTS = curl-config
- SUBDIRS = lib src include
--DIST_SUBDIRS = $(SUBDIRS) tests packages docs
-+DIST_SUBDIRS = $(SUBDIRS) packages
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libcurl.pc
- VSOURCES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c vtls/qssl.c	\
 

--- a/libs/curl/patches/400-hugehelp.patch
+++ /dev/null
@@ -1,14 +1,1 @@
---- a/src/tool_hugehelp.h
-+++ b/src/tool_hugehelp.h
-@@ -23,6 +23,10 @@
-  ***************************************************************************/
- #include "tool_setup.h"
- 
-+#ifdef USE_MANUAL
- void hugehelp(void);
-+#else
-+#define hugehelp() Curl_nop_stmt
-+#endif
- 
- #endif /* HEADER_CURL_TOOL_HUGEHELP_H */
 

--- a/libs/libfreecwmp/Makefile
+++ /dev/null
@@ -1,45 +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:=libfreecwmp
-PKG_VERSION:=2013-02-18
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://dev.libfreecwmp.org/libfreecwmp
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=2131f1eaf6fe0a0de57fe45d343903227333d89d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libfreecwmp
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=CWMP library
-  URL:=http://libfreecwmp.org/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libfreecwmp.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreecwmp.{a,so*} $(1)/usr/lib
-endef
-
-define Package/libfreecwmp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreecwmp.so.* $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,libfreecwmp))
-

file:a/libs/libowfat/Makefile (deleted)
--- a/libs/libowfat/Makefile
+++ /dev/null
@@ -1,59 +1,1 @@
-#
-# Copyright (C) 2010-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-LOWFAT_VERSION=0.28
-
-PKG_NAME:=libowfat
-PKG_VERSION:=$(LOWFAT_VERSION)
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://dl.fefe.de
-PKG_MD5SUM:=6bbee9a86506419657d87123b7a6f2c1
-
-include $(INCLUDE_DIR)/package.mk
-
-# set to 1 to enable debugging
-DEBUG=
-
-define Package/libowfat
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=reimplemented libdjb under GPL
-  URL:=http://www.fefe.de/libowfat/
-endef
-
-define Build/Configure
-endef
-
-TARGET_CFLAGS += $(FPIC)
-LOWFAT_MAKEOPTS = $(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
-	DEBUG="$(DEBUG)" \
-	VERSION="$(LOWFAT_VERSION)" \
-	OS="Linux"
-
-# work around a nasty gcc bug
-ifneq ($(CONFIG_GCC_VERSION_4_2_4),)
-  LOWFAT_MAKEOPTS += WOPTS=""
-endif
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(LOWFAT_MAKEOPTS)
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include/libowfat
-	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libowfat
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/*.a $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,libowfat))
-

file:a/libs/nacl/Makefile (deleted)
--- a/libs/nacl/Makefile
+++ /dev/null
@@ -1,48 +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:=nacl
-PKG_VERSION:=20110221
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://hyperelliptic.org/nacl
-PKG_MD5SUM:=7efb5715561c3d10dafd3fa97b4f2d20
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nacl
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=NaCl Networking and Cryptography library
-  URL:=http://nacl.cace-project.eu/
-endef
-
-define Build/Compile
-	cp do-openwrt $(PKG_BUILD_DIR)
-	( \
-		cd $(PKG_BUILD_DIR); \
-		chmod +x do-openwrt; \
-			CC="$(TARGET_CC)" \
-			CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-			AR="$(TARGET_CROSS)ar" \
-			RANLIB="$(TARGET_CROSS)ranlib" \
-			./do-openwrt \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/nacl
-	$(CP) $(PKG_BUILD_DIR)/build/include/*.h $(1)/usr/include/nacl/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/build/lib/libnacl.a $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,nacl))
-

file:a/libs/nacl/do-openwrt (deleted)
--- a/libs/nacl/do-openwrt
+++ /dev/null
@@ -1,207 +1,1 @@
-#!/bin/sh
-set -e
 
-# nacl/do
-# D. J. Bernstein
-# Public domain.
-
-version=`cat version`
-project=nacl
-
-top="`pwd`/build"
-bin="$top/bin"
-lib="$top/lib"
-include="$top/include"
-work="$top/work"
-
-
-# and work around bug in GNU sort
-LANG=C
-export LANG
-
-rm -rf "$top"
-mkdir -p "$top"
-mkdir -p "$bin"
-mkdir -p "$lib"
-mkdir -p "$include"
-
-exec >"$top/log"
-exec 2>&1
-exec 5>"$top/data"
-exec </dev/null
-
-echo "=== `date` === starting"
-
-echo "=== `date` === building inttypes"
-for target in int8 int16 int32 int64 uint8 uint16 uint32 uint64; do
-  (
-    echo "#ifndef crypto_${target}_h"
-    echo "#define crypto_${target}_h"
-    echo ""
-    echo "#include <stdint.h>"
-    echo ""
-    echo "typedef ${target}_t crypto_${target};"
-    echo ""
-    echo "#endif"
-  ) > "$include/crypto_$target.h"
-done
-
-echo "=== `date` === building randombytes"
-rm -rf "$work"
-mkdir -p "$work"
-cp -pr randombytes/* "$work"
-(
-  cd "$work"
-  
-  cp devurandom.c randombytes-impl.c
-  cp devurandom.h randombytes-impl.h
-  $CC $CFLAGS -c randombytes-impl.c
-  mkdir -p lib
-  mv randombytes-impl.o lib/randombytes.o
-  mkdir -p include
-  mv randombytes-impl.h include/randombytes.h
-)
-cp -pr "$work"/lib/* "$lib"
-cp -pr "$work"/include/* "$include"
-
-rm -rf "$work"
-mkdir -p "$work"
-echo 'void crypto_'"$project"'_base(void) { ; }' > "$work/${project}_base.c"
-( cd "$work" && $CC $CFLAGS -c ${project}_base.c )
-$AR cr "$lib/lib${project}.a" "$work/${project}_base.o"
-( $RANLIB "$lib/lib${project}.a" || exit 0 )
-
-# loop over operations
-cat OPERATIONS \
-| while read o
-do
-  [ -d "$o" ] || continue
-
-  # for each operation, loop over primitives
-  ls "$o" \
-  | sort \
-  | while read p
-  do
-    [ -d "$o/$p" ] || continue
-    op="${o}_${p}"
-
-    startdate=`date +%Y%m%d`
-
-    echo "=== `date` === $o/$p"
-
-    rm -rf "$work"
-    mkdir -p "$work"
-
-    if [ -d "$o/$p/ref" ]; then
-      implementationdir="$o/$p/ref"
-    else
-      implementationdir="$o/$p/portable"
-    fi
-
-    opi=`echo "$implementationdir" | tr ./- ___`
-    
-    echo "=== `date` === $implementationdir"
-
-    cfiles=`ls "$implementationdir" | grep '\.c$' || :`
-    sfiles=`ls "$implementationdir" | grep '\.[sS]$' || :`
-    
-    cp -p "$o"/*.c "$work"
-
-    cp -pr "$implementationdir"/* "$work"
-
-    cp -p MACROS "$work/MACROS"
-    cp -p PROTOTYPES.c "$work/PROTOTYPES.c"
-
-    (
-      cd "$work"
-      (
-	echo "#ifndef ${o}_H"
-	echo "#define ${o}_H"
-	echo ""
-	echo "#include \"${op}.h\""
-	echo ""
-	egrep "${o}"'$|'"${o}"'\(|'"${o}"'_' < MACROS \
-	  | sed "s/$o/$op/" | while read mop
-	do
-	  echo "#define ${mop} ${mop}" | sed "s/$op/$o/"
-	done
-	echo "#define ${o}_PRIMITIVE \"${p}\""
-	echo "#define ${o}_IMPLEMENTATION ${op}_IMPLEMENTATION"
-	echo "#define ${o}_VERSION ${op}_VERSION"
-	echo ""
-	echo "#endif"
-      ) > "$o.h"
-      (
-	echo "#ifndef ${op}_H"
-	echo "#define ${op}_H"
-	echo ""
-	sed 's/[ 	]CRYPTO_/ '"${opi}"'_/g' < api.h
-	echo '#ifdef __cplusplus'
-	  #echo '#include <string>'
-	  #egrep "${o}"'$|'"${o}"'\(|'"${o}"'_' < PROTOTYPES.cpp \
-	  #    | sed "s/$o/$opi/"
-	echo 'extern "C" {'
-	echo '#endif'
-	egrep "${o}"'$|'"${o}"'\(|'"${o}"'_' < PROTOTYPES.c \
-	  | sed "s/$o/$opi/"
-	echo '#ifdef __cplusplus'
-	echo '}'
-	echo '#endif'
-	echo ""
-	egrep "${o}"'$|'"${o}"'\(|'"${o}"'_' < MACROS \
-	  | sed "s/$o/$opi/" | while read mopi
-	do
-	    echo "#define ${mopi} ${mopi}" | sed "s/$opi/$op/"
-	done
-	echo "#define ${op}_IMPLEMENTATION \"${implementationdir}\""
-	echo "#ifndef ${opi}_VERSION"
-	echo "#define ${opi}_VERSION \"-\""
-	echo "#endif"
-	echo "#define ${op}_VERSION ${opi}_VERSION"
-	echo ""
-	echo "#endif"
-      ) > "$op.h"
-
-      echo "=== `date` === $implementationdir $CC $CFLAGS"
-      for f in $cfiles $sfiles
-      do
-	ok=1
-	$CC $CFLAGS \
-	    -I. -I"$include" \
-	    -c "$f" >errors 2>&1 || ok=0
-	( if [ `wc -l < errors` -lt 25 ]
-	  then
-	    cat errors
-	  else
-	    head errors
-	    echo ...
-	    tail errors
-	  fi
-	) \
-	| while read err
-	do
-	  echo "$version $startdate $o $p fromcompiler $implementationdir $f $err" >&5
-	done
-	
-	[ "$ok" = 1 ]
-      done
-
-      for f in *.o
-      do
-	mv "$f" "${opi}-$f"
-      done
-    )
-  
-    echo "=== `date` === $implementationdir $CC $CFLAGS finishing"
-
-    $AR cr "$lib/lib${project}.a" "$work"/*.o \
-    && ( $RANLIB "$lib/lib${project}.a" || exit 0 ) \
-    && cp -p "$work/$op.h" "$include/$op.h" \
-    && [ -f "$o/$p/selected" ] \
-    && cp -p "$work/$o.h" "$include/$o.h" \
-    || :
-  done
-done
-
-echo "=== `date` === finishing"
-

--- a/libs/rrdtool-1.0.x/Makefile
+++ /dev/null
@@ -1,132 +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:=rrdtool1
-PKG_VERSION:=1.0.50
-PKG_RELEASE:=2
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/rrdtool-$(PKG_VERSION)
-PKG_SOURCE:=rrdtool-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= \
-	http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x \
-	http://www.fastmirrors.org/rrdtool/rrdtool-1.0.x \
-	ftp://ftp.sunet.se/pub/network/monitoring/rrdtool/rrdtool-1.0.x
-PKG_MD5SUM:=c466e2e7df95fa8e318e46437da87686
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/rrdtool1/Default
-  TITLE:=Round Robin Database (RRD)
-  URL:=http://oss.oetiker.ch/rrdtool/
-endef
-
-define Package/rrdtool1/description/Default
- RRD is the Acronym for Round Robin Database. RRD is a system to store and
- display time-series data (i.e. network bandwidth, machine-room temperature,
- server load average). It stores the data in a very compact way that will
- not expand over time, and it presents useful graphs by processing the data
- to enforce a certain data density. It can be used either via simple wrapper
- scripts (from shell or Perl) or via frontends that poll network devices and
- put friendly user interface on it.
-
- This is version 1.0.x with cgilib-0.4, gd1.3 and libpng-1.0.9 linked into
- librrd.so. The library is much smaller compared to the 1.2.x version with
- separate dynamic linked libraries.
-endef
-
-define Package/librrd1
-$(call Package/rrdtool1/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+zlib
-  TITLE+= management library
-endef
-
-define Package/librrd1/description
-$(call Package/rrdtool1/description/Default)
- This package contains a shared library, used by other programs.
-endef
-
-define Package/rrdcgi1
-$(call Package/rrdtool1/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+librrd1
-  TITLE+= CGI graphing tool
-endef
-
-define Package/rrdcgi1/description
-$(call Package/rrdtool1/description/Default)
- This package contains the rrdcgi tool used to create web pages containing
- RRD graphs based on templates.
-endef
-
-define Package/rrdtool1
-$(call Package/rrdtool1/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+librrd1
-  TITLE+= management tools
-endef
-
-define Package/rrdtool1/description
-$(call Package/rrdtool1/description/Default)
- This package contains command line tools used to manage RRDs.
-endef
-
-TARGET_CFLAGS += $(FPIC) --std=c99
-
-CONFIGURE_ARGS += \
-	$(DISABLE_NLS) \
-	--enable-shared=yes \
-	--enable-static=yes \
-	--disable-rpath \
-	--with-gnu-ld \
-	--enable-local-zlib
-
-CONFIGURE_VARS += \
-	ac_cv_path_PERL=no \
-	rd_cv_ieee_works=yes \
-	shrext_cmds=".so"
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		shrext_cmds=".so" \
-		all install
-endef
-
-define Package/rrdtool1/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrd{tool,update} $(1)/usr/bin/
-endef
-
-define Package/rrdcgi1/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
-endef
-
-define Package/librrd1/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.0/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.0/include/
-	$(INSTALL_DIR)  $(1)/usr/lib/rrdtool-1.0/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/rrdtool-1.0/lib/
-endef
-
-$(eval $(call BuildPackage,librrd1))
-$(eval $(call BuildPackage,rrdcgi1))
-$(eval $(call BuildPackage,rrdtool1))
-

--- a/libs/rrdtool-1.0.x/patches/001-no_ordering_cd_joke.patch
+++ /dev/null
@@ -1,22 +1,1 @@
-diff -urN rrdtool-1.0.50/configure rrdtool-1.0.50.new/configure
---- rrdtool-1.0.50/configure	2005-04-25 22:48:09.000000000 +0200
-+++ rrdtool-1.0.50.new/configure	2009-03-09 17:25:38.000000000 +0100
-@@ -24873,17 +24873,12 @@
- echo "${ECHO_T}and out again" >&6
- 
- echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6
--sleep 1
- echo $ECHO_N ".$ac_c" 1>&6
--sleep 2
- echo $ECHO_N ".$ac_c" 1>&6
--sleep 1
- echo $ECHO_N ".$ac_c" 1>&6
--sleep 3
- echo $ECHO_N ".$ac_c" 1>&6
- echo $ECHO_N ".$ac_c" 1>&6
- echo $ECHO_N ".$ac_c" 1>&6
--sleep 2
- echo "$as_me:$LINENO: result:  just kidding ;-)" >&5
- echo "${ECHO_T} just kidding ;-)" >&6
- echo
 

--- a/libs/rrdtool-1.0.x/patches/002-no_timezone.patch
+++ /dev/null
@@ -1,25 +1,1 @@
---- a/src/rrd_tool.c
-+++ b/src/rrd_tool.c
-@@ -225,11 +225,8 @@
- 	  struct rusage  myusage;
- 	  struct timeval starttime;
- 	  struct timeval currenttime;
--	  struct timezone tz;
- 
--	    tz.tz_minuteswest =0;
--	    tz.tz_dsttime=0;
--	    gettimeofday(&starttime,&tz);
-+	    gettimeofday(&starttime,NULL);
- #endif
- 
- 	    while (fgets(aLine, sizeof(aLine)-1, stdin)){
-@@ -252,7 +249,7 @@
- 
- #if HAVE_GETRUSAGE
- 		getrusage(RUSAGE_SELF,&myusage);
--		gettimeofday(&currenttime,&tz);
-+		gettimeofday(&currenttime,NULL);
- 		printf("OK u:%1.2f s:%1.2f r:%1.2f\n",
- 		       (double)myusage.ru_utime.tv_sec+
- 		       (double)myusage.ru_utime.tv_usec/1000000.0,
 

--- a/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch
+++ /dev/null
@@ -1,14 +1,1 @@
-Index: rrdtool-1.0.50/src/rrd_format.h
-===================================================================
---- rrdtool-1.0.50.orig/src/rrd_format.h
-+++ rrdtool-1.0.50/src/rrd_format.h
-@@ -20,7 +20,7 @@
- 
- #define RRD_COOKIE    "RRD"
- #define RRD_VERSION   "0001"
--#define FLOAT_COOKIE  8.642135E130
-+#define FLOAT_COOKIE  ((double)8.642135E130)
- 
- #if defined(WIN32)
- #define DNAN          ((double)fmod(0.0,0.0))    
 

--- a/libs/rrdtool-1.0.x/patches/030-pod2man-stderr.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- rrdtool-1.0.50/doc/Makefile.am.orig	2013-11-16 11:44:50.940231208 -0500
-+++ rrdtool-1.0.50/doc/Makefile.am	2013-11-16 11:45:09.802229483 -0500
-@@ -35,7 +35,7 @@
- all-local: link txt man html
- 
- .pod.1 .pm.1 .pl.1:
--	pod2man --release=$(VERSION) --center=RRDtool $<  > $@
-+	pod2man --stderr --release=$(VERSION) --center=RRDtool $<  > $@
- 
- .1.txt:
- 	@NROFF@ -man -Tlp $< > $@ || echo @NROFF@ failed > $@
 

file:a/libs/shflags/Makefile (deleted)
--- a/libs/shflags/Makefile
+++ /dev/null
@@ -1,50 +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:=shflags
-PKG_REV:=133
-PKG_VERSION:=2012-06-11_r$(PKG_REV)
-PKG_RELEASE=1.0.x
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_URL:=http://shflags.googlecode.com/svn/trunk
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/shflags
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=shflags
-  DEPENDS:=+getopt
-  URL:=http://code.google.com/p/shflags/
-endef
-
-define Package/shflags/description
- command-line flags module for Unix shell scripts
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Build/Install
-endef
-
-define Package/shflags/install
-	$(INSTALL_DIR) $(1)/usr/share/shflags
-	$(CP) $(PKG_BUILD_DIR)/source/1.0/src/shflags  $(1)/usr/share/shflags/shflags.sh
-endef
-
-$(eval $(call BuildPackage,shflags))
-

--- a/libs/shflags/patches/000-strip.patch
+++ /dev/null
@@ -1,764 +1,1 @@
---- a/source/1.0/src/shflags
-+++ b/source/1.0/src/shflags
-@@ -1,91 +1,10 @@
--# $Id: shflags 132 2009-05-10 18:03:58Z kate.ward@forestent.com $
--# vim:et:ft=sh:sts=2:sw=2
--#
--# Copyright 2008 Kate Ward. All Rights Reserved.
--# Released under the LGPL (GNU Lesser General Public License)
--#
--# shFlags -- Advanced command-line flag library for Unix shell scripts.
--# http://code.google.com/p/shflags/
--#
--# Author: kate.ward@forestent.com (Kate Ward)
--#
--# This module implements something like the google-gflags library available
--# from http://code.google.com/p/google-gflags/.
--#
--# FLAG TYPES: This is a list of the DEFINE_*'s that you can do.  All flags take
--# a name, default value, help-string, and optional 'short' name (one-letter
--# name).  Some flags have other arguments, which are described with the flag.
--#
--# DEFINE_string: takes any input, and intreprets it as a string.
--#
--# DEFINE_boolean: typically does not take any argument: say --myflag to set
--#   FLAGS_myflag to true, or --nomyflag to set FLAGS_myflag to false.
--#   Alternately, you can say
--#     --myflag=true  or --myflag=t or --myflag=0  or
--#     --myflag=false or --myflag=f or --myflag=1
--#   Passing an option has the same affect as passing the option once.
--#
--# DEFINE_float: takes an input and intreprets it as a floating point number. As
--#   shell does not support floats per-se, the input is merely validated as
--#   being a valid floating point value.
--#
--# DEFINE_integer: takes an input and intreprets it as an integer.
--#
--# SPECIAL FLAGS: There are a few flags that have special meaning:
--#   --help (or -?)  prints a list of all the flags in a human-readable fashion
--#   --flagfile=foo  read flags from foo.  (not implemented yet)
--#   --              as in getopt(), terminates flag-processing
--#
--# EXAMPLE USAGE:
--#
--#   -- begin hello.sh --
--#   #! /bin/sh
--#   . ./shflags
--#   DEFINE_string name 'world' "somebody's name" n
--#   FLAGS "$@" || exit $?
--#   eval set -- "${FLAGS_ARGV}"
--#   echo "Hello, ${FLAGS_name}."
--#   -- end hello.sh --
--#
--#   $ ./hello.sh -n Kate
--#   Hello, Kate.
--#
--# NOTE: Not all systems include a getopt version that supports long flags. On
--# these systems, only short flags are recognized.
--
--#==============================================================================
--# shFlags
--#
--# Shared attributes:
--#   flags_error: last error message
--#   flags_return: last return value
--#
--#   __flags_longNames: list of long names for all flags
--#   __flags_shortNames: list of short names for all flags
--#   __flags_boolNames: list of boolean flag names
--#
--#   __flags_opts: options parsed by getopt
--#
--# Per-flag attributes:
--#   FLAGS_<flag_name>: contains value of flag named 'flag_name'
--#   __flags_<flag_name>_default: the default flag value
--#   __flags_<flag_name>_help: the flag help string
--#   __flags_<flag_name>_short: the flag short name
--#   __flags_<flag_name>_type: the flag type
--#
--# Notes:
--# - lists of strings are space separated, and a null value is the '~' char.
--
--# return if FLAGS already loaded
- [ -n "${FLAGS_VERSION:-}" ] && return 0
- FLAGS_VERSION='1.0.3'
- 
--# return values
- FLAGS_TRUE=0
- FLAGS_FALSE=1
- FLAGS_ERROR=2
- 
--# reserved flag names
- FLAGS_RESERVED='ARGC ARGV ERROR FALSE HELP PARENT RESERVED TRUE VERSION'
- 
- _flags_debug() { echo "flags:DEBUG $@" >&2; }
-@@ -93,7 +12,6 @@ _flags_warn() { echo "flags:WARN $@" >&2
- _flags_error() { echo "flags:ERROR $@" >&2; }
- _flags_fatal() { echo "flags:FATAL $@" >&2; }
- 
--# specific shell checks
- if [ -n "${ZSH_VERSION:-}" ]; then
-   setopt |grep "^shwordsplit$" >/dev/null
-   if [ $? -ne ${FLAGS_TRUE} ]; then
-@@ -107,20 +25,15 @@ if [ -n "${ZSH_VERSION:-}" ]; then
-   fi
- fi
- 
--#
--# constants
--#
- 
--# getopt version
- __FLAGS_GETOPT_VERS_STD=0
- __FLAGS_GETOPT_VERS_ENH=1
- __FLAGS_GETOPT_VERS_BSD=2
- 
- getopt >/dev/null 2>&1
- case $? in
--  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;  # bsd getopt
-+  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;
-   2)
--    # TODO(kward): look into '-T' option to test the internal getopt() version
-     if [ "`getopt --version`" = '-- ' ]; then
-       __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD}
-     else
-@@ -133,82 +46,49 @@ case $? in
-     ;;
- esac
- 
--# getopt optstring lengths
- __FLAGS_OPTSTR_SHORT=0
- __FLAGS_OPTSTR_LONG=1
- 
- __FLAGS_NULL='~'
- 
--# flag info strings
- __FLAGS_INFO_DEFAULT='default'
- __FLAGS_INFO_HELP='help'
- __FLAGS_INFO_SHORT='short'
- __FLAGS_INFO_TYPE='type'
- 
--# flag lengths
- __FLAGS_LEN_SHORT=0
- __FLAGS_LEN_LONG=1
- 
--# flag types
- __FLAGS_TYPE_NONE=0
- __FLAGS_TYPE_BOOLEAN=1
- __FLAGS_TYPE_FLOAT=2
- __FLAGS_TYPE_INTEGER=3
- __FLAGS_TYPE_STRING=4
- 
--# set the constants readonly
- __flags_constants=`set |awk -F= '/^FLAGS_/ || /^__FLAGS_/ {print $1}'`
- for __flags_const in ${__flags_constants}; do
--  # skip certain flags
-   case ${__flags_const} in
-     FLAGS_HELP) continue ;;
-     FLAGS_PARENT) continue ;;
-   esac
--  # set flag readonly
-   if [ -z "${ZSH_VERSION:-}" ]; then
-     readonly ${__flags_const}
--  else  # handle zsh
-+  else
-     case ${ZSH_VERSION} in
-       [123].*) readonly ${__flags_const} ;;
--      *) readonly -g ${__flags_const} ;;  # declare readonly constants globally
-+      *) readonly -g ${__flags_const} ;;
-     esac
-   fi
- done
- unset __flags_const __flags_constants
- 
--#
--# internal variables
--#
--
--__flags_boolNames=' '  # space separated list of boolean flag names
--__flags_longNames=' '  # space separated list of long flag names
--__flags_shortNames=' '  # space separated list of short flag names
--
--__flags_columns=''  # screen width in columns
--__flags_opts=''  # temporary storage for parsed getopt flags
--
--#------------------------------------------------------------------------------
--# private functions
--#
--
--# Define a flag.
--#
--# Calling this function will define the following info variables for the
--# specified flag:
--#   FLAGS_flagname - the name for this flag (based upon the long flag name)
--#   __flags_<flag_name>_default - the default value
--#   __flags_flagname_help - the help string
--#   __flags_flagname_short - the single letter alias
--#   __flags_flagname_type - the type of flag (one of __FLAGS_TYPE_*)
--#
--# Args:
--#   _flags__type: integer: internal type of flag (__FLAGS_TYPE_*)
--#   _flags__name: string: long flag name
--#   _flags__default: default flag value
--#   _flags__help: string: help string
--#   _flags__short: string: (optional) short flag name
--# Returns:
--#   integer: success of operation, or error
-+
-+__flags_boolNames=' '
-+__flags_longNames=' '
-+__flags_shortNames=' '
-+__flags_columns=''
-+__flags_opts=''
-+
- _flags_define()
- {
-   if [ $# -lt 4 ]; then
-@@ -226,16 +106,13 @@ _flags_define()
- 
-   _flags_return_=${FLAGS_TRUE}
- 
--  # TODO(kward): check for validity of the flag name (e.g. dashes)
- 
--  # check whether the flag name is reserved
-   echo " ${FLAGS_RESERVED} " |grep " ${_flags_name_} " >/dev/null
-   if [ $? -eq 0 ]; then
-     flags_error="flag name (${_flags_name_}) is reserved"
-     _flags_return_=${FLAGS_ERROR}
-   fi
- 
--  # require short option for getopt that don't support long options
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
-       -a ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} \
-       -a "${_flags_short_}" = "${__FLAGS_NULL}" ]
-@@ -244,7 +121,6 @@ _flags_define()
-     _flags_return_=${FLAGS_ERROR}
-   fi
- 
--  # check for existing long name definition
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
-     if _flags_itemInList "${_flags_name_}" \
-         ${__flags_longNames} ${__flags_boolNames}
-@@ -255,7 +131,6 @@ _flags_define()
-     fi
-   fi
- 
--  # check for existing short name definition
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
-       -a "${_flags_short_}" != "${__FLAGS_NULL}" ]
-   then
-@@ -266,9 +141,6 @@ _flags_define()
-     fi
-   fi
- 
--  # handle default value. note, on several occasions the 'if' portion of an
--  # if/then/else contains just a ':' which does nothing. a binary reversal via
--  # '!' is not done because it does not work on all shells.
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
-     case ${_flags_type_} in
-       ${__FLAGS_TYPE_BOOLEAN})
-@@ -301,7 +173,7 @@ _flags_define()
-         fi
-         ;;
- 
--      ${__FLAGS_TYPE_STRING}) ;;  # everything in shell is a valid string
-+      ${__FLAGS_TYPE_STRING}) ;;
- 
-       *)
-         flags_error="unrecognized flag type '${_flags_type_}'"
-@@ -311,7 +183,6 @@ _flags_define()
-   fi
- 
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
--    # store flag information
-     eval "FLAGS_${_flags_name_}='${_flags_default_}'"
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}=${_flags_type_}"
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}=\
-@@ -319,7 +190,6 @@ _flags_define()
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP}=\"${_flags_help_}\""
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT}='${_flags_short_}'"
- 
--    # append flag name(s) to list of names
-     __flags_longNames="${__flags_longNames}${_flags_name_} "
-     __flags_shortNames="${__flags_shortNames}${_flags_short_} "
-     [ ${_flags_type_} -eq ${__FLAGS_TYPE_BOOLEAN} ] && \
-@@ -333,17 +203,6 @@ _flags_define()
-   return ${flags_return}
- }
- 
--# Return valid getopt options using currently defined list of long options.
--#
--# This function builds a proper getopt option string for short (and long)
--# options, using the current list of long options for reference.
--#
--# Args:
--#   _flags_optStr: integer: option string type (__FLAGS_OPTSTR_*)
--# Output:
--#   string: generated option string for getopt
--# Returns:
--#   boolean: success of operation (always returns True)
- _flags_genOptStr()
- {
-   _flags_optStrType_=$1
-@@ -358,7 +217,6 @@ _flags_genOptStr()
-             ${_flags_flag_} ${__FLAGS_INFO_SHORT}`
-         if [ "${_flags_shortName_}" != "${__FLAGS_NULL}" ]; then
-           _flags_opts_="${_flags_opts_}${_flags_shortName_}"
--          # getopt needs a trailing ':' to indicate a required argument
-           [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
-               _flags_opts_="${_flags_opts_}:"
-         fi
-@@ -366,7 +224,6 @@ _flags_genOptStr()
- 
-       ${__FLAGS_OPTSTR_LONG})
-         _flags_opts_="${_flags_opts_:+${_flags_opts_},}${_flags_flag_}"
--        # getopt needs a trailing ':' to indicate a required argument
-         [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
-             _flags_opts_="${_flags_opts_}:"
-         ;;
-@@ -379,15 +236,6 @@ _flags_genOptStr()
-   return ${FLAGS_TRUE}
- }
- 
--# Returns flag details based on a flag name and flag info.
--#
--# Args:
--#   string: long flag name
--#   string: flag info (see the _flags_define function for valid info types)
--# Output:
--#   string: value of dereferenced flag variable
--# Returns:
--#   integer: one of FLAGS_{TRUE|FALSE|ERROR}
- _flags_getFlagInfo()
- {
-   _flags_name_=$1
-@@ -399,13 +247,6 @@ _flags_getFlagInfo()
-   if [ -n "${_flags_value_}" ]; then
-     flags_return=${FLAGS_TRUE}
-   else
--    # see if the _flags_name_ variable is a string as strings can be empty...
--    # note: the DRY principle would say to have this function call itself for
--    # the next three lines, but doing so results in an infinite loop as an
--    # invalid _flags_name_ will also not have the associated _type variable.
--    # Because it doesn't (it will evaluate to an empty string) the logic will
--    # try to find the _type variable of the _type variable, and so on. Not so
--    # good ;-)
-     _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}"
-     _flags_strToEval_="_flags_type_=\"\${${_flags_typeVar_}:-}\""
-     eval "${_flags_strToEval_}"
-@@ -424,15 +265,6 @@ _flags_getFlagInfo()
-   return ${flags_return}
- }
- 
--# check for presense of item in a list. passed a string (e.g. 'abc'), this
--# function will determine if the string is present in the list of strings (e.g.
--# ' foo bar abc ').
--#
--# Args:
--#   _flags__str: string: string to search for in a list of strings
--#   unnamed: list: list of strings
--# Returns:
--#   boolean: true if item is in the list
- _flags_itemInList()
- {
-   _flags_str_=$1
-@@ -449,34 +281,22 @@ _flags_itemInList()
-   return ${flags_return}
- }
- 
--# Returns the width of the current screen.
--#
--# Output:
--#   integer: width in columns of the current screen.
- _flags_columns()
- {
-   if [ -z "${__flags_columns}" ]; then
--    # determine the value and store it
-     if eval stty size >/dev/null 2>&1; then
--      # stty size worked :-)
-       set -- `stty size`
-       __flags_columns=$2
-     elif eval tput cols >/dev/null 2>&1; then
-       set -- `tput cols`
-       __flags_columns=$1
-     else
--      __flags_columns=80  # default terminal width
-+      __flags_columns=80
-     fi
-   fi
-   echo ${__flags_columns}
- }
- 
--# Validate a boolean.
--#
--# Args:
--#   _flags__bool: boolean: value to validate
--# Returns:
--#   bool: true if the value is a valid boolean
- _flags_validateBoolean()
- {
-   _flags_bool_=$1
-@@ -492,12 +312,6 @@ _flags_validateBoolean()
-   return ${flags_return}
- }
- 
--# Validate a float.
--#
--# Args:
--#   _flags__float: float: value to validate
--# Returns:
--#   bool: true if the value is a valid float
- _flags_validateFloat()
- {
-   _flags_float_=$1
-@@ -507,10 +321,10 @@ _flags_validateFloat()
-   else
-     flags_return=${FLAGS_TRUE}
-     case ${_flags_float_} in
--      -*)  # negative floats
-+      -*)
-         _flags_test_=`expr "${_flags_float_}" : '\(-[0-9][0-9]*\.[0-9][0-9]*\)'`
-         ;;
--      *)  # positive floats
-+      *)
-         _flags_test_=`expr "${_flags_float_}" : '\([0-9][0-9]*\.[0-9][0-9]*\)'`
-         ;;
-     esac
-@@ -521,22 +335,16 @@ _flags_validateFloat()
-   return ${flags_return}
- }
- 
--# Validate an integer.
--#
--# Args:
--#   _flags__integer: interger: value to validate
--# Returns:
--#   bool: true if the value is a valid integer
- _flags_validateInteger()
- {
-   _flags_int_=$1
- 
-   flags_return=${FLAGS_TRUE}
-   case ${_flags_int_} in
--    -*)  # negative ints
-+    -*)
-       _flags_test_=`expr "${_flags_int_}" : '\(-[0-9][0-9]*\)'`
-       ;;
--    *)  # positive ints
-+    *)
-       _flags_test_=`expr "${_flags_int_}" : '\([0-9][0-9]*\)'`
-       ;;
-   esac
-@@ -546,23 +354,12 @@ _flags_validateInteger()
-   return ${flags_return}
- }
- 
--# Parse command-line options using the standard getopt.
--#
--# Note: the flag options are passed around in the global __flags_opts so that
--# the formatting is not lost due to shell parsing and such.
--#
--# Args:
--#   @: varies: command-line options to parse
--# Returns:
--#   integer: a FLAGS success condition
- _flags_getoptStandard()
- {
-   flags_return=${FLAGS_TRUE}
-   _flags_shortOpts_=`_flags_genOptStr ${__FLAGS_OPTSTR_SHORT}`
- 
--  # check for spaces in passed options
-   for _flags_opt_ in "$@"; do
--    # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
-     _flags_match_=`echo "x${_flags_opt_}x" |sed 's/ //g'`
-     if [ "${_flags_match_}" != "x${_flags_opt_}x" ]; then
-       flags_error='the available getopt does not support spaces in options'
-@@ -585,15 +382,6 @@ _flags_getoptStandard()
-   return ${flags_return}
- }
- 
--# Parse command-line options using the enhanced getopt.
--#
--# Note: the flag options are passed around in the global __flags_opts so that
--# the formatting is not lost due to shell parsing and such.
--#
--# Args:
--#   @: varies: command-line options to parse
--# Returns:
--#   integer: a FLAGS success condition
- _flags_getoptEnhanced()
- {
-   flags_return=${FLAGS_TRUE}
-@@ -617,17 +405,6 @@ _flags_getoptEnhanced()
-   return ${flags_return}
- }
- 
--# Dynamically parse a getopt result and set appropriate variables.
--#
--# This function does the actual conversion of getopt output and runs it through
--# the standard case structure for parsing. The case structure is actually quite
--# dynamic to support any number of flags.
--#
--# Args:
--#   argc: int: original command-line argument count
--#   @: varies: output from getopt parsing
--# Returns:
--#   integer: a FLAGS success condition
- _flags_parseGetopt()
- {
-   _flags_argc_=$1
-@@ -638,35 +415,26 @@ _flags_parseGetopt()
-   if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
-     set -- $@
-   else
--    # note the quotes around the `$@' -- they are essential!
-     eval set -- "$@"
-   fi
- 
--  # provide user with number of arguments to shift by later
--  # NOTE: the FLAGS_ARGC variable is obsolete as of 1.0.3 because it does not
--  # properly give user access to non-flag arguments mixed in between flag
--  # arguments. Its usage was replaced by FLAGS_ARGV, and it is being kept only
--  # for backwards compatibility reasons.
-   FLAGS_ARGC=`expr $# - 1 - ${_flags_argc_}`
- 
--  # handle options. note options with values must do an additional shift
-   while true; do
-     _flags_opt_=$1
-     _flags_arg_=${2:-}
-     _flags_type_=${__FLAGS_TYPE_NONE}
-     _flags_name_=''
- 
--    # determine long flag name
-     case "${_flags_opt_}" in
--      --) shift; break ;;  # discontinue option parsing
-+      --) shift; break ;;
- 
--      --*)  # long option
-+      --*)
-         _flags_opt_=`expr "${_flags_opt_}" : '--\(.*\)'`
-         _flags_len_=${__FLAGS_LEN_LONG}
-         if _flags_itemInList "${_flags_opt_}" ${__flags_longNames}; then
-           _flags_name_=${_flags_opt_}
-         else
--          # check for negated long boolean version
-           if _flags_itemInList "${_flags_opt_}" ${__flags_boolNames}; then
-             _flags_name_=`expr "${_flags_opt_}" : 'no\(.*\)'`
-             _flags_type_=${__FLAGS_TYPE_BOOLEAN}
-@@ -675,12 +443,10 @@ _flags_parseGetopt()
-         fi
-         ;;
- 
--      -*)  # short option
-+      -*)
-         _flags_opt_=`expr "${_flags_opt_}" : '-\(.*\)'`
-         _flags_len_=${__FLAGS_LEN_SHORT}
-         if _flags_itemInList "${_flags_opt_}" ${__flags_shortNames}; then
--          # yes. match short name to long name. note purposeful off-by-one
--          # (too high) with awk calculations.
-           _flags_pos_=`echo "${__flags_shortNames}" \
-               |awk 'BEGIN{RS=" ";rn=0}$0==e{rn=NR}END{print rn}' \
-                   e=${_flags_opt_}`
-@@ -690,14 +456,12 @@ _flags_parseGetopt()
-         ;;
-     esac
- 
--    # die if the flag was unrecognized
-     if [ -z "${_flags_name_}" ]; then
-       flags_error="unrecognized option (${_flags_opt_})"
-       flags_return=${FLAGS_ERROR}
-       break
-     fi
- 
--    # set new flag value
-     [ ${_flags_type_} -eq ${__FLAGS_TYPE_NONE} ] && \
-         _flags_type_=`_flags_getFlagInfo \
-             "${_flags_name_}" ${__FLAGS_INFO_TYPE}`
-@@ -746,7 +510,6 @@ _flags_parseGetopt()
-         ;;
-     esac
- 
--    # handle special case help flag
-     if [ "${_flags_name_}" = 'help' ]; then
-       if [ ${FLAGS_help} -eq ${FLAGS_TRUE} ]; then
-         flags_help
-@@ -756,12 +519,10 @@ _flags_parseGetopt()
-       fi
-     fi
- 
--    # shift the option and non-boolean arguements out.
-     shift
-     [ ${_flags_type_} != ${__FLAGS_TYPE_BOOLEAN} ] && shift
-   done
- 
--  # give user back non-flag arguments
-   FLAGS_ARGV=''
-   while [ $# -gt 0 ]; do
-     FLAGS_ARGV="${FLAGS_ARGV:+${FLAGS_ARGV} }'$1'"
-@@ -773,43 +534,18 @@ _flags_parseGetopt()
-   return ${flags_return}
- }
- 
--#------------------------------------------------------------------------------
--# public functions
--#
--
--# A basic boolean flag. Boolean flags do not take any arguments, and their
--# value is either 1 (false) or 0 (true). For long flags, the false value is
--# specified on the command line by prepending the word 'no'. With short flags,
--# the presense of the flag toggles the current value between true and false.
--# Specifying a short boolean flag twice on the command results in returning the
--# value back to the default value.
--#
--# A default value is required for boolean flags.
--#
--# For example, lets say a Boolean flag was created whose long name was 'update'
--# and whose short name was 'x', and the default value was 'false'. This flag
--# could be explicitly set to 'true' with '--update' or by '-x', and it could be
--# explicitly set to 'false' with '--noupdate'.
-+
- DEFINE_boolean() { _flags_define ${__FLAGS_TYPE_BOOLEAN} "$@"; }
- 
--# Other basic flags.
- DEFINE_float()   { _flags_define ${__FLAGS_TYPE_FLOAT} "$@"; }
- DEFINE_integer() { _flags_define ${__FLAGS_TYPE_INTEGER} "$@"; }
- DEFINE_string()  { _flags_define ${__FLAGS_TYPE_STRING} "$@"; }
- 
--# Parse the flags.
--#
--# Args:
--#   unnamed: list: command-line flags to parse
--# Returns:
--#   integer: success of operation, or error
- FLAGS()
- {
--  # define a standard 'help' flag if one isn't already defined
-   [ -z "${__flags_help_type:-}" ] && \
-       DEFINE_boolean 'help' false 'show this help' 'h'
- 
--  # parse options
-   if [ $# -gt 0 ]; then
-     if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
-       _flags_getoptStandard "$@"
-@@ -818,7 +554,6 @@ FLAGS()
-     fi
-     flags_return=$?
-   else
--    # nothing passed; won't bother running getopt
-     __flags_opts='--'
-     flags_return=${FLAGS_TRUE}
-   fi
-@@ -832,23 +567,11 @@ FLAGS()
-   return ${flags_return}
- }
- 
--# This is a helper function for determining the `getopt` version for platforms
--# where the detection isn't working. It simply outputs debug information that
--# can be included in a bug report.
--#
--# Args:
--#   none
--# Output:
--#   debug info that can be included in a bug report
--# Returns:
--#   nothing
- flags_getoptInfo()
- {
--  # platform info
-   _flags_debug "uname -a: `uname -a`"
-   _flags_debug "PATH: ${PATH}"
- 
--  # shell info
-   if [ -n "${BASH_VERSION:-}" ]; then
-     _flags_debug 'shell: bash'
-     _flags_debug "BASH_VERSION: ${BASH_VERSION}"
-@@ -857,7 +580,6 @@ flags_getoptInfo()
-     _flags_debug "ZSH_VERSION: ${ZSH_VERSION}"
-   fi
- 
--  # getopt info
-   getopt >/dev/null
-   _flags_getoptReturn=$?
-   _flags_debug "getopt return: ${_flags_getoptReturn}"
-@@ -866,39 +588,16 @@ flags_getoptInfo()
-   unset _flags_getoptReturn
- }
- 
--# Returns whether the detected getopt version is the enhanced version.
--#
--# Args:
--#   none
--# Output:
--#   none
--# Returns:
--#   bool: true if getopt is the enhanced version
- flags_getoptIsEnh()
- {
-   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_ENH}
- }
- 
--# Returns whether the detected getopt version is the standard version.
--#
--# Args:
--#   none
--# Returns:
--#   bool: true if getopt is the standard version
- flags_getoptIsStd()
- {
-   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD}
- }
- 
--# This is effectively a 'usage()' function. It prints usage information and
--# exits the program with ${FLAGS_FALSE} if it is ever found in the command line
--# arguments. Note this function can be overridden so other apps can define
--# their own --help flag, replacing this one, if they want.
--#
--# Args:
--#   none
--# Returns:
--#   integer: success of operation (always returns true)
- flags_help()
- {
-   if [ -n "${FLAGS_HELP:-}" ]; then
-@@ -953,19 +652,14 @@ flags_help()
-         echo "${flags_helpStr_}" >&2
-       else
-         echo "  ${flags_flagStr_}  ${flags_help_}" >&2
--        # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
--        # because it doesn't like empty strings when used in this manner.
-         flags_emptyStr_="`echo \"x${flags_flagStr_}x\" \
-             |awk '{printf "%"length($0)-2"s", ""}'`"
-         flags_helpStr_="  ${flags_emptyStr_}  ${flags_defaultStr_}"
-         flags_helpStrLen_=`expr "${flags_helpStr_}" : '.*'`
-         if [ ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} \
-             -o ${flags_helpStrLen_} -lt ${flags_columns_} ]; then
--          # indented to match help string
-           echo "${flags_helpStr_}" >&2
-         else
--          # indented four from left to allow for longer defaults as long flag
--          # names might be used too, making things too long
-           echo "    ${flags_defaultStr_}" >&2
-         fi
-       fi
-@@ -978,12 +672,6 @@ flags_help()
-   return ${FLAGS_TRUE}
- }
- 
--# Reset shflags back to an uninitialized state.
--#
--# Args:
--#   none
--# Returns:
--#   nothing
- flags_reset()
- {
-   for flags_name_ in ${__flags_longNames}; do
-@@ -1000,7 +688,6 @@ flags_reset()
-     eval ${flags_strToEval_}
-   done
- 
--  # reset internal variables
-   __flags_boolNames=' '
-   __flags_longNames=' '
-   __flags_shortNames=' '
 

file:a/net/ethtool/Makefile (deleted)
--- a/net/ethtool/Makefile
+++ /dev/null
@@ -1,41 +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:=ethtool
-PKG_VERSION:=3.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@KERNEL/software/network/ethtool
-PKG_MD5SUM:=f16c8416e6ec917e5753918dc23a60bd
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ethtool
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Display or change ethernet card settings
-  URL:=http://www.kernel.org/pub/software/network/ethtool/
-endef
-
-define Package/ethtool/description
- ethtool is a small utility for examining and tuning your ethernet-based
- network interface
-endef
-
-define Package/ethtool/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethtool $(1)/usr/sbin
-endef
-
-$(eval $(call BuildPackage,ethtool))
-

--- a/net/ethtool/patches/100-ixp4xx.patch
+++ /dev/null
@@ -1,195 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,7 +10,7 @@ ethtool_SOURCES = ethtool.c ethtool-copy
- 		  fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c	\
- 		  pcnet32.c realtek.c tg3.c marvell.c vioc.c	\
- 		  smsc911x.c at76c50x-usb.c sfc.c stmmac.c	\
--		  rxclass.c sfpid.c sfpdiag.c
-+		  rxclass.c sfpid.c sfpdiag.c ixp4xx.c
- 
- TESTS = test-cmdline test-features
- check_PROGRAMS = test-cmdline test-features
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -78,7 +78,7 @@ am_ethtool_OBJECTS = ethtool.$(OBJEXT) a
- 	tg3.$(OBJEXT) marvell.$(OBJEXT) vioc.$(OBJEXT) \
- 	smsc911x.$(OBJEXT) at76c50x-usb.$(OBJEXT) sfc.$(OBJEXT) \
- 	stmmac.$(OBJEXT) rxclass.$(OBJEXT) sfpid.$(OBJEXT) \
--	sfpdiag.$(OBJEXT)
-+	sfpdiag.$(OBJEXT) ixp4xx.$(OBJEXT)
- ethtool_OBJECTS = $(am_ethtool_OBJECTS)
- ethtool_LDADD = $(LDADD)
- ethtool_DEPENDENCIES =
-@@ -286,7 +286,7 @@ ethtool_SOURCES = ethtool.c ethtool-copy
- 		  fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c	\
- 		  pcnet32.c realtek.c tg3.c marvell.c vioc.c	\
- 		  smsc911x.c at76c50x-usb.c sfc.c stmmac.c	\
--		  rxclass.c sfpid.c sfpdiag.c
-+		  rxclass.c sfpid.c sfpdiag.c ixp4xx.c
- 
- test_cmdline_SOURCES = test-cmdline.c test-common.c $(ethtool_SOURCES) 
- test_cmdline_CFLAGS = -DTEST_ETHTOOL
-@@ -431,6 +431,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfpid.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smsc911x.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stmmac.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixp4xx.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-amd8111e.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-at76c50x-usb.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmdline-de2104x.Po@am__quote@
---- a/ethtool.c
-+++ b/ethtool.c
-@@ -873,6 +873,7 @@ static const struct {
- 	{ "igb", igb_dump_regs },
- 	{ "ixgb", ixgb_dump_regs },
- 	{ "ixgbe", ixgbe_dump_regs },
-+	{ "ixp4xx", ixp4xx_dump_regs },
- 	{ "natsemi", natsemi_dump_regs },
- 	{ "e100", e100_dump_regs },
- 	{ "amd8111e", amd8111e_dump_regs },
---- a/internal.h
-+++ b/internal.h
-@@ -241,6 +241,9 @@ int st_gmac_dump_regs(struct ethtool_drv
- /* Et131x ethernet controller */
- int et131x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
- 
-+/* Intel IXP4xx internal MAC */
-+int ixp4xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs);
-+
- /* Rx flow classification */
- int rxclass_parse_ruleopts(struct cmd_context *ctx,
- 			   struct ethtool_rx_flow_spec *fsp);
---- /dev/null
-+++ b/ixp4xx.c
-@@ -0,0 +1,130 @@
-+/*
-+ * Copyright (c) 2006 Christian Hohnstaed <chohnstaedt@innominate.com>
-+ * This file is released under the GPLv2
-+ */
-+
-+#include <stdio.h>
-+#include "internal.h"
-+
-+#ifndef BIT
-+#define BIT(x) (1<<x)
-+#endif
-+
-+#define TX_CNTRL1_TX_EN         BIT(0)
-+#define TX_CNTRL1_DUPLEX        BIT(1)
-+#define TX_CNTRL1_RETRY         BIT(2)
-+#define TX_CNTRL1_PAD_EN        BIT(3)
-+#define TX_CNTRL1_FCS_EN        BIT(4)
-+#define TX_CNTRL1_2DEFER        BIT(5)
-+#define TX_CNTRL1_RMII          BIT(6)
-+
-+/* TX Control Register 2 */
-+#define TX_CNTRL2_RETRIES_MASK  0xf
-+
-+/* RX Control Register 1 */
-+#define RX_CNTRL1_RX_EN         BIT(0)
-+#define RX_CNTRL1_PADSTRIP_EN   BIT(1)
-+#define RX_CNTRL1_CRC_EN        BIT(2)
-+#define RX_CNTRL1_PAUSE_EN      BIT(3)
-+#define RX_CNTRL1_LOOP_EN       BIT(4)
-+#define RX_CNTRL1_ADDR_FLTR_EN  BIT(5)
-+#define RX_CNTRL1_RX_RUNT_EN    BIT(6)
-+#define RX_CNTRL1_BCAST_DIS     BIT(7)
-+
-+/* Core Control Register */
-+#define CORE_RESET              BIT(0)
-+#define CORE_RX_FIFO_FLUSH      BIT(1)
-+#define CORE_TX_FIFO_FLUSH      BIT(2)
-+#define CORE_SEND_JAM           BIT(3)
-+#define CORE_MDC_EN             BIT(4)
-+
-+#define MAC "%02x:%02x:%02x:%02x:%02x:%02x"
-+#define MAC_DATA(d) (d)[0], (d)[1], (d)[2], (d)[3], (d)[4], (d)[5]
-+
-+int ixp4xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
-+{
-+	u8 *data = regs->data;
-+
-+	fprintf(stdout,
-+		"TXctrl:          0x%02x:0x%02x\n"
-+		"    Enable:      %s\n"
-+		"    Duplex:      %s\n"
-+		"    Retry:       %s (%d)\n"
-+		"    Padding:     %s\n"
-+		"    Frame check: %s\n"
-+		"    TX deferral: %s\n"
-+		"    Connection:  %s\n"
-+		"\n",
-+		data[0], data[1],
-+		data[0] & TX_CNTRL1_TX_EN   ? "yes"      : "no",
-+		data[0] & TX_CNTRL1_DUPLEX  ? "half"     : "full",
-+		data[0] & TX_CNTRL1_RETRY   ? "enabled"  : "disabled",
-+		data[1] & TX_CNTRL2_RETRIES_MASK,
-+		data[0] & TX_CNTRL1_PAD_EN  ? "enabled"  : "disabled",
-+		data[0] & TX_CNTRL1_FCS_EN  ? "enabled"  : "disabled",
-+		data[0] & TX_CNTRL1_2DEFER  ? "two-part" : "one-part",
-+		data[0] & TX_CNTRL1_RMII    ? "RMII"     : "Full MII"
-+	);
-+
-+	fprintf(stdout,
-+		"RXctrl:          0x%02x\n"
-+		"    Enable:      %s\n"
-+		"    Pad strip:   %s\n"
-+		"    CRC check:   %s\n"
-+		"    Pause:       %s\n"
-+		"    Loop:        %s\n"
-+		"    Promiscous:  %s\n"
-+		"    Runt frames: %s\n"
-+		"    Broadcast:   %s\n"
-+		"\n",
-+		data[2],
-+		data[2] & RX_CNTRL1_RX_EN        ? "yes"      : "no",
-+		data[2] & RX_CNTRL1_PADSTRIP_EN  ? "enabled"  : "disabled",
-+		data[2] & RX_CNTRL1_CRC_EN       ? "enabled"  : "disabled",
-+		data[2] & RX_CNTRL1_PAUSE_EN     ? "enabled"  : "disabled",
-+		data[2] & RX_CNTRL1_LOOP_EN      ? "enabled"  : "disabled",
-+		data[2] & RX_CNTRL1_ADDR_FLTR_EN ? "disabled" : "enabled",
-+		data[2] & RX_CNTRL1_RX_RUNT_EN   ? "forward"  : "discard",
-+		data[2] & RX_CNTRL1_BCAST_DIS    ? "disabled" : "enabled"
-+	);
-+	fprintf(stdout,
-+		"Core control:    0x%02x\n"
-+		"    Core state:  %s\n"
-+		"    RX fifo:     %s\n"
-+		"    TX fifo:     %s\n"
-+		"    Send jam:    %s\n"
-+		"    MDC clock    %s\n"
-+		"\n",
-+		data[32],
-+		data[32] & CORE_RESET          ? "reset"  : "normal operation",
-+		data[32] & CORE_RX_FIFO_FLUSH  ? "flush"  : "ok",
-+		data[32] & CORE_TX_FIFO_FLUSH  ? "flush"  : "ok",
-+		data[32] & CORE_SEND_JAM       ? "yes"    : "no",
-+		data[32] & CORE_MDC_EN         ? "output" : "input"
-+	);
-+	fprintf(stdout,
-+		"MAC addresses: \n"
-+		"  Multicast mask:     " MAC "\n"
-+		"  Multicast address:  " MAC "\n"
-+		"  Unicast address:    " MAC "\n"
-+		"\n",
-+		MAC_DATA(data+13), MAC_DATA(data+19), MAC_DATA(data+26)
-+	);
-+	fprintf(stdout,
-+		"Random seed:      0x%02x\n"
-+		"Threshold empty:   %3d\n"
-+		"Threshold full:    %3d\n"
-+		"TX buffer size:    %3d\n"
-+		"TX deferral:       %3d\n"
-+		"RX deferral:       %3d\n"
-+		"TX two deferral 1: %3d\n"
-+		"TX two deferral 2: %3d\n"
-+		"Slot time:         %3d\n"
-+		"Internal clock:    %3d\n"
-+		"\n",
-+		data[4], data[5], data[6], data[7], data[8], data[9],
-+		data[10], data[11], data[12], data[25]
-+	);
-+
-+	return 0;
-+}
 

--- a/net/freeradius2/Config.in
+++ /dev/null
@@ -1,15 +1,1 @@
-# FreeRADIUS avanced configuration
 
-choice
-	prompt "SSL library"
-	default FREERADIUS_OPENSSL
-	depends on PACKAGE_freeradius2-common
-
-config FREERADIUS_NOSSL
-	bool "No SSL support"
-
-config FREERADIUS_OPENSSL
-	bool "OpenSSL"
-
-endchoice
-

--- a/net/freeradius2/Makefile
+++ /dev/null
@@ -1,632 +1,1 @@
-#
-# Copyright (C) 2008-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=freeradius2
-PKG_VERSION:=2.2.3
-PKG_RELEASE:=3
-
-PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/freeradius/
-PKG_MD5SUM:=25fb44cc1bc121f44f61f439bf45a420
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION)
-PKG_FIXUP:=autoreconf
-
-PKG_CONFIG_DEPENDS := \
-  FREERADIUS_OPENSSL \
-  FREERADIUS_NOSSL
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/freeradius2/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/freeradius2/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://freeradius.org/
-  SUBMENU:=FreeRADIUS (version 2)
-endef
-
-define Package/freeradius2
-  $(call Package/freeradius2/Default)
-  DEPENDS:=+libltdl +libreadline +freeradius2-common
-  TITLE:=A flexible RADIUS server (version 2)
-endef
-
-define Package/freeradius2/conffiles
-/etc/freeradius2/clients.conf
-/etc/freeradius2/radiusd.conf
-/etc/freeradius2/sites/default
-endef
-
-define Package/freeradius2-democerts
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Demo certificates to test the server
-endef
-
-define Package/freeradius2-common
-  $(call Package/freeradius2/Default)
-  TITLE:=common files
-  DEPENDS:=+libpthread +FREERADIUS_OPENSSL:libopenssl
-endef
-
-define Package/freeradius2-mod-chap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=CHAP module
-endef
-
-define Package/freeradius2-mod-chap/conffiles
-/etc/freeradius2/modules/chap
-endef
-
-define Package/freeradius2-mod-detail
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Detailed accounting module
-endef
-
-define Package/freeradius2-mod-detail/conffiles
-/etc/freeradius2/modules/detail
-endef
-
-define Package/freeradius2-mod-eap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Base EAP module
-endef
-
-define Package/freeradius2-mod-eap/conffiles
-/etc/freeradius2/eap.conf
-endef
-
-define Package/freeradius2-mod-eap-gtc
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap
-  TITLE:=EAP/GTC module
-endef
-
-define Package/freeradius2-mod-eap-md5
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap
-  TITLE:=EAP/MD5 module
-endef
-
-define Package/freeradius2-mod-eap-mschapv2
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap +freeradius2-mod-mschap
-  TITLE:=EAP/MS-CHAPv2 module
-endef
-
-define Package/freeradius2-mod-eap-peap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap @FREERADIUS_OPENSSL
-  TITLE:=EAP/PEAP module
-endef
-
-define Package/freeradius2-mod-eap-tls
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap @FREERADIUS_OPENSSL
-  TITLE:=EAP/TLS module
-endef
-
-define Package/freeradius2-mod-eap-ttls
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-eap-tls
-  TITLE:=EAP/TTLS module
-endef
-
-define Package/freeradius2-mod-exec
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=EXEC module
-endef
-
-define Package/freeradius2-mod-exec/conffiles
-/etc/freeradius2/modules/exec
-endef
-
-define Package/freeradius2-mod-expiration
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Expiration module
-endef
-
-define Package/freeradius2-mod-expiration/conffiles
-/etc/freeradius2/modules/expiration
-endef
-
-define Package/freeradius2-mod-always
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Always module
-endef
-
-define Package/freeradius2-mod-always/conffiles
-/etc/freeradius2/modules/always
-endef
-
-define Package/freeradius2-mod-expr
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=EXPR module
-endef
-
-define Package/freeradius2-mod-expr/conffiles
-/etc/freeradius2/modules/expr
-endef
-
-define Package/freeradius2-mod-attr-filter
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=ATTR filter module
-endef
-
-define Package/freeradius2-mod-attr-filter/conffiles
-/etc/freeradius2/modules/attr_filter
-/etc/freeradius2/attrs
-/etc/freeradius2/attrs.access_reject
-/etc/freeradius2/attrs.accounting_response
-/etc/freeradius2/attrs.pre-proxy
-endef
-
-define Package/freeradius2-mod-attr-rewrite
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=ATTR rewrite module
-endef
-
-define Package/freeradius2-mod-attr-rewrite/conffiles
-/etc/freeradius2/modules/attr_rewrite
-endef
-
-define Package/freeradius2-mod-files
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Module using local files for authorization
-endef
-
-define Package/freeradius2-mod-files/conffiles
-/etc/freeradius2/acct_users
-/etc/freeradius2/preproxy_users
-/etc/freeradius2/users
-/etc/freeradius2/modules/files
-endef
-
-define Package/freeradius2-mod-passwd
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Rlm passwd module
-endef
-
-define Package/freeradius2-mod-passwd/conffiles
-/etc/freeradius2/modules/passwd
-endef
-
-define Package/freeradius2-mod-ldap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2 +PACKAGE_freeradius2-mod-ldap:libopenldap
-  TITLE:=LDAP module
-endef
-
-define Package/freeradius2-mod-ldap/conffiles
-/etc/freeradius2/ldap.attrmap
-/etc/freeradius2/modules/ldap
-endef
-
-define Package/freeradius2-mod-logintime
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Logintime module
-endef
-
-define Package/freeradius2-mod-logintime/conffiles
-/etc/freeradius2/modules/logintime
-endef
-
-define Package/freeradius2-mod-mschap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=MS-CHAP and MS-CHAPv2 module
-endef
-
-define Package/freeradius2-mod-mschap/conffiles
-/etc/freeradius2/modules/mschap
-endef
-
-define Package/freeradius2-mod-pap
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=PAP module
-endef
-
-define Package/freeradius2-mod-pap/conffiles
-/etc/freeradius2/modules/pap
-endef
-
-define Package/freeradius2-mod-preprocess
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Request pre-processing module
-endef
-
-define Package/freeradius2-mod-preprocess/conffiles
-/etc/freeradius2/hints
-/etc/freeradius2/huntgroups
-/etc/freeradius2/modules/preprocess
-endef
-
-define Package/freeradius2-mod-realm
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Realms handling module
-endef
-
-define Package/freeradius2-mod-realm/conffiles
-/etc/freeradius2/proxy.conf
-/etc/freeradius2/modules/realm
-endef
-
-define Package/freeradius2-mod-sql
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Base SQL module
-endef
-
-define Package/freeradius2-mod-sql/conffiles
-/etc/freeradius2/sql.conf
-endef
-
-define Package/freeradius2-mod-sql-mysql
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql \
-  	+PACKAGE_freeradius2-mod-sql-mysql:libmysqlclient-r
-  TITLE:=MySQL module
-endef
-
-define Package/freeradius2-mod-sql-pgsql
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql \
-  	+PACKAGE_freeradius2-mod-sql-pgsql:libpq
-  TITLE:=PostgreSQL module
-endef
-
-define Package/freeradius2-mod-sql-sqlite
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql \
-  	+PACKAGE_freeradius2-mod-sql-sqlite:libsqlite3
-  TITLE:=SQLite module
-endef
-
-define Package/freeradius2-mod-sqlcounter
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2-mod-sql
-  TITLE:=Generic SQL Counter module
-endef
-
-define Package/freeradius2-mod-radutmp
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=Radius UTMP module
-endef
-
-define Package/freeradius2-mod-radutmp/conffiles
-/etc/freeradius2/modules/radutmp
-/etc/freeradius2/modules/sradutmp
-endef
-
-define Package/freeradius2-utils
-  $(call Package/freeradius2/Default)
-  DEPENDS:=+freeradius2-common
-  TITLE:=Misc. client utilities
-endef
-
-define Package/freeradius2-mod-sqllog
-  $(call Package/freeradius2/Default)
-  DEPENDS:=freeradius2
-  TITLE:=SQL Logging module
-endef
-
-CONFIGURE_ARGS+= \
-	--libdir=/usr/lib/freeradius2 \
-	--libexecdir=/usr/lib/freeradius2 \
-	--enable-shared \
-	--disable-static \
-	--disable-developer \
-	--with-threads \
-	$(if $(CONFIG_FREERADIUS_OPENSSL),--with,--without)-openssl \
-	$(if $(CONFIG_FREERADIUS_OPENSSL),--with-openssl-includes="$(STAGING_DIR)/usr/include",) \
-	$(if $(CONFIG_FREERADIUS_OPENSSL),--with-openssl-libraries="$(STAGING_DIR)/usr/lib",) \
-	--with-system-libtool \
-	--with-system-libltdl \
-	--enable-strict-dependencies \
-	--with-raddbdir=/etc/freeradius2 \
-	--with-radacctdir=/var/db/radacct \
-	--with-logdir=/var/log \
-	--without-edir \
-	--without-snmp \
-	--without-rlm_checkval \
-	--without-rlm_dbm \
-	--without-rlm_counter \
-	--with-rlm_expr \
-	--with-rlm_eap \
-	--without-rlm_eap_sim \
-	--without-rlm_example \
-	--without-rlm_ippool \
-	--without-rlm_krb5 \
-	--without-rlm_otp \
-	--without-rlm_smsotp \
-	--without-rlm_pam \
-	--without-rlm_perl \
-	--without-rlm_python \
-	--without-rlm_smb \
-	--with-rlm_sql \
-	--with-rlm_sqlcounter \
-	--without-rlm_sqlhpwippool \
-	--without-rlm_sqlippool \
-	--without-rlm_sql_db2 \
-	--without-rlm_sql_firebird \
-	--without-rlm_sql_freetds \
-	--without-rlm_sql_iodbc \
-	--without-rlm_sql_oracle \
-	--without-rlm_sql_sybase \
-	--without-rlm_sql_unixodbc \
-	--without-rlm_sql_log \
-	--without-rlm_unix \
-	--without-rlm_eap_tnc \
-	--without-rlm_eap_ikev2 \
-	--without-rlm_opendirectory \
-	--without-rlm_wimax \
-	--without-rlm_ruby \
-	--without-rlm_caching \
-	--without-rlm_redis \
-	--without-rlm_rediswho \
-	--without-rlm_soh \
-	--without-rlm_sim \
-	--without-rlm_replicate \
-	--without-rlm_protocol_filter \
-	--without-rlm_policy \
-	--without-rlm_linelog \
-	--without-rlm_jradius \
-	--without-rlm_fastusers \
-	--without-rlm_eap_leap \
-	--without-rlm_dynamic_clients \
-	--without-rlm_digest \
-	--without-rlm_cram \
-	--without-rlm_copy_packet \
-	--without-rlm_acct_unique \
-	--without-rlm_acctlog
-	
-
-PKG_DICTIONARIES:= \
-	freeradius freeradius.internal \
-	rfc2865 rfc2866 rfc2867 rfc2868 rfc2869 rfc3162 rfc3576 rfc3580 \
-	rfc4372 rfc4675 rfc4679 \
-	microsoft \
-	wispr \
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-ldap),)
-  CONFIGURE_ARGS+= \
-		--with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib"
-  CONFIGURE_LIBS+= -lcrypto -lssl
-else
-  CONFIGURE_ARGS+= --without-rlm_ldap
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-mysql),)
-  CONFIGURE_ARGS+= \
-		--with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql"
-  CONFIGURE_LIBS+= -lz
-  CONFIGURE_VARS+= ac_cv_lib_mysqlclient_r_mysql_init=yes
-else
-  CONFIGURE_ARGS+= --without-rlm_sql_mysql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-pgsql),)
-  CONFIGURE_ARGS+= \
-		--with-rlm_sql_postgresql-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_sql_postgresql-lib-dir="$(STAGING_DIR)/usr/lib"
-else
-  CONFIGURE_ARGS+= --without-rlm_sql_postgresql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sqllog),)
-  CONFIGURE_ARGS+= \
-        --with-rlm_sql_log \
-        --with-experimental-modules \
-else
-  CONFIGURE_ARGS+= --without-rlm_sql_log
-endif
-
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-sqlite),)
-  CONFIGURE_ARGS+= \
-	--with-rlm_sql_sqlite \
-	--with-experimental-modules \
-	--with-sqlite-include-dir="$(STAGING_DIR)/usr/include" \
-	--with-sqlite-lib-dir="$(STAGING_DIR)/usr/lib"
-else
-  CONFIGURE_ARGS+= --without-rlm_sql_sqlite
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-eap-peap),)
-  CONFIGURE_ARGS+= \
-  		--with-rlm_eap_peap \
-		--with-rlm_eap_peap-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_eap_peap-lib-dir="$(STAGING_DIR)/usr/lib"
-  CONFIGURE_LIBS+= -lcrypto -lssl
-else
-  CONFIGURE_ARGS+= --without-rlm_eap_peap
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-eap-tls),)
-  CONFIGURE_ARGS+= \
-  		--with-rlm_eap_tls \
-		--with-rlm_eap_tls-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_eap_tls-lib-dir="$(STAGING_DIR)/usr/lib"
-  CONFIGURE_LIBS+= -lcrypto -lssl
-else
-  CONFIGURE_ARGS+= --without-rlm_eap_tls
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-eap-ttls),)
-  CONFIGURE_ARGS+= \
-  		--with-rlm_eap_ttls \
-		--with-rlm_eap_ttls-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_eap_ttls-lib-dir="$(STAGING_DIR)/usr/lib"
-  CONFIGURE_LIBS+= -lcrypto -lssl
-else
-  CONFIGURE_ARGS+= --without-rlm_eap_ttls
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-attr-rewrite),)
-  CONFIGURE_ARGS+= --with-rlm_attr-rewrite
-else
-  CONFIGURE_ARGS+= --without-rlm_attr-rewrite
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-radutmp),)
-  CONFIGURE_ARGS+= --with-rlm_radutmp
-else
-  CONFIGURE_ARGS+= --without-rlm_radutmp
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-logintime),)
-  CONFIGURE_ARGS+= --with-rlm_logintime
-else
-  CONFIGURE_ARGS+= --without-rlm_logintime
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-expiration),)
-  CONFIGURE_ARGS+= --with-rlm_expiration
-else
-  CONFIGURE_ARGS+= --without-rlm_expiration
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-always),)
-  CONFIGURE_ARGS+= --with-rlm_always
-else
-  CONFIGURE_ARGS+= --without-rlm_always
-endif
-
-CONFIGURE_VARS+= \
-	LDFLAGS="$$$$LDFLAGS" \
-	LIBS="$(CONFIGURE_LIBS)" \
-	MYSQL_CONFIG="no" \
-	ac_cv_lib_readline=no \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		R="$(PKG_INSTALL_DIR)" \
-		INSTALLSTRIP="" \
-		all certs install
-endef
-
-define Package/freeradius2-common/install
-	$(INSTALL_DIR) $(1)/etc/freeradius2
-	chmod 771 $(1)/etc/freeradius2
-	$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/dictionary $(1)/etc/freeradius2/ ; \
-	$(INSTALL_DIR) $(1)/usr/lib/freeradius2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/libfreeradius-radius{,-*}.so $(1)/usr/lib/freeradius2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/libfreeradius-eap{,-*}.so $(1)/usr/lib/freeradius2
-	$(INSTALL_DIR) $(1)/usr/share/freeradius2
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary $(1)/usr/share/freeradius2/
-	$(SED) "s,^\(\$$$$INCLUDE\),#\1,g" $(1)/usr/share/freeradius2/dictionary
-	for f in $(PKG_DICTIONARIES); do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$$$${f} $(1)/usr/share/freeradius2/ ; \
-		$(SED) "s,^#\(\$$$$INCLUDE dictionary\.$$$${f}\),\1,g" $(1)/usr/share/freeradius2/dictionary ; \
-	done
-endef
-
-define Package/freeradius2/install
-	$(INSTALL_DIR) $(1)/etc/freeradius2/modules
-	$(INSTALL_DIR) $(1)/etc/freeradius2/sites
-	for f in clients.conf radiusd.conf policy.conf; do \
-		$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/$$$${f} $(1)/etc/freeradius2/ ; \
-	done
-	$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/sites-available/default $(1)/etc/freeradius2/sites/default
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/radiusd.init $(1)/etc/init.d/radiusd
-endef
-
-define Package/freeradius2-democerts/install
-	$(INSTALL_DIR) $(1)/etc/freeradius2/certs
-	$(CP) \
-		$(PKG_BUILD_DIR)/raddb/certs/ca.pem \
-		$(PKG_BUILD_DIR)/raddb/certs/dh \
-		$(PKG_BUILD_DIR)/raddb/certs/random \
-		$(PKG_BUILD_DIR)/raddb/certs/server.pem \
-		$(1)/etc/freeradius2/certs/
-endef
-
-define Package/freeradius2-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	for f in radclient radeapclient radwho; do \
-		$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \
-	done
-endef
-
-define BuildPlugin
-  define Package/$(1)/install
-	[ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/freeradius2
-	for m in $(2); do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/$$$$$$$${m}{,-*}.so $$(1)/usr/lib/freeradius2 ; \
-	done
-	[ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius2
-	[ -z "$(4)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius2/$(4)
-	for f in $(3); do \
-		$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/$$$$$$$${f} $$(1)/etc/freeradius2/$$$$$$$${f} ; \
-	done
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-$(eval $(call BuildPackage,freeradius2))
-$(eval $(call BuildPackage,freeradius2-common))
-$(eval $(call BuildPackage,freeradius2-democerts))
-$(eval $(call BuildPlugin,freeradius2-mod-chap,rlm_chap,modules/chap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-detail,rlm_detail,modules/detail,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap,rlm_eap,eap.conf))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-gtc,rlm_eap_gtc,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-md5,rlm_eap_md5,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-mschapv2,rlm_eap_mschapv2,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-peap,rlm_eap_peap,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-tls,rlm_eap_tls,))
-$(eval $(call BuildPlugin,freeradius2-mod-eap-ttls,rlm_eap_ttls,))
-$(eval $(call BuildPlugin,freeradius2-mod-exec,rlm_exec,modules/exec modules/echo ,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-attr-rewrite,rlm_attr_rewrite,modules/attr_rewrite,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-files,rlm_files,acct_users preproxy_users users modules/files,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-passwd,rlm_passwd,modules/passwd,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-ldap,rlm_ldap,ldap.attrmap modules/ldap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-mschap,rlm_mschap,modules/mschap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-pap,rlm_pap,modules/pap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-preprocess,rlm_preprocess,hints huntgroups modules/preprocess,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-realm,rlm_realm,proxy.conf modules/realm modules/inner-eap,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-sql,rlm_sql,sql.conf,))
-$(eval $(call BuildPlugin,freeradius2-mod-sql-mysql,rlm_sql_mysql,))
-$(eval $(call BuildPlugin,freeradius2-mod-sql-pgsql,rlm_sql_postgresql,))
-$(eval $(call BuildPlugin,freeradius2-mod-sql-sqlite,rlm_sql_sqlite,))
-$(eval $(call BuildPlugin,freeradius2-mod-sqlcounter,rlm_sqlcounter,))
-$(eval $(call BuildPlugin,freeradius2-mod-sqllog,rlm_sql_log,))
-$(eval $(call BuildPlugin,freeradius2-mod-radutmp,rlm_radutmp,modules/radutmp modules/sradutmp,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-logintime,rlm_logintime,modules/logintime,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-expr,rlm_expr,modules/expr,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-attr-filter,rlm_attr_filter,modules/attr_filter attrs attrs.access_reject attrs.accounting_response attrs.pre-proxy,modules,,))
-$(eval $(call BuildPlugin,freeradius2-mod-expiration,rlm_expiration,modules/expiration,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-always,rlm_always,modules/always,modules,))
-$(eval $(call BuildPackage,freeradius2-utils))
-

--- a/net/freeradius2/files/radiusd.init
+++ /dev/null
@@ -1,23 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=50
 
-DEFAULT=/etc/default/radiusd
-LOG_D=/var/log
-RUN_D=/var/run
-PID_F=$RUN_D/radiusd.pid
-RADACCT_D=/var/db/radacct
-IPADDR=$(ifconfig br-lan | sed -n 's/.*dr:\(.*\)Bc.*/\1/p')
-
-start() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	mkdir -p $LOG_D
-	mkdir -p $RUN_D
-	mkdir -p $RADACCT_D
-	radiusd -i $IPADDR -p 1812,1813 $OPTIONS
-}
-
-stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
-}
-

--- a/net/freeradius2/patches/001-fix-makefile.patch
+++ /dev/null
@@ -1,11 +1,1 @@
---- a/Make.inc.in
-+++ b/Make.inc.in
-@@ -5,6 +5,7 @@
- #
- 
- # Location of files.
-+SHELL		= @SHELL@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- sysconfdir	= @sysconfdir@
 

--- a/net/freeradius2/patches/002-config.patch
+++ /dev/null
@@ -1,589 +1,1 @@
---- a/raddb/dictionary.in
-+++ b/raddb/dictionary.in
-@@ -11,7 +11,7 @@
- #
- #	The filename given here should be an absolute path. 
- #
--$INCLUDE	@prefix@/share/freeradius/dictionary
-+$INCLUDE	@prefix@/share/freeradius2/dictionary
- 
- #
- #	Place additional attributes or $INCLUDEs here.  They will
---- a/raddb/eap.conf
-+++ b/raddb/eap.conf
-@@ -27,7 +27,7 @@
- 		#  then that EAP type takes precedence over the
- 		#  default type configured here.
- 		#
--		default_eap_type = md5
-+		default_eap_type = peap
- 
- 		#  A list is maintained to correlate EAP-Response
- 		#  packets with EAP-Request packets.  After a
-@@ -72,8 +72,8 @@
- 		#  for wireless connections.  It is insecure, and does
- 		#  not provide for dynamic WEP keys.
- 		#
--		md5 {
--		}
-+#		md5 {
-+#		}
- 
- 		# Cisco LEAP
- 		#
-@@ -87,8 +87,8 @@
- 		#  User-Password, or the NT-Password attributes.
- 		#  'System' authentication is impossible with LEAP.
- 		#
--		leap {
--		}
-+#		leap {
-+#		}
- 
- 		#  Generic Token Card.
- 		#
-@@ -101,7 +101,7 @@
- 		#  the users password will go over the wire in plain-text,
- 		#  for anyone to see.
- 		#
--		gtc {
-+#		gtc {
- 			#  The default challenge, which many clients
- 			#  ignore..
- 			#challenge = "Password: "
-@@ -118,8 +118,8 @@
- 			#  configured for the request, and do the
- 			#  authentication itself.
- 			#
--			auth_type = PAP
--		}
-+#			auth_type = PAP
-+#		}
- 
- 		## EAP-TLS
- 		#
-@@ -215,7 +215,7 @@
- 			#  In these cases, fragment size should be
- 			#  1024 or less.
- 			#
--		#	fragment_size = 1024
-+			fragment_size = 1024
- 
- 			#  include_length is a flag which is
- 			#  by default set to yes If set to
-@@ -225,7 +225,7 @@
- 			#  message is included ONLY in the
- 			#  First packet of a fragment series.
- 			#
--		#	include_length = yes
-+			include_length = yes
- 
- 			#  Check the Certificate Revocation List
- 			#
-@@ -297,7 +297,7 @@
- 			# for the server to print out an error message,
- 			# and refuse to start.
- 			#
--			make_cert_command = "${certdir}/bootstrap"
-+		#	make_cert_command = "${certdir}/bootstrap"
- 
- 			#
- 			#  Elliptical cryptography configuration
-@@ -332,7 +332,7 @@
- 			#  You probably also want "use_tunneled_reply = yes"
- 			#  when using fast session resumption.
- 			#
--			cache {
-+		#	cache {
- 			      #
- 			      #  Enable it.  The default is "no".
- 			      #  Deleting the entire "cache" subsection
-@@ -348,14 +348,14 @@
- 			      #  enable resumption for just one user
- 			      #  by setting the above attribute to "yes".
- 			      #
--			      enable = no
-+		#	      enable = no
- 
- 			      #
- 			      #  Lifetime of the cached entries, in hours.
- 			      #  The sessions will be deleted after this
- 			      #  time.
- 			      #
--			      lifetime = 24 # hours
-+		#	      lifetime = 24 # hours
- 
- 			      #
- 			      #  The maximum number of entries in the
-@@ -364,8 +364,8 @@
- 			      #  This could be set to the number of users
- 			      #  who are logged in... which can be a LOT.
- 			      #
--			      max_entries = 255
--			}
-+		#	      max_entries = 255
-+		#	}
- 
- 			#
- 			#  As of version 2.1.10, client certificates can be
-@@ -503,7 +503,7 @@
- 		#
- 		#  in the control items for a request.
- 		#
--		ttls {
-+#		ttls {
- 			#  The tunneled EAP session needs a default
- 			#  EAP type which is separate from the one for
- 			#  the non-tunneled EAP module.  Inside of the
-@@ -511,7 +511,7 @@
- 			#  If the request does not contain an EAP
- 			#  conversation, then this configuration entry
- 			#  is ignored.
--			default_eap_type = md5
-+#			default_eap_type = mschapv2
- 
- 			#  The tunneled authentication request does
- 			#  not usually contain useful attributes
-@@ -527,7 +527,7 @@
- 			#  is copied to the tunneled request.
- 			#
- 			# allowed values: {no, yes}
--			copy_request_to_tunnel = no
-+#			copy_request_to_tunnel = yes
- 
- 			#  The reply attributes sent to the NAS are
- 			#  usually based on the name of the user
-@@ -540,7 +540,7 @@
- 			#  the tunneled request.
- 			#
- 			# allowed values: {no, yes}
--			use_tunneled_reply = no
-+#			use_tunneled_reply = no
- 
- 			#
- 			#  The inner tunneled request can be sent
-@@ -552,13 +552,13 @@
- 			#  the virtual server that processed the
- 			#  outer requests.
- 			#
--			virtual_server = "inner-tunnel"
-+#			virtual_server = "inner-tunnel"
- 
- 			#  This has the same meaning as the
- 			#  same field in the "tls" module, above.
- 			#  The default value here is "yes".
- 		#	include_length = yes
--		}
-+#		}
- 
- 		##################################################
- 		#
-@@ -627,14 +627,14 @@
- 
- 			#  the PEAP module also has these configuration
- 			#  items, which are the same as for TTLS.
--			copy_request_to_tunnel = no
--			use_tunneled_reply = no
-+			copy_request_to_tunnel = yes
-+			use_tunneled_reply = yes
- 
- 			#  When the tunneled session is proxied, the
- 			#  home server may not understand EAP-MSCHAP-V2.
- 			#  Set this entry to "no" to proxy the tunneled
- 			#  EAP-MSCHAP-V2 as normal MSCHAPv2.
--		#	proxy_tunneled_request_as_eap = yes
-+			proxy_tunneled_request_as_eap = no
- 
- 			#
- 			#  The inner tunneled request can be sent
-@@ -646,7 +646,8 @@
- 			#  the virtual server that processed the
- 			#  outer requests.
- 			#
--			virtual_server = "inner-tunnel"
-+		#	virtual_server = "inner-tunnel"
-+			EAP-TLS-Require-Client-Cert = no
- 
- 			# This option enables support for MS-SoH
- 			# see doc/SoH.txt for more info.
---- a/raddb/modules/counter
-+++ b/raddb/modules/counter
-@@ -69,7 +69,7 @@
- #  'check-name' attribute.
- #
- counter daily {
--	filename = ${db_dir}/db.daily
-+	filename = ${radacctdir}/db.daily
- 	key = User-Name
- 	count-attribute = Acct-Session-Time
- 	reset = daily
---- a/raddb/modules/pap
-+++ b/raddb/modules/pap
-@@ -18,5 +18,5 @@
- #
- #  http://www.openldap.org/faq/data/cache/347.html
- pap {
--	auto_header = no
-+	auto_header = yes
- }
---- a/raddb/modules/radutmp
-+++ b/raddb/modules/radutmp
-@@ -12,7 +12,7 @@ radutmp {
- 	#  Where the file is stored.  It's not a log file,
- 	#  so it doesn't need rotating.
- 	#
--	filename = ${logdir}/radutmp
-+	filename = ${radacctdir}/radutmp
- 
- 	#  The field in the packet to key on for the
- 	#  'user' name,  If you have other fields which you want
---- a/raddb/modules/sradutmp
-+++ b/raddb/modules/sradutmp
-@@ -10,7 +10,7 @@
- # then name "sradutmp" to identify it later in the "accounting"
- # section.
- radutmp sradutmp {
--	filename = ${logdir}/sradutmp
-+	filename = ${radacctdir}/sradutmp
- 	perm = 0644
- 	callerid = "no"
- }
---- a/raddb/radiusd.conf.in
-+++ b/raddb/radiusd.conf.in
-@@ -66,7 +66,7 @@ name = radiusd
- 
- #  Location of config and logfiles.
- confdir = ${raddbdir}
--run_dir = ${localstatedir}/run/${name}
-+run_dir = ${localstatedir}/run
- 
- # Should likely be ${localstatedir}/lib/radiusd
- db_dir = ${raddbdir}
-@@ -290,7 +290,7 @@ listen {
- 	#  If your system does not support this feature, you will
- 	#  get an error if you try to use it.
- 	#
--#	interface = eth0
-+	interface = br-lan
- 
- 	#  Per-socket lists of clients.  This is a very useful feature.
- 	#
-@@ -317,7 +317,7 @@ listen {
- #	ipv6addr = ::
- 	port = 0
- 	type = acct
--#	interface = eth0
-+	interface = br-lan
- #	clients = per_socket_clients
- }
- 
-@@ -541,8 +541,8 @@ security {
- #
- #  allowed values: {no, yes}
- #
--proxy_requests  = yes
--$INCLUDE proxy.conf
-+proxy_requests  = no
-+#$INCLUDE proxy.conf
- 
- 
- # CLIENTS CONFIGURATION
-@@ -739,7 +739,7 @@ instantiate {
- 	#  The entire command line (and output) must fit into 253 bytes.
- 	#
- 	#  e.g. Framed-Pool = `%{exec:/bin/echo foo}`
--	exec
-+#	exec
- 
- 	#
- 	#  The expression module doesn't do authorization,
-@@ -756,15 +756,15 @@ instantiate {
- 	#  other xlat functions such as md5, sha1 and lc.
- 	#
- 	#  We do not recommend removing it's listing here.
--	expr
-+#	expr
- 
- 	#
- 	# We add the counter module here so that it registers
- 	# the check-name attribute before any module which sets
- 	# it
- #	daily
--	expiration
--	logintime
-+#	expiration
-+#	logintime
- 
- 	# subsections here can be thought of as "virtual" modules.
- 	#
-@@ -788,7 +788,7 @@ instantiate {
- #	to multiple times.
- #
- ######################################################################
--$INCLUDE policy.conf
-+#$INCLUDE policy.conf
- 
- ######################################################################
- #
-@@ -798,9 +798,9 @@ $INCLUDE policy.conf
- #	match the regular expression: /[a-zA-Z0-9_.]+/
- #
- #	It allows you to define new virtual servers simply by placing
--#	a file into the raddb/sites-enabled/ directory.
-+#	a file into the /etc/freeradius2/sites/ directory.
- #
--$INCLUDE sites-enabled/
-+$INCLUDE sites/
- 
- ######################################################################
- #
-@@ -808,7 +808,7 @@ $INCLUDE sites-enabled/
- #	"authenticate {}", "accounting {}", have been moved to the
- #	the file:
- #
--#		raddb/sites-available/default
-+#		/etc/freeradius2/sites/default
- #
- #	This is the "default" virtual server that has the same
- #	configuration as in version 1.0.x and 1.1.x.  The default
---- a/raddb/sites-available/default
-+++ b/raddb/sites-available/default
-@@ -85,7 +85,7 @@ authorize {
- 	#
- 	#  It takes care of processing the 'raddb/hints' and the
- 	#  'raddb/huntgroups' files.
--	preprocess
-+#	preprocess
- 
- 	#
- 	#  If you want to have a log of authentication requests,
-@@ -96,7 +96,7 @@ authorize {
- 	#
- 	#  The chap module will set 'Auth-Type := CHAP' if we are
- 	#  handling a CHAP request and Auth-Type has not already been set
--	chap
-+#	chap
- 
- 	#
- 	#  If the users are logging in with an MS-CHAP-Challenge
-@@ -104,13 +104,13 @@ authorize {
- 	#  the MS-CHAP-Challenge attribute, and add 'Auth-Type := MS-CHAP'
- 	#  to the request, which will cause the server to then use
- 	#  the mschap module for authentication.
--	mschap
-+#	mschap
- 
- 	#
- 	#  If you have a Cisco SIP server authenticating against
- 	#  FreeRADIUS, uncomment the following line, and the 'digest'
- 	#  line in the 'authenticate' section.
--	digest
-+#	digest
- 
- 	#
- 	#  The WiMAX specification says that the Calling-Station-Id
-@@ -133,7 +133,7 @@ authorize {
- 	#  Otherwise, when the first style of realm doesn't match,
- 	#  the other styles won't be checked.
- 	#
--	suffix
-+#	suffix
- #	ntdomain
- 
- 	#
-@@ -195,8 +195,8 @@ authorize {
- 	# Use the checkval module
- #	checkval
- 
--	expiration
--	logintime
-+#	expiration
-+#	logintime
- 
- 	#
- 	#  If no other module has claimed responsibility for
-@@ -277,7 +277,7 @@ authenticate {
- 	#  If you have a Cisco SIP server authenticating against
- 	#  FreeRADIUS, uncomment the following line, and the 'digest'
- 	#  line in the 'authorize' section.
--	digest
-+#	digest
- 
- 	#
- 	#  Pluggable Authentication Modules.
-@@ -294,7 +294,7 @@ authenticate {
- 	#  be used for authentication ONLY for compatibility with legacy
- 	#  FreeRADIUS configurations.
- 	#
--	unix
-+#	unix
- 
- 	# Uncomment it if you want to use ldap for authentication
- 	#
-@@ -330,8 +330,8 @@ authenticate {
- #
- #  Pre-accounting.  Decide which accounting type to use.
- #
--preacct {
--	preprocess
-+#preacct {
-+#	preprocess
- 
- 	#
- 	#  Session start times are *implied* in RADIUS.
-@@ -354,7 +354,7 @@ preacct {
- 	#
- 	#  Ensure that we have a semi-unique identifier for every
- 	#  request, and many NAS boxes are broken.
--	acct_unique
-+#	acct_unique
- 
- 	#
- 	#  Look for IPASS-style 'realm/', and if not found, look for
-@@ -364,13 +364,13 @@ preacct {
- 	#  Accounting requests are generally proxied to the same
- 	#  home server as authentication requests.
- #	IPASS
--	suffix
-+#	suffix
- #	ntdomain
- 
- 	#
- 	#  Read the 'acct_users' file
--	files
--}
-+#	files
-+#}
- 
- #
- #  Accounting.  Log the accounting data.
-@@ -380,7 +380,7 @@ accounting {
- 	#  Create a 'detail'ed log of the packets.
- 	#  Note that accounting requests which are proxied
- 	#  are also logged in the detail file.
--	detail
-+#	detail
- #	daily
- 
- 	#  Update the wtmp file
-@@ -432,7 +432,7 @@ accounting {
- 	exec
- 
- 	#  Filter attributes from the accounting response.
--	attr_filter.accounting_response
-+	#attr_filter.accounting_response
- 
- 	#
- 	#  See "Autz-Type Status-Server" for how this works.
-@@ -458,7 +458,7 @@ session {
- #  Post-Authentication
- #  Once we KNOW that the user has been authenticated, there are
- #  additional steps we can take.
--post-auth {
-+#post-auth {
- 	#  Get an address from the IP Pool.
- #	main_pool
- 
-@@ -488,7 +488,7 @@ post-auth {
- #	ldap
- 
- 	# For Exec-Program and Exec-Program-Wait
--	exec
-+#	exec
- 
- 	#
- 	#  Calculate the various WiMAX keys.  In order for this to work,
-@@ -572,12 +572,12 @@ post-auth {
- 	#  Add the ldap module name (or instance) if you have set 
- 	#  'edir_account_policy_check = yes' in the ldap module configuration
- 	#
--	Post-Auth-Type REJECT {
--		# log failed authentications in SQL, too.
-+#	Post-Auth-Type REJECT {
-+#		# log failed authentications in SQL, too.
- #		sql
--		attr_filter.access_reject
--	}
--}
-+#		attr_filter.access_reject
-+#	}
-+#}
- 
- #
- #  When the server decides to proxy a request to a home server,
-@@ -587,7 +587,7 @@ post-auth {
- #
- #  Only a few modules currently have this method.
- #
--pre-proxy {
-+#pre-proxy {
- #	attr_rewrite
- 
- 	#  Uncomment the following line if you want to change attributes
-@@ -603,14 +603,14 @@ pre-proxy {
- 	#  server, un-comment the following line, and the
- 	#  'detail pre_proxy_log' section, above.
- #	pre_proxy_log
--}
-+#}
- 
- #
- #  When the server receives a reply to a request it proxied
- #  to a home server, the request may be massaged here, in the
- #  post-proxy stage.
- #
--post-proxy {
-+#post-proxy {
- 
- 	#  If you want to have a log of replies from a home server,
- 	#  un-comment the following line, and the 'detail post_proxy_log'
-@@ -634,7 +634,7 @@ post-proxy {
- 	#  hidden inside of the EAP packet, and the end server will
- 	#  reject the EAP request.
- 	#
--	eap
-+#	eap
- 
- 	#
- 	#  If the server tries to proxy a request and fails, then the
-@@ -656,5 +656,5 @@ post-proxy {
- #	Post-Proxy-Type Fail {
- #			detail
- #	}
--}
-+#}
- 
---- a/raddb/users
-+++ b/raddb/users
-@@ -169,22 +169,22 @@
- #	by the terminal server in which case there may not be a "P" suffix.
- #	The terminal server sends "Framed-Protocol = PPP" for auto PPP.
- #
--DEFAULT	Framed-Protocol == PPP
--	Framed-Protocol = PPP,
--	Framed-Compression = Van-Jacobson-TCP-IP
-+#DEFAULT	Framed-Protocol == PPP
-+#	Framed-Protocol = PPP,
-+#	Framed-Compression = Van-Jacobson-TCP-IP
- 
- #
- # Default for CSLIP: dynamic IP address, SLIP mode, VJ-compression.
- #
--DEFAULT	Hint == "CSLIP"
--	Framed-Protocol = SLIP,
--	Framed-Compression = Van-Jacobson-TCP-IP
-+#DEFAULT	Hint == "CSLIP"
-+#	Framed-Protocol = SLIP,
-+#	Framed-Compression = Van-Jacobson-TCP-IP
- 
- #
- # Default for SLIP: dynamic IP address, SLIP mode.
- #
--DEFAULT	Hint == "SLIP"
--	Framed-Protocol = SLIP
-+#DEFAULT	Hint == "SLIP"
-+#	Framed-Protocol = SLIP
- 
- #
- # Last default: rlogin to our main server.
 

--- a/net/freeradius2/patches/004-ldap_configure.patch
+++ /dev/null
@@ -1,4254 +1,1 @@
---- a/src/modules/rlm_ldap/configure
-+++ b/src/modules/rlm_ldap/configure
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # From configure.in Revision.
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61.
-+# Generated by GNU Autoconf 2.63.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -16,7 +16,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -38,17 +38,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-   else
--    PATH_SEPARATOR=:
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-   fi
--  rm -f conf$$.sh
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
- fi
- 
- # Support unset when possible.
-@@ -64,8 +92,6 @@ fi
- # there to prevent editors from complaining about space-tab.
- # (If _AS_PATH_WALK were called with IFS unset, it would disable word
- # splitting by setting IFS to empty value.)
--as_nl='
--'
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
-@@ -88,7 +114,7 @@ if test "x$as_myself" = x; then
-   as_myself=$0
- fi
- if test ! -f "$as_myself"; then
--  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
- fi
- 
-@@ -101,17 +127,10 @@ PS2='> '
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
--do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
--  else
--    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--  fi
--done
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
- 
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -133,7 +152,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X/"$0" |
-+$as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
-@@ -159,7 +178,7 @@ else
-   as_have_required=no
- fi
- 
--  if test $as_have_required = yes && 	 (eval ":
-+  if test $as_have_required = yes &&	 (eval ":
- (as_func_return () {
-   (exit \$1)
- }
-@@ -241,7 +260,7 @@ IFS=$as_save_IFS
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -262,7 +281,7 @@ _ASEOF
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -342,10 +361,10 @@ fi
- 
-       if test "x$CONFIG_SHELL" != x; then
-   for as_var in BASH_ENV ENV
--        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--        done
--        export CONFIG_SHELL
--        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+	done
-+	export CONFIG_SHELL
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- fi
- 
- 
-@@ -414,9 +433,10 @@ fi
- 
- test \$exitcode = 0") || {
-   echo No shell found that supports shell functions.
--  echo Please tell autoconf@gnu.org about your system,
--  echo including any error possibly output before this
--  echo message
-+  echo Please tell bug-autoconf@gnu.org about your system,
-+  echo including any error possibly output before this message.
-+  echo This can help us improve future autoconf versions.
-+  echo Configuration will now proceed without shell functions.
- }
- 
- 
-@@ -452,7 +472,7 @@ test \$exitcode = 0") || {
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -480,7 +500,6 @@ case `echo -n x` in
- *)
-   ECHO_N='-n';;
- esac
--
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -493,19 +512,22 @@ if test -d conf$$.dir; then
-   rm -f conf$$.dir/conf$$.file
- else
-   rm -f conf$$.dir
--  mkdir conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
- fi
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s='ln -s'
--  # ... but there are two gotchas:
--  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
--  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--  # In both cases, we have to default to `cp -p'.
--  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-     as_ln_s='cp -p'
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
-+  fi
- else
-   as_ln_s='cp -p'
- fi
-@@ -530,10 +552,10 @@ else
-   as_test_x='
-     eval sh -c '\''
-       if test -d "$1"; then
--        test -d "$1/.";
-+	test -d "$1/.";
-       else
- 	case $1 in
--        -*)set "./$1";;
-+	-*)set "./$1";;
- 	esac;
- 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- 	???[sx]*):;;*)false;;esac;fi
-@@ -578,57 +600,65 @@ PACKAGE_STRING=
- PACKAGE_BUGREPORT=
- 
- ac_unique_file="rlm_ldap.c"
--ac_subst_vars='SHELL
--PATH_SEPARATOR
--PACKAGE_NAME
--PACKAGE_TARNAME
--PACKAGE_VERSION
--PACKAGE_STRING
--PACKAGE_BUGREPORT
--exec_prefix
--prefix
--program_transform_name
--bindir
--sbindir
--libexecdir
--datarootdir
--datadir
--sysconfdir
--sharedstatedir
--localstatedir
--includedir
--oldincludedir
--docdir
--infodir
--htmldir
--dvidir
--pdfdir
--psdir
--libdir
--localedir
--mandir
--DEFS
--ECHO_C
--ECHO_N
--ECHO_T
--LIBS
--build_alias
--host_alias
--target_alias
--CC
--CFLAGS
--LDFLAGS
--CPPFLAGS
--ac_ct_CC
--EXEEXT
--OBJEXT
--edir
--ldap_ldflags
--ldap_cflags
--targetname
-+ac_subst_vars='LTLIBOBJS
- LIBOBJS
--LTLIBOBJS'
-+targetname
-+ldap_cflags
-+ldap_ldflags
-+edir
-+OBJEXT
-+EXEEXT
-+ac_ct_CC
-+CPPFLAGS
-+LDFLAGS
-+CFLAGS
-+CC
-+target_alias
-+host_alias
-+build_alias
-+LIBS
-+ECHO_T
-+ECHO_N
-+ECHO_C
-+DEFS
-+mandir
-+localedir
-+libdir
-+psdir
-+pdfdir
-+dvidir
-+htmldir
-+infodir
-+docdir
-+oldincludedir
-+includedir
-+localstatedir
-+sharedstatedir
-+sysconfdir
-+datadir
-+datarootdir
-+libexecdir
-+sbindir
-+bindir
-+program_transform_name
-+prefix
-+exec_prefix
-+PACKAGE_BUGREPORT
-+PACKAGE_STRING
-+PACKAGE_VERSION
-+PACKAGE_TARNAME
-+PACKAGE_NAME
-+PATH_SEPARATOR
-+SHELL'
- ac_subst_files=''
-+ac_user_opts='
-+enable_option_checking
-+with_rlm_ldap_lib_dir
-+with_rlm_ldap_include_dir
-+enable_shared
-+with_threads
-+with_edir
-+'
-       ac_precious_vars='build_alias
- host_alias
- target_alias
-@@ -642,6 +672,8 @@ CPPFLAGS'
- # Initialize some variables set by options.
- ac_init_help=
- ac_init_version=false
-+ac_unrecognized_opts=
-+ac_unrecognized_sep=
- # The variables have the same names as the options, with
- # dashes changed to underlines.
- cache_file=/dev/null
-@@ -740,13 +772,21 @@ do
-     datarootdir=$ac_optarg ;;
- 
-   -disable-* | --disable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
--    eval enable_$ac_feature=no ;;
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=no ;;
- 
-   -docdir | --docdir | --docdi | --doc | --do)
-     ac_prev=docdir ;;
-@@ -759,13 +799,21 @@ do
-     dvidir=$ac_optarg ;;
- 
-   -enable-* | --enable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
--    eval enable_$ac_feature=\$ac_optarg ;;
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=\$ac_optarg ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -956,22 +1004,38 @@ do
-     ac_init_version=: ;;
- 
-   -with-* | --with-*)
--    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
--    eval with_$ac_package=\$ac_optarg ;;
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=\$ac_optarg ;;
- 
-   -without-* | --without-*)
--    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
--    eval with_$ac_package=no ;;
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=no ;;
- 
-   --x)
-     # Obsolete; use --with-x.
-@@ -991,7 +1055,7 @@ do
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries=$ac_optarg ;;
- 
--  -*) { echo "$as_me: error: unrecognized option: $ac_option
-+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; }
-     ;;
-@@ -1000,16 +1064,16 @@ Try \`$0 --help' for more information."
-     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-    { (exit 1); exit 1; }; }
-     eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
- 
-   *)
-     # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-@@ -1018,22 +1082,38 @@ done
- 
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  { echo "$as_me: error: missing argument to $ac_option" >&2
-+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-    { (exit 1); exit 1; }; }
- fi
- 
--# Be sure to have absolute directory names.
-+if test -n "$ac_unrecognized_opts"; then
-+  case $enable_option_checking in
-+    no) ;;
-+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-+   { (exit 1); exit 1; }; } ;;
-+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-+  esac
-+fi
-+
-+# Check all directory arguments for consistency.
- for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
- 		datadir sysconfdir sharedstatedir localstatedir includedir \
- 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- 		libdir localedir mandir
- do
-   eval ac_val=\$$ac_var
-+  # Remove trailing slashes.
-+  case $ac_val in
-+    */ )
-+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-+      eval $ac_var=\$ac_val;;
-+  esac
-+  # Be sure to have absolute directory names.
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* )  continue;;
-     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
--  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-    { (exit 1); exit 1; }; }
- done
- 
-@@ -1048,7 +1128,7 @@ target=$target_alias
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-     If a cross compiler is detected then cross compile mode will be used." >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-@@ -1064,10 +1144,10 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
--  { echo "$as_me: error: Working directory cannot be determined" >&2
-+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-    { (exit 1); exit 1; }; }
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
--  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-    { (exit 1); exit 1; }; }
- 
- 
-@@ -1075,12 +1155,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
-   # Try the directory containing this script, then the parent directory.
--  ac_confdir=`$as_dirname -- "$0" ||
--$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$0" : 'X\(//\)[^/]' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$0" |
-+  ac_confdir=`$as_dirname -- "$as_myself" ||
-+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_myself" : 'X\(//\)[^/]' \| \
-+	 X"$as_myself" : 'X\(//\)$' \| \
-+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_myself" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -1107,12 +1187,12 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
--  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-    { (exit 1); exit 1; }; }
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
--	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-    { (exit 1); exit 1; }; }
- 	pwd)`
- # When building in place, set srcdir=.
-@@ -1161,9 +1241,9 @@ Configuration:
- 
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
--			  [$ac_default_prefix]
-+                          [$ac_default_prefix]
-   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
--			  [PREFIX]
-+                          [PREFIX]
- 
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -1173,25 +1253,25 @@ for instance \`--prefix=\$HOME'.
- For better control, use the options below.
- 
- Fine tuning of the installation directories:
--  --bindir=DIR           user executables [EPREFIX/bin]
--  --sbindir=DIR          system admin executables [EPREFIX/sbin]
--  --libexecdir=DIR       program executables [EPREFIX/libexec]
--  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
--  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
--  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
--  --libdir=DIR           object code libraries [EPREFIX/lib]
--  --includedir=DIR       C header files [PREFIX/include]
--  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
--  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
--  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
--  --infodir=DIR          info documentation [DATAROOTDIR/info]
--  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
--  --mandir=DIR           man documentation [DATAROOTDIR/man]
--  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
--  --htmldir=DIR          html documentation [DOCDIR]
--  --dvidir=DIR           dvi documentation [DOCDIR]
--  --pdfdir=DIR           pdf documentation [DOCDIR]
--  --psdir=DIR            ps documentation [DOCDIR]
-+  --bindir=DIR            user executables [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-+  --libdir=DIR            object code libraries [EPREFIX/lib]
-+  --includedir=DIR        C header files [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR           info documentation [DATAROOTDIR/info]
-+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR            man documentation [DATAROOTDIR/man]
-+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-+  --htmldir=DIR           html documentation [DOCDIR]
-+  --dvidir=DIR            dvi documentation [DOCDIR]
-+  --pdfdir=DIR            pdf documentation [DOCDIR]
-+  --psdir=DIR             ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -1203,6 +1283,7 @@ if test -n "$ac_init_help"; then
-   cat <<\_ACEOF
- 
- Optional Features:
-+  --disable-option-checking  ignore unrecognized --enable/--with options
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-@@ -1234,15 +1315,17 @@ fi
- if test "$ac_init_help" = "recursive"; then
-   # If there are subdirs, report their specific --help.
-   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
--    test -d "$ac_dir" || continue
-+    test -d "$ac_dir" ||
-+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-+      continue
-     ac_builddir=.
- 
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-   # A ".." for each directory in $ac_dir_suffix.
--  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-   case $ac_top_builddir_sub in
-   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -1278,7 +1361,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
-       echo &&
-       $SHELL "$ac_srcdir/configure" --help=recursive
-     else
--      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi || ac_status=$?
-     cd "$ac_pwd" || { ac_status=$?; break; }
-   done
-@@ -1288,10 +1371,10 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
-   cat <<\_ACEOF
- configure
--generated by GNU Autoconf 2.61
-+generated by GNU Autoconf 2.63
- 
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1302,7 +1385,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.61.  Invocation command line was
-+generated by GNU Autoconf 2.63.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1338,7 +1421,7 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  echo "PATH: $as_dir"
-+  $as_echo "PATH: $as_dir"
- done
- IFS=$as_save_IFS
- 
-@@ -1373,7 +1456,7 @@ do
-     | -silent | --silent | --silen | --sile | --sil)
-       continue ;;
-     *\'*)
--      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
-     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -1425,11 +1508,12 @@ _ASBOX
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -1459,9 +1543,9 @@ _ASBOX
-     do
-       eval ac_val=\$$ac_var
-       case $ac_val in
--      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-       esac
--      echo "$ac_var='\''$ac_val'\''"
-+      $as_echo "$ac_var='\''$ac_val'\''"
-     done | sort
-     echo
- 
-@@ -1476,9 +1560,9 @@ _ASBOX
-       do
- 	eval ac_val=\$$ac_var
- 	case $ac_val in
--	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- 	esac
--	echo "$ac_var='\''$ac_val'\''"
-+	$as_echo "$ac_var='\''$ac_val'\''"
-       done | sort
-       echo
-     fi
-@@ -1494,8 +1578,8 @@ _ASBOX
-       echo
-     fi
-     test "$ac_signal" != 0 &&
--      echo "$as_me: caught signal $ac_signal"
--    echo "$as_me: exit $exit_status"
-+      $as_echo "$as_me: caught signal $ac_signal"
-+    $as_echo "$as_me: exit $exit_status"
-   } >&5
-   rm -f core *.core core.conftest.* &&
-     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -1537,21 +1621,24 @@ _ACEOF
- 
- 
- # Let the site file select an alternate cache file if it wants to.
--# Prefer explicitly selected file to automatically selected ones.
-+# Prefer an explicitly selected file to automatically selected ones.
-+ac_site_file1=NONE
-+ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
--  set x "$CONFIG_SITE"
-+  ac_site_file1=$CONFIG_SITE
- elif test "x$prefix" != xNONE; then
--  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+  ac_site_file1=$prefix/share/config.site
-+  ac_site_file2=$prefix/etc/config.site
- else
--  set x "$ac_default_prefix/share/config.site" \
--	"$ac_default_prefix/etc/config.site"
-+  ac_site_file1=$ac_default_prefix/share/config.site
-+  ac_site_file2=$ac_default_prefix/etc/config.site
- fi
--shift
--for ac_site_file
-+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-+  test "x$ac_site_file" = xNONE && continue
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
--echo "$as_me: loading site script $ac_site_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
-     . "$ac_site_file"
-   fi
-@@ -1561,16 +1648,16 @@ if test -r "$cache_file"; then
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
--echo "$as_me: loading cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+$as_echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . "$cache_file";;
-       *)                      . "./$cache_file";;
-     esac
-   fi
- else
--  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
--echo "$as_me: creating cache $cache_file" >&6;}
-+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+$as_echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
- 
-@@ -1584,29 +1671,38 @@ for ac_var in $ac_precious_vars; do
-   eval ac_new_val=\$ac_env_${ac_var}_value
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
--echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
--echo "$as_me:   former value:  $ac_old_val" >&2;}
--	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
--echo "$as_me:   current value: $ac_new_val" >&2;}
--	ac_cache_corrupted=:
-+	# differences in whitespace do not lead to failure.
-+	ac_old_val_w=`echo x $ac_old_val`
-+	ac_new_val_w=`echo x $ac_new_val`
-+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+	  ac_cache_corrupted=:
-+	else
-+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-+	  eval $ac_var=\$ac_old_val
-+	fi
-+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-       fi;;
-   esac
-   # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
--    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-     *) ac_arg=$ac_var=$ac_new_val ;;
-     esac
-     case " $ac_configure_args " in
-@@ -1616,10 +1712,12 @@ echo "$as_me:   current value: $ac_new_v
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
--echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
--echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -1662,10 +1760,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1678,7 +1776,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1689,11 +1787,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1702,10 +1800,10 @@ if test -z "$ac_cv_prog_CC"; then
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1718,7 +1816,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1729,11 +1827,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_CC" = x; then
-@@ -1741,12 +1839,8 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     CC=$ac_ct_CC
-@@ -1759,10 +1853,10 @@ if test -z "$CC"; then
-           if test -n "$ac_tool_prefix"; then
-     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1775,7 +1869,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1786,11 +1880,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1799,10 +1893,10 @@ fi
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1820,7 +1914,7 @@ do
-        continue
-      fi
-     ac_cv_prog_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1843,11 +1937,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1858,10 +1952,10 @@ if test -z "$CC"; then
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1874,7 +1968,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1885,11 +1979,11 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1902,10 +1996,10 @@ if test -z "$CC"; then
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1918,7 +2012,7 @@ do
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -1929,11 +2023,11 @@ fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -1945,12 +2039,8 @@ done
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     CC=$ac_ct_CC
-@@ -1960,44 +2050,50 @@ fi
- fi
- 
- 
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH
-+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for C compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
-@@ -2016,27 +2112,22 @@ main ()
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
--ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--#
--# List of possible output files, starting from the most likely.
--# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
--# only as a last resort.  b.out is created by i960 compilers.
--ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
--#
--# The IRIX 6 linker writes into existing files which may not be
--# executable, retaining their permissions.  Remove them first so a
--# subsequent execution test works.
-+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+
-+# The possible output files:
-+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-+
- ac_rmfiles=
- for ac_file in $ac_files
- do
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-   esac
- done
-@@ -2047,10 +2138,11 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link_default") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -2061,7 +2153,7 @@ for ac_file in $ac_files ''
- do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
- 	;;
-     [ab].out )
- 	# We found the default executable, but exeext='' is most
-@@ -2088,25 +2180,27 @@ else
-   ac_file=''
- fi
- 
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
- See \`config.log' for more details." >&5
--echo "$as_me: error: C compiler cannot create executables
-+$as_echo "$as_me: error: C compiler cannot create executables
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
- 
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-@@ -2115,49 +2209,53 @@ if test "$cross_compiling" != yes; then
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run C compiled programs.
-+$as_echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
-     fi
-   fi
- fi
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
--{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
- 
--{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+$as_echo_n "checking for suffix of executables... " >&6; }
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -2166,31 +2264,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- for ac_file in conftest.exe conftest conftest.*; do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- 	  break;;
-     * ) break;;
-   esac
- done
- else
--  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+$as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2213,40 +2313,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   for ac_file in conftest.o conftest.obj conftest.*; do
-   test -f "$ac_file" || continue;
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
- done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+$as_echo "$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2272,20 +2375,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -2295,15 +2399,19 @@ rm -f core conftest.err conftest.$ac_obj
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
--GCC=`test $ac_compiler_gnu = yes && echo yes`
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-@@ -2330,20 +2438,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CFLAGS=""
-@@ -2368,20 +2477,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -2407,20 +2517,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -2435,8 +2546,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -2452,10 +2563,10 @@ else
-     CFLAGS=
-   fi
- fi
--{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
--echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
- if test "${ac_cv_prog_cc_c89+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
-@@ -2526,20 +2637,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_c89=$ac_arg
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -2555,15 +2667,15 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
-   x)
--    { echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6; } ;;
-+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-   xno)
--    { echo "$as_me:$LINENO: result: unsupported" >&5
--echo "${ECHO_T}unsupported" >&6; } ;;
-+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-   *)
-     CC="$CC $ac_cv_prog_cc_c89"
--    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
- 
- 
-@@ -2581,8 +2693,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test "${with_rlm_ldap_lib_dir+set}" = set; then
-   withval=$with_rlm_ldap_lib_dir;  case "$withval" in
- 	    no)
--		{ { echo "$as_me:$LINENO: error: Need rlm-ldap-lib-dir" >&5
--echo "$as_me: error: Need rlm-ldap-lib-dir" >&2;}
-+		{ { $as_echo "$as_me:$LINENO: error: Need rlm-ldap-lib-dir" >&5
-+$as_echo "$as_me: error: Need rlm-ldap-lib-dir" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
- 	    yes)
-@@ -2601,8 +2713,8 @@ fi
- if test "${with_rlm_ldap_include_dir+set}" = set; then
-   withval=$with_rlm_ldap_include_dir;  case "$withval" in
- 	    no)
--		{ { echo "$as_me:$LINENO: error: Need rlm-ldap-include-dir" >&5
--echo "$as_me: error: Need rlm-ldap-include-dir" >&2;}
-+		{ { $as_echo "$as_me:$LINENO: error: Need rlm-ldap-include-dir" >&5
-+$as_echo "$as_me: error: Need rlm-ldap-include-dir" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
- 	    yes)
-@@ -2641,8 +2753,8 @@ fi
- 
- 
- 				if test "x$enable_shared" = "xno"; then
--		{ echo "$as_me:$LINENO: WARNING: Static linking with libldap will probably result in unresolved symbols." >&5
--echo "$as_me: WARNING: Static linking with libldap will probably result in unresolved symbols." >&2;}
-+		{ $as_echo "$as_me:$LINENO: WARNING: Static linking with libldap will probably result in unresolved symbols." >&5
-+$as_echo "$as_me: WARNING: Static linking with libldap will probably result in unresolved symbols." >&2;}
- 	fi
- 
- 		rlm_ldap_with_threads=yes
-@@ -2661,10 +2773,10 @@ fi
- 
- 
- 			if test "x$rlm_ldap_with_threads" = "xyes"; then
--	    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+	    { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread  $LIBS"
-@@ -2696,39 +2808,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_pthread_pthread_create=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_pthread_pthread_create=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
--if test $ac_cv_lib_pthread_pthread_create = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
-    LIBS="-lpthread $LIBS"
- else
--  { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
--echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
-+$as_echo_n "checking for pthread_create in -lc_r... " >&6; }
- if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lc_r  $LIBS"
-@@ -2761,33 +2877,37 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_c_r_pthread_create=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_c_r_pthread_create=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6; }
--if test $ac_cv_lib_c_r_pthread_create = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
-+$as_echo "$ac_cv_lib_c_r_pthread_create" >&6; }
-+if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then
-    LIBS="-lc_r $LIBS"
- else
-    rlm_ldap_with_threads="no"
-@@ -2799,14 +2919,12 @@ fi
- 
- 	fi
- 
--				smart_try_dir=$rlm_ldap_lib_dir
--	if test "x$rlm_ldap_with_threads" = "xyes"; then
- 
- 
--sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'`
--sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
--{ echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5
--echo $ECHO_N "checking for ldap_init in -lldap_r... $ECHO_C" >&6; }
-+sm_lib_safe=`echo "sasl" | sed 'y%./+-%__p_%'`
-+sm_func_safe=`echo "sasl_encode" | sed 'y%./+-%__p_%'`
-+{ $as_echo "$as_me:$LINENO: checking for sasl_encode in -lsasl" >&5
-+$as_echo_n "checking for sasl_encode in -lsasl... " >&6; }
- 
- old_LIBS="$LIBS"
- smart_lib=
-@@ -2814,18 +2932,18 @@ smart_lib_dir=
- 
- if test "x$smart_try_dir" != "x"; then
-   for try in $smart_try_dir; do
--    LIBS="-L$try -lldap_r $old_LIBS"
-+    LIBS="-L$try -lsasl $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char sasl_encode();
- int
- main ()
- {
-- ldap_init()
-+ sasl_encode()
-   ;
-   return 0;
- }
-@@ -2836,26 +2954,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-L$try -lldap_r"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lsasl"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     if test "x$smart_lib" != "x"; then
-@@ -2866,18 +2988,18 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_lib" = "x"; then
--  LIBS="-lldap_r $old_LIBS"
-+  LIBS="-lsasl $old_LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char sasl_encode();
- int
- main ()
- {
-- ldap_init()
-+ sasl_encode()
-   ;
-   return 0;
- }
-@@ -2888,26 +3010,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-lldap_r"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-lsasl"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-   LIBS="$old_LIBS"
-@@ -2918,7 +3044,7 @@ if test "x$smart_lib" = "x"; then
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=libldap_r${libltdl_cv_shlibext}
-+  file=libsasl${libltdl_cv_shlibext}
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -2945,7 +3071,7 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=libldap_r.a
-+  file=libsasl.a
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -2970,18 +3096,18 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
- 
- 
-   for try in $smart_lib_dir /usr/local/lib /opt/lib; do
--    LIBS="-L$try -lldap_r $old_LIBS"
-+    LIBS="-L$try -lsasl $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char sasl_encode();
- int
- main ()
- {
-- ldap_init()
-+ sasl_encode()
-   ;
-   return 0;
- }
-@@ -2992,26 +3118,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-L$try -lldap_r"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lsasl"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     if test "x$smart_lib" != "x"; then
-@@ -3022,26 +3152,22 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_lib" != "x"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-   LIBS="$smart_lib $old_LIBS"
-   SMART_LIBS="$smart_lib $SMART_LIBS"
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--	    if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
--		fail="$fail libldap_r"
--	    fi
--	else
- 
- 
--sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'`
--sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
--{ echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
--echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6; }
-+sm_lib_safe=`echo "lber" | sed 'y%./+-%__p_%'`
-+sm_func_safe=`echo "ber_init" | sed 'y%./+-%__p_%'`
-+{ $as_echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
-+$as_echo_n "checking for ber_init in -llber... " >&6; }
- 
- old_LIBS="$LIBS"
- smart_lib=
-@@ -3049,18 +3175,18 @@ smart_lib_dir=
- 
- if test "x$smart_try_dir" != "x"; then
-   for try in $smart_try_dir; do
--    LIBS="-L$try -lldap $old_LIBS"
-+    LIBS="-L$try -llber $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char ber_init();
- int
- main ()
- {
-- ldap_init()
-+ ber_init()
-   ;
-   return 0;
- }
-@@ -3071,26 +3197,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-L$try -lldap"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -llber"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     if test "x$smart_lib" != "x"; then
-@@ -3101,18 +3231,18 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_lib" = "x"; then
--  LIBS="-lldap $old_LIBS"
-+  LIBS="-llber $old_LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char ber_init();
- int
- main ()
- {
-- ldap_init()
-+ ber_init()
-   ;
-   return 0;
- }
-@@ -3123,26 +3253,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-lldap"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-llber"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-   LIBS="$old_LIBS"
-@@ -3153,7 +3287,7 @@ if test "x$smart_lib" = "x"; then
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=libldap${libltdl_cv_shlibext}
-+  file=liblber${libltdl_cv_shlibext}
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -3180,7 +3314,7 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=libldap.a
-+  file=liblber.a
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -3205,18 +3339,18 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D
- 
- 
-   for try in $smart_lib_dir /usr/local/lib /opt/lib; do
--    LIBS="-L$try -lldap $old_LIBS"
-+    LIBS="-L$try -llber $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--extern char ldap_init();
-+extern char ber_init();
- int
- main ()
- {
-- ldap_init()
-+ ber_init()
-   ;
-   return 0;
- }
-@@ -3227,26 +3361,30 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  smart_lib="-L$try -lldap"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -llber"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     if test "x$smart_lib" != "x"; then
-@@ -3257,136 +3395,145 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_lib" != "x"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-   LIBS="$smart_lib $old_LIBS"
-   SMART_LIBS="$smart_lib $SMART_LIBS"
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--	    if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then
--		fail="$fail libldap"
--	    fi
--	fi
--
- 
--	smart_try_dir=$rlm_ldap_include_dir
-+				smart_try_dir=$rlm_ldap_lib_dir
-+	if test "x$rlm_ldap_with_threads" = "xyes"; then
- 
- 
--ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'`
--{ echo "$as_me:$LINENO: checking for ldap.h" >&5
--echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; }
-+sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'`
-+sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
-+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5
-+$as_echo_n "checking for ldap_init in -lldap_r... " >&6; }
- 
--old_CFLAGS="$CFLAGS"
--smart_include=
--smart_include_dir=
-+old_LIBS="$LIBS"
-+smart_lib=
-+smart_lib_dir=
- 
- if test "x$smart_try_dir" != "x"; then
-   for try in $smart_try_dir; do
--    CFLAGS="$old_CFLAGS -I$try"
-+    LIBS="-L$try -lldap_r $old_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
--		    #include <ldap.h>
-+extern char ldap_init();
- int
- main ()
- {
-- int a = 1;
-+ ldap_init()
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  smart_include="-I$try"
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lldap_r"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	smart_include=
-+
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--    if test "x$smart_include" != "x"; then
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    if test "x$smart_lib" != "x"; then
-       break;
-     fi
-   done
--  CFLAGS="$old_CFLAGS"
-+  LIBS="$old_LIBS"
- fi
- 
--if test "x$smart_include" = "x"; then
-+if test "x$smart_lib" = "x"; then
-+  LIBS="-lldap_r $old_LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
--		  #include <ldap.h>
-+extern char ldap_init();
- int
- main ()
- {
-- int a = 1;
-+ ldap_init()
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  smart_include=" "
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-lldap_r"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	smart_include=
-+
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  LIBS="$old_LIBS"
- fi
- 
--if test "x$smart_include" = "x"; then
-+if test "x$smart_lib" = "x"; then
- 
- 
- if test "x$LOCATE" != "x"; then
-         DIRS=
--  file=ldap.h
-+  file=libldap_r${libltdl_cv_shlibext}
- 
-   for x in `${LOCATE} $file 2>/dev/null`; do
-                                         base=`echo $x | sed "s%/${file}%%"`
-@@ -3400,19 +3547,505 @@ if test "x$LOCATE" != "x"; then
-       continue
-     fi
- 
--                    already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
-+                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-     if test "x$already" = "x"; then
-       DIRS="$DIRS $dir"
-     fi
-   done
- fi
- 
--eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
-+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
- 
- 
--  for try in $smart_include_dir /usr/local/include /opt/include; do
--    CFLAGS="$old_CFLAGS -I$try"
--    cat >conftest.$ac_ext <<_ACEOF
-+
-+if test "x$LOCATE" != "x"; then
-+        DIRS=
-+  file=libldap_r.a
-+
-+  for x in `${LOCATE} $file 2>/dev/null`; do
-+                                        base=`echo $x | sed "s%/${file}%%"`
-+    if test "x$x" = "x$base"; then
-+      continue;
-+    fi
-+
-+    dir=`${DIRNAME} $x 2>/dev/null`
-+                exclude=`echo ${dir} | ${GREP} /home`
-+    if test "x$exclude" != "x"; then
-+      continue
-+    fi
-+
-+                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-+    if test "x$already" = "x"; then
-+      DIRS="$DIRS $dir"
-+    fi
-+  done
-+fi
-+
-+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
-+
-+
-+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
-+    LIBS="-L$try -lldap_r $old_LIBS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+extern char ldap_init();
-+int
-+main ()
-+{
-+ ldap_init()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lldap_r"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    if test "x$smart_lib" != "x"; then
-+      break;
-+    fi
-+  done
-+  LIBS="$old_LIBS"
-+fi
-+
-+if test "x$smart_lib" != "x"; then
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-+  LIBS="$smart_lib $old_LIBS"
-+  SMART_LIBS="$smart_lib $SMART_LIBS"
-+else
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+	    if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then
-+		fail="$fail libldap_r"
-+	    fi
-+	else
-+
-+
-+sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'`
-+sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'`
-+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
-+$as_echo_n "checking for ldap_init in -lldap... " >&6; }
-+
-+old_LIBS="$LIBS"
-+smart_lib=
-+smart_lib_dir=
-+
-+if test "x$smart_try_dir" != "x"; then
-+  for try in $smart_try_dir; do
-+    LIBS="-L$try -lldap $old_LIBS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+extern char ldap_init();
-+int
-+main ()
-+{
-+ ldap_init()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lldap"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    if test "x$smart_lib" != "x"; then
-+      break;
-+    fi
-+  done
-+  LIBS="$old_LIBS"
-+fi
-+
-+if test "x$smart_lib" = "x"; then
-+  LIBS="-lldap $old_LIBS"
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+extern char ldap_init();
-+int
-+main ()
-+{
-+ ldap_init()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-lldap"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  LIBS="$old_LIBS"
-+fi
-+
-+if test "x$smart_lib" = "x"; then
-+
-+
-+if test "x$LOCATE" != "x"; then
-+        DIRS=
-+  file=libldap${libltdl_cv_shlibext}
-+
-+  for x in `${LOCATE} $file 2>/dev/null`; do
-+                                        base=`echo $x | sed "s%/${file}%%"`
-+    if test "x$x" = "x$base"; then
-+      continue;
-+    fi
-+
-+    dir=`${DIRNAME} $x 2>/dev/null`
-+                exclude=`echo ${dir} | ${GREP} /home`
-+    if test "x$exclude" != "x"; then
-+      continue
-+    fi
-+
-+                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-+    if test "x$already" = "x"; then
-+      DIRS="$DIRS $dir"
-+    fi
-+  done
-+fi
-+
-+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
-+
-+
-+
-+if test "x$LOCATE" != "x"; then
-+        DIRS=
-+  file=libldap.a
-+
-+  for x in `${LOCATE} $file 2>/dev/null`; do
-+                                        base=`echo $x | sed "s%/${file}%%"`
-+    if test "x$x" = "x$base"; then
-+      continue;
-+    fi
-+
-+    dir=`${DIRNAME} $x 2>/dev/null`
-+                exclude=`echo ${dir} | ${GREP} /home`
-+    if test "x$exclude" != "x"; then
-+      continue
-+    fi
-+
-+                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
-+    if test "x$already" = "x"; then
-+      DIRS="$DIRS $dir"
-+    fi
-+  done
-+fi
-+
-+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
-+
-+
-+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
-+    LIBS="-L$try -lldap $old_LIBS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+extern char ldap_init();
-+int
-+main ()
-+{
-+ ldap_init()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  smart_lib="-L$try -lldap"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    if test "x$smart_lib" != "x"; then
-+      break;
-+    fi
-+  done
-+  LIBS="$old_LIBS"
-+fi
-+
-+if test "x$smart_lib" != "x"; then
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-+  LIBS="$smart_lib $old_LIBS"
-+  SMART_LIBS="$smart_lib $SMART_LIBS"
-+else
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+	    if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then
-+		fail="$fail libldap"
-+	    fi
-+	fi
-+
-+
-+	smart_try_dir=$rlm_ldap_include_dir
-+
-+
-+ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'`
-+{ $as_echo "$as_me:$LINENO: checking for ldap.h" >&5
-+$as_echo_n "checking for ldap.h... " >&6; }
-+
-+old_CFLAGS="$CFLAGS"
-+smart_include=
-+smart_include_dir=
-+
-+if test "x$smart_try_dir" != "x"; then
-+  for try in $smart_try_dir; do
-+    CFLAGS="$old_CFLAGS -I$try"
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+		    #include <ldap.h>
-+int
-+main ()
-+{
-+ int a = 1;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  smart_include="-I$try"
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	smart_include=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    if test "x$smart_include" != "x"; then
-+      break;
-+    fi
-+  done
-+  CFLAGS="$old_CFLAGS"
-+fi
-+
-+if test "x$smart_include" = "x"; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+		  #include <ldap.h>
-+int
-+main ()
-+{
-+ int a = 1;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  smart_include=" "
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	smart_include=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+if test "x$smart_include" = "x"; then
-+
-+
-+if test "x$LOCATE" != "x"; then
-+        DIRS=
-+  file=ldap.h
-+
-+  for x in `${LOCATE} $file 2>/dev/null`; do
-+                                        base=`echo $x | sed "s%/${file}%%"`
-+    if test "x$x" = "x$base"; then
-+      continue;
-+    fi
-+
-+    dir=`${DIRNAME} $x 2>/dev/null`
-+                exclude=`echo ${dir} | ${GREP} /home`
-+    if test "x$exclude" != "x"; then
-+      continue
-+    fi
-+
-+                    already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
-+    if test "x$already" = "x"; then
-+      DIRS="$DIRS $dir"
-+    fi
-+  done
-+fi
-+
-+eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
-+
-+
-+  for try in $smart_include_dir /usr/local/include /opt/include; do
-+    CFLAGS="$old_CFLAGS -I$try"
-+    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3434,20 +4067,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   smart_include="-I$try"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	smart_include=
-@@ -3462,14 +4096,14 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- 
- if test "x$smart_include" != "x"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   eval "ac_cv_header_$ac_safe=yes"
-   CFLAGS="$old_CFLAGS $smart_include"
-   SMART_CFLAGS="$SMART_CFLAGS $smart_include"
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 	if test "$ac_cv_header_ldap_h" != "yes"; then
-@@ -3478,10 +4112,10 @@ fi
- 
- 
- 	if test "x$fail" = "x"; then
--	    { echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5
--echo $ECHO_N "checking for ldap_start_tls_s... $ECHO_C" >&6; }
-+	    { $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5
-+$as_echo_n "checking for ldap_start_tls_s... " >&6; }
- if test "${ac_cv_func_ldap_start_tls_s+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3534,39 +4168,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_ldap_start_tls_s=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_ldap_start_tls_s=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5
--echo "${ECHO_T}$ac_cv_func_ldap_start_tls_s" >&6; }
--if test $ac_cv_func_ldap_start_tls_s = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5
-+$as_echo "$ac_cv_func_ldap_start_tls_s" >&6; }
-+if test "x$ac_cv_func_ldap_start_tls_s" = x""yes; then
-    SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_START_TLS"
- fi
- 
--	    { echo "$as_me:$LINENO: checking for ldap_initialize" >&5
--echo $ECHO_N "checking for ldap_initialize... $ECHO_C" >&6; }
-+	    { $as_echo "$as_me:$LINENO: checking for ldap_initialize" >&5
-+$as_echo_n "checking for ldap_initialize... " >&6; }
- if test "${ac_cv_func_ldap_initialize+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3619,39 +4257,43 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_ldap_initialize=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_ldap_initialize=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5
--echo "${ECHO_T}$ac_cv_func_ldap_initialize" >&6; }
--if test $ac_cv_func_ldap_initialize = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5
-+$as_echo "$ac_cv_func_ldap_initialize" >&6; }
-+if test "x$ac_cv_func_ldap_initialize" = x""yes; then
-    SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INITIALIZE"
- fi
- 
--	    { echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5
--echo $ECHO_N "checking for ldap_int_tls_config... $ECHO_C" >&6; }
-+	    { $as_echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5
-+$as_echo_n "checking for ldap_int_tls_config... " >&6; }
- if test "${ac_cv_func_ldap_int_tls_config+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3704,32 +4346,36 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_ldap_int_tls_config=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_ldap_int_tls_config=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5
--echo "${ECHO_T}$ac_cv_func_ldap_int_tls_config" >&6; }
--if test $ac_cv_func_ldap_int_tls_config = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5
-+$as_echo "$ac_cv_func_ldap_int_tls_config" >&6; }
-+if test "x$ac_cv_func_ldap_int_tls_config" = x""yes; then
-    SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INT_TLS_CONFIG"
- fi
- 
-@@ -3738,11 +4384,11 @@ fi
- 
- for ac_func in ldap_set_rebind_proc
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3795,44 +4441,51 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
- done
- 
--        { echo "$as_me:$LINENO: checking whether ldap_set_rebind_proc takes 3 arguments" >&5
--echo $ECHO_N "checking whether ldap_set_rebind_proc takes 3 arguments... $ECHO_C" >&6; }
-+        { $as_echo "$as_me:$LINENO: checking whether ldap_set_rebind_proc takes 3 arguments" >&5
-+$as_echo_n "checking whether ldap_set_rebind_proc takes 3 arguments... " >&6; }
- if test "${ac_cv_ldap_set_rebind_proc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
- 
-         cat >conftest.$ac_ext <<_ACEOF
-@@ -3858,20 +4511,21 @@ case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_ldap_set_rebind_proc=3
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_ldap_set_rebind_proc=2
-@@ -3879,8 +4533,8 @@ fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_ldap_set_rebind_proc" >&5
--echo "${ECHO_T}$ac_cv_ldap_set_rebind_proc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_ldap_set_rebind_proc" >&5
-+$as_echo "$ac_cv_ldap_set_rebind_proc" >&6; }
- 	fi
- 
- 	targetname=rlm_ldap
-@@ -3891,21 +4545,21 @@ fi
- 
- if test x"$fail" != x""; then
- 	if test x"${enable_strict_dependencies}" = x"yes"; then
--		{ { echo "$as_me:$LINENO: error: set --without-rlm_ldap to disable it explicitly." >&5
--echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;}
-+		{ { $as_echo "$as_me:$LINENO: error: set --without-rlm_ldap to disable it explicitly." >&5
-+$as_echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;}
-    { (exit 1); exit 1; }; }
- 	else
--		{ echo "$as_me:$LINENO: WARNING: silently not building rlm_ldap." >&5
--echo "$as_me: WARNING: silently not building rlm_ldap." >&2;}
--		{ echo "$as_me:$LINENO: WARNING: FAILURE: rlm_ldap requires: $fail." >&5
--echo "$as_me: WARNING: FAILURE: rlm_ldap requires: $fail." >&2;}
-+		{ $as_echo "$as_me:$LINENO: WARNING: silently not building rlm_ldap." >&5
-+$as_echo "$as_me: WARNING: silently not building rlm_ldap." >&2;}
-+		{ $as_echo "$as_me:$LINENO: WARNING: FAILURE: rlm_ldap requires: $fail." >&5
-+$as_echo "$as_me: WARNING: FAILURE: rlm_ldap requires: $fail." >&2;}
- 		if test x"$headersuggestion" != x; then
--			{ echo "$as_me:$LINENO: WARNING: $headersuggestion" >&5
--echo "$as_me: WARNING: $headersuggestion" >&2;}
-+			{ $as_echo "$as_me:$LINENO: WARNING: $headersuggestion" >&5
-+$as_echo "$as_me: WARNING: $headersuggestion" >&2;}
- 		fi
- 		if test x"$libsuggestion" != x; then
--			{ echo "$as_me:$LINENO: WARNING: $libsuggestion" >&5
--echo "$as_me: WARNING: $libsuggestion" >&2;}
-+			{ $as_echo "$as_me:$LINENO: WARNING: $libsuggestion" >&5
-+$as_echo "$as_me: WARNING: $libsuggestion" >&2;}
- 		fi
- 		targetname=""
- 	fi
-@@ -3966,11 +4620,12 @@ _ACEOF
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -4003,12 +4658,12 @@ echo "$as_me: WARNING: Cache variable $a
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
--      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
--echo "$as_me: updating cache $cache_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -4025,6 +4680,12 @@ test "x$exec_prefix" = xNONE && exec_pre
- # take arguments), then branch to the quote section.  Otherwise,
- # look for a macro that doesn't take arguments.
- ac_script='
-+:mline
-+/\\$/{
-+ N
-+ s,\\\n,,
-+ b mline
-+}
- t clear
- :clear
- s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
-@@ -4054,7 +4715,7 @@ ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
--  ac_i=`echo "$ac_i" | sed "$ac_script"`
-+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-   #    will be set to the directory where LIBOBJS objects are built.
-   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -4067,11 +4728,12 @@ LTLIBOBJS=$ac_ltlibobjs
- 
- 
- : ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF
-+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- #! $SHELL
- # Generated by $as_me.
- # Run this file to recreate the current configuration.
-@@ -4084,7 +4746,7 @@ ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
-@@ -4094,7 +4756,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
-@@ -4116,17 +4778,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-   else
--    PATH_SEPARATOR=:
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-   fi
--  rm -f conf$$.sh
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
- fi
- 
- # Support unset when possible.
-@@ -4142,8 +4832,6 @@ fi
- # there to prevent editors from complaining about space-tab.
- # (If _AS_PATH_WALK were called with IFS unset, it would disable word
- # splitting by setting IFS to empty value.)
--as_nl='
--'
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
-@@ -4166,7 +4854,7 @@ if test "x$as_myself" = x; then
-   as_myself=$0
- fi
- if test ! -f "$as_myself"; then
--  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
- fi
- 
-@@ -4179,17 +4867,10 @@ PS2='> '
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
--do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
--  else
--    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--  fi
--done
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
- 
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -4211,7 +4892,7 @@ as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X/"$0" |
-+$as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
-@@ -4262,7 +4943,7 @@ $as_unset CDPATH
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -4290,7 +4971,6 @@ case `echo -n x` in
- *)
-   ECHO_N='-n';;
- esac
--
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -4303,19 +4983,22 @@ if test -d conf$$.dir; then
-   rm -f conf$$.dir/conf$$.file
- else
-   rm -f conf$$.dir
--  mkdir conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
- fi
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s='ln -s'
--  # ... but there are two gotchas:
--  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
--  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--  # In both cases, we have to default to `cp -p'.
--  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-     as_ln_s='cp -p'
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
-+  fi
- else
-   as_ln_s='cp -p'
- fi
-@@ -4340,10 +5023,10 @@ else
-   as_test_x='
-     eval sh -c '\''
-       if test -d "$1"; then
--        test -d "$1/.";
-+	test -d "$1/.";
-       else
- 	case $1 in
--        -*)set "./$1";;
-+	-*)set "./$1";;
- 	esac;
- 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- 	???[sx]*):;;*)false;;esac;fi
-@@ -4366,7 +5049,7 @@ exec 6>&1
- # values after options handling.
- ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.61.  Invocation command line was
-+generated by GNU Autoconf 2.63.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -4379,26 +5062,33 @@ on `(hostname || uname -n) 2>/dev/null |
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<_ACEOF
-+case $ac_config_files in *"
-+"*) set x $ac_config_files; shift; ac_config_files=$*;;
-+esac
-+
-+
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- # Files that config.status was made for.
- config_files="$ac_config_files"
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
- 
--Usage: $0 [OPTIONS] [FILE]...
-+Usage: $0 [OPTION]... [FILE]...
- 
-   -h, --help       print this help, then exit
-   -V, --version    print version number and configuration settings, then exit
--  -q, --quiet      do not print progress messages
-+  -q, --quiet, --silent
-+                   do not print progress messages
-   -d, --debug      don't remove temporary files
-       --recheck    update $as_me by reconfiguring in the same conditions
--  --file=FILE[:TEMPLATE]
--		   instantiate the configuration file FILE
-+      --file=FILE[:TEMPLATE]
-+                   instantiate the configuration file FILE
- 
- Configuration files:
- $config_files
-@@ -4406,23 +5096,23 @@ $config_files
- Report bugs to <bug-autoconf@gnu.org>."
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.61,
--  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.63,
-+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- 
--Copyright (C) 2006 Free Software Foundation, Inc.
-+Copyright (C) 2008 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
- ac_pwd='$ac_pwd'
- srcdir='$srcdir'
-+test -n "\$AWK" || AWK=awk
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
--# If no file are specified by the user, then we need to provide default
--# value.  By we need to know if files were specified by the user.
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# The default lists apply if the user does not specify any file.
- ac_need_defaults=:
- while test $# != 0
- do
-@@ -4444,21 +5134,24 @@ do
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
--    echo "$ac_cs_version"; exit ;;
-+    $as_echo "$ac_cs_version"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
--    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-     ac_need_defaults=false;;
-   --he | --h |  --help | --hel | -h )
--    echo "$ac_cs_usage"; exit ;;
-+    $as_echo "$ac_cs_usage"; exit ;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil | --si | --s)
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) { echo "$as_me: error: unrecognized option: $1
-+  -*) { $as_echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
- 
-@@ -4477,30 +5170,32 @@ if $ac_cs_silent; then
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- if \$ac_cs_recheck; then
--  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
--  CONFIG_SHELL=$SHELL
-+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  shift
-+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-+  CONFIG_SHELL='$SHELL'
-   export CONFIG_SHELL
--  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  exec "\$@"
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- exec 5>>config.log
- {
-   echo
-   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
- ## Running $as_me. ##
- _ASBOX
--  echo "$ac_log"
-+  $as_echo "$ac_log"
- } >&5
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- 
- # Handling of arguments.
- for ac_config_target in $ac_config_targets
-@@ -4508,8 +5203,8 @@ do
-   case $ac_config_target in
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- 
--  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
- done
-@@ -4548,114 +5243,143 @@ $debug ||
-   (umask 077 && mkdir "$tmp")
- } ||
- {
--   echo "$me: cannot create a temporary directory in ." >&2
-+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
--#
--# Set up the sed scripts for CONFIG_FILES section.
--#
--
--# No need to generate the scripts if there are no CONFIG_FILES.
--# This happens for instance when ./config.status config.h
-+# Set up the scripts for CONFIG_FILES section.
-+# No need to generate them if there are no CONFIG_FILES.
-+# This happens for instance with `./config.status config.h'.
- if test -n "$CONFIG_FILES"; then
- 
--_ACEOF
- 
-+ac_cr='
'
-+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-+  ac_cs_awk_cr='\\r'
-+else
-+  ac_cs_awk_cr=$ac_cr
-+fi
-+
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+_ACEOF
- 
- 
-+{
-+  echo "cat >conf$$subs.awk <<_ACEOF" &&
-+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-+  echo "_ACEOF"
-+} >conf$$subs.sh ||
-+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--SHELL!$SHELL$ac_delim
--PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
--PACKAGE_NAME!$PACKAGE_NAME$ac_delim
--PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
--PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
--PACKAGE_STRING!$PACKAGE_STRING$ac_delim
--PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
--exec_prefix!$exec_prefix$ac_delim
--prefix!$prefix$ac_delim
--program_transform_name!$program_transform_name$ac_delim
--bindir!$bindir$ac_delim
--sbindir!$sbindir$ac_delim
--libexecdir!$libexecdir$ac_delim
--datarootdir!$datarootdir$ac_delim
--datadir!$datadir$ac_delim
--sysconfdir!$sysconfdir$ac_delim
--sharedstatedir!$sharedstatedir$ac_delim
--localstatedir!$localstatedir$ac_delim
--includedir!$includedir$ac_delim
--oldincludedir!$oldincludedir$ac_delim
--docdir!$docdir$ac_delim
--infodir!$infodir$ac_delim
--htmldir!$htmldir$ac_delim
--dvidir!$dvidir$ac_delim
--pdfdir!$pdfdir$ac_delim
--psdir!$psdir$ac_delim
--libdir!$libdir$ac_delim
--localedir!$localedir$ac_delim
--mandir!$mandir$ac_delim
--DEFS!$DEFS$ac_delim
--ECHO_C!$ECHO_C$ac_delim
--ECHO_N!$ECHO_N$ac_delim
--ECHO_T!$ECHO_T$ac_delim
--LIBS!$LIBS$ac_delim
--build_alias!$build_alias$ac_delim
--host_alias!$host_alias$ac_delim
--target_alias!$target_alias$ac_delim
--CC!$CC$ac_delim
--CFLAGS!$CFLAGS$ac_delim
--LDFLAGS!$LDFLAGS$ac_delim
--CPPFLAGS!$CPPFLAGS$ac_delim
--ac_ct_CC!$ac_ct_CC$ac_delim
--EXEEXT!$EXEEXT$ac_delim
--OBJEXT!$OBJEXT$ac_delim
--edir!$edir$ac_delim
--ldap_ldflags!$ldap_ldflags$ac_delim
--ldap_cflags!$ldap_cflags$ac_delim
--targetname!$targetname$ac_delim
--LIBOBJS!$LIBOBJS$ac_delim
--LTLIBOBJS!$LTLIBOBJS$ac_delim
--_ACEOF
-+  . ./conf$$subs.sh ||
-+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
-+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-+  if test $ac_delim_n = $ac_delim_num; then
-     break
-   elif $ac_last_try; then
--    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
- done
-+rm -f conf$$subs.sh
- 
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
--if test -n "$ac_eof"; then
--  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
--  ac_eof=`expr $ac_eof + 1`
--fi
--
--cat >>$CONFIG_STATUS <<_ACEOF
--cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
--_ACEOF
--sed '
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
--s/^/s,@/; s/!/@,|#_!!_#|/
--:n
--t n
--s/'"$ac_delim"'$/,g/; t
--s/$/\\/; p
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
--' >>$CONFIG_STATUS <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--:end
--s/|#_!!_#|//g
--CEOF$ac_eof
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
- _ACEOF
-+sed -n '
-+h
-+s/^/S["/; s/!.*/"]=/
-+p
-+g
-+s/^[^!]*!//
-+:repl
-+t repl
-+s/'"$ac_delim"'$//
-+t delim
-+:nl
-+h
-+s/\(.\{148\}\).*/\1/
-+t more1
-+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-+p
-+n
-+b repl
-+:more1
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t nl
-+:delim
-+h
-+s/\(.\{148\}\).*/\1/
-+t more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"/
-+p
-+b
-+:more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t delim
-+' <conf$$subs.awk | sed '
-+/^[^""]/{
-+  N
-+  s/\n//
-+}
-+' >>$CONFIG_STATUS || ac_write_fail=1
-+rm -f conf$$subs.awk
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+_ACAWK
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-+  for (key in S) S_is_set[key] = 1
-+  FS = ""
- 
-+}
-+{
-+  line = $ 0
-+  nfields = split(line, field, "@")
-+  substed = 0
-+  len = length(field[1])
-+  for (i = 2; i < nfields; i++) {
-+    key = field[i]
-+    keylen = length(key)
-+    if (S_is_set[key]) {
-+      value = S[key]
-+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-+      len += length(value) + length(field[++i])
-+      substed = 1
-+    } else
-+      len += 1 + keylen
-+  }
-+
-+  print line
-+}
-+
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-+else
-+  cat
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-+   { (exit 1); exit 1; }; }
-+_ACEOF
- 
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-@@ -4672,19 +5396,21 @@ s/^[^=]*=[	 ]*$//
- }'
- fi
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- fi # test -n "$CONFIG_FILES"
- 
- 
--for ac_tag in  :F $CONFIG_FILES
-+eval set X "  :F $CONFIG_FILES      "
-+shift
-+for ac_tag
- do
-   case $ac_tag in
-   :[FHLC]) ac_mode=$ac_tag; continue;;
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
--echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-    { (exit 1); exit 1; }; };;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -4713,26 +5439,38 @@ echo "$as_me: error: Invalid tag $ac_tag
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
--echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-    { (exit 1); exit 1; }; };;
-       esac
--      ac_file_inputs="$ac_file_inputs $ac_f"
-+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-+      ac_file_inputs="$ac_file_inputs '$ac_f'"
-     done
- 
-     # Let's still pretend it is `configure' which instantiates (i.e., don't
-     # use $as_me), people would be surprised to read:
-     #    /* config.h.  Generated by config.status.  */
--    configure_input="Generated from "`IFS=:
--	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+    configure_input='Generated from '`
-+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-+	`' by configure.'
-     if test x"$ac_file" != x-; then
-       configure_input="$ac_file.  $configure_input"
--      { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-+$as_echo "$as_me: creating $ac_file" >&6;}
-     fi
-+    # Neutralize special characters interpreted by sed in replacement strings.
-+    case $configure_input in #(
-+    *\&* | *\|* | *\\* )
-+       ac_sed_conf_input=`$as_echo "$configure_input" |
-+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-+    *) ac_sed_conf_input=$configure_input;;
-+    esac
- 
-     case $ac_tag in
--    *:-:* | *:-) cat >"$tmp/stdin";;
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; } ;;
-     esac
-     ;;
-   esac
-@@ -4742,7 +5480,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
- 	 X"$ac_file" : 'X\(//\)[^/]' \| \
- 	 X"$ac_file" : 'X\(//\)$' \| \
- 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$ac_file" |
-+$as_echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -4768,7 +5506,7 @@ echo X"$ac_file" |
-     as_dirs=
-     while :; do
-       case $as_dir in #(
--      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-       *) as_qdir=$as_dir;;
-       esac
-       as_dirs="'$as_qdir' $as_dirs"
-@@ -4777,7 +5515,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
- 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$as_dir" |
-+$as_echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -4798,17 +5536,17 @@ echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
-   ac_builddir=.
- 
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-   # A ".." for each directory in $ac_dir_suffix.
--  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-   case $ac_top_builddir_sub in
-   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -4844,12 +5582,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- # If the template does not know about datarootdir, expand it.
- # FIXME: This hack should be removed a few years after 2.60.
- ac_datarootdir_hack=; ac_datarootdir_seen=
- 
--case `sed -n '/datarootdir/ {
-+ac_sed_dataroot='
-+/datarootdir/ {
-   p
-   q
- }
-@@ -4858,13 +5597,14 @@ case `sed -n '/datarootdir/ {
- /@infodir@/p
- /@localedir@/p
- /@mandir@/p
--' $ac_file_inputs` in
-+'
-+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
- *datarootdir*) ac_datarootdir_seen=yes;;
- *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
--  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
--echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-   ac_datarootdir_hack='
-   s&@datadir@&$datadir&g
-   s&@docdir@&$docdir&g
-@@ -4878,15 +5618,16 @@ _ACEOF
- # Neutralize VPATH when `$srcdir' = `.'.
- # Shell code in configure.ac might set extrasub.
- # FIXME: do we really want to maintain this feature?
--cat >>$CONFIG_STATUS <<_ACEOF
--  sed "$ac_vpsub
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_sed_extra="$ac_vpsub
- $extrasub
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s&@configure_input@&$configure_input&;t t
-+s|@configure_input@|$ac_sed_conf_input|;t t
- s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@top_build_prefix@&$ac_top_build_prefix&;t t
- s&@srcdir@&$ac_srcdir&;t t
- s&@abs_srcdir@&$ac_abs_srcdir&;t t
- s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -4895,21 +5636,28 @@ s&@builddir@&$ac_builddir&;t t
- s&@abs_builddir@&$ac_abs_builddir&;t t
- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
- $ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-+"
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; }
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
--  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined.  Please make sure it is defined." >&5
--echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined.  Please make sure it is defined." >&2;}
- 
-   rm -f "$tmp/stdin"
-   case $ac_file in
--  -) cat "$tmp/out"; rm -f "$tmp/out";;
--  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
--  esac
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+  esac \
-+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; }
-  ;;
- 
- 
-@@ -4924,6 +5672,11 @@ _ACEOF
- chmod +x $CONFIG_STATUS
- ac_clean_files=$ac_clean_files_save
- 
-+test $ac_write_fail = 0 ||
-+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+
- 
- # configure is writing to config.log, and then calls config.status.
- # config.status does its own redirection, appending to config.log.
-@@ -4945,5 +5698,9 @@ if test "$no_create" != yes; then
-   # would make configure fail if this is the last instruction.
-   $ac_cs_success || { (exit 1); exit 1; }
- fi
-+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-+fi
- 
- 
---- a/src/modules/rlm_ldap/configure.in
-+++ b/src/modules/rlm_ldap/configure.in
-@@ -87,6 +87,9 @@ if test x$with_[]modname != xno; then
- 			 )
- 	fi
- 
-+	FR_SMART_CHECK_LIB(sasl, sasl_encode)
-+	FR_SMART_CHECK_LIB(lber, ber_init)
-+
- 	dnl Try only "-lldap_r" or "-lldap"
- 	dnl Static linking will probably not work, but nobody ever
- 	dnl complained about it.
 

--- a/net/freeradius2/patches/008-honor_ccpflags.patch
+++ /dev/null
@@ -1,16 +1,1 @@
---- a/src/modules/rules.mak
-+++ b/src/modules/rules.mak
-@@ -63,10 +63,10 @@ $(LT_OBJS): $(SERVER_HEADERS)
- #
- #######################################################################
- %.lo: %.c
--	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(RLM_CFLAGS) -c $<
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $<
- 
- %.lo: %.cpp
--	$(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(RLM_CFLAGS) -c $<
-+	$(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $<
- 
- ifneq ($(TARGET),)
- #######################################################################
 

--- a/net/freeradius2/patches/010-disbale-openssl-check.patch
+++ /dev/null
@@ -1,39 +1,1 @@
---- a/configure.in
-+++ b/configure.in
-@@ -831,35 +831,6 @@ if test "x$WITH_OPENSSL" = xyes; then
-     OPENSSL_INCLUDE="-DOPENSSL_NO_KRB5"
-   fi
- 
--  dnl #
--  dnl #  Now check that the header versions match the library
--  dnl #
--  AC_MSG_CHECKING([OpenSSL library and header version consistency])
--  AC_RUN_IFELSE(
--    [AC_LANG_PROGRAM(
--      [[
--        #include <stdio.h>
--        #include <openssl/opensslv.h>
--        #include <openssl/crypto.h>
--      ]],
--      [[
--        if (SSLeay() == OPENSSL_VERSION_NUMBER) {
--          return 0;
--        } else {
--          printf("library: %lx header: %lx... ", (unsigned long) SSLeay(), (unsigned long) OPENSSL_VERSION_NUMBER);
--          return 1;
--        }
--      ]]
--    )],
--    [
--      AC_MSG_RESULT(yes)
--    ],
--    [
--      AC_MSG_RESULT(no)
--      AC_MSG_FAILURE([OpenSSL library version does not match header version])
--    ]
--  )
--
-   if test "x$OPENSSL_LIBS" = x; then
-     LIBS=$old_LIBS
-     LDFLAGS="$old_LDFLAGS"
 

file:a/net/fwknop/Makefile (deleted)
--- a/net/fwknop/Makefile
+++ /dev/null
@@ -1,120 +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:=fwknop
-PKG_VERSION:=2.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download
-PKG_MD5SUM:=96de4c5a4ae75a8618ef80269c6a70ad
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fwknop/Default
-  TITLE:=FireWall KNock OPerator
-  URL:=http://www.cipherdyne.org/fwknop/
-  MAINTAINER:=Jonathan Bennett <jbscience87@gmail.com>
-endef
-
-define Package/fwknop/Default/description
-  Fwknop implements an authorization scheme known as Single Packet Authorization
-  (SPA) for Linux systems running iptables.  This mechanism requires only a
-  single encrypted and non-replayed packet to communicate various pieces of
-  information including desired access through an iptables policy. The main
-  application of this program is to use iptables in a default-drop stance to
-  protect services such as SSH with an additional layer of security in order to
-  make the exploitation of vulnerabilities (both 0-day and unpatched code) much
-  more difficult.
-endef
-
-define Package/fwknopd
-  $(call Package/fwknop/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall
-  TITLE+= Daemon
-  DEPENDS:=+iptables +libfko +libpcap
-endef
-
-define Package/fwknopd/description
-  $(call Package/fwknop/Default/description)
-  This package contains the fwknop daemon.
-endef
-
-define Package/fwknopd/conffiles
-/etc/fwknop/access.conf
-/etc/fwknop/fwknopd.conf
-endef
-
-define Package/fwknop
-  $(call Package/fwknop/Default)
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Firewall
-  TITLE+= Client
-  DEPENDS:=+libfko
-endef
-
-define Package/fwknop/description
-  $(call Package/fwknop/Default/description)
-  This package contains the fwknop client.
-endef
-
-define Package/libfko
-  $(call Package/fwknop/Default)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=Firewall
-  TITLE+= Library
-endef
-
-define Package/libfko/description
-  $(call Package/fwknop/Default/description)
-  This package contains the libfko shared library.
-endef
-
-CONFIGURE_ARGS += \
-	--without-gpgme \
-	--with-iptables=/usr/sbin/iptables
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/fko.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfko.{a,la,so*} $(1)/usr/lib/
-endef
-
-define Package/fwknopd/install
-	$(INSTALL_DIR) $(1)/etc/fwknop
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/fwknop/{access,fwknopd}.conf \
-		$(1)/etc/fwknop/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/extras/fwknop.init.openwrt \
-		$(1)/etc/init.d/fwknopd
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fwknopd $(1)/usr/sbin/
-endef
-
-define Package/fwknop/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fwknop $(1)/usr/bin/
-endef
-
-define Package/libfko/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfko.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,fwknopd))
-$(eval $(call BuildPackage,fwknop))
-$(eval $(call BuildPackage,libfko))
-

--- a/net/fwknop/patches/001-fix_config.patch
+++ /dev/null
@@ -1,33 +1,1 @@
---- a/server/fwknopd.conf
-+++ b/server/fwknopd.conf
-@@ -29,7 +29,12 @@
- # Define the ethernet interface on which we will sniff packets.
- # Default if not set is eth0.
- #
--#PCAP_INTF                   eth0;
-+
-+# The following line is changed specifically for Openwrt.
-+# Openwrt defaults to using eth1 as its wan port. If using PPPoE,
-+# Then this needs to be set to pppoe-wan.
-+
-+PCAP_INTF                   eth1;
- 
- # By default fwknopd does not put the pcap interface into promiscuous mode.
- # Set this to 'Y' to enable promiscuous sniffing.
-@@ -252,8 +257,13 @@
- # The IPT_FORWARD_ACCESS variable is only used if ENABLE_IPT_FORWARDING is
- # enabled.
- #
--#IPT_FORWARD_ACCESS      ACCEPT, filter, FORWARD, 1, FWKNOP_FORWARD, 1;
--#IPT_DNAT_ACCESS         DNAT, nat, PREROUTING, 1, FWKNOP_PREROUTING, 1;
-+
-+# These two lines are changed specifically for Openwrt, due to
-+# different naming conventions. IPT_FORWARD is still disabled
-+# by default, and must be enabled earlier in this file to be used.
-+
-+IPT_FORWARD_ACCESS      ACCEPT, filter, zone_wan_forward, 1, FWKNOP_FORWARD, 1;
-+IPT_DNAT_ACCESS         DNAT, nat, zone_wan_prerouting, 1, FWKNOP_PREROUTING, 1;
- 
- # The IPT_SNAT_ACCESS variable is not used unless both ENABLE_IPT_SNAT and
- # ENABLE_IPT_FORWARDING are enabled.  Also, the external static IP must be
 

--- a/net/fwknop/patches/002-fix_init.patch
+++ /dev/null
@@ -1,18 +1,1 @@
---- a/extras/openwrt/package/fwknop/files/fwknopd.init
-+++ b/extras/openwrt/package/fwknop/files/fwknopd.init
-@@ -8,12 +8,12 @@ FWKNOPD_BIN=/usr/sbin/fwknopd
- 
- start()
- {
--	$FWKNOPD_BIN
-+	service_start $FWKNOPD_BIN
- }
- 
- stop()
- {
--	$FWKNOPD_BIN -K
-+	service_stop $FWKNOPD_BIN -K
- }
- 
- restart()
 

file:a/net/haproxy/Makefile (deleted)
--- a/net/haproxy/Makefile
+++ /dev/null
@@ -1,63 +1,1 @@
-#
-# Copyright (C) 2010-2011 OpenWrt.org
-# Copyright (C) 2009-2010 Thomas Heil <heil@terminal-consulting.de>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=haproxy
-PKG_VERSION:=1.4.25
-PKG_RELEASE:=01
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src
-PKG_MD5SUM:=74b5ec1f0f9b4d148c8083bcfb512ccd
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/haproxy
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=The Reliable, High Performance TCP/HTTP Load Balancer
-  URL:=http://haproxy.1wt.eu/
-  DEPENDS:=+libpcre +libltdl
-  MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
-endef
-
-define Package/haproxy/conffiles
-/etc/haproxy.cfg
-endef
-
-define Package/haproxy/description
-  Open source High Performance TCP/HTTP Load Balancer
-endef
-
-define Build/Compile
-	$(MAKE) TARGET=linux2628 -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LD="$(TARGET_CC)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=8192 -DSYSTEM_MAXCONN=65530" USE_LINUX_TPROXY=1 USE_LINUX_SPLICE=1 \
-		VERSION="$(PKG_VERSION)-patch$(PKG_RELEASE)" \
-		all install
-endef
-
-define Package/haproxy/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/haproxy $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/haproxy.cfg $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/haproxy.init $(1)/etc/init.d/haproxy
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/net
-	$(INSTALL_BIN) ./files/haproxy.hotplug $(1)/etc/hotplug.d/net/90-haproxy
-endef
-
-$(eval $(call BuildPackage,haproxy))
-

--- a/net/haproxy/files/haproxy.cfg
+++ /dev/null
@@ -1,101 +1,1 @@
-# Example configuration file for HAProxy 1.3, refer to the url below for
-# a full documentation and examples for configuration:
-# http://haproxy.1wt.eu/download/1.3/doc/configuration.txt
 
-
-# Global parameters
-global
-
-	# Log events to a remote syslog server at given address using the
-	# specified facility and verbosity level. Multiple log options 
-	# are allowed.
-	#log 10.0.0.1 daemon info
-
-	# Specifiy the maximum number of allowed connections.
-	maxconn 32000
-
-	# Raise the ulimit for the maximum allowed number of open socket
-	# descriptors per process. This is usually at least twice the
-	# number of allowed connections (maxconn * 2 + nb_servers + 1) .
-	ulimit-n 65535
-
-	# Drop privileges (setuid, setgid), default is "root" on OpenWrt.
-	uid 0
-	gid 0
-
-	# Perform chroot into the specified directory.
-	#chroot /var/run/haproxy/
-
-	# Daemonize on startup
-	daemon
-
-	nosplice
-	# Enable debugging
-	#debug
-
-	# Spawn given number of processes and distribute load among them,
-	# used for multi-core environments or to circumvent per-process
-	# limits like number of open file descriptors. Default is 1.
-	#nbproc 2
-
-
-# Example HTTP proxy listener
-listen my_http_proxy
-
-	# Bind to port 81 and 444 on all interfaces (0.0.0.0)
-	bind :81,:444
-
-	# We're proxying HTTP here...
-	mode http
-
-	# Simple HTTP round robin over two servers using the specified
-	# source ip 192.168.1.1 .
-	balance roundrobin
-	server server01 192.168.1.10:80 source 192.168.1.1
-	server server02 192.168.1.20:80 source 192.168.1.1
-
-	# Serve an internal statistics page on /stats:
-	stats enable
-	stats uri /stats
-
-	# Enable HTTP basic auth for the statistics:
-	stats realm HA_Stats
-	stats auth username:password
-
-
-# Example SMTP proxy listener
-listen my_smtp_proxy
-
-	# Disable this instance without commenting out the section.
-	disabled
-
-	# Bind to port 26 and 588 on localhost
-	bind 127.0.0.1:26,127.0.0.1:588
-
-	# This is a TCP proxy
-	mode tcp
-
-	# Round robin load balancing over two servers on port 123 forcing
-	# the address 192.168.1.1 and port 25 as source.
-	balance roundrobin
-  #use next line for transparent proxy, so the servers can see the 
-  #original ip-address and remove source keyword in server definition
-  #source 0.0.0.0 usesrc clientip
-	server server01 192.168.1.10:123 source 192.168.1.1:25
-	server server02 192.168.1.20:123 source 192.168.1.1:25
-	
-
-# Special health check listener for integration with external load
-# balancers.
-listen local_health_check
-
-	# Listen on port 60000
-	bind :60000
-
-	# This is a health check
-	mode health
-
-	# Enable HTTP-style responses: "HTTP/1.0 200 OK"
-	# else just print "OK".
-	#option httpchk
-

--- a/net/haproxy/files/haproxy.hotplug
+++ /dev/null
@@ -1,9 +1,1 @@
-#!/bin/sh
 
-if [ "$ACTION" = add ]; then
-
-	/etc/init.d/haproxy enabled && \
-		/etc/init.d/haproxy start
-fi
-
-

--- a/net/haproxy/files/haproxy.init
+++ /dev/null
@@ -1,24 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2010 OpenWrt.org
 
-START=99
-STOP=80
-
-SERVICE_USE_PID=1
-
-HAPROXY_BIN="/usr/sbin/haproxy"
-HAPROXY_CONFIG="/etc/haproxy.cfg"
-HAPROXY_PID="/var/run/haproxy.pid"
-
-start() {
-	service_start $HAPROXY_BIN -q -D -f "$HAPROXY_CONFIG" -p "$HAPROXY_PID"
-}
-
-stop() {
-	service_stop $HAPROXY_BIN
-}
-
-reload() {
-	$HAPROXY_BIN -D -q -f $HAPROXY_CONFIG -p $HAPROXY_PID -sf $(cat $HAPROXY_PID)
-}
-

--- a/net/haproxy/patches/001-haproxy-1.4.x-sendproxy.patch
+++ /dev/null
@@ -1,507 +1,1 @@
-From af2038557a14bf6e2915bed545e216a0f1a95fc5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cyril=20Bont=C3=A9?= <cyril.bonte@free.fr>
-Date: Mon, 15 Apr 2013 22:05:00 +0200
-Subject: [PATCH] Proxy Protocol based on haproxy 1.4.23
 
----
- doc/configuration.txt     |  26 ++++++-
- include/common/standard.h |  25 ++++++-
- include/proto/client.h    |   1 +
- include/types/buffers.h   |  20 ++---
- include/types/protocols.h |   1 +
- src/cfgparse.c            |  15 +++-
- src/client.c              | 186 ++++++++++++++++++++++++++++++++++++++++++++++
- src/proto_http.c          |   4 +-
- src/session.c             |   7 ++
- src/standard.c            |   9 ++-
- 10 files changed, 275 insertions(+), 19 deletions(-)
-
-Index: haproxy-1.4.25/doc/configuration.txt
-===================================================================
---- haproxy-1.4.25.orig/doc/configuration.txt
-+++ haproxy-1.4.25/doc/configuration.txt
-@@ -1343,6 +1343,7 @@ bind [<address>]:<port_range> [, ...] tr
- bind [<address>]:<port_range> [, ...] id <id>
- bind [<address>]:<port_range> [, ...] name <name>
- bind [<address>]:<port_range> [, ...] defer-accept
-+bind [<address>]:<port_range> [, ...] accept-proxy
-   Define one or several listening addresses and/or ports in a frontend.
-   May be used in sections :   defaults | frontend | listen | backend
-                                   no   |    yes   |   yes  |   no
-@@ -1423,6 +1424,19 @@ bind [<address>]:<port_range> [, ...] de
-                   with front firewalls which would see an established
-                   connection while the proxy will only see it in SYN_RECV.
- 
-+    accept-proxy  is an optional keyword which enforces use of the PROXY
-+                  protocol over any connection accepted by this listener. The
-+                  PROXY protocol dictates the layer 3/4 addresses of the
-+                  incoming connection to be used everywhere an address is used,
-+                  with the only exception of "tcp-request connection" rules
-+                  which will only see the real connection address. Logs will
-+                  reflect the addresses indicated in the protocol, unless it is
-+                  violated, in which case the real address will still be used.
-+                  This keyword combined with support from external components
-+                  can be used as an efficient and reliable alternative to the
-+                  X-Forwarded-For mechanism which is not always reliable and
-+                  not even always usable.
-+
-   It is possible to specify a list of address:port combinations delimited by
-   commas. The frontend will then listen on all of these addresses. There is no
-   fixed limit to the number of addresses and ports which can be listened on in
-@@ -1433,8 +1447,10 @@ bind [<address>]:<port_range> [, ...] de
-         listen http_proxy
-             bind :80,:443
-             bind 10.0.0.1:10080,10.0.0.1:10443
-+            bind 127.0.0.1:8443 accept-proxy
- 
--  See also : "source".
-+  See also : "source", "option forwardfor" and the PROXY protocol
-+             documentation.
- 
- 
- bind-process [ all | odd | even | <number 1-32> ] ...
-@@ -7257,7 +7273,9 @@ marked with a star ('*') after the field
- 
- Detailed fields description :
-   - "client_ip" is the IP address of the client which initiated the TCP
--    connection to haproxy.
-+    connection to haproxy. Note that when the connection is accepted on a
-+    socket configured with "accept-proxy" and the PROXY protocol is correctly
-+    used, then the logs will reflect the forwarded connection's information.
- 
-   - "client_port" is the TCP port of the client which initiated the connection.
- 
-@@ -7430,7 +7448,9 @@ with a star ('*') after the field name b
- 
- Detailed fields description :
-   - "client_ip" is the IP address of the client which initiated the TCP
--    connection to haproxy.
-+    connection to haproxy. Note that when the connection is accepted on a
-+    socket configured with "accept-proxy" and the PROXY protocol is correctly
-+    used, then the logs will reflect the forwarded connection's information.
- 
-   - "client_port" is the TCP port of the client which initiated the connection.
- 
-Index: haproxy-1.4.25/include/common/standard.h
-===================================================================
---- haproxy-1.4.25.orig/include/common/standard.h
-+++ haproxy-1.4.25/include/common/standard.h
-@@ -269,6 +269,28 @@ static inline unsigned int __strl2uic(co
- 	return i;
- }
- 
-+/* This function reads an unsigned integer from the string pointed to by <s>
-+ * and returns it. The <s> pointer is adjusted to point to the first unread
-+ * char. The function automatically stops at <end>.
-+ */
-+static inline unsigned int __read_uint(const char **s, const char *end)
-+{
-+	const char *ptr = *s;
-+	unsigned int i = 0;
-+	unsigned int j, k;
-+
-+	while (ptr < end) {
-+		j = *ptr - '0';
-+		k = i * 10;
-+		if (j > 9)
-+			break;
-+		i = k + j;
-+		ptr++;
-+	}
-+	*s = ptr;
-+	return i;
-+}
-+
- extern unsigned int str2ui(const char *s);
- extern unsigned int str2uic(const char *s);
- extern unsigned int strl2ui(const char *s, int len);
-@@ -276,9 +298,10 @@ extern unsigned int strl2uic(const char 
- extern int strl2ic(const char *s, int len);
- extern int strl2irc(const char *s, int len, int *ret);
- extern int strl2llrc(const char *s, int len, long long *ret);
-+extern unsigned int read_uint(const char **s, const char *end);
- unsigned int inetaddr_host(const char *text);
- unsigned int inetaddr_host_lim(const char *text, const char *stop);
--unsigned int inetaddr_host_lim_ret(const char *text, char *stop, const char **ret);
-+unsigned int inetaddr_host_lim_ret(char *text, char *stop, char **ret);
- 
- static inline char *cut_crlf(char *s) {
- 
-Index: haproxy-1.4.25/include/proto/client.h
-===================================================================
---- haproxy-1.4.25.orig/include/proto/client.h
-+++ haproxy-1.4.25/include/proto/client.h
-@@ -25,6 +25,7 @@
- #include <common/config.h>
- #include <types/session.h>
- 
-+int frontend_decode_proxy_request(struct session *s, struct buffer *req, int an_bit);
- void get_frt_addr(struct session *s);
- int event_accept(int fd);
- 
-Index: haproxy-1.4.25/include/types/buffers.h
-===================================================================
---- haproxy-1.4.25.orig/include/types/buffers.h
-+++ haproxy-1.4.25/include/types/buffers.h
-@@ -135,16 +135,16 @@
-  * The field is blanked by buffer_init() and only by analysers themselves
-  * afterwards.
-  */
--#define AN_REQ_INSPECT          0x00000001  /* inspect request contents */
--#define AN_REQ_WAIT_HTTP        0x00000002  /* wait for an HTTP request */
--#define AN_REQ_HTTP_PROCESS_FE  0x00000004  /* process the frontend's HTTP part */
--#define AN_REQ_SWITCHING_RULES  0x00000008  /* apply the switching rules */
--#define AN_REQ_HTTP_PROCESS_BE  0x00000010  /* process the backend's HTTP part */
--#define AN_REQ_HTTP_INNER       0x00000020  /* inner processing of HTTP request */
--#define AN_REQ_HTTP_TARPIT      0x00000040  /* wait for end of HTTP tarpit */
--#define AN_REQ_HTTP_BODY        0x00000080  /* inspect HTTP request body */
--#define AN_REQ_STICKING_RULES   0x00000100  /* table persistence matching */
--/* unused: 0x200 */
-+#define AN_REQ_DECODE_PROXY     0x00000001  /* take the proxied address from a 'PROXY' line */
-+#define AN_REQ_INSPECT          0x00000002  /* inspect request contents */
-+#define AN_REQ_WAIT_HTTP        0x00000004  /* wait for an HTTP request */
-+#define AN_REQ_HTTP_PROCESS_FE  0x00000008  /* process the frontend's HTTP part */
-+#define AN_REQ_SWITCHING_RULES  0x00000010  /* apply the switching rules */
-+#define AN_REQ_HTTP_PROCESS_BE  0x00000020  /* process the backend's HTTP part */
-+#define AN_REQ_HTTP_INNER       0x00000040  /* inner processing of HTTP request */
-+#define AN_REQ_HTTP_TARPIT      0x00000080  /* wait for end of HTTP tarpit */
-+#define AN_REQ_HTTP_BODY        0x00000100  /* inspect HTTP request body */
-+#define AN_REQ_STICKING_RULES   0x00000200  /* table persistence matching */
- #define AN_REQ_PRST_RDP_COOKIE  0x00000400  /* persistence on rdp cookie */
- #define AN_REQ_HTTP_XFER_BODY   0x00000800  /* forward request body */
- 
-Index: haproxy-1.4.25/include/types/protocols.h
-===================================================================
---- haproxy-1.4.25.orig/include/types/protocols.h
-+++ haproxy-1.4.25/include/types/protocols.h
-@@ -72,6 +72,7 @@
- #define LI_O_FOREIGN	0x0002	/* permit listening on foreing addresses */
- #define LI_O_NOQUICKACK	0x0004	/* disable quick ack of immediate data (linux) */
- #define LI_O_DEF_ACCEPT	0x0008	/* wait up to 1 second for data before accepting */
-+#define LI_O_ACC_PROXY  0x0010  /* find the proxied address in the first request line */
- 
- /* The listener will be directly referenced by the fdtab[] which holds its
-  * socket. The listener provides the protocol-specific accept() function to
-Index: haproxy-1.4.25/src/cfgparse.c
-===================================================================
---- haproxy-1.4.25.orig/src/cfgparse.c
-+++ haproxy-1.4.25/src/cfgparse.c
-@@ -1467,6 +1467,16 @@ int cfg_parse_listen(const char *file, i
- #endif
- 			}
- 
-+			if (!strcmp(args[cur_arg], "accept-proxy")) { /* expect a 'PROXY' line first */
-+				struct listener *l;
-+
-+				for (l = curproxy->listen; l != last_listen; l = l->next)
-+					l->options |= LI_O_ACC_PROXY;
-+
-+				cur_arg ++;
-+				continue;
-+			}
-+
- 			if (!strcmp(args[cur_arg], "name")) {
- 				struct listener *l;
- 
-@@ -1519,7 +1529,7 @@ int cfg_parse_listen(const char *file, i
- 				continue;
- 			}
- 
--			Alert("parsing [%s:%d] : '%s' only supports the 'transparent', 'defer-accept', 'name', 'id', 'mss' and 'interface' options.\n",
-+			Alert("parsing [%s:%d] : '%s' only supports the 'transparent', 'accept-proxy', 'defer-accept', 'name', 'id', 'mss' and 'interface' options.\n",
- 			      file, linenum, args[0]);
- 			err_code |= ERR_ALERT | ERR_FATAL;
- 			goto out;
-@@ -5743,6 +5753,9 @@ out_uri_auth_compat:
- 			listener->handler = process_session;
- 			listener->analysers |= curproxy->fe_req_ana;
- 
-+			if (listener->options & LI_O_ACC_PROXY)
-+				listener->analysers |= AN_REQ_DECODE_PROXY;
-+
- 			/* smart accept mode is automatic in HTTP mode */
- 			if ((curproxy->options2 & PR_O2_SMARTACC) ||
- 			    (curproxy->mode == PR_MODE_HTTP &&
-Index: haproxy-1.4.25/src/client.c
-===================================================================
---- haproxy-1.4.25.orig/src/client.c
-+++ haproxy-1.4.25/src/client.c
-@@ -22,6 +22,7 @@
- 
- #include <common/compat.h>
- #include <common/config.h>
-+#include <common/debug.h>
- #include <common/time.h>
- 
- #include <types/global.h>
-@@ -43,6 +44,191 @@
- #include <proto/task.h>
- 
- 
-+/* This analyser tries to fetch a line from the request buffer which looks like :
-+ *
-+ *   "PROXY" <SP> PROTO <SP> SRC3 <SP> DST3 <SP> SRC4 <SP> <DST4> "\r\n"
-+ *
-+ * There must be exactly one space between each field. Fields are :
-+ *  - PROTO : layer 4 protocol, which must be "TCP4" or "TCP6".
-+ *  - SRC3  : layer 3 (eg: IP) source address in standard text form
-+ *  - DST3  : layer 3 (eg: IP) destination address in standard text form
-+ *  - SRC4  : layer 4 (eg: TCP port) source address in standard text form
-+ *  - DST4  : layer 4 (eg: TCP port) destination address in standard text form
-+ *
-+ * This line MUST be at the beginning of the buffer and MUST NOT wrap.
-+ *
-+ * Once the data is fetched, the values are set in the session's field and data
-+ * are removed from the buffer. The function returns zero if it needs to wait
-+ * for more data (max: timeout_client), or 1 if it has finished and removed itself.
-+ */
-+int frontend_decode_proxy_request(struct session *s, struct buffer *req, int an_bit)
-+{
-+	char *line = req->data;
-+	char *end = req->data + req->l;
-+	int len;
-+
-+	DPRINTF(stderr,"[%u] %s: session=%p b=%p, exp(r,w)=%u,%u bf=%08x bl=%d analysers=%02x\n",
-+		now_ms, __FUNCTION__,
-+		s,
-+		req,
-+		req->rex, req->wex,
-+		req->flags,
-+		req->l,
-+		req->analysers);
-+
-+	if (req->flags & (BF_READ_ERROR|BF_READ_TIMEOUT))
-+		goto fail;
-+
-+	len = MIN(req->l, 6);
-+	if (!len)
-+		goto missing;
-+
-+	/* Decode a possible proxy request, fail early if it does not match */
-+	if (strncmp(line, "PROXY ", len) != 0)
-+		goto fail;
-+
-+	line += 6;
-+	if (req->l < 18) /* shortest possible line */
-+		goto missing;
-+
-+	if (!memcmp(line, "TCP4 ", 5) != 0) {
-+		u32 src3, dst3, sport, dport;
-+
-+		line += 5;
-+
-+		src3 = inetaddr_host_lim_ret(line, end, &line);
-+		if (line == end)
-+			goto missing;
-+		if (*line++ != ' ')
-+			goto fail;
-+
-+		dst3 = inetaddr_host_lim_ret(line, end, &line);
-+		if (line == end)
-+			goto missing;
-+		if (*line++ != ' ')
-+			goto fail;
-+
-+		sport = read_uint((const char **)&line, end);
-+		if (line == end)
-+			goto missing;
-+		if (*line++ != ' ')
-+			goto fail;
-+
-+		dport = read_uint((const char **)&line, end);
-+		if (line > end - 2)
-+			goto missing;
-+		if (*line++ != '\r')
-+			goto fail;
-+		if (*line++ != '\n')
-+			goto fail;
-+
-+		/* update the session's addresses and mark them set */
-+		((struct sockaddr_in *)&s->cli_addr)->sin_family      = AF_INET;
-+		((struct sockaddr_in *)&s->cli_addr)->sin_addr.s_addr = htonl(src3);
-+		((struct sockaddr_in *)&s->cli_addr)->sin_port        = htons(sport);
-+
-+		((struct sockaddr_in *)&s->frt_addr)->sin_family      = AF_INET;
-+		((struct sockaddr_in *)&s->frt_addr)->sin_addr.s_addr = htonl(dst3);
-+		((struct sockaddr_in *)&s->frt_addr)->sin_port        = htons(dport);
-+		s->flags |= SN_FRT_ADDR_SET;
-+
-+	}
-+	else if (!memcmp(line, "TCP6 ", 5) != 0) {
-+		u32 sport, dport;
-+		char *src_s;
-+		char *dst_s, *sport_s, *dport_s;
-+		struct in6_addr src3, dst3;
-+
-+		line+=5;
-+
-+		src_s = line;
-+		dst_s = sport_s = dport_s = NULL;
-+		while (1) {
-+			if (line > end - 2) {
-+				goto missing;
-+			}
-+			else if (*line == '\r') {
-+				*line = 0;
-+				line++;
-+				if (*line++ != '\n')
-+					goto fail;
-+				break;
-+			}
-+
-+			if (*line == ' ') {
-+				*line = 0;
-+				if (!dst_s)
-+					dst_s = line+1;
-+				else if (!sport_s)
-+					sport_s = line+1;
-+				else if (!dport_s)
-+					dport_s = line+1;
-+			}
-+			line++;
-+		}
-+
-+		if (!dst_s || !sport_s || !dport_s)
-+			goto fail;
-+
-+		sport = read_uint((const char **)&sport_s,dport_s-1);
-+		if ( *sport_s != 0 )
-+			goto fail;
-+
-+		dport = read_uint((const char **)&dport_s,line-2);
-+		if ( *dport_s != 0 )
-+			goto fail;
-+
-+		if (inet_pton(AF_INET6, src_s, (void *)&src3) != 1)
-+			goto fail;
-+
-+		if (inet_pton(AF_INET6, dst_s, (void *)&dst3) != 1)
-+			goto fail;
-+
-+		/* update the session's addresses and mark them set */
-+		((struct sockaddr_in6 *)&s->cli_addr)->sin6_family      = AF_INET6;
-+		memcpy(&((struct sockaddr_in6 *)&s->cli_addr)->sin6_addr, &src3, sizeof(struct in6_addr));
-+		((struct sockaddr_in6 *)&s->cli_addr)->sin6_port        = htons(sport);
-+
-+		((struct sockaddr_in6 *)&s->frt_addr)->sin6_family      = AF_INET6;
-+		memcpy(&((struct sockaddr_in6 *)&s->frt_addr)->sin6_addr, &dst3, sizeof(struct in6_addr));
-+		((struct sockaddr_in6 *)&s->frt_addr)->sin6_port        = htons(dport);
-+		s->flags |= SN_FRT_ADDR_SET;
-+	}
-+	else {
-+		goto fail;
-+	}
-+
-+	/* remove the PROXY line from the request */
-+	len = line - req->data;
-+	buffer_replace2(req, req->data, line, NULL, 0);
-+	req->total -= len; /* don't count the header line */
-+
-+	req->analysers &= ~an_bit;
-+	return 1;
-+
-+ missing:
-+	if (!(req->flags & (BF_SHUTR|BF_FULL))) {
-+		buffer_dont_connect(s->req);
-+		return 0;
-+	}
-+	/* missing data and buffer is either full or shutdown => fail */
-+
-+ fail:
-+	buffer_abort(req);
-+	buffer_abort(s->rep);
-+	req->analysers = 0;
-+
-+	s->fe->counters.failed_req++;
-+	if (s->listener->counters)
-+		s->listener->counters->failed_req++;
-+
-+	if (!(s->flags & SN_ERR_MASK))
-+		s->flags |= SN_ERR_PRXCOND;
-+	if (!(s->flags & SN_FINST_MASK))
-+		s->flags |= SN_FINST_R;
-+	return 0;
-+}
-+
- /* Retrieves the original destination address used by the client, and sets the
-  * SN_FRT_ADDR_SET flag.
-  */
-Index: haproxy-1.4.25/src/proto_http.c
-===================================================================
---- haproxy-1.4.25.orig/src/proto_http.c
-+++ haproxy-1.4.25/src/proto_http.c
-@@ -4209,7 +4209,8 @@ void http_end_txn_clean_session(struct s
- 	if (s->rep->lr >= s->rep->data + s->rep->size)
- 		s->rep->lr -= s->req->size;
- 
--	s->req->analysers |= s->fe->fe_req_ana;
-+	s->req->analysers = s->fe->fe_req_ana;
-+	s->req->analysers &= ~AN_REQ_DECODE_PROXY;
- 	s->rep->analysers = 0;
- 
- 	http_silent_debug(__LINE__, s);
-@@ -7807,7 +7808,6 @@ void http_reset_txn(struct session *s)
- 	http_init_txn(s);
- 
- 	s->be = s->fe;
--	s->req->analysers = s->listener->analysers;
- 	s->logs.logwait = s->fe->to_log;
- 	s->srv = s->prev_srv = s->srv_conn = NULL;
- 	/* re-init store persistence */
-Index: haproxy-1.4.25/src/session.c
-===================================================================
---- haproxy-1.4.25.orig/src/session.c
-+++ haproxy-1.4.25/src/session.c
-@@ -34,6 +34,7 @@
- #include <proto/proxy.h>
- #include <proto/queue.h>
- #include <proto/server.h>
-+#include <proto/client.h>
- #include <proto/stick_table.h>
- #include <proto/stream_interface.h>
- #include <proto/stream_sock.h>
-@@ -1083,6 +1084,12 @@ resync_stream_interface:
- 			while (ana_list && max_loops--) {
- 				/* Warning! ensure that analysers are always placed in ascending order! */
- 
-+				if (ana_list & AN_REQ_DECODE_PROXY) {
-+					if (!frontend_decode_proxy_request(s, s->req, AN_REQ_DECODE_PROXY))
-+						break;
-+					UPDATE_ANALYSERS(s->req->analysers, ana_list, ana_back, AN_REQ_DECODE_PROXY);
-+				}
-+
- 				if (ana_list & AN_REQ_INSPECT) {
- 					if (!tcp_inspect_request(s, s->req, AN_REQ_INSPECT))
- 						break;
-Index: haproxy-1.4.25/src/standard.c
-===================================================================
---- haproxy-1.4.25.orig/src/standard.c
-+++ haproxy-1.4.25/src/standard.c
-@@ -569,6 +569,11 @@ unsigned int strl2uic(const char *s, int
- 	return __strl2uic(s, len);
- }
- 
-+unsigned int read_uint(const char **s, const char *end)
-+{
-+	return __read_uint(s, end);
-+}
-+
- /* This one is 7 times faster than strtol() on athlon with checks.
-  * It returns the value of the number composed of all valid digits read,
-  * and can process negative numbers too.
-@@ -993,12 +998,12 @@ unsigned int inetaddr_host_lim(const cha
-  * Idem except the pointer to first unparsed byte is returned into <ret> which
-  * must not be NULL.
-  */
--unsigned int inetaddr_host_lim_ret(const char *text, char *stop, const char **ret)
-+unsigned int inetaddr_host_lim_ret(char *text, char *stop, char **ret)
- {
- 	const unsigned int ascii_zero = ('0' << 24) | ('0' << 16) | ('0' << 8) | '0';
- 	register unsigned int dig100, dig10, dig1;
- 	int s;
--	const char *p, *d;
-+	char *p, *d;
- 
- 	dig1 = dig10 = dig100 = ascii_zero;
- 	s = 24;
-

file:a/net/tinyproxy/Makefile (deleted)
--- a/net/tinyproxy/Makefile
+++ /dev/null
@@ -1,51 +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:=tinyproxy
-PKG_VERSION:=1.8.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/
-PKG_MD5SUM:=292ac51da8ad6ae883d4ebf56908400d
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tinyproxy
-  SUBMENU:=Web Servers/Proxies
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Tinyproxy is a lightweight HTTP and HTTPS proxy
-  URL:=http://tinyproxy.sourceforge.net/
-endef
-
-define Package/tinyproxy/conffiles
-/etc/config/tinyproxy
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-filter \
-	--enable-transparent \
-	--disable-regexcheck \
-
-define Package/tinyproxy/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/share/tinyproxy
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/tinyproxy/*.html $(1)/usr/share/tinyproxy/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/tinyproxy.config $(1)/etc/config/tinyproxy
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/tinyproxy.init $(1)/etc/init.d/tinyproxy
-endef
-
-$(eval $(call BuildPackage,tinyproxy))
-

--- a/net/tinyproxy/files/tinyproxy.config
+++ /dev/null
@@ -1,252 +1,1 @@
-config tinyproxy
 
-#
-# Enable the proxy
-#
-option enabled 0
-
-#
-# Name of the user the tinyproxy daemon should switch to after the port
-# has been bound.
-#
-option User nobody
-option Group nogroup
-
-#
-# Port to listen on.
-#
-option Port 8888
-
-#
-# If you have multiple interfaces this allows you to bind to only one. If
-# this is commented out, tinyproxy will bind to all interfaces present.
-#
-#option Listen 192.168.0.1
-
-#
-# The Bind directive allows you to bind the outgoing connections to a
-# particular IP address.
-#
-#option Bind 192.168.0.1
-
-#
-# Timeout: The number of seconds of inactivity a connection is allowed to
-# have before it closed by tinyproxy.
-#
-option Timeout 600
-
-#
-# ErrorFile: Defines the HTML file to send when a given HTTP error
-# occurs.  You will probably need to customize the location to your
-# particular install.  The usual locations to check are:
-#   /usr/local/share/tinyproxy
-#   /usr/share/tinyproxy
-#   /etc/tinyproxy
-#
-#option ErrorFile_404 "/usr/share/tinyproxy/404.html"
-#option ErrorFile_400 "/usr/share/tinyproxy/400.html"
-#option ErrorFile_503 "/usr/share/tinyproxy/503.html"
-#option ErrorFile_403 "/usr/share/tinyproxy/403.html"
-#option ErrorFile_408 "/usr/share/tinyproxy/408.html"
-
-# 
-# DefaultErrorFile: The HTML file that gets sent if there is no
-# HTML file defined with an ErrorFile keyword for the HTTP error
-# that has occured.
-#
-option DefaultErrorFile "/usr/share/tinyproxy/default.html"
-
-#
-# StatFile: The HTML file that gets sent when a request is made
-# for the stathost.  If this file doesn't exist a basic page is
-# hardcoded in tinyproxy.
-#
-option StatFile "/usr/share/tinyproxy/stats.html"
-
-#
-# Where to log the information. Either LogFile or Syslog should be set,
-# but not both.
-#
-option LogFile "/var/log/tinyproxy.log"
-#option Syslog 1
-
-#
-# Set the logging level. Allowed settings are:
-#	Critical	(least verbose)
-#	Error
-#	Warning
-#	Notice
-#	Connect		(to log connections without Info's noise)
-#	Info		(most verbose)
-# The LogLevel logs from the set level and above. For example, if the LogLevel
-# was set to Warning, than all log messages from Warning to Critical would be
-# output, but Notice and below would be suppressed.
-#
-option LogLevel Info
-
-#
-# Include the X-Tinyproxy header, which has the client's IP address when
-# connecting to the sites listed.
-#
-# list XTinyproxy mydomain.com
-
-#
-# This is the absolute highest number of threads which will be created. In
-# other words, only MaxClients number of clients can be connected at the
-# same time.
-#
-option MaxClients 100
-
-#
-# These settings set the upper and lower limit for the number of
-# spare servers which should be available. If the number of spare servers
-# falls below MinSpareServers then new ones will be created. If the number
-# of servers exceeds MaxSpareServers then the extras will be killed off.
-#
-option MinSpareServers 5
-option MaxSpareServers 20
-
-#
-# Number of servers to start initially.
-#
-option StartServers 10
-
-#
-# MaxRequestsPerChild is the number of connections a thread will handle
-# before it is killed. In practise this should be set to 0, which disables
-# thread reaping. If you do notice problems with memory leakage, then set
-# this to something like 10000
-#
-option MaxRequestsPerChild 0
-
-#
-# The following is the authorization controls. If there are any access
-# control keywords then the default action is to DENY. Otherwise, the
-# default action is ALLOW.
-#
-# Also the order of the controls are important. The incoming connections
-# are tested against the controls based on order.
-#
-list Allow 127.0.0.1
-#list Allow 192.168.0.0/16
-#list Allow 172.16.0.0/12
-#list Allow 10.0.0.0/8
-
-#
-# The "Via" header is required by the HTTP RFC, but using the real host name
-# is a security concern.  If the following directive is enabled, the string
-# supplied will be used as the host name in the Via header; otherwise, the
-# server's host name will be used.
-#
-option ViaProxyName "tinyproxy"
-
-#
-# The location of the filter file.
-#
-#option Filter "/etc/tinyproxy/filter"
-
-#
-# Filter based on URLs rather than domains.
-#
-#option FilterURLs 1
-
-#
-# Use POSIX Extended regular expressions rather than basic.
-#
-#option FilterExtended 1
-
-#
-# Use case sensitive regular expressions.
-#                                                                         
-#option FilterCaseSensitive 1
-
-#
-# Change the default policy of the filtering system.  If this directive is
-# commented out, or is set to "0" then the default policy is to allow
-# everything which is not specifically denied by the filter file.
-#
-# However, by setting this directive to "1" the default policy becomes to
-# deny everything which is _not_ specifically allowed by the filter file.
-#
-#option FilterDefaultDeny 1
-
-#
-# If an Anonymous keyword is present, then anonymous proxying is enabled.
-# The headers listed are allowed through, while all others are denied. If
-# no Anonymous keyword is present, then all header are allowed through.
-# You must include quotes around the headers.
-#
-#list Anonymous "Host"
-#list Anonymous "Authorization"
-
-#
-# This is a list of ports allowed by tinyproxy when the CONNECT method
-# is used.  To disable the CONNECT method altogether, set the value to 0.
-# If no ConnectPort line is found, all ports are allowed (which is not
-# very secure.)
-#
-# The following two ports are used by SSL.
-#
-list ConnectPort 443
-list ConnectPort 563
-
-#
-# Turns on upstream proxy support.
-#
-# The upstream rules allow you to selectively route upstream connections
-# based on the host/domain of the site being accessed.
-#
-# For example:
-#  # connection to test domain goes through testproxy
-#
-#config upstream
-#	option type proxy
-#	option via testproxy:8008
-#	option target ".test.domain.invalid"
-#
-#config upstream
-#	option type proxy
-#	option via testproxy:8008
-#	option target ".our_testbed.example.com"
-#
-#config upstream
-#	option type proxy
-#	option via testproxy:8008
-#	option target "192.168.128.0/255.255.254.0"
-#
-#  # no upstream proxy for internal websites and unqualified hosts
-#
-#config upstream
-#	option type reject
-#	option target ".internal.example.com"
-#
-#config upstream
-#	option type reject
-#	option target "www.example.com"
-#
-#config upstream
-#	option type reject
-#	option target "10.0.0.0/8"
-#
-#config upstream
-#	option type reject
-#	option target "192.168.0.0/255.255.254.0"
-#
-#config upstream
-#	option type reject
-#	option target "."
-#
-#  # default upstream is internet firewall
-#
-#config upstream
-#	option type proxy
-#	option via firewall.internal.example.com:80
-#
-# The LAST matching rule wins the route decision.  As you can see, you
-# can use a host, or a domain:
-#  name     matches host exactly
-#  .name    matches any host in domain "name"
-#  .        matches any host with no domain (in 'empty' domain)
-#  IP/bits  matches network/mask
-#  IP/mask  matches network/mask
-

--- a/net/tinyproxy/files/tinyproxy.init
+++ /dev/null
@@ -1,139 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
 
-START=50
-
-CFGFILE=/var/etc/tinyproxy.conf
-
-section_enabled() {
-	config_get_bool enabled "$1" 'enabled' 0
-	[ $enabled -gt 0 ]
-}
-
-start() {
-	config_load 'tinyproxy'
-	config_foreach start_proxy 'tinyproxy'
-}
-
-stop() {
-	service_stop /usr/sbin/tinyproxy
-}
-
-start_proxy() {
-	section_enabled "$1" || return 1
-
-	mkdir -m0755 -p /var/etc
-	echo '### AUTOGENERATED CONFIGURATION' > $CFGFILE
-	echo '### DO NOT EDIT' >> $CFGFILE
-	echo '### SEE /etc/config/tinyproxy INSTEAD' >> $CFGFILE
-	echo '' >> $CFGFILE
-
-	proxy_atom "$1" User >> $CFGFILE
-	proxy_atom "$1" Group >> $CFGFILE
-	proxy_atom "$1" Port 8888 >> $CFGFILE
-	proxy_atom "$1" Listen >> $CFGFILE
-	proxy_atom "$1" Bind >> $CFGFILE
-	proxy_atom "$1" Timeout >> $CFGFILE
-
-	proxy_string "$1" ErrorFile_400 "ErrorFile 400" >> $CFGFILE
-	proxy_string "$1" ErrorFile_403 "ErrorFile 403" >> $CFGFILE
-	proxy_string "$1" ErrorFile_404 "ErrorFile 404" >> $CFGFILE
-	proxy_string "$1" ErrorFile_408 "ErrorFile 408" >> $CFGFILE
-	proxy_string "$1" ErrorFile_503 "ErrorFile 503" >> $CFGFILE
-
-	proxy_string "$1" DefaultErrorFile >> $CFGFILE
-	proxy_string "$1" StatHost StatHost 127.0.0.1 >> $CFGFILE
-	proxy_string "$1" StatFile >> $CFGFILE
-	proxy_string "$1" LogFile >> $CFGFILE
-
-	proxy_flag "$1" SysLog >> $CFGFILE
-
-	proxy_atom "$1" LogLevel >> $CFGFILE
-
-	proxy_list "$1" XTinyproxy >> $CFGFILE
-
-	proxy_atom "$1" MaxClients >> $CFGFILE
-	proxy_atom "$1" MinSpareServers >> $CFGFILE
-	proxy_atom "$1" MaxSpareServers >> $CFGFILE
-	proxy_atom "$1" StartServers >> $CFGFILE
-	proxy_atom "$1" MaxRequestsPerChild >> $CFGFILE
-	proxy_list "$1" Allow >> $CFGFILE
-
-	proxy_string "$1" ViaProxyName >> $CFGFILE
-	proxy_string "$1" Filter >> $CFGFILE
-
-	proxy_flag "$1" FilterURLs >> $CFGFILE
-	proxy_flag "$1" FilterExtended >> $CFGFILE
-	proxy_flag "$1" FilterCaseSensitive >> $CFGFILE
-	proxy_flag "$1" FilterDefaultDeny Yes No >> $CFGFILE
-
-	proxy_list "$1" Anonymous '"' >> $CFGFILE
-	proxy_list "$1" ConnectPort >> $CFGFILE
-
-	config_foreach write_upstream upstream
-
-	service_start /usr/sbin/tinyproxy -c "$CFGFILE"
-}
-
-write_upstream() {
-	local type
-	local via
-	local target
-
-	config_get "type" "$1" "type"
-	config_get via "$1" via
-	config_get target "$1" target
-	[ -n "$target" ] && target=' "'"$target"'"'
-
-	[ "$type" == "proxy" -a -n "$via" ] && \
-		echo "upstream $via$target" >> $CFGFILE
-
-	[ "$type" == "reject" -a -n "$target" ] && \
-		echo "no upstream$target" >> $CFGFILE
-}
-
-proxy_atom() {
-	local SECTION=$1
-	local OPTION=$2
-	local DEFAULT=$3
-
-	config_get _value "$SECTION" "$OPTION"
-	[ -z "$_value" ] && _value="$DEFAULT"
-	[ -n "$_value" ] && echo "$OPTION $_value"
-}
-
-proxy_string() {
-	local SECTION=$1
-	local OPTION=$2
-	local ALIAS=$3
-	local DEFAULT=$4
-
-	config_get _value "$SECTION" "$OPTION"
-	[ -z "$_value" ] && _value="$DEFAULT"
-	[ -n "$_value" ] && echo "${ALIAS:-${OPTION}} "'"'"$_value"'"'
-}
-
-proxy_flag() {
-	local SECTION=$1
-	local OPTION=$2
-	local TRUE="${3:-On}"
-	local FALSE="${4:-Off}"
-
-	config_get_bool _value "$SECTION" "$OPTION" 0
-	[ "$_value" -eq "1" ] && _value="$TRUE" || _value="$FALSE"
-	echo "$OPTION $_value"
-}
-
-proxy_list() {
-	local SECTION=$1
-	local OPTION=$2
-	local ENCLOSE=$3
-
-	config_get _value "$SECTION" "$OPTION"
-	[ -n "$_value" ] && {
-		for entry in $_value; do
-			echo "$OPTION ${ENCLOSE}${entry}${ENCLOSE}"
-		done
-	}
-}
-

--- a/net/tinyproxy/patches/010-no-docs-and-tests.patch
+++ /dev/null
@@ -1,87 +1,1 @@
---- a/configure
-+++ b/configure
-@@ -6815,59 +6815,8 @@ fi
- 
- 
- 
--# Check for asciidoc
--# Extract the first word of "a2x", so it can be a program name with args.
--set dummy a2x; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_A2X+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $A2X in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_A2X="$A2X" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="no"
--  ;;
--esac
--fi
--A2X=$ac_cv_path_A2X
--if test -n "$A2X"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5
--$as_echo "$A2X" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- if test "x$A2X" != "xno"; then
--  HAVE_A2X_TRUE=
--  HAVE_A2X_FALSE='#'
--else
-   HAVE_A2X_TRUE='#'
-   HAVE_A2X_FALSE=
--fi
--
--if test x"$A2X" = x"no"; then
--  as_fn_error $? "Test for asciidoc failed. See the file 'INSTALL' for help." "$LINENO" 5
--fi
- 
- ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/templates/Makefile etc/Makefile docs/Makefile docs/man5/Makefile docs/man5/tinyproxy.conf.txt docs/man8/Makefile docs/man8/tinyproxy.txt m4macros/Makefile tests/Makefile tests/scripts/Makefile"
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,7 @@ SUBDIRS = \
- 	src \
- 	data \
- 	etc \
--	docs \
- 	m4macros \
--	tests
- 
- # tools want this on a single line
- ACLOCAL_AMFLAGS = -I m4macros
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -222,9 +222,7 @@ SUBDIRS = \
- 	src \
- 	data \
- 	etc \
--	docs \
- 	m4macros \
--	tests
- 
- 
- # tools want this on a single line
 

--- a/net/tinyproxy/patches/020-config_and_pid-path.patch
+++ /dev/null
@@ -1,14 +1,1 @@
---- a/src/main.c
-+++ b/src/main.c
-@@ -326,8 +326,8 @@ static void initialize_config_defaults (
-         conf->errorpages = NULL;
-         conf->stathost = safestrdup (TINYPROXY_STATHOST);
-         conf->idletimeout = MAX_IDLE_TIME;
--        conf->logf_name = safestrdup (LOCALSTATEDIR "/log/tinyproxy/tinyproxy.log");
--        conf->pidpath = safestrdup (LOCALSTATEDIR "/run/tinyproxy/tinyproxy.pid");
-+        conf->logf_name = safestrdup (LOCALSTATEDIR "/log/tinyproxy.log");
-+        conf->pidpath = safestrdup (LOCALSTATEDIR "/tinyproxy.pid");
- }
- 
- /**
 

--- a/net/tinyproxy/patches/030-allow_bind_in_transparent_mode.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/src/conf.c
-+++ b/src/conf.c
-@@ -865,7 +865,6 @@ static HANDLE_FUNC (handle_deny)
- 
- static HANDLE_FUNC (handle_bind)
- {
--#ifndef TRANSPARENT_PROXY
-         int r = set_string_arg (&conf->bind_address, line, &match[2]);
- 
-         if (r)
-@@ -873,11 +872,6 @@ static HANDLE_FUNC (handle_bind)
-         log_message (LOG_INFO,
-                      "Outgoing connections bound to IP %s", conf->bind_address);
-         return 0;
--#else
--        fprintf (stderr,
--                 "\"Bind\" cannot be used with transparent support enabled.\n");
--        return 1;
--#endif
- }
- 
- static HANDLE_FUNC (handle_listen)
 

--- a/net/tinyproxy/patches/120-fix_INET6.patch
+++ /dev/null
@@ -1,39 +1,1 @@
---- a/src/sock.c
-+++ b/src/sock.c
-@@ -39,8 +39,7 @@
-  * returned if the bind succeeded.  Otherwise, -1 is returned
-  * to indicate an error.
-  */
--static int
--bind_socket (int sockfd, const char *addr, int family)
-+static int bind_socket (int sockfd, const char *addr)
- {
-         struct addrinfo hints, *res, *ressave;
- 
-@@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *add
-         assert (addr != NULL && strlen (addr) != 0);
- 
-         memset (&hints, 0, sizeof (struct addrinfo));
--        hints.ai_family = family;
-+        hints.ai_family = AF_UNSPEC;
-         hints.ai_socktype = SOCK_STREAM;
- 
-         /* The local port it not important */
-@@ -106,14 +105,12 @@ int opensock (const char *host, int port
- 
-                 /* Bind to the specified address */
-                 if (bind_to) {
--                        if (bind_socket (sockfd, bind_to,
--                                         res->ai_family) < 0) {
-+                        if (bind_socket (sockfd, bind_to) < 0) {
-                                 close (sockfd);
-                                 continue;       /* can't bind, so try again */
-                         }
-                 } else if (config.bind_address) {
--                        if (bind_socket (sockfd, config.bind_address,
--                                         res->ai_family) < 0) {
-+                        if (bind_socket (sockfd, config.bind_address) < 0) {
-                                 close (sockfd);
-                                 continue;       /* can't bind, so try again */
-                         }
 

file:a/net/vnstat/Makefile (deleted)
--- a/net/vnstat/Makefile
+++ /dev/null
@@ -1,109 +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:=vnstat
-PKG_VERSION:=1.11
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://humdi.net/vnstat
-PKG_MD5SUM:=a5a113f9176cd61fb954f2ba297f5fdb
-
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS:=libgd
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vnstat/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://humdi.net/vnstat/
-endef
-
-define Package/vnstat
-$(call Package/vnstat/Default)
-  TITLE:=Console-based network traffic monitor
-endef
-
-define Package/vnstat/description
-	vnStat is a network traffic monitor for Linux that keeps a log of daily
-	network traffic for the selected interface(s). vnStat isn't a packet
-	sniffer. The traffic information is analyzed from the /proc -filesystem,
-	so vnStat can be used without root permissions.
-endef
-
-define Package/vnstati
-$(call Package/vnstat/Default)
-  DEPENDS+=vnstat +libgd
-  TITLE:=PNG image output support for vnStat
-endef
-
-define Package/vnstati/description
-	The purpose of vnstati is to provide image output support for statistics
-	collected using vnstat(1). However, the image file format is limited to
-	png. All basic outputs of vnStat are supported excluding live traffic
-	features. The image can be outputted either to a file or to standard
-	output.
-endef
-
-define Package/vnstat/conffiles
-/etc/vnstat.conf
-/etc/config/vnstat
-endef
-
-define Build/Compile/vnstat
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)"
-endef
-
-define Build/Compile/vnstati
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \
-		all
-endef
-
-define Build/Compile
-$(call Build/Compile/vnstat)
-$(call Build/Compile/vnstati)
-endef
-
-define Package/vnstat/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/vnstat $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/vnstatd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/vnstat.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/vnstat.config $(1)/etc/config/vnstat
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/vnstat.init $(1)/etc/init.d/vnstat
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/vnstat.defaults $(1)/etc/uci-defaults/vnstat
-endef
-
-define Package/vnstati/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/vnstati $(1)/usr/bin/
-endef
-
-define Package/vnstat/postinst
-#!/bin/sh
-[ -n "$${IPKG_INSTROOT}" ] || (. /etc/uci-defaults/vnstat) && rm -f /etc/uci-defaults/vnstat
-exit 0
-endef
-
-$(eval $(call BuildPackage,vnstat))
-$(eval $(call BuildPackage,vnstati))
-

--- a/net/vnstat/files/vnstat.config
+++ /dev/null
@@ -1,6 +1,1 @@
-config vnstat
-	list interface		br-lan
-#	list interface		eth0.1
-#	option remote		http://example.org/vnstat/
-#	option symlink		/www/vnstat
 

--- a/net/vnstat/files/vnstat.defaults
+++ /dev/null
@@ -1,14 +1,1 @@
-#!/bin/sh
 
-wan="$(uci -P/var/state get network.wan.ifname)"
-
-if [ -n "$wan" ]; then
-	uci -q batch <<-EOF >/dev/null
-		del_list vnstat.@vnstat[-1].interface=$wan
-		add_list vnstat.@vnstat[-1].interface=$wan
-		commit vnstat
-	EOF
-fi
-
-exit 0
-

--- a/net/vnstat/files/vnstat.init
+++ /dev/null
@@ -1,83 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
 
-START=99
-
-vnstat_option() {
-	sed -ne "s/^[[:space:]]*$1[[:space:]]*['\"]\([^'\"]*\)['\"].*/\1/p" \
-		/etc/vnstat.conf
-}
-
-start() {
-	local lib="$(vnstat_option DatabaseDir)"
-	local pid="$(vnstat_option PidFile)"
-
-	[ -n "$lib" ] || {
-		echo "Error: No DatabaseDir set in vnstat.conf" >&2
-		exit 1
-	}
-
-	[ -n "$pid" ] || {
-		echo "Error: No PidFile set in vnstat.conf" >&2
-		exit 1
-	}
-
-	mkdir -p "$lib"
-
-	init_ifaces() {
-		local cfg="$1"
-		local url lnk
-
-		init_iface() {
-			local ifn="$1"
-
-			[ -n "$url" ] && {
-				local try=0
-				local max=3
-				local hostname="$(cat /proc/sys/kernel/hostname)"
-
-				while [ $((++try)) -le $max ]; do
-					if wget -q -O "$lib/$ifn" "$url/${hostname}_$ifn" 2>/dev/null && [ -e "$lib/$ifn" ]; then
-						logger -t "vnstat" "Downloaded backup for database $ifn"
-						break
-					else
-						logger -t "vnstat" "Download try $try/$max for database $ifn failed"
-						sleep 30
-					fi
-				done
-			}
-
-			/usr/bin/vnstat -u -i "$ifn" >/dev/null
-
-			[ -n "$lnk" ] && {
-				mkdir -p "$lnk"
-				[ -L "$lnk/$ifn" ] || ln -s "$lib/$ifn" "$lnk/$ifn"
-			}
-		}
-
-		config_get url "$cfg" remote
-		config_get lnk "$cfg" symlink
-		config_list_foreach "$cfg" interface init_iface
-
-		return 1
-	}
-
-	config_load vnstat
-	config_foreach init_ifaces vnstat
-
-	SERVICE_PID_FILE="${pid}"
-	service_start /usr/sbin/vnstatd -d
-}
-
-stop() {
-	local pid="$(vnstat_option PidFile)"
-
-	[ -n "$pid" ] || {
-		echo "Error: No PidFile set in vnstat.conf" >&2
-		exit 1
-	}
-
-	SERVICE_PID_FILE="${pid}"
-	service_stop /usr/sbin/vnstatd
-}
-

--- a/net/vnstat/patches/001-conf.patch
+++ /dev/null
@@ -1,20 +1,1 @@
---- a/cfg/vnstat.conf
-+++ b/cfg/vnstat.conf
-@@ -72,13 +72,13 @@ TrafficlessDays 1
- ##
- 
- # how often (in seconds) interface data is updated
--UpdateInterval 30
-+UpdateInterval 60
- 
- # how often (in seconds) interface status changes are checked
--PollInterval 5
-+PollInterval 30
- 
- # how often (in minutes) data is saved to file
--SaveInterval 5
-+SaveInterval 30
- 
- # how often (in minutes) data is saved when all interface are offline
- OfflineSaveInterval 30
 

--- a/net/vnstat/patches/002-no_install_strip.patch
+++ /dev/null
@@ -1,36 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -54,11 +54,11 @@ install:
- 
- # install everything else
- 	install -d -m 755 $(BIN) $(SBIN) $(MAN)/man1 $(MAN)/man5 $(DESTDIR)/var/lib/vnstat
--	install -s -m 755 src/vnstat $(BIN)
--	install -s -m 755 src/vnstatd $(SBIN)
-+	install -m 755 src/vnstat $(BIN)
-+	install -m 755 src/vnstatd $(SBIN)
- 	@if [ -f "src/vnstati" ]; \
--	then echo install -s -m 755 src/vnstati $(BIN); \
--	install -s -m 755 src/vnstati $(BIN); \
-+	then echo install -m 755 src/vnstati $(BIN); \
-+	install -m 755 src/vnstati $(BIN); \
- 	fi
- 
- # update man pages, gzip it if previous version was done so	
-@@ -127,12 +127,12 @@ bsdinstall:
- 
- # install binaries
- 	install -d -m 755 $(DESTDIR)/var/db/vnstat
--	install -s -m 755 src/vnstat $(BIN_BSD)
--	install -s -m 755 src/vnstatd $(SBIN_BSD)
-+	install -m 755 src/vnstat $(BIN_BSD)
-+	install -m 755 src/vnstatd $(SBIN_BSD)
- 
- 	@if [ -f "src/vnstati" ]; \
--	then echo install -s -m 755 src/vnstati $(BIN_BSD); \
--	install -s -m 755 src/vnstati $(BIN_BSD); \
-+	then echo install -m 755 src/vnstati $(BIN_BSD); \
-+	install -m 755 src/vnstati $(BIN_BSD); \
- 	fi
- 
- # install default config if such doesn't exist
 

--- a/net/vnstat/patches/003-no_install_uname.patch
+++ /dev/null
@@ -1,16 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -22,12 +22,6 @@ clean:
- install:
- 	@echo "Installing vnStat..."
- 
--# check that system is really Linux
--	@if [ `uname` != "Linux" ]; \
--	then echo "This isn't a Linux system. Maybe 'make bsdinstall' is what you need?"; \
--	false; \
--	fi
--
- # check that there's something to install
- 	@if [ ! -f "src/vnstat" ] || [ ! -f "src/vnstatd" ]; \
- 	then echo "Nothing to install, run make first."; \
 

--- a/net/vnstat/patches/004-install_bsd_fix.patch
+++ /dev/null
@@ -1,22 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -43,7 +43,8 @@ install:
- # install default config if such doesn't exist
- 	@if [ ! -f "$(DESTDIR)/etc/vnstat.conf" ]; \
- 	then echo "Installing config to $(DESTDIR)/etc/vnstat.conf"; \
--	install -D -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \
-+	install -d -m 755 $(DESTDIR)/etc; \
-+	install -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \
- 	fi
- 
- # install everything else
-@@ -63,7 +64,7 @@ install:
- 	then echo install -m 644 man/vnstati.1 $(MAN)/man1; \
- 	install -m 644 man/vnstati.1 $(MAN)/man1; \
- 	fi
--	
-+
- 	@if [ -f $(MAN)/man1/vnstat.1.gz ]; \
- 	then gzip -f9 $(MAN)/man1/vnstat.1; \
- 	gzip -f9 $(MAN)/man1/vnstatd.1; \
 

file:a/net/wshaper/Makefile (deleted)
--- a/net/wshaper/Makefile
+++ /dev/null
@@ -1,56 +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.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wshaper
-PKG_VERSION:=0.2
-PKG_RELEASE:=2
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/wshaper
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+kmod-sched +tc
-  TITLE:=wshaper
-  URL:=http://lartc.org/wondershaper/
-  PKGARCH:=all
-endef
-
-define Package/wshaper/description
- A script to do traffing shaping with the HTB algorithm.
- Wshaper attempts to:
- * Maintain low latency for interfactive traffic at all times
- * Allow 'surfing' at reasonable speeds while up or downloading
- * Make sure uploads don't harm downloads, and the other way around
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/wshaper/install
-	$(INSTALL_DIR) $(1)/usr/sbin/ $(1)/etc/init.d $(1)/etc/config
-	$(INSTALL_BIN) ./files/wshaper.htb $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/wshaper.init $(1)/etc/init.d/wshaper
-	$(INSTALL_DATA) ./files/wshaper.config $(1)/etc/config/wshaper
-endef
-
-define Package/wshaper/conffiles
-/etc/config/wshaper
-endef
-
-$(eval $(call BuildPackage,wshaper))
-

--- a/net/wshaper/files/wshaper.config
+++ /dev/null
@@ -1,5 +1,1 @@
-config 'wshaper' 'settings'
-	option 'network' 'wan'
-	option 'downlink' '2000'
-	option 'uplink' '240'
 

--- a/net/wshaper/files/wshaper.htb
+++ /dev/null
@@ -1,162 +1,1 @@
-#!/bin/sh
-# Wonder Shaper
-# please read the README before filling out these values 
-#
-# Set the following values to somewhat less than your actual download
-# and uplink speed. In kilobits. Also set the device that is to be shaped.
 
-# All config needs to be done in /etc/config/wshaper
-
-. /lib/functions.sh
-config_load wshaper
-for s in downlink uplink network nopriohostdst nopriohostsrc noprioportdst noprioportsrc; do
-	config_get $s settings $s
-done
-
-device=$(uci_get_state network "$network" ifname "$network")
-[ -z "$device" ] && logger -t wondershaper "Error: Could not find the device for network $network, aborting." && exit 1
-[ -z "$downlink" ] && logger -t wondershaper "Error: Downlink speed not set, aborting." && exit 1
-[ -z "$uplink" ] && logger -t wondershaper "Error: Uplink speed not set, aborting." && exit 1
-
-MODULES='sch_ingress sch_sfq sch_htb cls_u32 act_police'
-DOWNLINK="$downlink"
-UPLINK="$uplink"
-DEV="$device"
-
-# low priority OUTGOING traffic - you can leave this blank if you want
-# low priority source netmasks
-NOPRIOHOSTSRC="$nopriohostsrc"
-
-# low priority destination netmasks
-NOPRIOHOSTDST="$nopriohostdst"
-
-# low priority source ports
-NOPRIOPORTSRC="$noprioportsrc"
-
-# low priority destination ports
-NOPRIOPORTDST="$noprioportdst"
-
-if [ "$1" = "status" ]
-then
-	tc -s qdisc ls dev $DEV
-	tc -s class ls dev $DEV
-	exit
-fi
-
-
-# clean existing down- and uplink qdiscs, hide errors
-tc qdisc del dev $DEV root    2> /dev/null > /dev/null
-tc qdisc del dev $DEV ingress 2> /dev/null > /dev/null
-
-if [ "$1" = "stop" ] 
-then 
-	for i in $MODULES ; do
-		rmmod $i
-	done
-	exit
-fi
-
-for i in $MODULES ; do
-        insmod $i
-done
-
-###### uplink
-
-# install root HTB, point default traffic to 1:20:
-
-tc qdisc add dev $DEV root handle 1: htb default 20
-
-# shape everything at $UPLINK speed - this prevents huge queues in your
-# DSL modem which destroy latency:
-
-tc class add dev $DEV parent 1: classid 1:1 htb rate ${UPLINK}kbit burst 6k
-
-# high prio class 1:10:
-
-tc class add dev $DEV parent 1:1 classid 1:10 htb rate ${UPLINK}kbit \
-   burst 6k prio 1
-
-# bulk & default class 1:20 - gets slightly less traffic, 
-# and a lower priority:
-
-tc class add dev $DEV parent 1:1 classid 1:20 htb rate $((9*$UPLINK/10))kbit \
-   burst 6k prio 2
-
-tc class add dev $DEV parent 1:1 classid 1:30 htb rate $((8*$UPLINK/10))kbit \
-   burst 6k prio 2
-
-# all get Stochastic Fairness:
-tc qdisc add dev $DEV parent 1:10 handle 10: sfq perturb 10
-tc qdisc add dev $DEV parent 1:20 handle 20: sfq perturb 10
-tc qdisc add dev $DEV parent 1:30 handle 30: sfq perturb 10
-
-# TOS Minimum Delay (ssh, NOT scp) in 1:10:
-
-tc filter add dev $DEV parent 1:0 protocol ip prio 10 u32 \
-      match ip tos 0x10 0xff  flowid 1:10
-
-# ICMP (ip protocol 1) in the interactive class 1:10 so we 
-# can do measurements & impress our friends:
-tc filter add dev $DEV parent 1:0 protocol ip prio 10 u32 \
-        match ip protocol 1 0xff flowid 1:10
-
-# To speed up downloads while an upload is going on, put ACK packets in
-# the interactive class:
-
-tc filter add dev $DEV parent 1: protocol ip prio 10 u32 \
-   match ip protocol 6 0xff \
-   match u8 0x05 0x0f at 0 \
-   match u16 0x0000 0xffc0 at 2 \
-   match u8 0x10 0xff at 33 \
-   flowid 1:10
-
-# rest is 'non-interactive' ie 'bulk' and ends up in 1:20
-
-# some traffic however suffers a worse fate
-for a in $NOPRIOPORTDST
-do
-	tc filter add dev $DEV parent 1: protocol ip prio 14 u32 \
-	   match ip dport $a 0xffff flowid 1:30
-done
-
-for a in $NOPRIOPORTSRC
-do
- 	tc filter add dev $DEV parent 1: protocol ip prio 15 u32 \
-	   match ip sport $a 0xffff flowid 1:30
-done
-
-for a in $NOPRIOHOSTSRC
-do
- 	tc filter add dev $DEV parent 1: protocol ip prio 16 u32 \
-	   match ip src $a flowid 1:30
-done
-
-for a in $NOPRIOHOSTDST
-do
- 	tc filter add dev $DEV parent 1: protocol ip prio 17 u32 \
-	   match ip dst $a flowid 1:30
-done
-
-# rest is 'non-interactive' ie 'bulk' and ends up in 1:20
-
-tc filter add dev $DEV parent 1: protocol ip prio 18 u32 \
-   match ip dst 0.0.0.0/0 flowid 1:20
-
-
-########## downlink #############
-# slow downloads down to somewhat less than the real speed  to prevent 
-# queuing at our ISP. Tune to see how high you can set it.
-# ISPs tend to have *huge* queues to make sure big downloads are fast
-#
-# attach ingress policer:
-
-tc qdisc add dev $DEV handle ffff: ingress
-
-# filter *everything* to it (0.0.0.0/0), drop everything that's
-# coming in too fast:
-
-tc filter add dev $DEV parent ffff: protocol ip prio 50 u32 match ip src \
-   0.0.0.0/0 police rate ${DOWNLINK}kbit burst 10k drop flowid :1
-
-logger -t wondershaper "Wondershaper was started on device $device."
-

--- a/net/wshaper/files/wshaper.init
+++ /dev/null
@@ -1,11 +1,1 @@
-#!/bin/sh /etc/rc.common
 
-START=45
-start() {
-	wshaper.htb
-}
-
-stop() {
-	wshaper.htb stop
-}
-

file:a/net/xl2tpd/Makefile (deleted)
--- a/net/xl2tpd/Makefile
+++ /dev/null
@@ -1,69 +1,1 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xl2tpd
-PKG_VERSION:=1.3.1
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-# Host seems to be down.
-#PKG_SOURCE_URL:=ftp://ftp.xelerance.com/xl2tpd/
-PKG_MD5SUM:=cf61576fef5c2d6c68279a408ec1f0d5
-PKG_SOURCE_URL:=http://pkgs.fedoraproject.org/lookaside/pkgs/xl2tpd/xl2tpd-$(PKG_VERSION).tar.gz/$(PKG_MD5SUM)/
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/xl2tpd
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon
-  URL:=http://www.xelerance.com/software/xl2tpd/
-  SUBMENU:=VPN
-  DEPENDS:=+ppp-mod-pppol2tp +ip +resolveip
-endef
-
-define Package/xl2tpd/description
-l2tpd is the open source implementation of the L2TP tunneling protocol (RFC2661).
-It does implement both LAC and LNS role in a L2TP networking architecture. The
-main goal of this protocol is to tunnel PPP frame trough an IP network.
-endef
-
-# XXX: CFLAGS are already set by Build/Compile/Default
-MAKE_FLAGS+= \
-	OFLAGS=""
-
-define Package/xl2tpd/conffiles
-/etc/xl2tpd/xl2tpd.conf
-/etc/xl2tpd/xl2tp-secrets
-/etc/ppp/options.xl2tpd
-endef
-
-define Package/xl2tpd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/xl2tpd $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/xl2tpd-control $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/xl2tpd.init $(1)/etc/init.d/xl2tpd
-
-	$(INSTALL_DIR) $(1)/etc/xl2tpd
-	$(INSTALL_DATA) ./files/xl2tpd.conf $(1)/etc/xl2tpd/
-	$(INSTALL_CONF) ./files/xl2tp-secrets $(1)/etc/xl2tpd/
-
-	$(INSTALL_DIR) $(1)/etc/ppp
-	$(INSTALL_DATA) ./files/options.xl2tpd $(1)/etc/ppp/
-
-	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/l2tp.sh $(1)/lib/netifd/proto
-endef
-
-$(eval $(call BuildPackage,xl2tpd))
-

file:a/net/xl2tpd/README (deleted)
--- a/net/xl2tpd/README
+++ /dev/null
@@ -1,24 +1,1 @@
-OpenWRT Package for xl2tpd
 
-xl2tpd is a development from the original l2tpd package originally written by
-Mark Spencer, subsequently forked by Scott Balmos and David Stipp, inherited
-by Jeff McAdams, modified substantially by Jacco de Leeuw and then forked 
-again by Xelerance (after it was abandoned by l2tpd.org).
-
-Rationale for inclusion in OpenWRT:
-
-l2tpd has some serious alignment problems on RISC platforms. It also runs 
-purely in userspace.
-
-Some of the features added in this fork include:
-
-1. IPSec SA reference tracking inconjunction with openswan's IPSec transport
-   mode, which adds support for multiple clients behind the same NAT router
-	 and multiple clients on the same internal IP behind different NAT routers.
-
-2. Support for the pppol2tp kernel mode L2TP.
-
-3. Alignment and endian problems resolved.
-
-hcg
-

--- a/net/xl2tpd/files/l2tp.sh
+++ /dev/null
@@ -1,108 +1,1 @@
-#!/bin/sh
 
-[ -x /usr/sbin/xl2tpd ] || exit 0
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-proto_l2tp_init_config() {
-	proto_config_add_string "username"
-	proto_config_add_string "password"
-	proto_config_add_string "keepalive"
-	proto_config_add_string "pppd_options"
-	proto_config_add_boolean "ipv6"
-	proto_config_add_int "mtu"
-	proto_config_add_string "server"
-	available=1
-	no_device=1
-}
-
-proto_l2tp_setup() {
-	local config="$1"
-	local iface="$2"
-	local optfile="/tmp/l2tp/options.${config}"
-
-	local ip serv_addr server
-	json_get_var server server && {
-		for ip in $(resolveip -t 5 "$server"); do
-			( proto_add_host_dependency "$config" "$ip" )
-			serv_addr=1
-		done
-	}
-	[ -n "$serv_addr" ] || {
-		echo "Could not resolve server address"
-		sleep 5
-		proto_setup_failed "$config"
-		exit 1
-	}
-
-	if [ ! -p /var/run/xl2tpd/l2tp-control ]; then
-		/etc/init.d/xl2tpd start
-	fi
-
-	json_get_vars ipv6 demand keepalive username password pppd_options
-	[ "$ipv6" = 1 ] || ipv6=""
-	if [ "${demand:-0}" -gt 0 ]; then
-		demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
-	else
-		demand="persist"
-	fi
-
-	[ -n "$mtu" ] || json_get_var mtu mtu
-
-	local interval="${keepalive##*[, ]}"
-	[ "$interval" != "$keepalive" ] || interval=5
-
-	mkdir -p /tmp/l2tp
-
-	echo "${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}}" > "${optfile}"
-	echo "usepeerdns" >> "${optfile}"
-	echo "nodefaultroute" >> "${optfile}"
-	echo "${username:+user \"$username\" password \"$password\"}" >> "${optfile}"
-	echo "ipparam \"$config\"" >> "${optfile}"
-	echo "ifname \"l2tp-$config\"" >> "${optfile}"
-	echo "ip-up-script /lib/netifd/ppp-up" >> "${optfile}"
-	echo "ipv6-up-script /lib/netifd/ppp-up" >> "${optfile}"
-	echo "ip-down-script /lib/netifd/ppp-down" >> "${optfile}"
-	echo "ipv6-down-script /lib/netifd/ppp-down" >> "${optfile}"
-	# Don't wait for LCP term responses; exit immediately when killed.
-	echo "lcp-max-terminate 0" >> "${optfile}"
-	echo "${ipv6:++ipv6} ${pppd_options}" >> "${optfile}"
-	echo "${mtu:+mtu $mtu mru $mtu}" >> "${optfile}"
-
-	xl2tpd-control add l2tp-${config} pppoptfile=${optfile} lns=${server} redial=yes redial timeout=20
-	xl2tpd-control connect l2tp-${config}
-}
-
-proto_l2tp_teardown() {
-	local interface="$1"
-	local optfile="/tmp/l2tp/options.${interface}"
-
-	case "$ERROR" in
-		11|19)
-			proto_notify_error "$interface" AUTH_FAILED
-			proto_block_restart "$interface"
-		;;
-		2)
-			proto_notify_error "$interface" INVALID_OPTIONS
-			proto_block_restart "$interface"
-		;;
-	esac
-
-	xl2tpd-control disconnect l2tp-${interface}
-	# Wait for interface to go down
-        while [ -d /sys/class/net/l2tp-${interface} ]; do
-		sleep 1
-	done
-
-	xl2tpd-control remove l2tp-${interface}
-	rm -f ${optfile}
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol l2tp
-}
-

--- a/net/xl2tpd/files/options.xl2tpd
+++ /dev/null
@@ -1,14 +1,1 @@
-#
 
-lock
-noauth
-debug
-dump
-logfd 2
-logfile /var/log/xl2tpd.log
-noccp
-novj
-novjccomp
-nopcomp
-noaccomp
-

--- a/net/xl2tpd/files/xl2tp-secrets
+++ /dev/null
@@ -1,6 +1,1 @@
-# Secrets for authenticating l2tp tunnels
-# us		them		secret
-# *		marko		blah2
-# zeus		marko		blah
-# *		*		interop
 

--- a/net/xl2tpd/files/xl2tpd.conf
+++ /dev/null
@@ -1,24 +1,1 @@
-[global]
-port = 1701
-auth file = /etc/xl2tpd/xl2tp-secrets
-access control = no
 
-;[lns default]
-;exclusive = yes
-;ip range = 192.168.254.202-192.168.254.210
-;lac = 10.0.1.2
-;hidden bit = no
-;local ip = 192.168.254.200
-;length bit = yes
-;refuse authentication = yes
-;name = VersaLink
-;ppp debug = yes
-;pppoptfile = /etc/ppp/options.xl2tpd
-
-;[lac left]
-;lns = 10.0.1.2
-;refuse authentication = yes
-;name = VersaLink
-;ppp debug = yes
-;pppoptfile = /etc/ppp/options.xl2tpd
-

--- a/net/xl2tpd/files/xl2tpd.conf.sample
+++ /dev/null
@@ -1,74 +1,1 @@
-;
-; Sample l2tpd configuration file
-;
-; This example file should give you some idea of how the options for l2tpd
-; should work.  The best place to look for a list of all options is in
-; the source code itself, until I have the time to write better documetation :)
-; Specifically, the file "file.c" contains a list of commands at the end.
-;
-; You most definitely don't have to spell out everything as it is done here
-;
-; [global]										; Global parameters:
-; port = 1701									; * Bind to port 1701
-; auth file = /etc/xl2tpd/xl2tp-secrets			; * Where our challenge secrets are
-; access control = yes							; * Refuse connections without IP match
-; rand source = dev								; Source for entropy for random
-; 												; numbers, options are:
-; 												; dev - reads of /dev/urandom
-; 												; sys - uses rand()
-; 												; egd - reads from egd socket
-; 												; egd is not yet implemented
-;
-; [lns default]									; Our fallthrough LNS definition
-; exclusive = no								; * Only permit one tunnel per host
-; ip range = 192.168.0.1-192.168.0.20			; * Allocate from this IP range
-; no ip range = 192.168.0.3-192.168.0.9			; * Except these hosts
-; ip range = 192.168.0.5						; * But this one is okay
-; ip range = lac1-lac2							; * And anything from lac1 to lac2's IP
-; lac = 192.168.1.4 - 192.168.1.8				; * These can connect as LAC's
-; no lac = untrusted.marko.net					; * This guy can't connect
-; hidden bit = no								; * Use hidden AVP's?
-; local ip = 192.168.1.2						; * Our local IP to use
-; length bit = yes								; * Use length bit in payload?
-; require chap = yes							; * Require CHAP auth. by peer
-; refuse pap = yes								; * Refuse PAP authentication
-; refuse chap = no								; * Refuse CHAP authentication
-; refuse authentication = no					; * Refuse authentication altogether
-; require authentication = yes					; * Require peer to authenticate
-; unix authentication = no						; * Use /etc/passwd for auth.
-; name = myhostname								; * Report this as our hostname
-; ppp debug = no								; * Turn on PPP debugging
-; pppoptfile = /etc/ppp/options.xl2tpd.lns		; * ppp options file
-; call rws = 10									; * RWS for call (-1 is valid)
-; tunnel rws = 4								; * RWS for tunnel (must be > 0)
-; flow bit = yes								; * Include sequence numbers
-; challenge = yes								; * Challenge authenticate peer ;
-;
-; [lac marko]									; Example VPN LAC definition
-; lns = lns.marko.net							; * Who is our LNS?
-; lns = lns2.marko.net							; * A backup LNS (not yet used)
-; redial = yes									; * Redial if disconnected?
-; redial timeout = 15							; * Wait n seconds between redials
-; max redials = 5								; * Give up after n consecutive failures
-; hidden bit = yes								; * User hidden AVP's?
-; local ip = 192.168.1.1						; * Force peer to use this IP for us
-; remote ip = 192.168.1.2						; * Force peer to use this as their IP
-; length bit = no								; * Use length bit in payload?
-; require pap = no								; * Require PAP auth. by peer
-; require chap = yes							; * Require CHAP auth. by peer
-; refuse pap = yes								; * Refuse PAP authentication
-; refuse chap = no								; * Refuse CHAP authentication
-; refuse authentication = no					; * Refuse authentication altogether
-; require authentication = yes					; * Require peer to authenticate
-; name = marko									; * Report this as our hostname
-; ppp debug = no								; * Turn on PPP debugging
-; pppoptfile = /etc/ppp/options.xl2tpd.marko	; * ppp options file for this lac
-; call rws = 10									; * RWS for call (-1 is valid)
-; tunnel rws = 4								; * RWS for tunnel (must be > 0)
-; flow bit = yes								; * Include sequence numbers
-; challenge = yes								; * Challenge authenticate peer
-;
-; [lac cisco]									; Another quick LAC
-; lns = cisco.marko.net							; * Required, but can take from default
-; require authentication = yes
 

--- a/net/xl2tpd/files/xl2tpd.init
+++ /dev/null
@@ -1,19 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2010 OpenWrt.org
 
-START=60
-BIN=xl2tpd
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
-
-start() {
-	mkdir -p $RUN_D/$BIN
-	[ -f $DEFAULT ] && . $DEFAULT
-	$BIN $OPTIONS
-}
-
-stop() {
-	[ -f $PID_F ] && kill $(cat $PID_F)
-}
-

--- a/net/xl2tpd/patches/100-makefile_opt_flags.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -90,7 +90,8 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include
- 
- IPFLAGS?= -DIP_ALLOCATION
- 
--CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
-+OFLAGS=-O2
-+CFLAGS+= $(DFLAGS) $(OFLAGS) -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS)
- HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
- OBJS=xl2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
- SRCS=${OBJS:.o=.c} ${HDRS}
 

--- a/net/xl2tpd/patches/110-makefile_dont_build_pfc.patch
+++ /dev/null
@@ -1,44 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -106,10 +106,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin
- MANDIR?=$(DESTDIR)${PREFIX}/share/man
- 
- 
--all: $(EXEC) pfc $(CONTROL_EXEC)
-+all: $(EXEC) $(CONTROL_EXEC)
- 
- clean:
--	rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC)
-+	rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC)
- 
- $(EXEC): $(OBJS) $(HDRS)
- 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
-@@ -117,14 +117,10 @@ $(EXEC): $(OBJS) $(HDRS)
- $(CONTROL_EXEC): $(CONTROL_SRCS)
- 	$(CC) $(CONTROL_SRCS) -o $@
- 
--pfc:
--	$(CC) $(CFLAGS) -c contrib/pfc.c
--	$(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
--
- romfs:
- 	$(ROMFSINST) /bin/$(EXEC)
- 
--install: ${EXEC} pfc ${CONTROL_EXEC}
-+install: ${EXEC} ${CONTROL_EXEC}
- 	install -d -m 0755 ${SBINDIR}
- 	install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC)
- 	install -d -m 0755 ${MANDIR}/man5
-@@ -132,11 +128,6 @@ install: ${EXEC} pfc ${CONTROL_EXEC}
- 	install -m 0644 doc/xl2tpd.8 ${MANDIR}/man8/
- 	install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \
- 		 ${MANDIR}/man5/
--	# pfc
--	install -d -m 0755 ${BINDIR}
--	install -m 0755 pfc ${BINDIR}/pfc
--	install -d -m 0755 ${MANDIR}/man1
--	install -m 0644 contrib/pfc.1 ${MANDIR}/man1/
- 	# control exec
- 	install -d -m 0755 ${SBINDIR}
- 	install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC)
 

--- a/net/xl2tpd/patches/120-kernel-mode-l2tp.patch
+++ /dev/null
@@ -1,418 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -62,8 +62,8 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include
- # are packages seperately (eg kernel-headers on Fedora)
- # Note: 2.6.23+ support still needs some changes in the xl2tpd source
- #
--#OSFLAGS+= -DUSE_KERNEL
--#
-+# Kernel mode fixed by sigwall <fionov@gmail.com>
-+OSFLAGS+= -DUSE_KERNEL
- #
- # Uncomment the next line for FreeBSD
- #
---- a/call.c
-+++ b/call.c
-@@ -680,6 +680,8 @@ struct call *get_call (int tunnel, int c
-         st->peer.sin_port = port;
- 	st->refme  = refme;
- 	st->refhim = refhim;
-+        st->udp_fd = -1;
-+        st->pppox_fd = -1;
-         bcopy (&addr, &st->peer.sin_addr, sizeof (addr));
-         st->next = tunnels.head;
-         tunnels.head = st;
---- a/control.c
-+++ b/control.c
-@@ -596,6 +596,9 @@ int control_finish (struct tunnel *t, st
-         if (gconfig.debug_state)
-             l2tp_log (LOG_DEBUG, "%s: sending SCCCN\n", __FUNCTION__);
-         control_xmit (buf);
-+
-+        connect_pppol2tp(t);
-+
-         /* Schedule a HELLO */
-         tv.tv_sec = HELLO_DELAY;
-         tv.tv_usec = 0;
-@@ -608,6 +611,7 @@ int control_finish (struct tunnel *t, st
- 		  "Connection established to %s, %d.  Local: %d, Remote: %d (ref=%u/%u).\n",
- 		  IPADDY (t->peer.sin_addr),
- 		  ntohs (t->peer.sin_port), t->ourtid, t->tid, t->refme, t->refhim);
-+
-         if (t->lac)
-         {
-             /* This is part of a LAC, so we want to go ahead
-@@ -635,6 +639,9 @@ int control_finish (struct tunnel *t, st
- 		  IPADDY (t->peer.sin_addr),
- 		  ntohs (t->peer.sin_port), t->ourtid, t->tid, t->refme, t->refhim,
- 		  t->lns->entname);
-+
-+        connect_pppol2tp(t);
-+
-         /* Schedule a HELLO */
-         tv.tv_sec = HELLO_DELAY;
-         tv.tv_usec = 0;
---- a/l2tp.h
-+++ b/l2tp.h
-@@ -167,6 +167,8 @@ struct tunnel
-     int ourrws;                 /* Receive Window Size */
-     int rxspeed;		/* Receive bps */
-     int txspeed;		/* Transmit bps */
-+    int udp_fd;			/* UDP fd */
-+    int pppox_fd;			/* PPPOX tunnel fd */
-     struct call *self;
-     struct lns *lns;            /* LNS that owns us */
-     struct lac *lac;            /* LAC that owns us */
-@@ -220,6 +222,7 @@ extern void control_xmit (void *);
- extern int ppd;
- extern int switch_io;           /* jz */
- extern int control_fd;
-+extern int connect_pppol2tp(struct tunnel *t);
- extern int start_pppd (struct call *c, struct ppp_opts *);
- extern void magic_lac_dial (void *);
- extern int get_entropy (unsigned char *, int);
---- a/linux/include/linux/if_pppol2tp.h
-+++ b/linux/include/linux/if_pppol2tp.h
-@@ -2,7 +2,7 @@
-  * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661)
-  *
-  * This file supplies definitions required by the PPP over L2TP driver
-- * (pppol2tp.c).  All version information wrt this file is located in pppol2tp.c
-+ * (l2tp_ppp.c).  All version information wrt this file is located in l2tp_ppp.c
-  *
-  * License:
-  *		This program is free software; you can redistribute it and/or
-@@ -15,18 +15,13 @@
- #ifndef __LINUX_IF_PPPOL2TP_H
- #define __LINUX_IF_PPPOL2TP_H
- 
--#include <asm/types.h>
--
--#ifdef __KERNEL__
--#include <linux/in.h>
--#endif
-+#include <linux/types.h>
- 
- /* Structure used to connect() the socket to a particular tunnel UDP
-- * socket.
-+ * socket over IPv4.
-  */
--struct pppol2tp_addr
--{
--	pid_t	pid;			/* pid that owns the fd.
-+struct pppol2tp_addr {
-+	__kernel_pid_t	pid;		/* pid that owns the fd.
- 					 * 0 => current */
- 	int	fd;			/* FD of UDP socket to use */
- 
-@@ -36,6 +31,45 @@ struct pppol2tp_addr
- 	__u16 d_tunnel, d_session;	/* For sending outgoing packets */
- };
- 
-+/* Structure used to connect() the socket to a particular tunnel UDP
-+ * socket over IPv6.
-+ */
-+struct pppol2tpin6_addr {
-+	__kernel_pid_t	pid;		/* pid that owns the fd.
-+					 * 0 => current */
-+	int	fd;			/* FD of UDP socket to use */
-+
-+	__u16 s_tunnel, s_session;	/* For matching incoming packets */
-+	__u16 d_tunnel, d_session;	/* For sending outgoing packets */
-+
-+	struct sockaddr_in6 addr;	/* IP address and port to send to */
-+};
-+
-+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
-+ * bits. So we need a different sockaddr structure.
-+ */
-+struct pppol2tpv3_addr {
-+	__kernel_pid_t	pid;		/* pid that owns the fd.
-+					 * 0 => current */
-+	int	fd;			/* FD of UDP or IP socket to use */
-+
-+	struct sockaddr_in addr;	/* IP address and port to send to */
-+
-+	__u32 s_tunnel, s_session;	/* For matching incoming packets */
-+	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
-+};
-+
-+struct pppol2tpv3in6_addr {
-+	__kernel_pid_t	pid;		/* pid that owns the fd.
-+					 * 0 => current */
-+	int	fd;			/* FD of UDP or IP socket to use */
-+
-+	__u32 s_tunnel, s_session;	/* For matching incoming packets */
-+	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
-+
-+	struct sockaddr_in6 addr;	/* IP address and port to send to */
-+};
-+
- /* Socket options:
-  * DEBUG	- bitmask of debug message categories
-  * SENDSEQ	- 0 => don't send packets with sequence numbers
-@@ -66,4 +100,4 @@ enum {
- 
- 
- 
--#endif
-+#endif /* __LINUX_IF_PPPOL2TP_H */
---- a/network.c
-+++ b/network.c
-@@ -45,6 +45,7 @@ int init_network (void)
-     server.sin_family = AF_INET;
-     server.sin_addr.s_addr = gconfig.listenaddr; 
-     server.sin_port = htons (gconfig.port);
-+    int flags;
-     if ((server_socket = socket (PF_INET, SOCK_DGRAM, 0)) < 0)
-     {
-         l2tp_log (LOG_CRIT, "%s: Unable to allocate socket. Terminating.\n",
-@@ -52,6 +53,10 @@ int init_network (void)
-         return -EINVAL;
-     };
- 
-+    flags = 1;
-+    setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
-+    setsockopt(server_socket, SOL_SOCKET, SO_NO_CHECK, &flags, sizeof(flags));
-+
-     if (bind (server_socket, (struct sockaddr *) &server, sizeof (server)))
-     {
-         close (server_socket);
-@@ -321,6 +326,11 @@ int build_fdset (fd_set *readfds)
- 
- 	while (tun)
- 	{
-+		if (tun->udp_fd > -1) {
-+			if (tun->udp_fd > max)
-+				max = tun->udp_fd;
-+			FD_SET (tun->udp_fd, readfds);
-+		}
- 		call = tun->call_head;
- 		while (call)
- 		{
-@@ -390,6 +400,8 @@ void network_thread ()
-     struct iovec iov;
-     char cbuf[256];
-     unsigned int refme, refhim;
-+    int * currentfd;
-+    int server_socket_processed;
- 
-     /* This one buffer can be recycled for everything except control packets */
-     buf = new_buf (MAX_RECV_SIZE);
-@@ -428,7 +440,21 @@ void network_thread ()
-         {
-             do_control ();
-         }
--        if (FD_ISSET (server_socket, &readfds))
-+        server_socket_processed = 0;
-+        currentfd = NULL;
-+        st = tunnels.head;
-+        while (st || !server_socket_processed) {
-+            if (st && (st->udp_fd == -1)) {
-+                st=st->next;
-+                continue;
-+            }
-+            if (st) {
-+                currentfd = &st->udp_fd;
-+            } else {
-+                currentfd = &server_socket;
-+                server_socket_processed = 1;
-+            }
-+            if (FD_ISSET (*currentfd, &readfds))
-         {
-             /*
-              * Okay, now we're ready for reading and processing new data.
-@@ -457,12 +483,19 @@ void network_thread ()
- 	    msgh.msg_flags = 0;
- 	    
- 	    /* Receive one packet. */
--	    recvsize = recvmsg(server_socket, &msgh, 0);
-+	    recvsize = recvmsg(*currentfd, &msgh, 0);
- 
-             if (recvsize < MIN_PAYLOAD_HDR_LEN)
-             {
-                 if (recvsize < 0)
-                 {
-+                    if (errno == ECONNREFUSED) {
-+                        close(*currentfd);
-+                    }
-+                    if ((errno == ECONNREFUSED) ||
-+                        (errno == EBADF)) {
-+                        *currentfd = -1;
-+                    }
-                     if (errno != EAGAIN)
-                         l2tp_log (LOG_WARNING,
-                              "%s: recvfrom returned error %d (%s)\n",
-@@ -567,6 +600,8 @@ void network_thread ()
- 		}
- 	    };
- 	}
-+	if (st) st=st->next;
-+	}
- 
- 	/*
- 	 * finished obvious sources, look for data from PPP connections.
-@@ -639,3 +674,82 @@ void network_thread ()
-     }
- 
- }
-+
-+int connect_pppol2tp(struct tunnel *t) {
-+#ifdef USE_KERNEL
-+        if (kernel_support) {
-+            int ufd = -1, fd2 = -1;
-+            int flags;
-+            struct sockaddr_pppol2tp sax;
-+
-+            struct sockaddr_in server;
-+            server.sin_family = AF_INET;
-+            server.sin_addr.s_addr = gconfig.listenaddr;
-+            server.sin_port = htons (gconfig.port);
-+            if ((ufd = socket (PF_INET, SOCK_DGRAM, 0)) < 0)
-+            {
-+                l2tp_log (LOG_CRIT, "%s: Unable to allocate UDP socket. Terminating.\n",
-+                    __FUNCTION__);
-+                return -EINVAL;
-+            };
-+
-+            flags=1;
-+            setsockopt(ufd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
-+            setsockopt(ufd, SOL_SOCKET, SO_NO_CHECK, &flags, sizeof(flags));
-+
-+            if (bind (ufd, (struct sockaddr *) &server, sizeof (server)))
-+            {
-+                close (ufd);
-+                l2tp_log (LOG_CRIT, "%s: Unable to bind UDP socket: %s. Terminating.\n",
-+                     __FUNCTION__, strerror(errno), errno);
-+                return -EINVAL;
-+            };
-+            server = t->peer;
-+            flags = fcntl(ufd, F_GETFL);
-+            if (flags == -1 || fcntl(ufd, F_SETFL, flags | O_NONBLOCK) == -1) {
-+                l2tp_log (LOG_WARNING, "%s: Unable to set UDP socket nonblock.\n",
-+                     __FUNCTION__);
-+                return -EINVAL;
-+            }
-+            if (connect (ufd, (struct sockaddr *) &server, sizeof(server)) < 0) {
-+                l2tp_log (LOG_CRIT, "%s: Unable to connect UDP peer. Terminating.\n",
-+                 __FUNCTION__);
-+                return -EINVAL;
-+            }
-+
-+            t->udp_fd=ufd;
-+
-+            fd2 = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP);
-+            if (fd2 < 0) {
-+                l2tp_log (LOG_WARNING, "%s: Unable to allocate PPPoL2TP socket.\n",
-+                     __FUNCTION__);
-+                return -EINVAL;
-+            }
-+            flags = fcntl(fd2, F_GETFL);
-+            if (flags == -1 || fcntl(fd2, F_SETFL, flags | O_NONBLOCK) == -1) {
-+                l2tp_log (LOG_WARNING, "%s: Unable to set PPPoL2TP socket nonblock.\n",
-+                     __FUNCTION__);
-+                return -EINVAL;
-+            }
-+            sax.sa_family = AF_PPPOX;
-+            sax.sa_protocol = PX_PROTO_OL2TP;
-+            sax.pppol2tp.pid = 0;
-+            sax.pppol2tp.fd = t->udp_fd;
-+            sax.pppol2tp.addr.sin_addr.s_addr = t->peer.sin_addr.s_addr;
-+            sax.pppol2tp.addr.sin_port = t->peer.sin_port;
-+            sax.pppol2tp.addr.sin_family = AF_INET;
-+            sax.pppol2tp.s_tunnel  = t->ourtid;
-+            sax.pppol2tp.s_session = 0;
-+            sax.pppol2tp.d_tunnel  = t->tid;
-+            sax.pppol2tp.d_session = 0;
-+            if ((connect(fd2, (struct sockaddr *)&sax, sizeof(sax))) < 0) {
-+                l2tp_log (LOG_WARNING, "%s: Unable to connect PPPoL2TP socket. %d %s\n",
-+                     __FUNCTION__, errno, strerror(errno));
-+                close(fd2);
-+                return -EINVAL;
-+            }
-+            t->pppox_fd = fd2;
-+        }
-+#endif
-+    return 0;
-+}
---- a/xl2tpd.c
-+++ b/xl2tpd.c
-@@ -278,7 +278,11 @@ void death_handler (int signal)
-     struct tunnel *st, *st2;
-     int sec;
-     l2tp_log (LOG_CRIT, "%s: Fatal signal %d received\n", __FUNCTION__, signal);
-+#ifdef USE_KERNEL
-+        if (kernel_support || signal != SIGTERM) {
-+#else
-         if (signal != SIGTERM) {
-+#endif
-                 st = tunnels.head;
-                 while (st)
-                 {
-@@ -349,7 +353,7 @@ int start_pppd (struct call *c, struct p
-     int flags;
- #endif
-     int pos = 1;
--    int fd2;
-+    int fd2 = -1;
- #ifdef DEBUG_PPPD
-     int x;
- #endif
-@@ -397,7 +401,7 @@ int start_pppd (struct call *c, struct p
-        sax.sa_family = AF_PPPOX;
-        sax.sa_protocol = PX_PROTO_OL2TP;
-        sax.pppol2tp.pid = 0;
--       sax.pppol2tp.fd = server_socket;
-+       sax.pppol2tp.fd = c->container->udp_fd;
-        sax.pppol2tp.addr.sin_addr.s_addr = c->container->peer.sin_addr.s_addr;
-        sax.pppol2tp.addr.sin_port = c->container->peer.sin_port;
-        sax.pppol2tp.addr.sin_family = AF_INET;
-@@ -408,6 +412,7 @@ int start_pppd (struct call *c, struct p
-        if (connect(fd2, (struct sockaddr *)&sax, sizeof(sax)) < 0) {
-            l2tp_log (LOG_WARNING, "%s: Unable to connect PPPoL2TP socket.\n",
-                 __FUNCTION__);
-+           close(fd2);
-            return -EINVAL;
-        }
-        stropt[pos++] = strdup ("plugin");
-@@ -484,7 +489,7 @@ int start_pppd (struct call *c, struct p
-         dup2 (fd2, 0);
-         dup2 (fd2, 1);
- 	close(fd2);
--
-+       }
-         /* close all the calls pty fds */
-         st = tunnels.head;
-         while (st)
-@@ -492,12 +497,17 @@ int start_pppd (struct call *c, struct p
-             sc = st->call_head;
-             while (sc)
-             {
--                close (sc->fd);
-+#ifdef USE_KERNEL
-+                if (kernel_support) {
-+                    close(st->udp_fd); /* tunnel UDP fd */
-+                    close(st->pppox_fd); /* tunnel PPPoX fd */
-+                } else
-+#endif
-+                    close (sc->fd); /* call pty fd */
-                 sc = sc->next;
-             }
-             st = st->next;
-         }
--       }
- 
-         /* close the UDP socket fd */
-         close (server_socket);
-@@ -615,6 +625,10 @@ void destroy_tunnel (struct tunnel *t)
-        the memory pointed to by t->chal_us.vector at some other place */
-     if (t->chal_them.vector)
-         free (t->chal_them.vector);
-+    if (t->pppox_fd > -1 )
-+        close (t->pppox_fd);
-+    if (t->udp_fd > -1 )
-+        close (t->udp_fd);
-     free (t);
-     free (me);
- }
 

--- a/net/xl2tpd/patches/130-no-kill-ipparam.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/control.c
-+++ b/control.c
-@@ -905,8 +905,6 @@ int control_finish (struct tunnel *t, st
-                 po = add_opt (po, c->lac->pppoptfile);
-             }
-         };
--	po = add_opt (po, "ipparam");
--        po = add_opt (po, IPADDY (t->peer.sin_addr));
-         start_pppd (c, po);
-         opt_destroy (po);
-         if (c->lac)
 

--- a/net/xl2tpd/patches/140-control_src_cflags.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -115,7 +115,7 @@ $(EXEC): $(OBJS) $(HDRS)
- 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
- 
- $(CONTROL_EXEC): $(CONTROL_SRCS)
--	$(CC) $(CONTROL_SRCS) -o $@
-+	$(CC) $(CFLAGS) $(CONTROL_SRCS) -o $@
- 
- romfs:
- 	$(ROMFSINST) /bin/$(EXEC)
 

file:a/utils/collectd/Makefile (deleted)
--- a/utils/collectd/Makefile
+++ /dev/null
@@ -1,312 +1,1 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=collectd
-PKG_VERSION:=4.10.8
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://collectd.org/files/
-PKG_MD5SUM:=7a60495208b9383225493c6dd6abb2f0
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-COLLECTD_PLUGINS_DISABLED:= \
-	apple_sensors \
-	battery \
-	cpufreq \
-	curl_json \
-	entropy \
-	genericjmx \
-	gmond \
-	hddtemp \
-	ipmi \
-	ipvs \
-	java \
-	libvirt \
-	mbmon \
-	memcachec \
-	memcached \
-	monitorus \
-	multimeter \
-	netapp \
-	nfs \
-	notify_desktop \
-	notify_email \
-	openvz \
-	oracle \
-	perl \
-	pinba \
-	python \
-	routeros \
-	rrdcached \
-	serial \
-	swap \
-	tape \
-	tokyotyrant \
-	uuid \
-	vserver \
-	xmms \
-	zfs_arc \
-
-COLLECTD_PLUGINS_SELECTED:= \
-	apache \
-	apcups \
-	ascent \
-	bind \
-	conntrack \
-	contextswitch \
-	cpu \
-	csv \
-	curl \
-	dbi \
-	df \
-	disk \
-	dns \
-	email \
-	exec \
-	filecount \
-	fscache \
-	interface \
-	iptables \
-	irq \
-	iwinfo \
-	load \
-	logfile \
-	madwifi \
-	memory \
-	modbus \
-	mysql \
-	netlink \
-	network \
-	nginx \
-	ntpd \
-	nut \
-	olsrd \
-	onewire \
-	openvpn \
-	ping \
-	postgresql \
-	powerdns \
-	processes \
-	protocols \
-	rrdtool \
-	sensors \
-	snmp \
-	syslog \
-	tail \
-	table \
-	ted \
-	tcpconns \
-	teamspeak2 \
-	thermal \
-	unixsock \
-	uptime \
-	users \
-	vmem \
-	wireless \
-	write_http \
-
-PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_PACKAGE_collectd-mod-%,$(subst _,-,$(COLLECTD_PLUGINS_SELECTED))) \
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-define Package/collectd/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Lightweight system statistics collection daemon
-  URL:=http://verplant.org/collectd/
-endef
-
-define Package/collectd
-$(call Package/collectd/Default)
-  DEPENDS:= +libpthread +zlib +libltdl +libip4tc
-  MENU:=1
-endef
-
-define Package/collectd/description
- collectd is a small daemon which collects system information periodically
- and provides mechanismns to store the values in a variety of ways.
-endef
-
-ifneq ($(CONFIG_avr32),)
-  TARGET_CFLAGS += -fsigned-char
-endif
-
-# common configure args
-CONFIGURE_ARGS+= \
-	--disable-debug \
-	--enable-daemon \
-	--enable-getifaddrs \
-	--with-nan-emulation \
-	--without-libgcrypt
-
-CONFIGURE_VARS+= \
-	CFLAGS="$$$$CFLAGS $(FPIC)" \
-	LDFLAGS="$$$$LDFLAGS -lm -lz" \
-	KERNEL_DIR="$(LINUX_DIR)" \
-
-CONFIGURE_PLUGIN= \
-	$(foreach m, $(1), \
-		$(if $(CONFIG_PACKAGE_collectd-mod-$(subst _,-,$(m))),--enable-$(m),--disable-$(m)) \
-	)
-
-CONFIGURE_ARGS+= \
-	$(call CONFIGURE_PLUGIN,$(COLLECTD_PLUGINS_SELECTED)) \
-	$(call CONFIGURE_PLUGIN,$(COLLECTD_PLUGINS_DISABLED)) \
-
-# exception: mod-ascent needs libxml2
-ifneq ($(CONFIG_PACKAGE_collectd-mod-ascent),)
-  CONFIGURE_VARS+= \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2"
-endif
-
-ifneq ($(CONFIG_BIG_ENDIAN),)
-  CONFIGURE_ARGS+= --with-fp-layout=endianflip
-else
-  CONFIGURE_ARGS+= --with-fp-layout=nothing
-endif
-
-ifneq ($(CONFIG_PACKAGE_collectd-mod-postgresql),)
-  CONFIGURE_ARGS+= --with-libpq="$(STAGING_DIR)/usr/"
-endif
-
-ifneq ($(CONFIG_PACKAGE_collectd-mod-mysql),)
-  CONFIGURE_ARGS+= --with-libmysql="$(STAGING_DIR)/usr/"
-endif
-
-# exception: mod-netlink needs libnetlink from iproute
-ifneq ($(CONFIG_PACKAGE_collectd-mod-netlink),)
-  CONFIGURE_ARGS+= --with-libnetlink="$(STAGING_DIR)/usr"
-endif
-
-# exception: mod-modbus needs libmodbus
-ifneq ($(CONFIG_PACKAGE_collectd-mod-modbus),)
-  CONFIGURE_ARGS+= --with-libmodbus="$(STAGING_DIR)/usr"
-endif
-
-# exception: mod-onewire needs libow-capi
-ifneq ($(CONFIG_PACKAGE_collectd-mod-onewire),)
-  CONFIGURE_ARGS+= --with-libowcapi="$(STAGING_DIR)/usr"
-endif
-
-# exception: mod-rrdtool needs rrdtool-1.0.x
-ifneq ($(CONFIG_PACKAGE_collectd-mod-rrdtool),)
-  CONFIGURE_ARGS+= --with-librrd="$(STAGING_DIR)/usr/lib/rrdtool-1.0"
-endif
-
-define Package/collectd/conffiles
-/etc/collectd.conf
-endef
-
-define Package/collectd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/share/collectd
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/collectd/types.db $(1)/usr/share/collectd/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_CONF) ./files/collectd.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/collectd.init $(1)/etc/init.d/collectd
-endef
-
-# 1: plugin name
-# 2: plugin title/description
-# 3: files
-# 4: extra dependency
-define BuildPlugin
-
-  PKG_CONFIG_DEPENDS+= CONFIG_PACKAGE_collectd-mod-$(1)
-
-  define Package/collectd-mod-$(1)
-  $$(call Package/collectd/Default)
-    TITLE:=$(2) plugin
-    DEPENDS:= collectd $(4)
-  endef
-
-  define Package/collectd-mod-$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/collectd
-	for m in $(3); do \
-		$(CP) \
-			$(PKG_INSTALL_DIR)/usr/lib/collectd/$$$$$$$${m}.so \
-			$$(1)/usr/lib/collectd/ ; \
-	done
-  endef
-
-  $$(eval $$(call BuildPackage,collectd-mod-$(1)))
-
-endef
-
-$(eval $(call BuildPackage,collectd))
-
-#$(eval $(call BuildPlugin,NAME,DESCRIPTION,FILES,DEPENDENCIES))
-$(eval $(call BuildPlugin,apache,apache status input,apache,+PACKAGE_collectd-mod-apache:libcurl))
-$(eval $(call BuildPlugin,apcups,apcups status input,apcups,))
-$(eval $(call BuildPlugin,ascent,ascent status input,ascent,+PACKAGE_collectd-mod-ascent:libcurl +PACKAGE_collectd-mod-ascent:libxml2))
-$(eval $(call BuildPlugin,bind,BIND server/zone input,bind,+PACKAGE_collectd-mod-bind:libcurl +PACKAGE_collectd-mod-bind:libxml2))
-$(eval $(call BuildPlugin,conntrack,connection tracking table size input,conntrack,))
-$(eval $(call BuildPlugin,contextswitch,context switch input,contextswitch,))
-$(eval $(call BuildPlugin,cpu,CPU input,cpu,))
-$(eval $(call BuildPlugin,csv,CSV output,csv,))
-$(eval $(call BuildPlugin,curl,cURL input,curl,+PACKAGE_collectd-mod-curl:libcurl))
-$(eval $(call BuildPlugin,dbi,relational database input,dbi,+PACKAGE_collectd-mod-dbi:libdbi))
-$(eval $(call BuildPlugin,df,disk space input,df,))
-$(eval $(call BuildPlugin,disk,disk usage/timing input,disk,))
-$(eval $(call BuildPlugin,dns,DNS traffic input,dns,+PACKAGE_collectd-mod-dns:libpcap))
-$(eval $(call BuildPlugin,email,email output,email,))
-$(eval $(call BuildPlugin,exec,process exec input,exec,))
-$(eval $(call BuildPlugin,filecount,file count input,filecount,))
-$(eval $(call BuildPlugin,fscache,file-system based caching framework input,fscache,))
-$(eval $(call BuildPlugin,interface,network interfaces input,interface,))
-$(eval $(call BuildPlugin,iptables,iptables status input,iptables,+PACKAGE_collectd-mod-iptables:iptables +libiptc))
-$(eval $(call BuildPlugin,irq,interrupt usage input,irq,))
-$(eval $(call BuildPlugin,iwinfo,libiwinfo wireless statistics,iwinfo,+PACKAGE_collectd-mod-iwinfo:libiwinfo))
-$(eval $(call BuildPlugin,load,system load input,load,))
-$(eval $(call BuildPlugin,logfile,log files output,logfile,))
-$(eval $(call BuildPlugin,madwifi,MadWifi status input,madwifi,))
-$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient-r))
-$(eval $(call BuildPlugin,memory,physical memory usage input,memory,))
-$(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus @BROKEN))
-$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip @BROKEN))
-$(eval $(call BuildPlugin,network,network input/output,network))
-$(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl))
-$(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,))
-$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut))
-$(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,))
-$(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi @BROKEN))
-$(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,))
-$(eval $(call BuildPlugin,ping,ping status input,ping,+PACKAGE_collectd-mod-ping:liboping))
-$(eval $(call BuildPlugin,postgresql,PostgreSQL status input,postgresql,+PACKAGE_collectd-mod-postgresql:libpq))
-$(eval $(call BuildPlugin,powerdns,PowerDNS server status input,powerdns,))
-$(eval $(call BuildPlugin,processes,process status input,processes,))
-$(eval $(call BuildPlugin,protocols,network protocols input,protocols,))
-$(eval $(call BuildPlugin,rrdtool,RRDtool output,rrdtool,+PACKAGE_collectd-mod-rrdtool:librrd1))
-$(eval $(call BuildPlugin,sensors,lm_sensors input,sensors,+PACKAGE_collectd-mod-sensors:libsensors @BROKEN))
-$(eval $(call BuildPlugin,snmp,SNMP input,snmp,+PACKAGE_collectd-mod-snmp:libnetsnmp))
-$(eval $(call BuildPlugin,syslog,syslog output,syslog,))
-$(eval $(call BuildPlugin,tail,tail input,tail,))
-$(eval $(call BuildPlugin,table,table-like structured file input,table,))
-$(eval $(call BuildPlugin,teamspeak2,TeamSpeak2 input,teamspeak2,))
-$(eval $(call BuildPlugin,ted,The Energy Detective input,ted,@((!TARGET_avr32)||BROKEN))) # fails on avr32 because of warnings treated as errors
-$(eval $(call BuildPlugin,tcpconns,TCP connection tracking input,tcpconns,))
-$(eval $(call BuildPlugin,thermal,system temperatures input,thermal,))
-$(eval $(call BuildPlugin,unixsock,unix socket output,unixsock,))
-$(eval $(call BuildPlugin,uptime,uptime status input,uptime,))
-$(eval $(call BuildPlugin,users,user logged in status input,users,))
-$(eval $(call BuildPlugin,vmem,virtual memory usage input,vmem,))
-$(eval $(call BuildPlugin,wireless,wireless status input,wireless,))
-$(eval $(call BuildPlugin,write-http,HTTP POST output,write_http,+PACKAGE_collectd-mod-write-http:libcurl))
-

--- a/utils/collectd/files/collectd.conf
+++ /dev/null
@@ -1,91 +1,1 @@
-#
-# OpenWrt Config file for collectd(1).
-# Please read collectd.conf(5) for a list of options.
-# http://collectd.org/
-#
 
-#Hostname   "localhost"
-#FQDNLookup  true
-BaseDir     "/var/lib/collectd"
-PIDFile     "/var/run/collectd.pid"
-#PluginDir  "/usr/lib/collectd"
-#TypesDB    "/usr/share/collectd/types.db"
-Interval    30
-ReadThreads 2
-
-#LoadPlugin syslog
-#LoadPlugin logfile
-
-#<Plugin syslog>
-#	LogLevel info
-#</Plugin>
-
-#<Plugin logfile>
-#	LogLevel info
-#	File STDOUT
-#	Timestamp true
-#</Plugin>
-
-LoadPlugin cpu
-LoadPlugin df
-LoadPlugin disk
-LoadPlugin interface
-LoadPlugin load
-LoadPlugin memory
-LoadPlugin network
-#LoadPlugin ping
-#LoadPlugin processes
-#LoadPlugin rrdtool
-#LoadPlugin serial
-LoadPlugin wireless
-
-#<Plugin df>
-#	FSType tmpfs
-#	IgnoreSelected true
-#	ReportByDevice false
-#	ReportReserved false
-#	ReportInodes false
-#</Plugin>
-
-#<Plugin disk>
-#	Disk "/^[hs]d[a-f][0-9]?$/"
-#	IgnoreSelected false
-#</Plugin>
-
-#<Plugin interface>
-#	Interface "eth0"
-#	Interface "br-lan"
-#	IgnoreSelected false
-#</Plugin>
-
-<Plugin network>
-#	Server "ff18::efc0:4a42" "25826"
-	Server "239.192.74.66" "25826"
-#	Listen "ff18::efc0:4a42" "25826"
-#	Listen "239.192.74.66" "25826"
-#	TimeToLive "128"
-#	Forward false
-#	CacheFlush 1800
-#	ReportStats false
-</Plugin>
-
-#<Plugin ping>
-#	Host "host.foo.bar"
-#	Interval 1.0
-#	Timeout 0.9
-#	TTL 255
-#	SourceAddress "1.2.3.4"
-#	Device "eth0"
-#	MaxMissed -1
-#</Plugin>
-
-#<Plugin processes>
-#	Process "name"
-#</Plugin>
-
-#<Plugin rrdtool>
-#	DataDir "/var/lib/collectd/rrd"
-#	CacheTimeout 120
-#	CacheFlush   900
-#</Plugin>
-

--- a/utils/collectd/files/collectd.init
+++ /dev/null
@@ -1,16 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-START=80
-
-SERVICE_USE_PID=1
-
-start() {
-	mkdir -m 0755 -p /var/lib/collectd
-	service_start /usr/sbin/collectd
-}
-
-stop() {
-	service_stop /usr/sbin/collectd
-}
-

--- a/utils/collectd/patches/001-undefined-AM_PATH_LIBGCRYPT.patch
+++ /dev/null
@@ -1,5 +1,1 @@
---- /dev/null
-+++ b/fake-am_path_libgcrypt.m4
-@@ -0,0 +1 @@
-+AC_DEFUN([AM_PATH_LIBGCRYPT],[:])
 

--- a/utils/collectd/patches/003-remove-werror.patch
+++ /dev/null
@@ -1,67 +1,1 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -7,7 +7,7 @@ SUBDIRS += liboconfig
- endif
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- AM_CPPFLAGS = -DPREFIX='"${prefix}"'
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1833,7 +1833,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2)
--@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
-+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
- AM_CPPFLAGS = -DPREFIX='"${prefix}"' \
- 	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
- 	-DLOCALSTATEDIR='"${localstatedir}"' \
---- a/src/libcollectdclient/Makefile.am
-+++ b/src/libcollectdclient/Makefile.am
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- pkginclude_HEADERS = client.h lcc_features.h
---- a/src/libcollectdclient/Makefile.in
-+++ b/src/libcollectdclient/Makefile.in
-@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign no-dependencies
--@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
-+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
- pkginclude_HEADERS = client.h lcc_features.h
- lib_LTLIBRARIES = libcollectdclient.la
- nodist_pkgconfig_DATA = libcollectdclient.pc
---- a/src/owniptc/Makefile.am
-+++ b/src/owniptc/Makefile.am
-@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependenci
- EXTRA_DIST = libiptc.c README.collectd
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- 
- noinst_LTLIBRARIES = libiptc.la
---- a/src/owniptc/Makefile.in
-+++ b/src/owniptc/Makefile.in
-@@ -296,7 +296,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- EXTRA_DIST = libiptc.c README.collectd
--@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
-+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
- noinst_LTLIBRARIES = libiptc.la
- libiptc_la_SOURCES = libip4tc.c libip6tc.c \
- 		ipt_kernel_headers.h libip6tc.h libiptc.h linux_list.h \
 

--- a/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
+++ /dev/null
@@ -1,58 +1,1 @@
---- a/src/rrdtool.c
-+++ b/src/rrdtool.c
-@@ -80,6 +80,7 @@ static const char *config_keys[] =
- 	"HeartBeat",
- 	"RRARows",
- 	"RRATimespan",
-+	"RRASingle",
- 	"XFF",
- 	"WritesPerSecond",
- 	"RandomTimeout"
-@@ -101,6 +102,8 @@ static rrdcreate_config_t rrdcreate_conf
- 	/* timespans = */ NULL,
- 	/* timespans_num = */ 0,
- 
-+	/* rrasingle = */ 0,
-+
- 	/* consolidation_functions = */ NULL,
- 	/* consolidation_functions_num = */ 0
- };
-@@ -1027,6 +1030,14 @@ static int rrd_config (const char *key,
- 
- 		free (value_copy);
- 	}
-+	else if (strcasecmp ("RRASingle", key) == 0)
-+	{
-+		if (IS_TRUE (value))
-+		{
-+			rrdcreate_config.rrasingle = 1;
-+			NOTICE ("rrdtool plugin: RRASingle = true: creating only AVERAGE RRAs");
-+		}
-+	}
- 	else if (strcasecmp ("XFF", key) == 0)
- 	{
- 		double tmp = atof (value);
---- a/src/utils_rrdcreate.c
-+++ b/src/utils_rrdcreate.c
-@@ -122,6 +122,9 @@ static int rra_get (char ***ret, const v
-     rts_num = rra_timespans_num;
-   }
- 
-+  if (cfg->rrasingle)
-+    rra_types_num = 1;
-+
-   rra_max = rts_num * rra_types_num;
- 
-   if ((rra_def = (char **) malloc ((rra_max + 1) * sizeof (char *))) == NULL)
---- a/src/utils_rrdcreate.h
-+++ b/src/utils_rrdcreate.h
-@@ -36,6 +36,8 @@ struct rrdcreate_config_s
-   int *timespans;
-   size_t timespans_num;
- 
-+  int rrasingle;
-+
-   char **consolidation_functions;
-   size_t consolidation_functions_num;
- };
 

--- a/utils/collectd/patches/110-net-device-stats.patch
+++ /dev/null
@@ -1,47 +1,1 @@
----
- src/interface.c |   33 ++++++++++++++++++++++++++++++++-
- 1 file changed, 32 insertions(+), 1 deletion(-)
 
---- a/src/interface.c
-+++ b/src/interface.c
-@@ -203,7 +203,38 @@ static int interface_read (void)
- #  define IFA_RX_ERROR rx_errors
- #  define IFA_TX_ERROR tx_errors
- #else
--#  error "No suitable type for `struct ifaddrs->ifa_data' found."
-+struct net_device_stats {
-+	unsigned long	rx_packets;
-+	unsigned long	tx_packets;
-+	unsigned long	rx_bytes;
-+	unsigned long	tx_bytes;
-+	unsigned long	rx_errors;
-+	unsigned long	tx_errors;
-+	unsigned long	rx_dropped;
-+	unsigned long	tx_dropped;
-+	unsigned long	multicast;
-+	unsigned long	collisions;
-+	unsigned long	rx_length_errors;
-+	unsigned long	rx_over_errors;
-+	unsigned long	rx_crc_errors;
-+	unsigned long	rx_frame_errors;
-+	unsigned long	rx_fifo_errors;
-+	unsigned long	rx_missed_errors;
-+	unsigned long	tx_aborted_errors;
-+	unsigned long	tx_carrier_errors;
-+	unsigned long	tx_fifo_errors;
-+	unsigned long	tx_heartbeat_errors;
-+	unsigned long	tx_window_errors;
-+	unsigned long	rx_compressed;
-+	unsigned long	tx_compressed;
-+};
-+#  define IFA_DATA net_device_stats
-+#  define IFA_RX_BYTES rx_bytes
-+#  define IFA_TX_BYTES tx_bytes
-+#  define IFA_RX_PACKT rx_packets
-+#  define IFA_TX_PACKT tx_packets
-+#  define IFA_RX_ERROR rx_errors
-+#  define IFA_TX_ERROR tx_errors
- #endif
- 
- 	struct IFA_DATA *if_data;
-

--- a/utils/collectd/patches/120-fix_kernel_2.6.37.patch
+++ /dev/null
@@ -1,79 +1,1 @@
---- a/src/owniptc/libiptc.c
-+++ b/src/owniptc/libiptc.c
-@@ -81,11 +81,11 @@ static const char *hooknames[] = {
- };
- 
- /* Convenience structures */
--struct ipt_error_target
-+ struct ipt_error_target2
- {
- 	STRUCT_ENTRY_TARGET t;
- 	char error[TABLE_MAXNAMELEN];
--};
-+}; 
- 
- struct chain_head;
- struct rule_head;
-@@ -1007,10 +1007,10 @@ static int parse_table(TC_HANDLE_T h)
- /* Convenience structures */
- struct iptcb_chain_start{
- 	STRUCT_ENTRY e;
--	struct ipt_error_target name;
-+	struct ipt_error_target2 name;
- };
- #define IPTCB_CHAIN_START_SIZE	(sizeof(STRUCT_ENTRY) +			\
--				 ALIGN(sizeof(struct ipt_error_target)))
-+				 ALIGN(sizeof(struct ipt_error_target2)))
- 
- struct iptcb_chain_foot {
- 	STRUCT_ENTRY e;
-@@ -1021,10 +1021,10 @@ struct iptcb_chain_foot {
- 
- struct iptcb_chain_error {
- 	STRUCT_ENTRY entry;
--	struct ipt_error_target target;
-+	struct ipt_error_target2 target;
- };
- #define IPTCB_CHAIN_ERROR_SIZE	(sizeof(STRUCT_ENTRY) +			\
--				 ALIGN(sizeof(struct ipt_error_target)))
-+				 ALIGN(sizeof(struct ipt_error_target2)))
- 
- 
- 
-@@ -1069,7 +1069,7 @@ static int iptcc_compile_chain(TC_HANDLE
- 		head->e.next_offset = IPTCB_CHAIN_START_SIZE;
- 		strcpy(head->name.t.u.user.name, ERROR_TARGET);
- 		head->name.t.u.target_size = 
--				ALIGN(sizeof(struct ipt_error_target));
-+				ALIGN(sizeof(struct ipt_error_target2));
- 		strcpy(head->name.error, c->name);
- 	} else {
- 		repl->hook_entry[c->hooknum-1] = c->head_offset;	
-@@ -1113,7 +1113,7 @@ static int iptcc_compile_chain_offsets(T
- 	if (!iptcc_is_builtin(c))  {
- 		/* Chain has header */
- 		*offset += sizeof(STRUCT_ENTRY) 
--			     + ALIGN(sizeof(struct ipt_error_target));
-+			     + ALIGN(sizeof(struct ipt_error_target2));
- 		(*num)++;
- 	}
- 
-@@ -1153,7 +1153,7 @@ static int iptcc_compile_table_prep(TC_H
- 	/* Append one error rule at end of chain */
- 	num++;
- 	offset += sizeof(STRUCT_ENTRY)
--		  + ALIGN(sizeof(struct ipt_error_target));
-+		  + ALIGN(sizeof(struct ipt_error_target2));
- 
- 	/* ruleset size is now in offset */
- 	*size = offset;
-@@ -1177,7 +1177,7 @@ static int iptcc_compile_table(TC_HANDLE
- 	error->entry.target_offset = sizeof(STRUCT_ENTRY);
- 	error->entry.next_offset = IPTCB_CHAIN_ERROR_SIZE;
- 	error->target.t.u.user.target_size = 
--		ALIGN(sizeof(struct ipt_error_target));
-+		ALIGN(sizeof(struct ipt_error_target2));
- 	strcpy((char *)&error->target.t.u.user.name, ERROR_TARGET);
- 	strcpy((char *)&error->target.error, "ERROR");
- 
 

--- a/utils/collectd/patches/130-timeleft-max.patch
+++ /dev/null
@@ -1,15 +1,1 @@
-Derived from uptream commit d5b09f2b: http://octo.cx/d5b09f2
 
---- a/src/types.db
-+++ b/src/types.db
-@@ -152,7 +152,7 @@ tcp_connections		value:GAUGE:0:429496729
- temperature		value:GAUGE:-273.15:U
- threads			value:GAUGE:0:U
- time_dispersion		seconds:GAUGE:-1000000:1000000
--timeleft		timeleft:GAUGE:0:3600
-+timeleft		timeleft:GAUGE:0:U
- time_offset		seconds:GAUGE:-1000000:1000000
- total_bytes		value:DERIVE:0:U
- total_requests		value:DERIVE:0:U
-
-

--- a/utils/collectd/patches/200-fix-git-describe-error.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/version-gen.sh
-+++ b/version-gen.sh
-@@ -2,7 +2,7 @@
- 
- DEFAULT_VERSION="4.10.8.git"
- 
--VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
-+#VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
- 
- if test -z "$VERSION"; then
- 	VERSION="$DEFAULT_VERSION"
 

--- a/utils/collectd/patches/400-fix-olsrd-get-all.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/src/olsrd.c
-+++ b/src/olsrd.c
-@@ -653,7 +653,7 @@ static int olsrd_read (void) /* {{{ */
-   if (fh == NULL)
-     return (-1);
- 
--  fputs ("\r\n", fh);
-+  fputs ("/all \r\n", fh);
-   fflush (fh);
- 
-   while (fgets (buffer, sizeof (buffer), fh) != NULL)
 

--- a/utils/collectd/patches/900-add-iwinfo-plugin.patch
+++ /dev/null
@@ -1,276 +1,1 @@
---- a/configure.in
-+++ b/configure.in
-@@ -490,6 +490,9 @@ AC_CHECK_HEADERS(netinet/if_ether.h, [],
- have_termios_h="no"
- AC_CHECK_HEADERS(termios.h, [have_termios_h="yes"])
- 
-+# For the iwinfo plugin
-+AC_CHECK_LIB(iwinfo, iwinfo_backend, [with_iwinfo="yes"], [with_iwinfo="no (libiwinfo not found)"], [])
-+
- #
- # Checks for typedefs, structures, and compiler characteristics.
- #
-@@ -4081,6 +4084,7 @@ plugin_interface="no"
- plugin_ipmi="no"
- plugin_ipvs="no"
- plugin_irq="no"
-+plugin_iwinfo="no"
- plugin_libvirt="no"
- plugin_load="no"
- plugin_memory="no"
-@@ -4388,6 +4392,7 @@ AC_PLUGIN([ipmi],        [$plugin_ipmi],
- AC_PLUGIN([iptables],    [$with_libiptc],      [IPTables rule counters])
- AC_PLUGIN([ipvs],        [$plugin_ipvs],       [IPVS connection statistics])
- AC_PLUGIN([irq],         [$plugin_irq],        [IRQ statistics])
-+AC_PLUGIN([iwinfo],      [$with_iwinfo],       [Common iwinfo wireless statistics])
- AC_PLUGIN([java],        [$with_java],         [Embed the Java Virtual Machine])
- AC_PLUGIN([libvirt],     [$plugin_libvirt],    [Virtual machine statistics])
- AC_PLUGIN([load],        [$plugin_load],       [System load])
-@@ -4666,6 +4671,7 @@ Configuration:
-     protobuf-c  . . . . . $have_protoc_c
-     oracle  . . . . . . . $with_oracle
-     python  . . . . . . . $with_python
-+    iwinfo  . . . . . . . $with_iwinfo
- 
-   Features:
-     daemon mode . . . . . $enable_daemon
-@@ -4705,6 +4711,7 @@ Configuration:
-     iptables  . . . . . . $enable_iptables
-     ipvs  . . . . . . . . $enable_ipvs
-     irq . . . . . . . . . $enable_irq
-+    iwinfo  . . . . . . . $enable_iwinfo
-     java  . . . . . . . . $enable_java
-     libvirt . . . . . . . $enable_libvirt
-     load  . . . . . . . . $enable_load
---- a/src/collectd.conf.in
-+++ b/src/collectd.conf.in
-@@ -82,6 +82,7 @@ FQDNLookup   true
- #@BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
- #@BUILD_PLUGIN_IPVS_TRUE@LoadPlugin ipvs
- #@BUILD_PLUGIN_IRQ_TRUE@LoadPlugin irq
-+#@BUILD_PLUGIN_IWINFO_TRUE@LoadPlugin iwinfo
- #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
- #@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
- @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
-@@ -376,6 +377,12 @@ FQDNLookup   true
- #	IgnoreSelected true
- #</Plugin>
- 
-+#<Plugin iwinfo>
-+#   Interface "ath0"
-+#   Interface "ra0"
-+#   Interface "wlan0"
-+#</Plugin>
-+
- #<Plugin "java">
- #	JVMArg "-verbose:jni"
- #	JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar"
---- a/src/collectd.conf.pod
-+++ b/src/collectd.conf.pod
-@@ -1478,6 +1478,27 @@ and all other interrupts are collected.
- 
- =back
- 
-+=head2 Plugin C<iwinfo>
-+
-+=over 4
-+
-+=item B<Interface> I<Interface>
-+
-+Select this interface. By default all detected wireless interfaces will be
-+collected. For a more detailed description see B<IgnoreSelected> below.
-+
-+=item B<IgnoreSelected> I<true>|I<false>
-+
-+If no configuration if given, the B<iwinfo>-plugin will collect data from all
-+detected wireless interfaces. You can use the B<Interface>-option to pick the
-+interfaces you're interested in. Sometimes, however, it's easier/preferred to
-+collect all interfaces I<except> a few ones. This option enables you to do
-+that: By setting B<IgnoreSelected> to I<true> the effect of B<Interface> is
-+inverted: All selected interfaces are ignored and all other interfaces are
-+collected.
-+
-+=back
-+
- =head2 Plugin C<java>
- 
- The I<Java> plugin makes it possible to write extensions for collectd in Java.
---- /dev/null
-+++ b/src/iwinfo.c
-@@ -0,0 +1,150 @@
-+/**
-+ * collectd - src/iwinfo.c
-+ * Copyright (C) 2011  Jo-Philipp Wich
-+ *
-+ * 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; only version 2 of the License is applicable.
-+ *
-+ * 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.,
-+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-+ **/
-+
-+#include "collectd.h"
-+#include "common.h"
-+#include "plugin.h"
-+#include "utils_ignorelist.h"
-+
-+#include <stdint.h>
-+#include <iwinfo.h>
-+
-+#define PROCNETDEV "/proc/net/dev"
-+
-+static const char *config_keys[] = {
-+	"Interface",
-+	"IgnoreSelected"
-+};
-+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
-+
-+static ignorelist_t *ignorelist = NULL;
-+
-+static int iwinfo_config(const char *key, const char *value)
-+{
-+	if (ignorelist == NULL)
-+		ignorelist = ignorelist_create(1);
-+
-+	if (ignorelist == NULL)
-+		return 1;
-+
-+	if (strcasecmp(key, "Interface") == 0)
-+		ignorelist_add(ignorelist, value);
-+	else if (strcasecmp(key, "IgnoreSelected") == 0)
-+		ignorelist_set_invert(ignorelist, IS_TRUE(value) ? 0 : 1);
-+	else
-+		return -1;
-+
-+	return 0;
-+}
-+
-+static void iwinfo_submit(const char *ifname, const char *type, int value)
-+{
-+	value_t values[1];
-+	value_list_t vl = VALUE_LIST_INIT;
-+
-+	values[0].gauge = value;
-+
-+	vl.values = values;
-+	vl.values_len = 1;
-+
-+	sstrncpy(vl.host, hostname_g, sizeof(vl.host));
-+	sstrncpy(vl.plugin, "iwinfo", sizeof(vl.plugin));
-+	sstrncpy(vl.plugin_instance, ifname, sizeof(vl.plugin_instance));
-+	sstrncpy(vl.type, type, sizeof(vl.type));
-+	/*sstrncpy(vl.type_instance, "", sizeof(vl.type_instance));*/
-+
-+	plugin_dispatch_values(&vl);
-+}
-+
-+static void iwinfo_process(const char *ifname)
-+{
-+	int val;
-+	char buf[IWINFO_BUFSIZE];
-+	const struct iwinfo_ops *iw = iwinfo_backend(ifname);
-+
-+	/* does appear to be a wifi iface */
-+	if (iw)
-+	{
-+		if (iw->bitrate(ifname, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "bitrate", val * 1000);
-+
-+		if (iw->signal(ifname, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "signal_power", val);
-+
-+		if (iw->noise(ifname, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "signal_noise", val);
-+
-+		if (iw->quality(ifname, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "signal_quality", val);
-+
-+		if (iw->assoclist(ifname, buf, &val))
-+			val = 0;
-+		iwinfo_submit(ifname, "stations",
-+		              val / sizeof(struct iwinfo_assoclist_entry));
-+	}
-+
-+	iwinfo_finish();
-+}
-+
-+static int iwinfo_read(void)
-+{
-+	char line[1024];
-+	char ifname[128];
-+	FILE *f;
-+
-+	f = fopen(PROCNETDEV, "r");
-+	if (f == NULL)
-+	{
-+		char err[1024];
-+		WARNING("iwinfo: Unable to open " PROCNETDEV ": %s",
-+		        sstrerror(errno, err, sizeof(err)));
-+		return -1;
-+	}
-+
-+	while (fgets(line, sizeof(line), f))
-+	{
-+		if (!strchr(line, ':'))
-+			continue;
-+
-+		if (!sscanf(line, " %127[^:]", ifname))
-+			continue;
-+
-+		if (ignorelist_match(ignorelist, ifname))
-+			continue;
-+
-+		if (strstr(ifname, "mon.") || strstr(ifname, ".sta") ||
-+		    strstr(ifname, "tmp.") || strstr(ifname, "wifi"))
-+			continue;
-+
-+		iwinfo_process(ifname);
-+	}
-+
-+	fclose(f);
-+
-+	return 0;
-+}
-+
-+void module_register(void)
-+{
-+	plugin_register_config("iwinfo", iwinfo_config, config_keys, config_keys_num);
-+	plugin_register_read("iwinfo", iwinfo_read);
-+}
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -453,6 +453,15 @@ collectd_LDADD += "-dlopen" irq.la
- collectd_DEPENDENCIES += irq.la
- endif
- 
-+if BUILD_PLUGIN_IWINFO
-+pkglib_LTLIBRARIES += iwinfo.la
-+iwinfo_la_SOURCES = iwinfo.c
-+iwinfo_la_LDFLAGS = -module -avoid-version
-+iwinfo_la_LIBADD = -liwinfo
-+collectd_LDADD += "-dlopen" iwinfo.la
-+collectd_DEPENDENCIES += iwinfo.la
-+endif
-+
- if BUILD_PLUGIN_JAVA
- pkglib_LTLIBRARIES += java.la
- java_la_SOURCES = java.c
---- a/src/types.db
-+++ b/src/types.db
-@@ -171,3 +171,4 @@ voltage			value:GAUGE:U:U
- vs_memory		value:GAUGE:0:9223372036854775807
- vs_processes		value:GAUGE:0:65535
- vs_threads		value:GAUGE:0:65535
-+stations		value:GAUGE:0:256
 

--- a/utils/collectd/patches/920-fix-ping-droprate.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/src/ping.c
-+++ b/src/ping.c
-@@ -651,7 +651,7 @@ static int ping_read (void) /* {{{ */
-           / ((double) (pkg_recv * (pkg_recv - 1))));
- 
-     /* Calculate drop rate. */
--    droprate = ((double) (pkg_sent - pkg_recv)) / ((double) pkg_sent);
-+    droprate = ((double) (pkg_sent - pkg_recv)) * 100 / ((double) pkg_sent);
- 
-     submit (hl->host, "ping", latency_average);
-     submit (hl->host, "ping_stddev", latency_stddev);
 

--- a/utils/coreutils/Makefile
+++ /dev/null
@@ -1,110 +1,1 @@
-#
-# Copyright (C) 2008-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:=coreutils
-PKG_VERSION:=8.16
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNU/coreutils
-PKG_MD5SUM:=89b06f91634208dceba7b36ad1f9e8b9
-PKG_BUILD_DEPENDS:=libpthread
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-COREUTILS_APPLETS := \
-	base64 basename cat chcon chgrp chmod chown chroot cksum comm cp csplit \
-	cut date dd dir dircolors dirname du echo env expand expr factor	\
-	false fmt fold groups head hostid id install join kill link ln logname	\
-	ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup nproc od paste	\
-	pathchk pinky pr printenv printf ptx pwd readlink realpath rm rmdir	\
-	runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred	\
-	shuf sleep sort split stat stdbuf stty sum sync tac tail tee test	\
-	timeout touch tr true truncate tsort tty uname unexpand	uniq unlink	\
-	uptime users vdir wc who whoami yes
-
-DEPENDS_sort = +libpthread
-DEPENDS_timeout = +librt
-DEPENDS_uptime = +libelf1
-DEPENDS_expr = +libgmp
-DEPENDS_factor = +libgmp
-
-define Package/coreutils/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=The GNU core utilities
-  URL:=http://www.gnu.org/software/coreutils/
-endef
-
-define Package/coreutils
-  $(call Package/coreutils/Default)
-  TITLE:=The GNU core utilities
-  MENU:=1
-endef
-
-define Package/coreutils/description
- Full versions of standard GNU utilities. Normally, you would not use this
- package, since the functionality in BusyBox is more than sufficient and
- smaller.
-endef
-
-define GenPlugin
- define Package/$(1)
-   $(call Package/coreutils/Default)
-   DEPENDS:=coreutils $(DEPENDS_$(2))
-   TITLE:=Utility $(2) from the GNU core utilities
- endef
-
- define Package/$(1)/description
-  Full version of standard GNU $(2) utility. Normally, you would not use this
-  package, since the functionality in BusyBox is more than sufficient.
- endef
-endef
-
-$(foreach a,$(COREUTILS_APPLETS),$(eval $(call GenPlugin,coreutils-$(a),$(a))))
-
-CONFIGURE_VARS += \
-	gl_cv_func_mbrtowc_incomplete_state=yes \
-	gl_cv_func_mbrtowc_retval=yes \
-	gl_cv_func_wcrtomb_retval=yes
-
-ifneq ($(CONFIG_USE_UCLIBC),)
-  CONFIGURE_VARS += \
-	ac_cv_type_pthread_spinlock_t=$(if $(filter 0.9.30% 0.9.2% 0.9.31%,$(call qstrip,$(CONFIG_UCLIBC_VERSION))),no,yes)
-endif
-
-CONFIGURE_ARGS += \
-	--enable-install-program=su
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		SHELL="/bin/bash" \
-		all install install-root
-endef
-
-define Package/coreutils/install
-	true
-endef
-
-define BuildPlugin
-  define Package/$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $$(1)/usr/bin/
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-$(eval $(call BuildPackage,coreutils))
-
-$(foreach a,$(COREUTILS_APPLETS),$(eval $(call BuildPlugin,coreutils-$(a),$(a))))
-

--- a/utils/coreutils/patches/001-no_docs_man_tests.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,7 +17,7 @@
- 
- ALL_RECURSIVE_TARGETS =
- 
--SUBDIRS = lib src doc man po tests gnulib-tests
-+SUBDIRS = lib src po
- 
- changelog_etc =				\
-   ChangeLog-2005			\
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1639,7 +1639,7 @@ top_srcdir = @top_srcdir@
- 
- # Some tests always need root privileges, others need them only sometimes.
- ALL_RECURSIVE_TARGETS = install-root check-root distcheck-hook
--SUBDIRS = lib src doc man po tests gnulib-tests
-+SUBDIRS = lib src po
- changelog_etc = \
-   ChangeLog-2005			\
-   ChangeLog-2006			\
 

--- a/utils/coreutils/patches/002-fix_compile_with_uclibc.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- a/lib/pthread.in.h
-+++ b/lib/pthread.in.h
-@@ -232,6 +232,9 @@ pthread_mutex_unlock (pthread_mutex_t *m
- 
- /* Approximate spinlocks with mutexes.  */
- 
-+#ifdef __UCLIBC__
-+#define pthread_spinlock_t original_pthread_spinlock_t
-+#endif
- typedef pthread_mutex_t pthread_spinlock_t;
- 
- static inline int
 

--- a/utils/coreutils/patches/010-fix-gets-removal.patch
+++ /dev/null
@@ -1,16 +1,1 @@
-diff --git a/lib/stdio.in.h b/lib/stdio.in.h
-index 9dc7c4a..9fdac77 100644
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -711,10 +711,6 @@ _GL_CXXALIAS_SYS (gets, char *, (char *s));
- #  undef gets
- # endif
- _GL_CXXALIASWARN (gets);
--/* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
- 
 

--- a/utils/freecwmp/Config.in
+++ /dev/null
@@ -1,27 +1,1 @@
-if PACKAGE_freecwmp-curl || PACKAGE_freecwmp-zstream
 
-config FREECWMP_SCRIPTS_FULL
-	bool "Install all freecwmp scripts"
-	default y
-
-choice
-	prompt "Select ACS sever"
-	default FREECWMP_ACS_MULTI
-
-config FREECWMP_ACS_MULTI
-	bool "No specific ACS, follow standard"
-
-config FREECWMP_ACS_HDM
-	bool "HDM"
-endchoice
-
-config FREECWMP_DEBUG
-	bool "Compile with debug options"
-	default n
-
-config FREECWMP_DEVEL
-	bool "Compile with development options"
-	default n
-
-endif
-

file:a/utils/freecwmp/Makefile (deleted)
--- a/utils/freecwmp/Makefile
+++ /dev/null
@@ -1,134 +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:=freecwmp
-PKG_VERSION:=2013-02-18
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://dev.freecwmp.org/freecwmp
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c1a9c1883189fec77cba32c46bc26658ca3f8123
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_FIXUP:=autoreconf
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_FREECWMP_ACS_MULTI \
-	CONFIG_FREECWMP_ACS_HDM \
-	CONFIG_FREECWMP_DEBUG \
-	CONFIG_FREECWMP_DEVEL
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/freecwmp/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=CWMP client
-  DEPENDS:=+libfreecwmp +libuci +libubox +libubus +libmicroxml +shflags
-endef
-
-define Package/freecwmp/description
- A free client implementation of CWMP (TR-069) protocol
-endef
-
-define Package/freecwmp-curl
-  $(call Package/freecwmp/Default)
-  TITLE+= (using libcurl)
-  DEPENDS+= +libcurl
-  VARIANT:=curl
-endef
-
-define Package/freecwmp-zstream
-  $(call Package/freecwmp/Default)
-  TITLE+= (using libzstream)
-  DEPENDS+= +libzstream
-  VARIANT:=zstream
-endef
-
-define Package/freecwmp-zstream/config
-	source "$(SOURCE)/Config.in"
-endef
-
-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE
-
-TARGET_LDFLAGS += \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-CONFIGURE_ARGS += \
-	--with-libfreecwmp-include-path=$(STAGING_DIR)/usr/include \
-	--with-uci-include-path=$(STAGING_DIR)/usr/include \
-	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
-	--with-libubus-include-path=$(STAGING_DIR)/usr/include
-
-ifeq ($(BUILD_VARIANT),zstream)
-CONFIGURE_ARGS += \
-	--enable-http=zstream \
-	--with-zstream-include-path=$(STAGING_DIR)/usr/include
-endif
-
-ifeq ($(BUILD_VARIANT),curl)
-CONFIGURE_ARGS += \
-	--enable-http=curl
-endif
-
-ifeq ($(CONFIG_FREECWMP_ACS_MULTI),y)
-CONFIGURE_ARGS += \
-	--enable-acs=multi
-endif
-
-ifeq ($(CONFIG_FREECWMP_ACS_HDM),y)
-CONFIGURE_ARGS += \
-	--enable-acs=hdm
-endif
-
-ifeq ($(CONFIG_FREECWMP_DEBUG),y)
-CONFIGURE_ARGS += \
-	--enable-debug
-endif
-
-ifeq ($(CONFIG_FREECWMP_DEVEL),y)
-CONFIGURE_ARGS += \
-	--enable-devel
-endif
-
-define Package/freecwmp-$(BUILD_VARIANT)/conffiles
-/etc/config/freecwmp
-/usr/share/freecwmp/defaults
-endef
-
-define Package/freecwmp-$(BUILD_VARIANT)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/freecwmpd $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/ext/openwrt/config/freecwmp $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/freecwmpd.init $(1)/etc/init.d/freecwmpd
-ifeq ($(CONFIG_FREECWMP_SCRIPTS_FULL),y)
-	$(INSTALL_DIR) $(1)/usr/share/freecwmp
-	$(CP) $(PKG_BUILD_DIR)/ext/openwrt/scripts/defaults $(1)/usr/share/freecwmp
-	$(CP) $(PKG_BUILD_DIR)/ext/openwrt/scripts/functions $(1)/usr/share/freecwmp
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ext/openwrt/scripts/freecwmp.sh $(1)/usr/sbin/freecwmp
-endif
-endef
-
-$(eval $(call BuildPackage,freecwmp-curl))
-$(eval $(call BuildPackage,freecwmp-zstream))
-

--- a/utils/freecwmp/files/freecwmpd.init
+++ /dev/null
@@ -1,13 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2012-2013 OpenWrt.org
 
-START=90
-
-start() {
-	service_start /usr/sbin/freecwmpd
-}
-
-stop() {
-	service_stop /usr/sbin/freecwmpd
-}
-

file:a/utils/haserl/Config.in (deleted)
--- a/utils/haserl/Config.in
+++ /dev/null
@@ -1,36 +1,1 @@
-if PACKAGE_haserl
 
-	config HASERL_with_lua
-		bool
-		default n
-
-	comment "Lua support"
-
-	config HASERL_shell_luac
-		bool
-		prompt "Support --shell=luac"
-		select HASERL_with_lua
-		default n
-		help
-			haserl(1):
-			The luac "shell" is a precompiled lua chunk, so interactive
-			editing and testing of scripts is not possible. However,
-			haserl can be compiled with luac support only, and this
-			allows lua support even in a small memory environment. All
-			haserl lua features listed above are still available. (If
-			luac is the only shell built into haserl, the
-			haserl.loadfile is disabled, as the haserl parser is not
-			compiled in.)
-
-	config HASERL_shell_lua
-		bool
-		prompt "Support --shell=lua"
-		select HASERL_with_lua
-		default n
-		help
-			haserl(1):
-			If compiled with lua support, --shell=lua will enable lua as the
-			script language instead of bash shell.
-
-endif
-

file:a/utils/haserl/Makefile (deleted)
--- a/utils/haserl/Makefile
+++ /dev/null
@@ -1,50 +1,1 @@
-#
-# Copyright (C) 2006-2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=haserl
-PKG_VERSION:=0.9.32
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/haserl
-PKG_MD5SUM:=18e2208aea6d772d1670c1a648bb6b77
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/haserl
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=A CGI wrapper to embed shell scripts in HTML documents
-  URL:=http://haserl.sourceforge.net/
-  MENU:=1
-  DEPENDS:= +HASERL_with_lua:liblua
-endef
-
-define Package/haserl/config
-	source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_HASERL_with_lua),y)
-	CONFIGURE_ARGS+=--with-lua
-	TARGET_LDFLAGS += -ldl
-endif
-ifneq ($(CONFIG_HASERL_shell_lua),y)
-	CONFIGURE_ARGS+=--disable-luashell
-endif
-ifneq ($(CONFIG_HASERL_shell_luac),y)
-	CONFIGURE_ARGS+=--disable-luacshell
-endif
-
-define Package/haserl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/haserl $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,haserl))
-

--- a/utils/haserl/patches/100-replace-lua2c-with-sed.patch
+++ /dev/null
@@ -1,81 +1,1 @@
---- a/src/Makefile.in	2013-09-20 23:52:15.000000000 +0300
-+++ b/src/Makefile.in	2014-05-03 23:06:17.000000000 +0300
-@@ -76,7 +76,6 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--@USE_LUA_TRUE@noinst_PROGRAMS = lua2c$(EXEEXT)
- @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
- @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
- bin_PROGRAMS = haserl$(EXEEXT)
-@@ -115,9 +114,6 @@
- haserl_DEPENDENCIES = $(am__DEPENDENCIES_1)
- haserl_LINK = $(CCLD) $(haserl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--lua2c_SOURCES = lua2c.c
--lua2c_OBJECTS = lua2c.$(OBJEXT)
--lua2c_LDADD = $(LDADD)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -150,8 +146,8 @@
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo "  CCLD    " $@;
- am__v_CCLD_1 = 
--SOURCES = $(haserl_SOURCES) $(nodist_haserl_SOURCES) lua2c.c
--DIST_SOURCES = $(am__haserl_SOURCES_DIST) lua2c.c
-+SOURCES = $(haserl_SOURCES) $(nodist_haserl_SOURCES)
-+DIST_SOURCES = $(am__haserl_SOURCES_DIST)
- am__can_run_installinfo = \
-   case $$AM_UPDATE_INFO_DIR in \
-     n|no|NO) false;; \
-@@ -273,7 +269,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--EXTRA_DIST = haserl_lualib.lua lua2c.c
-+EXTRA_DIST = haserl_lualib.lua
- 
- # Not strictly required, but we explicitly do not distribute the generated inc file
- nodist_haserl_SOURCES = haserl_lualib.inc
-@@ -386,10 +382,6 @@
- 	@rm -f haserl$(EXEEXT)
- 	$(AM_V_CCLD)$(haserl_LINK) $(haserl_OBJECTS) $(haserl_LDADD) $(LIBS)
- 
--@USE_LUA_FALSE@lua2c$(EXEEXT): $(lua2c_OBJECTS) $(lua2c_DEPENDENCIES) $(EXTRA_lua2c_DEPENDENCIES) 
--@USE_LUA_FALSE@	@rm -f lua2c$(EXEEXT)
--@USE_LUA_FALSE@	$(AM_V_CCLD)$(LINK) $(lua2c_OBJECTS) $(lua2c_LDADD) $(LIBS)
--
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
- 
-@@ -406,7 +398,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-haserl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-rfc2388.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-sliding_buffer.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua2c.Po@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -758,17 +749,13 @@
- 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
- 
- 
--# lua2c_LIBS ?= -llua -ldl -lm
--@USE_LUA_TRUE@lua2c_LDFLAGS ?= -Wl,-E
--@USE_LUA_TRUE@lua2c:	lua2c.c
--@USE_LUA_TRUE@	$(CC_FOR_BUILD) $(CFLAGS) $(LUA_CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
--@USE_LUA_TRUE@		-o $@ $^ $(LIBS) $(LUA_LIBS)
- 
--@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c
--@USE_LUA_TRUE@	if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \
-+@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua
-+@USE_LUA_TRUE@	if ! sed -re '/--\[\[/,/\]\]--/d; s/[[:space:]]*--.*//g; s/^[[:space:]]*//g; /^$$/d; s/ (=+) /\1/g; s/,[[:space:]]*/,/g; s/ ([()])/\1/g; s/key/k/g; s/value/v/g; s/^/"/; s/$$/\\n"/' haserl_lualib.lua >$@.tmp; then \
- @USE_LUA_TRUE@		rm $@; \
- @USE_LUA_TRUE@		exit 1 ;\
- @USE_LUA_TRUE@	fi
-+@USE_LUA_TRUE@	{ echo "static const char haserl_lualib[] = "; cat $@.tmp; echo ";"; rm $@.tmp; } >$@
- 
- @USE_LUA_TRUE@h_lua_common.c : haserl_lualib.inc
- 
 

--- a/utils/haserl/patches/101-adjust-script-size.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/src/h_lua_common.c	2013-09-20 23:35:19.000000000 +0300
-+++ b/src/h_lua_common.c	2014-05-03 19:27:43.000000000 +0300
-@@ -79,7 +79,7 @@
- 
-   /* and load our haserl library */
-   if (luaL_loadbuffer
--      (lua_vm, (const char *) &haserl_lualib, sizeof (haserl_lualib),
-+      (lua_vm, (const char *) haserl_lualib, sizeof(haserl_lualib)-1,
-        "luascript.lua") || lua_pcall (lua_vm, 0, 0, 0))
-     {
-       die_with_message (NULL, NULL,
 

file:a/utils/lsof/Makefile (deleted)
--- a/utils/lsof/Makefile
+++ /dev/null
@@ -1,56 +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
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=lsof
-PKG_VERSION:=4.86
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)+dfsg.orig.tar.gz
-PKG_SOURCE_URL:=http://ftp2.de.debian.org/debian/pool/main/l/lsof
-PKG_MD5SUM:=23420509564a897b76055f9d84d19068
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)+dfsg.orig
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS += $(LIBRPC)
-
-define Package/lsof
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=$(LIBRPC_DEPENDS)
-  TITLE:=LiSt Open Files - a diagnostic tool
-  URL:=http://people.freebsd.org/~abe/
-endef
-
-define Build/Configure
-	cd $(PKG_BUILD_DIR); \
-		LINUX_CLIB="-DGLIBCV=2" \
-		LSOF_CC="$(TARGET_CC)" \
-		LSOF_INCLUDE="-I$(STAGING_DIR)/usr/include" \
-		LSOF_VSTR="$(LINUX_VERSION)" \
-		LSOF_CFGF="$(TARGET_CFLAGS)" \
-		LSOF_CFGL="$(TARGET_LDFLAGS)" \
-		LSOF_AR="$(TARGET_CROSS)ar cr" \
-		LSOF_RANLIB="$(TARGET_CROSS)ranlib" \
-		./Configure -n linux
-endef
-
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR)
-endef
-
-define Package/lsof/install	
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lsof $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,lsof))
-

--- a/utils/lsof/patches/001-lsof_makefile.patch
+++ /dev/null
@@ -1,14 +1,1 @@
---- a/lib/Makefile.skel
-+++ b/lib/Makefile.skel
-@@ -21,8 +21,8 @@ OBJ=	ckkv.o cvfs.o dvch.o fino.o isfn.o
- all:	${LIB}
- 
- ${LIB}:	${OBJ}
--	${AR}
--	${RANLIB}
-+	${AR} ${LIB} ${OBJ}
-+	${RANLIB} ${LIB}
- 
- clean:	FRC
- 	rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core
 

--- a/utils/lsof/patches/002-lsof_noportmap.patch
+++ /dev/null
@@ -1,19 +1,1 @@
---- a/print.c
-+++ b/print.c
-@@ -161,6 +161,7 @@ endnm(sz)
- static void
- fill_portmap()
- {
-+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_RPC__)
- 	char buf[128], *cp, *nm;
- 	CLIENT *c;
- 	int h, port, pr;
-@@ -279,6 +280,7 @@ fill_portmap()
- 	    Pth[pr][h] = pt;
- 	}
- 	clnt_destroy(c);
-+#endif
- }
- #endif	/* !defined(HASNORPC_H) */
- 
 

--- a/utils/lsof/patches/003-lsof_selinux.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/Configure
-+++ b/Configure
-@@ -2806,7 +2806,7 @@ return(0); }
- 	LSOF_TMP1=1
-       fi	# }
-     fi	# }
--    if test $LSOF_TMP1 -eq 1	# {
-+    if test 0 -eq 1	# {
-     then
-       LSOF_CFGF="$LSOF_CFGF -DHASSELINUX"
-       LSOF_CFGL="$LSOF_CFGL -lselinux"
 

--- a/utils/lsof/patches/004-lsof_ccv.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- a/Configure
-+++ b/Configure
-@@ -2682,6 +2682,9 @@ LOCKF_OWNER4
-     if test "X$LSOF_CC" = "X"	# {
-     then
-       LSOF_CC=cc
-+    fi	# }
-+    if test "X$LSOF_CCV" = "X"	# {
-+    then
-       LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
-     fi	# }
-     if test "X$LINUX_CONF_CC" = "X"	# {
 

file:a/utils/minicom/Makefile (deleted)
--- a/utils/minicom/Makefile
+++ /dev/null
@@ -1,38 +1,1 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=minicom
-PKG_VERSION:=2.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://alioth.debian.org/download.php/2332/
-PKG_MD5SUM:=0ebe7a91898384ca906787cc4e2c3f25
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/minicom
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncurses
-  TITLE:=Terminal emulation program
-  URL:=http://alioth.debian.org/projects/minicom/
-  SUBMENU:=Terminal
-endef
-
-define Package/minicom/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ascii-xfr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,minicom))
-

--- a/utils/minicom/patches/010-resolve-getline-conflict.patch
+++ /dev/null
@@ -1,112 +1,1 @@
---- a/src/minicom.c
-+++ b/src/minicom.c
-@@ -167,7 +167,7 @@ static void shjump(int sig)
- #endif /*SIGTSTP*/
- 
- /* Get a line from either window or scroll back buffer. */
--static ELM *getline(WIN *w, int no)
-+static ELM *mc_getline(WIN *w, int no)
- {
-   int i;
-   static ELM outofrange[MAXCOLS] = {{0,0,0}};
-@@ -205,7 +205,7 @@ static void drawhist(WIN *w, int y, int 
- 
-   w->direct = 0;
-   for (f = 0; f < w->ys; f++)
--    mc_wdrawelm(w, f, getline(w, y++));
-+    mc_wdrawelm(w, f, mc_getline(w, y++));
-   if (r)
-     mc_wredraw(w, 1);
-   w->direct = 1;
-@@ -227,7 +227,7 @@ void drawhist_look(WIN *w, int y, int r,
-   tmp_line[0]='\0';
-   w->direct = 0;
-   for (f = 0; f < w->ys; f++) {
--    tmp_e = getline(w, y++);
-+    tmp_e = mc_getline(w, y++);
- 
-     /* First we "accumulate" the line into a variable */
-     mc_wdrawelm_var(w, tmp_e, tmp_line);
-@@ -324,7 +324,7 @@ int find_next(WIN *w, WIN *w_hist,
- 
-   for (next_line = hit_line; next_line <= all_lines; next_line++) {
-     /* we do 'something' here... :-) */
--    tmp_e = getline(w_hist, next_line);
-+    tmp_e = mc_getline(w_hist, next_line);
- 
-     /*
-      * First we "accumulate" the line into a variable.
-@@ -379,9 +379,9 @@ wchar_t *StrStr(wchar_t *str1, wchar_t *
- static void drawcite(WIN *w, int y, int citey, int start, int end)
- {
-   if (y+citey >= start && y+citey <= end)
--    mc_wdrawelm_inverse(w, y, getline(w, y+citey));
-+    mc_wdrawelm_inverse(w, y, mc_getline(w, y+citey));
-   else
--    mc_wdrawelm(w, y, getline(w, y+citey));
-+    mc_wdrawelm(w, y, mc_getline(w, y+citey));
- }
- 
- static void drawcite_whole(WIN *w, int y, int start, int end)
-@@ -400,7 +400,7 @@ static void do_cite(WIN *w, int start, i
-   for (y=start; y<=end; y++) {
-     vt_send('>');
-     vt_send(' ');
--    tmp_e = getline(w, y);
-+    tmp_e = mc_getline(w, y);
-     mc_wdrawelm_var(w, tmp_e, tmp_line);
-     tmp_line[w->xs] = 0;
-     for (x = w->xs-1; x >= 0; x--) {
-@@ -600,7 +600,7 @@ static void scrollback(void)
-         if (citemode) {
-           inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
-         } else {
--          tmp_e = getline(b_us, y);
-+          tmp_e = mc_getline(b_us, y);
-           if (wcslen(look_for) > 1) {
-             /* quick scan for pattern match */
-             mc_wdrawelm_var(b_us, tmp_e, tmp_line);
-@@ -611,9 +611,9 @@ static void scrollback(void)
-         }
- 
-         if (inverse)
--          mc_wdrawelm_inverse(b_us, 0, getline(b_us, y));
-+          mc_wdrawelm_inverse(b_us, 0, mc_getline(b_us, y));
-         else
--          mc_wdrawelm(b_us, 0, getline(b_us, y));
-+          mc_wdrawelm(b_us, 0, mc_getline(b_us, y));
-         if (citemode)
-           mc_wlocate(b_us, 0, cite_y);
-         mc_wflush();
-@@ -648,7 +648,7 @@ static void scrollback(void)
-         if (citemode) {
-           inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
-         } else {
--          tmp_e = getline(b_us, y + b_us->ys - 1);
-+          tmp_e = mc_getline(b_us, y + b_us->ys - 1);
-           if (wcslen(look_for) > 1) {
-             /* quick scan for pattern match */
-             mc_wdrawelm_var(b_us, tmp_e, tmp_line);
-@@ -660,10 +660,10 @@ static void scrollback(void)
- 
-         if (inverse)
-           mc_wdrawelm_inverse(b_us, b_us->ys - 1,
--                           getline(b_us, y + b_us->ys - 1));
-+                           mc_getline(b_us, y + b_us->ys - 1));
-         else
-           mc_wdrawelm(b_us, b_us->ys - 1,
--                   getline(b_us, y + b_us->ys - 1));
-+                   mc_getline(b_us, y + b_us->ys - 1));
-         if (citemode)
-           mc_wlocate(b_us, 0, cite_y);
-         mc_wflush();
-@@ -753,7 +753,7 @@ static void scrollback(void)
-         mc_wlocate(b_st, 0, 0);
-         mc_wprintf(b_st, hline);
-         mc_wredraw(b_st, 1);
--        mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
-+        mc_wdrawelm_inverse(b_us, cite_y, mc_getline(b_us, cite_ystart));
-         mc_wlocate(b_us, 0, cite_y);
-         break;
-       case K_ESC:
 

file:a/utils/nano/Makefile (deleted)
--- a/utils/nano/Makefile
+++ /dev/null
@@ -1,53 +1,1 @@
-#
-# Copyright (C) 2007-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:=nano
-PKG_VERSION:=2.2.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.nano-editor.org/dist/v2.2
-PKG_MD5SUM:=03233ae480689a008eb98feb1b599807
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nano
-  SUBMENU:=Editors
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=An enhanced clone of the Pico text editor
-  URL:=http://www.nano-editor.org/
-  MAINTAINER:=Bernhard Loos <bernhardloos@googlemail.com>
-  DEPENDS:=+libncurses
-endef
-
-define Package/nano/description
-  GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone
-  of the Pico text editor.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-tiny \
-	--disable-glibtest \
-	--disable-utf8 \
-	--without-slang \
-
-CONFIGURE_VARS += \
-	ac_cv_header_regex_h=no \
-
-define Package/nano/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,nano))
-

file:a/utils/rtl-sdr/Makefile (deleted)
--- a/utils/rtl-sdr/Makefile
+++ /dev/null
@@ -1,89 +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:=rtl-sdr
-PKG_VERSION:=2013-06-12
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.osmocom.org/rtl-sdr.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8c3a99c8f7a88d7d2a05845d4b20cfcdacac4054
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-CMAKE_INSTALL:=1
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/rtl-sdr/Default
-  TITLE:=Software Defined Radio with Realtek RTL2832U
-  URL:=http://sdr.osmocom.org/trac/wiki/rtl-sdr
-endef
-
-define Package/rtl-sdr/Default/description
-  rtl-sdr allows DVB-T dongles based on the Realtek RTL2832U to be used as
-  an inexpensive SDR.
-endef
-
-define Package/rtl-sdr
-  $(call Package/rtl-sdr/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+librt +libpthread +librtlsdr
-endef
-
-define Package/rtl-sdr/description
-  $(call Package/rtl-sdr/Default/description)
-
-  This package contains the utilities and daemons.
-endef
-
-define Package/librtlsdr
-  $(call Package/rtl-sdr/Default)
-  TITLE+= shared library
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+= library
-  DEPENDS:=+libusb-1.0
-endef
-
-define Package/librtlsdr/description
-  $(call Package/rtl-sdr/Default/description)
-
-  This package contains the librtlsdr shared library.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librtlsdr.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/librtlsdr.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/rtl-sdr/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rtl_* $(1)/usr/bin/
-endef
-
-define Package/librtlsdr/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librtlsdr.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,rtl-sdr))
-$(eval $(call BuildPackage,librtlsdr))
-

--- a/utils/smartmontools/Makefile
+++ /dev/null
@@ -1,95 +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
-include $(INCLUDE_DIR)/uclibc++.mk
-
-PKG_NAME:=smartmontools
-PKG_VERSION:=5.40
-PKG_RELEASE:=4
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/smartmontools
-PKG_MD5SUM:=0f0be0239914ad87830a4fff594bda5b
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/smartmontools/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=$(CXX_DEPENDS)
-  TITLE:=S.M.A.R.T Monitoring
-  URL:=http://smartmontools.sourceforge.net/
-endef
-
-define Package/smartmontools
-  $(call Package/smartmontools/Default)
-  TITLE+= Tool
-endef
-
-define Package/smartmontools/description
-  smartmontools contains utility programs (smartctl) to
-  control/monitor storage systems using the Self-Monitoring, Analysis
-  and Reporting Technology System (S.M.A.R.T.) built into most modern
-  ATA and SCSI disks. It is derived from smartsuite.
-endef
-
-define Package/smartd
-  $(call Package/smartmontools/Default)
-  DEPENDS+= +rsync
-  TITLE+= Daemon
-endef
-
-define Package/smartd/description
-  smartmontools contains utility programs (smartd) to
-  control/monitor storage systems using the Self-Monitoring, Analysis
-  and Reporting Technology System (S.M.A.R.T.) built into most modern
-  ATA and SCSI disks. It is derived from smartsuite.
-endef
-
-# uses GNU configure
-
-CONFIGURE_VARS += \
-	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
-	LDFLAGS="$$$$LDFLAGS" \
-	LIBS="-nodefaultlibs -lc -luClibc++ -lm $(LIBGCC_S) -lc" \
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-		./autogen.sh \
-	);
-	$(call Build/Configure/Default)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		BUILD_INFO='"(localbuild)"' \
-		LD="$(TARGET_CXX)"
-endef
-
-define Package/smartmontools/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/smartctl $(1)/usr/sbin/
-endef
-
-define Package/smartd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/smartd $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/smartd.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/smartd.init $(1)/etc/init.d/smartd
-endef
-
-define Package/smartd/conffiles
-/etc/smartd.conf
-endef
-
-$(eval $(call BuildPackage,smartmontools))
-$(eval $(call BuildPackage,smartd))
-

--- a/utils/smartmontools/files/smartd.conf
+++ /dev/null
@@ -1,2 +1,1 @@
-/dev/hdb -H
 

--- a/utils/smartmontools/files/smartd.init
+++ /dev/null
@@ -1,17 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
 
-START=95
-
-start() {
-	service_start /usr/sbin/smartd -q never
-}
-
-stop() {
-	service_stop /usr/sbin/smartd
-}
-
-reload() {
-	service_reload /usr/sbin/smartd
-}
-

file:a/utils/tmux/Makefile (deleted)
--- a/utils/tmux/Makefile
+++ /dev/null
@@ -1,44 +1,1 @@
-#
-# Copyright (C) 2009-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:=tmux
-PKG_VERSION:=1.6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/tmux
-PKG_MD5SUM:=3e37db24aa596bf108a0442a81c845b3
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tmux
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Terminal multiplexer
-  DEPENDS:=+libncurses +libevent2 +libpthread +librt
-  URL:=http://tmux.sourceforge.net/
-endef
-
-define Package/tmux/description
-  tmux is a modern, BSD-licensed alternative to GNU screen.
-endef
-
-MAKE_FLAGS += \
-	PREFIX="/usr" \
-	PLATFORM="linux"
-
-define Package/tmux/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tmux $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,tmux))
-

--- a/utils/tmux/patches/100-b64_ntop-conflict.patch
+++ /dev/null
@@ -1,42 +1,1 @@
-Index: tmux-1.6/compat.h
-===================================================================
---- tmux-1.6.orig/compat.h
-+++ tmux-1.6/compat.h
-@@ -198,7 +198,9 @@ int	 	 daemon(int, int);
- 
- #ifndef HAVE_B64_NTOP
- /* b64_ntop.c */
--int		 b64_ntop(const char *, size_t, char *, size_t);
-+int		 local_b64_ntop(const char *, size_t, char *, size_t);
-+#else
-+#define local_b64_ntop b64_ntop
- #endif
- 
- #ifndef HAVE_FORKPTY
-Index: tmux-1.6/compat/b64_ntop.c
-===================================================================
---- tmux-1.6.orig/compat/b64_ntop.c
-+++ tmux-1.6/compat/b64_ntop.c
-@@ -122,7 +122,7 @@ static const char Pad64 = '=';
-    */
- 
- int
--b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
-+local_b64_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize) {
- 	size_t datalength = 0;
- 	uint8_t input[3];
- 	uint8_t output[4];
-Index: tmux-1.6/tty.c
-===================================================================
---- tmux-1.6.orig/tty.c
-+++ tmux-1.6/tty.c
-@@ -1006,7 +1006,7 @@ tty_cmd_setselection(struct tty *tty, co
- 	off = 4 * ((ctx->num + 2) / 3) + 1; /* storage for base64 */
- 	buf = xmalloc(off);
- 
--	b64_ntop(ctx->ptr, ctx->num, buf, off);
-+	local_b64_ntop(ctx->ptr, ctx->num, buf, off);
- 	tty_putcode_ptr2(tty, TTYC_MS, "", buf);
- 
- 	xfree(buf);
 

file:a/utils/unrar/Makefile (deleted)
--- a/utils/unrar/Makefile
+++ /dev/null
@@ -1,49 +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:=unrar
-PKG_VERSION:=4.0.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.rarlab.com/rar
-PKG_MD5SUM:=41b0a9bca945b4ae2608421afd8f606e
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/unrar
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/uclibc++.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/unrar
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=compression
-  TITLE:=unrar application
-  URL:=http://www.rarlab.com/
-  DEPENDS:=$(CXX_DEPENDS)
-endef
-
-define Package/unrar/description
-   unrar is an application that can decompress files and archives created using
-   the RAR compression scheme
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, )
-	ln -s $(PKG_BUILD_DIR)/makefile.unix $(PKG_BUILD_DIR)/Makefile
-endef
-
-define Package/unrar/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/unrar $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,unrar))
-

file:a/utils/unzip/Makefile (deleted)
--- a/utils/unzip/Makefile
+++ /dev/null
@@ -1,57 +1,1 @@
-#
-# Copyright (C) 2006-2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=unzip
-PKG_VERSION:=5.52
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)552.zip
-PKG_SOURCE_URL:=@SF/infozip
-PKG_MD5SUM:=3d55b4e7375c3d0b81feca52dc0e4d48
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
-
-define Package/unzip
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=
-  TITLE:=De-archiver for .zip files
-  URL:=http://infozip.sourceforge.net/UnZip.html
-  SUBMENU:=compression
-endef
-
-define Package/unzip/description
-	InfoZIP's unzip program. With the exception of multi-volume archives
-	(ie, .ZIP files that are split across several disks using PKZIP's /& option),
-	this can handle any file produced either by PKZIP, or the corresponding
-	InfoZIP zip program.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -f unix/Makefile generic \
-		$(TARGET_CONFIGURE_OPTS) \
-		prefix="$(PKG_INSTALL_DIR)/usr" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CF="$(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \
-		LD="$(TARGET_CC) $(TARGET_LDFLAGS)" \
-		install
-endef
-
-define Package/unzip/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,unzip))
-

file:a/utils/zip/Makefile (deleted)
--- a/utils/zip/Makefile
+++ /dev/null
@@ -1,56 +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:=zip
-PKG_VERSION:=2.32
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)232.zip
-PKG_SOURCE_URL:=@SF/infozip
-PKG_MD5SUM:=da947ed356e5fdb30ff4bc3dc7698f33
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
-
-define Package/zip
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=
-  TITLE:=Archiver for .zip files
-  URL:=http://infozip.sourceforge.net/Zip.html
-  SUBMENU:=compression
-endef
-
-define Package/zip/description
-	This is InfoZIP's zip program. It produces files that are fully
-	compatible with the popular PKZIP program; however, the command line
-	options are not identical. In other words, the end result is the same,
-	but the methods differ.
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -f unix/Makefile generic \
-		prefix="$(PKG_INSTALL_DIR)/usr" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CC="$(TARGET_CC) $(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \
-		LD="$(TARGET_CC) $(TARGET_LDFLAGS)" \
-		install
-endef
-
-define Package/zip/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,zip))
-

comments