diff options
Diffstat (limited to 'openwrt/package/squid')
16 files changed, 0 insertions, 1116 deletions
diff --git a/openwrt/package/squid/Config.in b/openwrt/package/squid/Config.in deleted file mode 100644 index 100740cd9..000000000 --- a/openwrt/package/squid/Config.in +++ /dev/null @@ -1,93 +0,0 @@ -menu "squid............................. proxy and web cache" - -config BR2_PACKAGE_SQUID - prompt "squid................................. full-featured Web proxy cache" - tristate - default m if CONFIG_DEVEL - select BR2_PACKAGE_LIBOPENSSL - help - 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. - - http://www.squid-cache.org - -config BR2_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM - prompt "squid-mod-basic-auth-getpwnam......... getpwnam basic authentication helper" - tristate - depends BR2_PACKAGE_SQUID - help - Password basic authentication helper - -config BR2_PACKAGE_SQUID_MOD_BASIC_AUTH_NCSA - prompt "squid-mod-basic-auth-ncsa............. NCSA basic authentication helper" - tristate - depends BR2_PACKAGE_SQUID - help - NCSA basic authentication helper - -config BR2_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB - prompt "squid-mod-basic-auth-smb.............. Samba basic authentication helper" - tristate - depends BR2_PACKAGE_SQUID - help - Samba basic authentication helper - -config BR2_PACKAGE_SQUID_MOD_BASIC_AUTH_WINBIND - prompt "squid-mod-basic-auth-winbind.......... Winbind basic authentication helper" - tristate - depends BR2_PACKAGE_SQUID - help - Winbind basic authentication helper - -config BR2_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD - prompt "squid-mod-digest-auth-password........ Password digest authentication ehlper" - tristate - depends BR2_PACKAGE_SQUID - help - Password digest authentication helper - -config BR2_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER - prompt "squid-mod-external-acl-ip_user........ IP user external ACL helper" - tristate - depends BR2_PACKAGE_SQUID - help - IP user external ACL helper - -config BR2_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP - prompt "squid-mod-external-acl-unix-group..... Unix group external ACL helper" - tristate - depends BR2_PACKAGE_SQUID - help - Unix group external ACL helper - -config BR2_PACKAGE_SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP - prompt "squid-mod-external-acl-winbind-group.. Winbind group external ACL helper" - tristate - depends BR2_PACKAGE_SQUID - help - Winbind group external ACL helper - -config BR2_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH - prompt "squid-mod-ntlm-auth-fakeauth.......... Fakeauth NTLM authentication helper" - tristate - depends BR2_PACKAGE_SQUID - help - Fakeauth NTLM authentication helper - -config BR2_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH - prompt "squid-mod-ntlm-auth-smb-auth.......... Samba NTLM authentication helper" - tristate - depends BR2_PACKAGE_SQUID - help - Samba NTLM authentication helper - -config BR2_PACKAGE_SQUID_MOD_NTLM_AUTH_WINBIND_AUTH - prompt "squid-mod-ntlm-auth-winbind-auth...... Winbind NTLM authentication helper" - tristate - depends BR2_PACKAGE_SQUID - help - Winbind NTLM authentication helper - -endmenu diff --git a/openwrt/package/squid/Makefile b/openwrt/package/squid/Makefile deleted file mode 100644 index 1bd2e5abc..000000000 --- a/openwrt/package/squid/Makefile +++ /dev/null @@ -1,186 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=squid -PKG_VERSION:=2.5.STABLE13 -PKG_RELEASE:=1 -PKG_MD5SUM:=3e64468e123be1246d17486dab6bee87 - -PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v2/2.5/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_CAT:=bzcat -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -AUTH_MODULES:=basic digest ntlm -ifneq ($(BR2_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM),) -BASIC_AUTH_HELPERS+= getpwnam -endif -ifneq ($(BR2_PACKAGE_SQUID_MOD_BASIC_AUTH_NCSA),) -BASIC_AUTH_HELPERS+= NCSA -endif -ifneq ($(BR2_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB),) -BASIC_AUTH_HELPERS+= SMB -endif -ifneq ($(BR2_PACKAGE_SQUID_MOD_BASIC_AUTH_WINBIND),) -BASIC_AUTH_HELPERS+= winbind -endif - -ifneq ($(BR2_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD),) -DIGEST_AUTH_HELPERS:=password -endif - -ifneq ($(BR2_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER),) -EXTERNAL_ACL_HELPERS+= ip_user -endif -ifneq ($(BR2_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP),) -EXTERNAL_ACL_HELPERS+= unix_group -endif -ifneq ($(BR2_PACKAGE_SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP),) -EXTERNAL_ACL_HELPERS+= winbind_group -endif - -ifneq ($(BR2_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH),) -NTLM_AUTH_HELPERS+= fakeauth -endif -ifneq ($(BR2_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH),) -NTLM_AUTH_HELPERS+= SMB -endif -ifneq ($(BR2_PACKAGE_SQUID_MOD_NTLM_AUTH_WINBIND_AUTH),) -NTLM_AUTH_HELPERS+= winbind -endif - -include $(TOPDIR)/package/rules.mk - -define PKG_mod_template - -$$(IPKG_$(1)): - install -d -m0755 $$(IDIR_$(1))/usr/lib/squid - if [ -e $(PKG_INSTALL_DIR)/usr/lib/squid/$(2) ]; then \ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/$(2) $$(IDIR_$(1))/usr/lib/squid/ ; \ - fi - $(RSTRIP) $$(IDIR_$(1)) - $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) - -endef - - -$(eval $(call PKG_template,SQUID,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,$(PKG_NAME)-mod-basic-auth-getpwnam,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,$(PKG_NAME)-mod-basic-auth-ncsa,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,$(PKG_NAME)-mod-basic-auth-smb,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,$(PKG_NAME)-mod-basic-auth-winbind,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,$(PKG_NAME)-mod-digest-auth-password,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,$(PKG_NAME)-mod-external-acl-ip-user,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,$(PKG_NAME)-mod-external-acl-unix-group,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,$(PKG_NAME)-mod-external-acl-winbind-group,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,$(PKG_NAME)-mod-ntlm-auth-fakeauth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,$(PKG_NAME)-mod-ntlm-auth-smb-auth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,$(PKG_NAME)-mod-ntlm-auth-winbind-auth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_WINBIND,wb_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check)) -$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group)) -$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,wb_group)) -$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,wb_ntlmauth)) - -$(PKG_BUILD_DIR)/.configured: - (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ac_cv_sizeof_void_p=4 \ - ac_cv_sizeof_short=2 \ - ac_cv_sizeof_int=4 \ - ac_cv_sizeof_long=4 \ - ac_cv_sizeof_long_long=8 \ - ac_cv_sizeof___int64=0 \ - ac_cv_sizeof_int16_t=2 \ - ac_cv_sizeof_uint16_t=2 \ - ac_cv_sizeof_u_int16_t=2 \ - ac_cv_sizeof_int32_t=4 \ - ac_cv_sizeof_uint32_t=4 \ - ac_cv_sizeof_u_int32_t=4 \ - ac_cv_sizeof_int64_t=8 \ - ac_cv_sizeof_uint64_t=8 \ - ac_cv_sizeof_u_int64_t=8 \ - ac_cv_func_setresuid=no \ - ac_cv_func_va_copy=no \ - ac_cv_func___va_copy=no \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share/squid \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib/squid \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc/squid \ - $(DISABLE_LARGEFILE) \ - --enable-shared \ - --enable-static \ - --with-gnu-ld \ - --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="$(AUTH_MODULES)" \ - --enable-basic-auth-helpers="$(BASIC_AUTH_HELPERS)" \ - --enable-ntlm-auth-helpers="$(NTLM_AUTH_HELPERS)" \ - --enable-digest-auth-helpers="$(DIGEST_AUTH_HELPERS)" \ - --enable-external-acl-helpers="$(EXTERNAL_ACL_HELPERS)" \ - ); - touch $@ - -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR=$(PKG_INSTALL_DIR) \ - all install - touch $@ - -$(IPKG_SQUID): - install -d -m0755 $(IDIR_SQUID)/etc/squid - $(CP) $(PKG_INSTALL_DIR)/etc/squid/mime.conf $(IDIR_SQUID)/etc/squid/ - $(CP) $(PKG_INSTALL_DIR)/etc/squid/squid.conf $(IDIR_SQUID)/etc/squid/ - install -d -m0755 $(IDIR_SQUID)/usr/share/squid - $(CP) $(PKG_INSTALL_DIR)/usr/share/squid/* $(IDIR_SQUID)/usr/share/squid/ - install -d -m0755 $(IDIR_SQUID)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/squid $(IDIR_SQUID)/usr/sbin/ - $(RSTRIP) $(IDIR_SQUID) - $(IPKG_BUILD) $(IDIR_SQUID) $(PACKAGE_DIR) diff --git a/openwrt/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control b/openwrt/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control deleted file mode 100644 index cc9dfe661..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-getpwnam -Section: net -Depends: squid -Priority: optional -Description: getpwnam basic authentication helper diff --git a/openwrt/package/squid/ipkg/squid-mod-basic-auth-ncsa.control b/openwrt/package/squid/ipkg/squid-mod-basic-auth-ncsa.control deleted file mode 100644 index 94b8e9ece..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-basic-auth-ncsa.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-ncsa -Section: net -Depends: squid -Priority: optional -Description: ncsa basic authentication helper diff --git a/openwrt/package/squid/ipkg/squid-mod-basic-auth-smb.control b/openwrt/package/squid/ipkg/squid-mod-basic-auth-smb.control deleted file mode 100644 index 9adbeaa01..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-basic-auth-smb.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-smb -Section: net -Depends: squid -Priority: optional -Description: Samba basic authentication helper diff --git a/openwrt/package/squid/ipkg/squid-mod-basic-auth-winbind.control b/openwrt/package/squid/ipkg/squid-mod-basic-auth-winbind.control deleted file mode 100644 index 49047fab5..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-basic-auth-winbind.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-winbind -Section: net -Depends: squid -Priority: optional -Description: winbind basic authentication helper diff --git a/openwrt/package/squid/ipkg/squid-mod-digest-auth-password.control b/openwrt/package/squid/ipkg/squid-mod-digest-auth-password.control deleted file mode 100644 index a78b61636..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-digest-auth-password.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-digest-auth-password -Section: net -Depends: squid -Priority: optional -Description: password digest authentication helper diff --git a/openwrt/package/squid/ipkg/squid-mod-external-acl-ip-user.control b/openwrt/package/squid/ipkg/squid-mod-external-acl-ip-user.control deleted file mode 100644 index eb613a370..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-external-acl-ip-user.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-external-acl-ip-user -Section: net -Depends: squid -Priority: optional -Description: IP user external acl helper diff --git a/openwrt/package/squid/ipkg/squid-mod-external-acl-unix-group.control b/openwrt/package/squid/ipkg/squid-mod-external-acl-unix-group.control deleted file mode 100644 index 01614125f..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-external-acl-unix-group.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-external-acl-unix-group -Section: net -Depends: squid -Priority: optional -Description: Unix group external acl helper diff --git a/openwrt/package/squid/ipkg/squid-mod-external-acl-winbind-group.control b/openwrt/package/squid/ipkg/squid-mod-external-acl-winbind-group.control deleted file mode 100644 index 308a32d46..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-external-acl-winbind-group.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-external-acl-winbind-group -Section: net -Depends: squid -Priority: optional -Description: winbind group external acl helper diff --git a/openwrt/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control b/openwrt/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control deleted file mode 100644 index 51779ec01..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-ntlm-auth-fakeauth -Section: net -Depends: squid -Priority: optional -Description: fakeauht NTLM authentication helper diff --git a/openwrt/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control b/openwrt/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control deleted file mode 100644 index 1561bfa68..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-ntlm-auth-smb-auth -Section: net -Depends: squid -Priority: optional -Description: samba NTLM authentication helper diff --git a/openwrt/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control b/openwrt/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control deleted file mode 100644 index 1480c2965..000000000 --- a/openwrt/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-ntlm-auth-winbind-auth -Section: net -Depends: squid -Priority: optional -Description: winbind NTLM authentication helper diff --git a/openwrt/package/squid/ipkg/squid.conffiles b/openwrt/package/squid/ipkg/squid.conffiles deleted file mode 100644 index cd06f9da5..000000000 --- a/openwrt/package/squid/ipkg/squid.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/squid/mime.conf -/etc/squid/squid.conf diff --git a/openwrt/package/squid/ipkg/squid.control b/openwrt/package/squid/ipkg/squid.control deleted file mode 100644 index 0657eb1ef..000000000 --- a/openwrt/package/squid/ipkg/squid.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid -Section: net -Depends: libopenssl, libpthread -Priority: optional -Description: squid web and cache proxy diff --git a/openwrt/package/squid/patches/01-cross_compile.patch b/openwrt/package/squid/patches/01-cross_compile.patch deleted file mode 100644 index fd8f9b0e7..000000000 --- a/openwrt/package/squid/patches/01-cross_compile.patch +++ /dev/null @@ -1,775 +0,0 @@ -diff -urN squid-2.5.STABLE13/configure squid-2.5.STABLE13.new/configure ---- squid-2.5.STABLE13/configure 2006-03-12 12:29:22.000000000 +0100 -+++ squid-2.5.STABLE13.new/configure 2006-04-15 10:30:10.000000000 +0200 -@@ -2441,10 +2441,6 @@ - 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 - -diff -urN squid-2.5.STABLE13/include/autoconf.h.in squid-2.5.STABLE13.new/include/autoconf.h.in ---- squid-2.5.STABLE13/include/autoconf.h.in 2005-09-13 02:12:34.000000000 +0200 -+++ squid-2.5.STABLE13.new/include/autoconf.h.in 2006-04-15 10:29:39.000000000 +0200 -@@ -729,10 +729,10 @@ - #undef HAVE_OPENSSL_ERR_H - - /* Define if you have the <openssl/md5.h> header file. */ --#undef HAVE_OPENSSL_MD5_H -+#define HAVE_OPENSSL_MD5_H 1 - - /* Define if you have the <openssl/ssl.h> header file. */ --#undef HAVE_OPENSSL_SSL_H -+#define HAVE_OPENSSL_SSL_H 1 - - /* Define if you have the <poll.h> header file. */ - #undef HAVE_POLL_H -diff -urN squid-2.5.STABLE13/lib/Makefile.in squid-2.5.STABLE13.new/lib/Makefile.in ---- squid-2.5.STABLE13/lib/Makefile.in 2005-09-28 22:57:20.000000000 +0200 -+++ squid-2.5.STABLE13.new/lib/Makefile.in 2006-04-15 10:29:39.000000000 +0200 -@@ -63,6 +63,7 @@ - host_triplet = @host@ - AMTAR = @AMTAR@ - AR = @AR@ -+HOST_AR = ar - AR_R = @AR_R@ - AUTH_LIBS = @AUTH_LIBS@ - AUTH_MODULES = @AUTH_MODULES@ -@@ -72,6 +73,7 @@ - CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ - CACHE_ICP_PORT = @CACHE_ICP_PORT@ - CC = @CC@ -+HOST_CC = gcc - CGIEXT = @CGIEXT@ - CPP = @CPP@ - CRYPTLIB = @CRYPTLIB@ -@@ -95,6 +97,8 @@ - MV = @MV@ - NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ - OBJEXT = @OBJEXT@ -+HOST_OBJEXT = @OBJEXT@.$(shell uname -m) -+HOST_DEPEXT = .$(shell uname -m) - PACKAGE = @PACKAGE@ - PERL = @PERL@ - PKGCONFIG = @PKGCONFIG@ -@@ -133,6 +137,7 @@ - noinst_LIBRARIES = \ - @LIBDLMALLOC@ \ - libmiscutil.a \ -+ libmiscutil$(shell uname -m).a \ - libntlmauth.a \ - @LIBREGEX@ - -@@ -162,9 +167,34 @@ - util.c \ - uudecode.c - -+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 -@@ -193,9 +223,11 @@ - libmiscutil_a_AR = $(AR) cru - libmiscutil_a_DEPENDENCIES = @LIBOBJS@ - @NEED_OWN_MD5_TRUE@am__objects_1 = md5.$(OBJEXT) -+@NEED_OWN_MD5_TRUE@am__host_objects_1 = md5.$(HOST_OBJEXT) - @NEED_OWN_MD5_FALSE@am__objects_1 = - @NEED_OWN_SNPRINTF_FALSE@am__objects_2 = - @NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT) -+@NEED_OWN_SNPRINTF_TRUE@am__host_objects_2 = snprintf.$(HOST_OBJEXT) - am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \ - getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \ - html_quote.$(OBJEXT) iso3307.$(OBJEXT) $(am__objects_1) \ -@@ -203,7 +235,19 @@ - rfc1738.$(OBJEXT) rfc2617.$(OBJEXT) safe_inet_addr.$(OBJEXT) \ - $(am__objects_2) splay.$(OBJEXT) Stack.$(OBJEXT) \ - stub_memaccount.$(OBJEXT) util.$(OBJEXT) uudecode.$(OBJEXT) -+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) cru - libntlmauth_a_DEPENDENCIES = @LIBOBJS@ - am_libntlmauth_a_OBJECTS = ntlmauth.$(OBJEXT) -@@ -233,22 +277,42 @@ - @AMDEP_TRUE@ $(DEPDIR)/splay.Po $(DEPDIR)/strerror.Po \ - @AMDEP_TRUE@ $(DEPDIR)/stub_memaccount.Po $(DEPDIR)/tempnam.Po \ - @AMDEP_TRUE@ $(DEPDIR)/util.Po $(DEPDIR)/uudecode.Po -+@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) -+ -+ - 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 $@ -+HOST_LINK = $(HOST_CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ - DIST_SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) \ - $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) \ -- $(libregex_a_SOURCES) -+ $(libregex_a_SOURCES) $(libmiscutil_a_HOST_SOURCES) - DIST_COMMON = Makefile.am Makefile.in drand48.c inet_ntoa.c \ - initgroups.c strerror.c tempnam.c --SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) $(libregex_a_SOURCES) -+SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) $(libmiscutil_a_HOST_SOURCES) $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) $(libregex_a_SOURCES) - - all: all-am - - .SUFFIXES: --.SUFFIXES: .c .o .obj -+.SUFFIXES: .c .o .obj .o.$(shell uname -m) - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/Makefile -@@ -265,10 +329,13 @@ - -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) -@@ -313,6 +380,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/uudecode.Po@am__quote@ - -+ - distclean-depend: - -rm -rf $(DEPDIR) - -@@ -321,7 +389,8 @@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< -- -+.c.o.$(shell uname -m): -+ $(HOST_COMPILE) -o $(shell basename $< .c).o.$(shell uname -m) -c $< - .c.obj: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -diff -urN squid-2.5.STABLE13/src/ctype.c squid-2.5.STABLE13.new/src/ctype.c ---- squid-2.5.STABLE13/src/ctype.c 1970-01-01 01:00:00.000000000 +0100 -+++ squid-2.5.STABLE13.new/src/ctype.c 2006-04-15 10:29:39.000000000 +0200 -@@ -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); -+ -diff -urN squid-2.5.STABLE13/src/Makefile.in squid-2.5.STABLE13.new/src/Makefile.in ---- squid-2.5.STABLE13/src/Makefile.in 2005-09-28 22:57:21.000000000 +0200 -+++ squid-2.5.STABLE13.new/src/Makefile.in 2006-04-15 10:29:39.000000000 +0200 -@@ -1141,6 +1143,9 @@ - $(SHELL) -c "test -f squid.conf.default || ./cf_gen cf.data" - - cf_parser.h: cf.data cf_gen$(EXEEXT) -+ rm -f cf_gen -+ gcc -c ctype.c -+ gcc -o cf_gen cf_gen.c -I./ -I../ -I../include/ -L../lib -lmiscutil$(shell uname -m) -lm -lnsl -Wl,ctype.o - ./cf_gen cf.data - - cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre |