From: Luka Perkov <luka@openwrt.org>
Date: Sun, 11 Jan 2015 23:41:33 +0000 (+0000)
Subject: squid: moved to github
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=581b89cd9a4b95b7041545d3367e1d79a53f9d96;p=openwrt%2Fsvn-archive%2Fpackages.git

squid: moved to github

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

SVN-Revision: 43943
---

diff --git a/net/squid/Makefile b/net/squid/Makefile
deleted file mode 100644
index 04d2d7b27..000000000
--- a/net/squid/Makefile
+++ /dev/null
@@ -1,189 +0,0 @@
-#
-# 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:=squid
-PKG_VERSION:=2.7.STABLE9
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.7/
-PKG_MD5SUM:=3c6642c85470b1079207d43bba25a819
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/squid/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  URL:=http://www.squid-cache.org/
-endef
-
-define Package/squid
-  $(call Package/squid/Default)
-  MENU:=1
-  DEPENDS:=+libopenssl +libpthread
-  TITLE:=full-featured Web proxy cache
-endef
-
-define Package/squid/description
-	Squid is a high-performance proxy caching server for web clients,
-	supporting FTP, gopher, and HTTP data objects. Unlike traditional
-	caching software, Squid handles all requests in a single,
-	non-blocking, I/O-driven process.
-endef
-
-define Package/squid/conffiles
-/etc/squid/mime.conf
-/etc/squid/squid.conf
-endef
-
-define Package/squid-mod-cachemgr
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=Web based proxy manager and reporting tool
-endef
-
-define Package/squid-mod-basic-auth-getpwnam
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=getpwnam basic authentication helper
-endef
-
-define Package/squid-mod-basic-auth-ncsa
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=NCSA basic authentication helper
-endef
-
-define Package/squid-mod-basic-auth-smb
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=Samba basic authentication helper
-endef
-
-define Package/squid-mod-digest-auth-password
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=Password digest authentication helper
-endef
-
-define Package/squid-mod-external-acl-ip-user
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=IP user external ACL helper
-endef
-
-define Package/squid-mod-external-acl-unix-group
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=Unix group external ACL helper
-endef
-
-define Package/squid-mod-ntlm-auth-fakeauth
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=Fakeauth NTLM authentication helper
-endef
-
-define Package/squid-mod-ntlm-auth-smb-auth
-  $(call Package/squid/Default)
-  DEPENDS:=squid
-  TITLE:=Samba NTLM authentication helper
-endef
-
-CONFIGURE_ARGS += \
-	--datadir=/usr/share/squid \
-	--libexecdir=/usr/lib/squid \
-	--sysconfdir=/etc/squid \
-	--enable-shared \
-	--enable-static \
-	--enable-x-accelerator-vary \
-	--with-pthreads \
-	--with-dl \
-	--enable-icmp \
-	--enable-kill-parent-hack \
-	--enable-arp-acl \
-	--enable-ssl \
-	--enable-htcp \
-	--enable-err-languages=English \
-	--enable-default-err-language=English \
-	--enable-linux-netfilter \
-	--enable-icmp \
-	--enable-external-acl-helpers="" \
-	--enable-underscores \
-	--enable-cache-digests \
-	--enable-referer-log \
-	--enable-delay-pools \
-	--enable-useragent-log \
-	--with-openssl=$(STAGING_DIR)/usr \
-	--enable-auth="basic digest ntlm" \
-	--enable-basic-auth-helpers="getpwnam NCSA SMB" \
-	--enable-ntlm-auth-helpers="fakeauth SMB" \
-	--enable-digest-auth-helpers="password" \
-	--enable-external-acl-helpers="ip_user unix_group" \
-	--enable-storeio=null,ufs \
-	--enable-epoll \
-	--with-maxfd=4096 \
-	--without-libcap
-
-CONFIGURE_VARS += \
-	ac_cv_header_linux_netfilter_ipv4_h=yes \
-	ac_cv_epoll_works=yes \
-
-define Build/Compile
-	# pass INCLUDES to compile host sources against our OpenSSL, not the host one
-	$(MAKE) -C $(PKG_BUILD_DIR)/lib \
-		all
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-endef
-
-define BuildPlugin
-  define Package/$(1)/install
-	$(INSTALL_DIR) $$(1)/usr/lib/squid
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/$(2) $$(1)/usr/lib/squid/
-  endef
-
-  $$(eval $$(call BuildPackage,$(1)))
-endef
-
-define Package/squid/install
-	$(INSTALL_DIR) $(1)/etc/squid
-	$(CP) $(PKG_INSTALL_DIR)/etc/squid/mime.conf $(1)/etc/squid/
-	$(CP) $(PKG_INSTALL_DIR)/etc/squid/squid.conf $(1)/etc/squid/
-	$(INSTALL_DIR) $(1)/usr/share/squid
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/squid/* $(1)/usr/share/squid/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/squid
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/{unlinkd,pinger,logfile-daemon} $(1)/usr/lib/squid/
-endef
-
-define Package/squid-mod-cachemgr/install
-	$(INSTALL_DIR) $(1)/www/cgi-bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/cachemgr.cgi $(1)/www/cgi-bin/
-endef
-
-$(eval $(call RequireHeader,/usr/include/openssl/ssl.h, \
-	$(PKG_NAME) requires the openssl development (named like libssl-dev, \
-	depending of your package manager) package be installed on the host-system. \
-))
-
-$(eval $(call BuildPackage,squid))
-$(eval $(call BuildPackage,squid-mod-cachemgr))
-$(eval $(call BuildPlugin,squid-mod-basic-auth-getpwnam,getpwname_auth))
-$(eval $(call BuildPlugin,squid-mod-basic-auth-ncsa,ncsa_auth))
-$(eval $(call BuildPlugin,squid-mod-basic-auth-smb,smb_auth))
-$(eval $(call BuildPlugin,squid-mod-digest-auth-password,digest_pw_auth))
-$(eval $(call BuildPlugin,squid-mod-external-acl-ip-user,ip_user_check))
-$(eval $(call BuildPlugin,squid-mod-external-acl-unix-group,squid_unix_group))
-$(eval $(call BuildPlugin,squid-mod-ntlm-auth-fakeauth,fakeauth_auth))
-$(eval $(call BuildPlugin,squid-mod-ntlm-auth-smb-auth,ntlm_auth))
-
diff --git a/net/squid/patches/001-cross_compile.patch b/net/squid/patches/001-cross_compile.patch
deleted file mode 100644
index f2648d91c..000000000
--- a/net/squid/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,561 +0,0 @@
---- /dev/null
-+++ b/src/ctype.c
-@@ -0,0 +1,546 @@
-+/*
-+ Static ctype data for IFC-7.1 / RedHat-9 workaround.
-+ This is taken from the GLIBC source code.
-+ Hack by Joe Krahn <krahn@niehs.nih.gov>
-+
-+ To use, compile with gcc (ifc should work as well):
-+
-+   gcc -c ctype.c
-+
-+ Next, include the resulting ctype.o when creating executables.
-+ Do this automatically using a ~/.ifcrc file with a line like this:
-+  
-+   -Wl,/some/path/ctype.o
-+
-+ That's all.
-+
-+ My .ifcrc also turns off the typically excessive warnings:
-+   -cm -w90 -w95 -Wl,/home/krahn/Prog/ctype/ctype.o
-+ 
-+ To IFC maintainters: it would be nice to flag on/off specific
-+ warning types, like -woff=22,33,44
-+
-+*/
-+
-+/*
-+  file: ctype.c
-+
-+  Derived from C-ctype.c and ctype-info.c in the GLIBC 2.3 source.
-+
-+  To compile: (either gcc or icc is OK)
-+      icc -c ctype.c
-+
-+  To use, just add the object file ctype.o at link stage. Example:
-+      ifc -o hello hello.f ctype.o
-+
-+*/
-+
-+
-+/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <stdint.h>
-+
-+/* This table's entries are taken from POSIX.2 Table 2-6
-+   ``LC_CTYPE Category Definition in the POSIX Locale''.
-+
-+   The `_nl_C_LC_CTYPE_width' array is a GNU extension.
-+
-+   In the `_nl_C_LC_CTYPE_class' array the value for EOF (== -1)
-+   is set to always return 0 and the conversion arrays return EOF.  */
-+
-+const char _nl_C_LC_CTYPE_class[768] =
-+  /* 0x80 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0x86 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0x8c */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0x92 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0x98 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0x9e */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xa4 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xaa */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xb0 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xb6 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xbc */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xc2 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xc8 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xce */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xd4 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xda */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xe0 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xe6 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xec */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xf2 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xf8 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xfe */ "\000\000" "\000\000" "\002\000" "\002\000" "\002\000" "\002\000"
-+  /* 0x04 */ "\002\000" "\002\000" "\002\000" "\002\000" "\002\000" "\003\040"
-+  /* 0x0a */ "\002\040" "\002\040" "\002\040" "\002\040" "\002\000" "\002\000"
-+  /* 0x10 */ "\002\000" "\002\000" "\002\000" "\002\000" "\002\000" "\002\000"
-+  /* 0x16 */ "\002\000" "\002\000" "\002\000" "\002\000" "\002\000" "\002\000"
-+  /* 0x1c */ "\002\000" "\002\000" "\002\000" "\002\000" "\001\140" "\004\300"
-+  /* 0x22 */ "\004\300" "\004\300" "\004\300" "\004\300" "\004\300" "\004\300"
-+  /* 0x28 */ "\004\300" "\004\300" "\004\300" "\004\300" "\004\300" "\004\300"
-+  /* 0x2e */ "\004\300" "\004\300" "\010\330" "\010\330" "\010\330" "\010\330"
-+  /* 0x34 */ "\010\330" "\010\330" "\010\330" "\010\330" "\010\330" "\010\330"
-+  /* 0x3a */ "\004\300" "\004\300" "\004\300" "\004\300" "\004\300" "\004\300"
-+  /* 0x40 */ "\004\300" "\010\325" "\010\325" "\010\325" "\010\325" "\010\325"
-+  /* 0x46 */ "\010\325" "\010\305" "\010\305" "\010\305" "\010\305" "\010\305"
-+  /* 0x4c */ "\010\305" "\010\305" "\010\305" "\010\305" "\010\305" "\010\305"
-+  /* 0x52 */ "\010\305" "\010\305" "\010\305" "\010\305" "\010\305" "\010\305"
-+  /* 0x58 */ "\010\305" "\010\305" "\010\305" "\004\300" "\004\300" "\004\300"
-+  /* 0x5e */ "\004\300" "\004\300" "\004\300" "\010\326" "\010\326" "\010\326"
-+  /* 0x64 */ "\010\326" "\010\326" "\010\326" "\010\306" "\010\306" "\010\306"
-+  /* 0x6a */ "\010\306" "\010\306" "\010\306" "\010\306" "\010\306" "\010\306"
-+  /* 0x70 */ "\010\306" "\010\306" "\010\306" "\010\306" "\010\306" "\010\306"
-+  /* 0x76 */ "\010\306" "\010\306" "\010\306" "\010\306" "\010\306" "\004\300"
-+  /* 0x7c */ "\004\300" "\004\300" "\004\300" "\002\000" "\000\000" "\000\000"
-+  /* 0x82 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0x88 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0x8e */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0x94 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0x9a */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xa0 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xa6 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xac */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xb2 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xb8 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xbe */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xc4 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xca */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xd0 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xd6 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xdc */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xe2 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xe8 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xee */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xf4 */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+  /* 0xfa */ "\000\000" "\000\000" "\000\000" "\000\000" "\000\000" "\000\000"
-+;
-+const char _nl_C_LC_CTYPE_class32[1024] =
-+  /* 0x00 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
-+  /* 0x03 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
-+  /* 0x06 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
-+  /* 0x09 */ "\000\000\003\040" "\000\000\002\040" "\000\000\002\040"
-+  /* 0x0c */ "\000\000\002\040" "\000\000\002\040" "\000\000\002\000"
-+  /* 0x0f */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
-+  /* 0x12 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
-+  /* 0x15 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
-+  /* 0x18 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
-+  /* 0x1b */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
-+  /* 0x1e */ "\000\000\002\000" "\000\000\002\000" "\000\000\001\140"
-+  /* 0x21 */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x24 */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x27 */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x2a */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x2d */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x30 */ "\000\000\010\330" "\000\000\010\330" "\000\000\010\330"
-+  /* 0x33 */ "\000\000\010\330" "\000\000\010\330" "\000\000\010\330"
-+  /* 0x36 */ "\000\000\010\330" "\000\000\010\330" "\000\000\010\330"
-+  /* 0x39 */ "\000\000\010\330" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x3c */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x3f */ "\000\000\004\300" "\000\000\004\300" "\000\000\010\325"
-+  /* 0x42 */ "\000\000\010\325" "\000\000\010\325" "\000\000\010\325"
-+  /* 0x45 */ "\000\000\010\325" "\000\000\010\325" "\000\000\010\305"
-+  /* 0x48 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
-+  /* 0x4b */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
-+  /* 0x4e */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
-+  /* 0x51 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
-+  /* 0x54 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
-+  /* 0x57 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
-+  /* 0x5a */ "\000\000\010\305" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x5d */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x60 */ "\000\000\004\300" "\000\000\010\326" "\000\000\010\326"
-+  /* 0x63 */ "\000\000\010\326" "\000\000\010\326" "\000\000\010\326"
-+  /* 0x66 */ "\000\000\010\326" "\000\000\010\306" "\000\000\010\306"
-+  /* 0x69 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
-+  /* 0x6c */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
-+  /* 0x6f */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
-+  /* 0x72 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
-+  /* 0x75 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
-+  /* 0x78 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
-+  /* 0x7b */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
-+  /* 0x7e */ "\000\000\004\300" "\000\000\002\000" "\000\000\000\000"
-+  /* 0x81 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x84 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x87 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x8a */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x8d */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x90 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x93 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x96 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x99 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x9c */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0x9f */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xa2 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xa5 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xa8 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xab */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xae */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xb1 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xb4 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xb7 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xba */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xbd */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xc0 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xc3 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xc6 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xc9 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xcc */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xcf */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xd2 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xd5 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xd8 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xdb */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xde */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xe1 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xe4 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xe7 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xea */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xed */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xf0 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xf3 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xf6 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xf9 */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xfc */ "\000\000\000\000" "\000\000\000\000" "\000\000\000\000"
-+  /* 0xff */ "\000\000\000\000"
-+;
-+const uint32_t _nl_C_LC_CTYPE_toupper[384] =
-+{
-+  /* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-+  /* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-+  /* 0x90 */ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-+  /* 0x98 */ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-+  /* 0xa0 */ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-+  /* 0xa8 */ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-+  /* 0xb0 */ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-+  /* 0xb8 */ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-+  /* 0xc0 */ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-+  /* 0xc8 */ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-+  /* 0xd0 */ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-+  /* 0xd8 */ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-+  /* 0xe0 */ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-+  /* 0xe8 */ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-+  /* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-+  /* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xffffffff,
-+  /* 0x00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+  /* 0x08 */ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-+  /* 0x10 */ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-+  /* 0x18 */ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-+  /* 0x20 */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-+  /* 0x28 */ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-+  /* 0x30 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-+  /* 0x38 */ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-+  /* 0x40 */ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-+  /* 0x48 */ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-+  /* 0x50 */ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
-+  /* 0x58 */ 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
-+  /* 0x60 */ 0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-+  /* 0x68 */ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-+  /* 0x70 */ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
-+  /* 0x78 */ 0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-+  /* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-+  /* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-+  /* 0x90 */ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-+  /* 0x98 */ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-+  /* 0xa0 */ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-+  /* 0xa8 */ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-+  /* 0xb0 */ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-+  /* 0xb8 */ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-+  /* 0xc0 */ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-+  /* 0xc8 */ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-+  /* 0xd0 */ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-+  /* 0xd8 */ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-+  /* 0xe0 */ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-+  /* 0xe8 */ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-+  /* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-+  /* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-+};
-+const uint32_t _nl_C_LC_CTYPE_tolower[384] =
-+{
-+  /* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-+  /* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-+  /* 0x90 */ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-+  /* 0x98 */ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-+  /* 0xa0 */ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-+  /* 0xa8 */ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-+  /* 0xb0 */ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-+  /* 0xb8 */ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-+  /* 0xc0 */ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-+  /* 0xc8 */ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-+  /* 0xd0 */ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-+  /* 0xd8 */ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-+  /* 0xe0 */ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-+  /* 0xe8 */ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-+  /* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-+  /* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xffffffff,
-+  /* 0x00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+  /* 0x08 */ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-+  /* 0x10 */ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-+  /* 0x18 */ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-+  /* 0x20 */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-+  /* 0x28 */ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-+  /* 0x30 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-+  /* 0x38 */ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-+  /* 0x40 */ 0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-+  /* 0x48 */ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-+  /* 0x50 */ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-+  /* 0x58 */ 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
-+  /* 0x60 */ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-+  /* 0x68 */ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-+  /* 0x70 */ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-+  /* 0x78 */ 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-+  /* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-+  /* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-+  /* 0x90 */ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-+  /* 0x98 */ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-+  /* 0xa0 */ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-+  /* 0xa8 */ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-+  /* 0xb0 */ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-+  /* 0xb8 */ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-+  /* 0xc0 */ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-+  /* 0xc8 */ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-+  /* 0xd0 */ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-+  /* 0xd8 */ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-+  /* 0xe0 */ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-+  /* 0xe8 */ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-+  /* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-+  /* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
-+};
-+
-+#define STRUCT_CTYPE_CLASS(p, q) \
-+  struct                                                                      \
-+    {                                                                         \
-+      uint32_t isctype_data[8];                                               \
-+      uint32_t header[5];                                                     \
-+      uint32_t level1[1];                                                     \
-+      uint32_t level2[1 << q];                                                \
-+      uint32_t level3[1 << p];                                                \
-+    }
-+
-+const STRUCT_CTYPE_CLASS(1, 1) _nl_C_LC_CTYPE_class_upper =
-+{
-+  { 0x00000000, 0x00000000, 0x07fffffe, 0x00000000,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 7, 1, 6, 1, 1 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 0, 8 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x07fffffe, 0x00000000 }
-+};
-+const STRUCT_CTYPE_CLASS(1, 1) _nl_C_LC_CTYPE_class_lower =
-+{
-+  { 0x00000000, 0x00000000, 0x00000000, 0x07fffffe,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 7, 1, 6, 1, 1 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 0, 8 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x00000000, 0x07fffffe }
-+};
-+const STRUCT_CTYPE_CLASS(1, 1) _nl_C_LC_CTYPE_class_alpha =
-+{
-+  { 0x00000000, 0x00000000, 0x07fffffe, 0x07fffffe,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 7, 1, 6, 1, 1 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 0, 8 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x07fffffe, 0x07fffffe }
-+};
-+const STRUCT_CTYPE_CLASS(1, 0) _nl_C_LC_CTYPE_class_digit =
-+{
-+  { 0x00000000, 0x03ff0000, 0x00000000, 0x00000000,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 6, 1, 6, 0, 1 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 7 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x00000000, 0x03ff0000 }
-+};
-+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_xdigit =
-+{
-+  { 0x00000000, 0x03ff0000, 0x0000007e, 0x0000007e,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 7, 1, 7, 0, 3 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 7 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x00000000, 0x03ff0000, 0x0000007e, 0x0000007e }
-+};
-+const STRUCT_CTYPE_CLASS(1, 0) _nl_C_LC_CTYPE_class_space =
-+{
-+  { 0x00003e00, 0x00000001, 0x00000000, 0x00000000,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 6, 1, 6, 0, 1 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 7 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x00003e00, 0x00000001 }
-+};
-+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_print =
-+{
-+  { 0x00000000, 0xffffffff, 0xffffffff, 0x7fffffff,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 7, 1, 7, 0, 3 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 7 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x00000000, 0xffffffff, 0xffffffff, 0x7fffffff }
-+};
-+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_graph =
-+{
-+  { 0x00000000, 0xfffffffe, 0xffffffff, 0x7fffffff,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 7, 1, 7, 0, 3 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 7 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x00000000, 0xfffffffe, 0xffffffff, 0x7fffffff }
-+};
-+const STRUCT_CTYPE_CLASS(1, 0) _nl_C_LC_CTYPE_class_blank =
-+{
-+  { 0x00000200, 0x00000001, 0x00000000, 0x00000000,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 6, 1, 6, 0, 1 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 7 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x00000200, 0x00000001 }
-+};
-+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_cntrl =
-+{
-+  { 0xffffffff, 0x00000000, 0x00000000, 0x80000000,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 7, 1, 7, 0, 3 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 7 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0xffffffff, 0x00000000, 0x00000000, 0x80000000 }
-+};
-+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_punct =
-+{
-+  { 0x00000000, 0xfc00fffe, 0xf8000001, 0x78000001,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 7, 1, 7, 0, 3 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 7 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x00000000, 0xfc00fffe, 0xf8000001, 0x78000001 }
-+};
-+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_alnum =
-+{
-+  { 0x00000000, 0x03ff0000, 0x07fffffe, 0x07fffffe,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  },
-+  { 7, 1, 7, 0, 3 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 7 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  { 0x00000000, 0x03ff0000, 0x07fffffe, 0x07fffffe }
-+};
-+
-+const struct
-+{
-+  uint32_t header[5];
-+  uint32_t level1[1];
-+  uint32_t level2[4];
-+  int32_t level3[32];
-+}
-+_nl_C_LC_CTYPE_map_toupper =
-+{
-+  { 7, 1, 5, 3, 31 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 0, 0, 0, 10 * sizeof (uint32_t) },
-+  /* 3rd-level table */
-+  {
-+    0x00000000, 0xffffffe0, 0xffffffe0, 0xffffffe0,
-+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
-+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
-+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
-+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
-+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
-+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0x00000000,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  }
-+},
-+_nl_C_LC_CTYPE_map_tolower =
-+{
-+  { 7, 1, 5, 3, 31 },
-+  /* 1st-level table */
-+  { 6 * sizeof (uint32_t) },
-+  /* 2nd-level table */
-+  { 0, 0, 10 * sizeof (uint32_t), 0 },
-+  /* 3rd-level table */
-+  {
-+    0x00000000, 0x00000020, 0x00000020, 0x00000020,
-+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
-+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
-+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
-+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
-+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
-+    0x00000020, 0x00000020, 0x00000020, 0x00000000,
-+    0x00000000, 0x00000000, 0x00000000, 0x00000000
-+  }
-+};
-+
-+#define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o)
-+
-+const uint16_t *__ctype_b = b (uint16_t, class, 128);
-+const uint32_t *__ctype32_b = b (uint32_t, class32, 0);
-+const int32_t *__ctype_tolower = b (int32_t, tolower, 128);
-+const int32_t *__ctype_toupper = b (int32_t, toupper, 128);
-+const uint32_t *__ctype32_tolower = b (uint32_t, tolower, 128);
-+const uint32_t *__ctype32_toupper = b (uint32_t, toupper, 128);
-+
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1234,6 +1234,9 @@ squid.conf.default: cf_parser.h
- 	true
- 
- cf_parser.h: cf.data cf_gen$(EXEEXT)
-+	rm -f cf_gen
-+	gcc -c ctype.c
-+	gcc -o cf_gen cf_gen.c -DNODEBUG=1 -I./ -I../ -I../include/ -L../lib -lmiscutil$(shell uname -m) -lm -lnsl -Wl,ctype.o
- 	./cf_gen cf.data $(srcdir)/cf.data.depend
- 
- cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
diff --git a/net/squid/patches/002-no_sslv2.patch b/net/squid/patches/002-no_sslv2.patch
deleted file mode 100644
index c5c0f0eeb..000000000
--- a/net/squid/patches/002-no_sslv2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/ssl_support.c
-+++ b/src/ssl_support.c
-@@ -446,10 +446,12 @@ sslCreateServerContext(const char *certf
-     ERR_clear_error();
-     debug(83, 1) ("Initialising SSL.\n");
-     switch (version) {
-+#ifndef OPENSSL_NO_SSL2
-     case 2:
- 	debug(83, 5) ("Using SSLv2.\n");
- 	method = SSLv2_server_method();
- 	break;
-+#endif
-     case 3:
- 	debug(83, 5) ("Using SSLv3.\n");
- 	method = SSLv3_server_method();
diff --git a/net/squid/patches/003-configure.patch b/net/squid/patches/003-configure.patch
deleted file mode 100644
index c58b29e70..000000000
--- a/net/squid/patches/003-configure.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -5059,10 +5059,6 @@ _ACEOF
-   if test -z "$SSLLIB"; then
-     SSLLIB="-lcrypto" # for MD5 routines
-   fi
--  if $PKGCONFIG --exists openssl; then
--    SSLLIB="`$PKGCONFIG --libs openssl`"
--    SSLFLAGS="`$PKGCONFIG --cflags openssl`"
--  fi
-   CPPFLAGS="${SSLFLAGS} $CPPFLAGS"
- fi
- 
-@@ -27318,7 +27314,7 @@ else
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -27481,8 +27477,7 @@ else
-   { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+See \`config.log' for more details." >&2;} }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -27733,7 +27728,7 @@ else
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -27815,7 +27810,7 @@ else
- See \`config.log' for more details." >&5
- $as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (true); true; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
diff --git a/net/squid/patches/004-include-autoconf.patch b/net/squid/patches/004-include-autoconf.patch
deleted file mode 100644
index 9ed436044..000000000
--- a/net/squid/patches/004-include-autoconf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/include/autoconf.h.in
-+++ b/include/autoconf.h.in
-@@ -313,10 +313,10 @@
- #undef HAVE_OPENSSL_ERR_H
- 
- /* Define to 1 if you have the <openssl/md5.h> header file. */
--#undef HAVE_OPENSSL_MD5_H
-+#define HAVE_OPENSSL_MD5_H 1
- 
- /* Define to 1 if you have the <openssl/ssl.h> header file. */
--#undef HAVE_OPENSSL_SSL_H
-+#define HAVE_OPENSSL_SSL_H 1
- 
- /* Define to 1 if you have the <paths.h> header file. */
- #undef HAVE_PATHS_H
diff --git a/net/squid/patches/005-lib-makefile.patch b/net/squid/patches/005-lib-makefile.patch
deleted file mode 100644
index 06b7955ba..000000000
--- a/net/squid/patches/005-lib-makefile.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -60,8 +60,10 @@ am__libmiscutil_a_SOURCES_DIST = Array.c
- 	rfc1123.c rfc1738.c rfc2617.c safe_inet_addr.c snprintf.c \
- 	splay.c Stack.c strsep.c stub_memaccount.c util.c uudecode.c \
- 	win32lib.c
-+@NEED_OWN_MD5_TRUE@am__host_objects_1 = md5.$(HOST_OBJEXT)
- @NEED_OWN_SNPRINTF_TRUE@am__objects_1 = snprintf.$(OBJEXT)
- @NEED_OWN_STRSEP_TRUE@am__objects_2 = strsep.$(OBJEXT)
-+@NEED_OWN_SNPRINTF_TRUE@am__host_objects_2 = snprintf.$(HOST_OBJEXT)
- @ENABLE_MINGW32SPECIFIC_TRUE@am__objects_3 = win32lib.$(OBJEXT)
- am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \
- 	getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \
-@@ -71,7 +73,19 @@ am_libmiscutil_a_OBJECTS = Array.$(OBJEX
- 	$(am__objects_1) splay.$(OBJEXT) Stack.$(OBJEXT) \
- 	$(am__objects_2) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \
- 	uudecode.$(OBJEXT) $(am__objects_3)
-+am_libmiscutil_a_HOST_OBJECTS = Array.$(HOST_OBJEXT) \
-+	base64.$(HOST_OBJEXT) getfullhostname.$(HOST_OBJEXT) \
-+	hash.$(HOST_OBJEXT) heap.$(HOST_OBJEXT) \
-+	html_quote.$(HOST_OBJEXT) iso3307.$(HOST_OBJEXT) \
-+	$(am__host_objects_1) radix.$(HOST_OBJEXT) \
-+	rfc1035.$(HOST_OBJEXT) rfc1123.$(HOST_OBJEXT) \
-+	rfc1738.$(HOST_OBJEXT) rfc2617.$(HOST_OBJEXT) \
-+	safe_inet_addr.$(HOST_OBJEXT) $(am__host_objects_2) \
-+	splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \
-+	stub_memaccount.$(HOST_OBJEXT) util.$(HOST_OBJEXT) \
-+	uudecode.$(HOST_OBJEXT)
- libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
-+libmiscutil_a_HOST_OBJECTS = $(am_libmiscutil_a_HOST_OBJECTS)
- libntlmauth_a_AR = $(AR) $(ARFLAGS)
- libntlmauth_a_DEPENDENCIES = @LIBOBJS@
- am_libntlmauth_a_OBJECTS = ntlmauth.$(OBJEXT)
-@@ -89,15 +103,19 @@ depcomp = $(SHELL) $(top_srcdir)/cfgaux/
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+HOST_COMPILE = $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(AM_CFLAGS)
- CCLD = $(CC)
-+HOST_CCLD = ld
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) \
-+HOST_LINK = $(HOST_CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) $(libmiscutil_a_HOST_SOURCES) \
- 	$(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) \
- 	$(libregex_a_SOURCES) $(libsspwin32_a_SOURCES)
- DIST_SOURCES = $(libdlmalloc_a_SOURCES) \
- 	$(am__libmiscutil_a_SOURCES_DIST) \
- 	$(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) \
--	$(libregex_a_SOURCES) $(libsspwin32_a_SOURCES)
-+	$(libregex_a_SOURCES) $(libsspwin32_a_SOURCES) $(libmiscutil_a_HOST_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -105,6 +123,7 @@ ACLOCAL = @ACLOCAL@
- ALLOCA = @ALLOCA@
- AMTAR = @AMTAR@
- AR = @AR@
-+HOST_AR = ar
- AR_R = @AR_R@
- AUTH_LIBS = @AUTH_LIBS@
- AUTH_MODULES = @AUTH_MODULES@
-@@ -117,6 +136,7 @@ BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS
- CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
- CACHE_ICP_PORT = @CACHE_ICP_PORT@
- CC = @CC@
-+HOST_CC = gcc
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CGIEXT = @CGIEXT@
-@@ -164,6 +184,8 @@ NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH
- NIS_LIBS = @NIS_LIBS@
- NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@
- OBJEXT = @OBJEXT@
-+HOST_OBJEXT = @OBJEXT@.$(shell uname -m)
-+HOST_DEPEXT = .$(shell uname -m)
- OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -261,6 +283,7 @@ EXTRA_LIBRARIES = \
- noinst_LIBRARIES = \
- 	@LIBDLMALLOC@ \
- 	libmiscutil.a \
-+	libmiscutil$(shell uname -m).a \
- 	libntlmauth.a \
- 	@LIBREGEX@ \
- 	$(LIBSSPWIN32)
-@@ -300,9 +323,34 @@ libmiscutil_a_SOURCES = \
- 	uudecode.c \
- 	$(WIN32SRC)
- 
-+libmiscutil_a_HOST_SOURCES = \
-+        Array.c \
-+        base64.c \
-+        getfullhostname.c \
-+        hash.c \
-+        heap.c \
-+        html_quote.c \
-+        iso3307.c \
-+        $(MD5SOURCE) \
-+        radix.c \
-+        rfc1035.c \
-+        rfc1123.c \
-+        rfc1738.c \
-+        rfc2617.c \
-+        safe_inet_addr.c \
-+        $(SNPRINTFSOURCE) \
-+        splay.c \
-+        Stack.c \
-+        stub_memaccount.c \
-+        util.c \
-+        uudecode.c
-+
- libmiscutil_a_LIBADD = \
- 	@LIBOBJS@
- 
-+libmiscutil_a_HOST_LIBADD = \
-+	@LIBOBJS@
-+
- # $(top_srcdir)/include/version.h should be a dependency
- libregex_a_SOURCES = \
- 	GNUregex.c
-@@ -323,7 +371,7 @@ INCLUDES = -I$(top_builddir)/include -I$
- all: all-am
- 
- .SUFFIXES:
--.SUFFIXES: .c .o .obj
-+.SUFFIXES: .c .o .obj .o.$(shell uname -m)
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -360,10 +408,13 @@ libdlmalloc.a: $(libdlmalloc_a_OBJECTS)
- 	-rm -f libdlmalloc.a
- 	$(libdlmalloc_a_AR) libdlmalloc.a $(libdlmalloc_a_OBJECTS) $(libdlmalloc_a_LIBADD)
- 	$(RANLIB) libdlmalloc.a
--libmiscutil.a: $(libmiscutil_a_OBJECTS) $(libmiscutil_a_DEPENDENCIES) 
-+libmiscutil.a: $(libmiscutil_a_OBJECTS) $(libmiscutil_a_HOST_OBJECTS) $(libmiscutil_a_DEPENDENCIES) 
- 	-rm -f libmiscutil.a
-+	-rm -f libmiscutil$(shell uname -m).a
- 	$(libmiscutil_a_AR) libmiscutil.a $(libmiscutil_a_OBJECTS) $(libmiscutil_a_LIBADD)
-+	ar rcu libmiscutil$(shell uname -m).a $(libmiscutil_a_HOST_OBJECTS) $(libmiscutil_a_HOST_LIBADD)
- 	$(RANLIB) libmiscutil.a
-+	ranlib libmiscutil$(shell uname -m).a
- libntlmauth.a: $(libntlmauth_a_OBJECTS) $(libntlmauth_a_DEPENDENCIES) 
- 	-rm -f libntlmauth.a
- 	$(libntlmauth_a_AR) libntlmauth.a $(libntlmauth_a_OBJECTS) $(libntlmauth_a_LIBADD)
-@@ -417,6 +468,21 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uudecode.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32lib.Po@am__quote@
-+@AMDEP_TRUE@DEP_HOST_FILES = $(DEPDIR)/Array.Po.$(HOST_DEPEXT) $(DEPDIR)/GNUregex.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/Stack.Po.$(HOST_DEPEXT) $(DEPDIR)/base64.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/dlmalloc.Po.$(HOST_DEPEXT) $(DEPDIR)/drand48.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/getfullhostname.Po.$(HOST_DEPEXT) $(DEPDIR)/hash.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/heap.Po.$(HOST_DEPEXT) $(DEPDIR)/html_quote.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/inet_ntoa.Po.$(HOST_DEPEXT) $(DEPDIR)/initgroups.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/iso3307.Po.$(HOST_DEPEXT) $(DEPDIR)/md5.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/ntlmauth.Po.$(HOST_DEPEXT) $(DEPDIR)/radix.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/rfc1035.Po.$(HOST_DEPEXT) $(DEPDIR)/rfc1123.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/rfc1738.Po.$(HOST_DEPEXT) $(DEPDIR)/rfc2617.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/safe_inet_addr.Po.$(HOST_DEPEXT) $(DEPDIR)/snprintf.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/splay.Po.$(HOST_DEPEXT) $(DEPDIR)/strerror.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/stub_memaccount.Po.$(HOST_DEPEXT) $(DEPDIR)/tempnam.Po.$(HOST_DEPEXT) \
-+@AMDEP_TRUE@    $(DEPDIR)/util.Po.$(HOST_DEPEXT) $(DEPDIR)/uudecode.Po.$(HOST_DEPEXT)
-+
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -425,6 +491,9 @@ distclean-compile:
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
-+.c.o.$(shell uname -m):
-+	$(HOST_COMPILE) -o $(shell basename $< .c).o.$(shell uname -m) -c $<
-+
- .c.obj:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po