Package: squid Version: 2.7.STABLE3-1 Followup-For: Bug #409261 Here's a new patch that takes some different approaches:
- MAXPATHLEN: Fixed by making available the fallback/default value already used by squid in the hea der squid.h to header util.h and including it where needed. - Host naming scheme not recognized by config.sub, changing it to DEB_BUILD_GNU_TYPE fixes the problem, without messing around config.sub. - Hurd has pthreads by some time now, so use them. -- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: hurd-i386 (i686-AT386) Kernel: GNU-Mach 1.3.99/Hurd-0.3 Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Shell: /bin/sh linked to /bin/bash Versions of packages squid depends on: ii adduser 3.110 add and remove users and groups ii debconf [debconf-2.0] 1.5.23 Debian configuration management sy ii hurd 20080607-5 The GNU Hurd ii libc0.3 2.7-13 GNU C Library: Shared libraries ii libcomerr2 1.40.11-1 common error description library ii libdb4.6 4.6.21-10 Berkeley v4.6 Database Libraries [ ii libkrb53 1.4.4-8 MIT Kerberos runtime libraries ii libldap-2.4-2 2.4.10-2 OpenLDAP libraries ii libpam0g 1.0.1-4 Pluggable Authentication Modules l ii logrotate 3.7.1-3 Log rotation utility ii lsb-base 3.2-20 Linux Standard Base 3.2 init scrip ii netbase 4.34 Basic TCP/IP networking system ii squid-common 2.7.STABLE3-1 Internet object cache (WWW proxy c squid recommends no packages. Versions of packages squid suggests: pn logcheck-database <none> (no description available) pn resolvconf <none> (no description available) pn smbclient <none> (no description available) pn squid-cgi <none> (no description available) pn squidclient <none> (no description available) pn winbind <none> (no description available) -- debconf information excluded
diff -Naur old/squid-2.7.STABLE3/debian/rules squid-2.7.STABLE3/debian/rules --- old/squid-2.7.STABLE3/debian/rules 2008-09-04 18:22:01.000000000 +0000 +++ squid-2.7.STABLE3/debian/rules 2008-09-04 17:01:28.000000000 +0000 @@ -66,11 +66,12 @@ DEFAULT_MIME_TABLE=$(datadir)/mime.conf \ DEFAULT_MIB_PATH=$(mibdir)/SQUID.txt -# The HURD doesn't have pthreads yet. -ifeq ($(DEB_HOST_ARCH_OS), gnu) - with_pthreads = --enable-storeio=ufs,diskd,null +# Disable ARP ACL for Hurd +ifeq ($(DEB_HOST_ARCH_OS), hurd) + with_pthreads = --enable-storeio=ufs,diskd,null \ + --with-pthreads with_netfilter = - with_arp_acl = + with_arp_acl = --disable-arp-acl with_epoll = else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) @@ -152,7 +153,7 @@ --enable-follow-x-forwarded-for \ --with-large-files \ --with-maxfd=65536 \ - $(DEB_HOST_ARCH_CPU)-debian-$(DEB_HOST_ARCH_OS) + $(DEB_BUILD_GNU_TYPE) # Architecture independant files. binary-indep: build checkroot diff -Naur old/squid-2.7.STABLE3/helpers/basic_auth/MSNT/allowusers.c squid-2.7.STABLE3/helpers/basic_auth/MSNT/allowusers.c --- old/squid-2.7.STABLE3/helpers/basic_auth/MSNT/allowusers.c 2002-06-26 19:09:48.000000000 +0000 +++ squid-2.7.STABLE3/helpers/basic_auth/MSNT/allowusers.c 2008-09-04 17:41:18.000000000 +0000 @@ -16,6 +16,7 @@ #include <string.h> #include "usersfile.h" #include "msntauth.h" +#include "util.h" static usersfile AllowUsers; static int init = 0; diff -Naur old/squid-2.7.STABLE3/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE3/helpers/basic_auth/MSNT/confload.c --- old/squid-2.7.STABLE3/helpers/basic_auth/MSNT/confload.c 2002-06-26 19:09:48.000000000 +0000 +++ squid-2.7.STABLE3/helpers/basic_auth/MSNT/confload.c 2008-09-04 17:41:31.000000000 +0000 @@ -21,6 +21,7 @@ #include "msntauth.h" #include "valid.h" +#include "util.h" /* Path to configuration file */ #ifndef SYSCONFDIR diff -Naur old/squid-2.7.STABLE3/helpers/basic_auth/MSNT/denyusers.c squid-2.7.STABLE3/helpers/basic_auth/MSNT/denyusers.c --- old/squid-2.7.STABLE3/helpers/basic_auth/MSNT/denyusers.c 2002-06-26 19:09:48.000000000 +0000 +++ squid-2.7.STABLE3/helpers/basic_auth/MSNT/denyusers.c 2008-09-04 17:41:05.000000000 +0000 @@ -17,6 +17,7 @@ #include <string.h> #include "usersfile.h" #include "msntauth.h" +#include "util.h" static usersfile DenyUsers; static int init = 0; diff -Naur old/squid-2.7.STABLE3/include/util.h squid-2.7.STABLE3/include/util.h --- old/squid-2.7.STABLE3/include/util.h 2006-12-10 13:36:23.000000000 +0000 +++ squid-2.7.STABLE3/include/util.h 2008-09-04 17:27:36.000000000 +0000 @@ -48,6 +48,11 @@ #define SQUIDHOSTNAMELEN 256 #endif +#define SQUID_MAXPATHLEN 256 +#ifndef MAXPATHLEN +#define MAXPATHLEN SQUID_MAXPATHLEN +#endif + #if defined(_SQUID_FREEBSD_) #define _etext etext #endif diff -Naur old/squid-2.7.STABLE3/src/squid.h squid-2.7.STABLE3/src/squid.h --- old/squid-2.7.STABLE3/src/squid.h 2008-01-09 13:55:23.000000000 +0000 +++ squid-2.7.STABLE3/src/squid.h 2008-09-04 17:27:29.000000000 +0000 @@ -278,11 +278,6 @@ #define SQUIDHOSTNAMELEN 256 -#define SQUID_MAXPATHLEN 256 -#ifndef MAXPATHLEN -#define MAXPATHLEN SQUID_MAXPATHLEN -#endif - #if !HAVE_GETRUSAGE #if defined(_SQUID_HPUX_) #define HAVE_GETRUSAGE 1 diff -Naur old/squid-2.7.STABLE3/src/structs.h squid-2.7.STABLE3/src/structs.h --- old/squid-2.7.STABLE3/src/structs.h 2008-06-24 23:14:18.000000000 +0000 +++ squid-2.7.STABLE3/src/structs.h 2008-09-04 17:29:51.000000000 +0000 @@ -36,6 +36,7 @@ #include "config.h" #include "splay.h" +#include "util.h" #define PEER_MULTICAST_SIBLINGS 1
