This patch is generated from the squid-amake branch of HEAD in squid Sun Jan 25 14:42:46 2004 GMT See http://devel.squid-cache.org/ Index: squid/Makefile.am diff -u /dev/null squid/Makefile.am:1.1.2.3 --- /dev/null Sun Jan 25 06:42:13 2004 +++ squid/Makefile.am Wed Aug 22 06:39:55 2001 @@ -0,0 +1,24 @@ +## Process this file with automake to produce Makefile.in +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects +DIST_SUBDIRS = lib snmplib scripts src icons errors contrib +SUBDIRS = lib @makesnmplib@ scripts src icons errors + +EXTRA_DIST = include/config.h.in +DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]* + +dist-hook: + @ for subdir in "include"; do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + cp -p $(srcdir)/$$subdir/*.h $(distdir)/$$subdir \ + || exit 1; \ + fi; \ + done + +##&& cp -p $(srcdir)/$$subdir/*.in $(distdir)/$$subdir Index: squid/bootstrap.sh diff -u /dev/null squid/bootstrap.sh:1.1.2.2 --- /dev/null Sun Jan 25 06:42:13 2004 +++ squid/bootstrap.sh Fri Apr 6 06:59:47 2001 @@ -0,0 +1,10 @@ +#! /bin/sh +# Used to setup the configure.in, autoheader and Makefile.in's if configure +# has not been generated. This script is only needed for developers when +# configure has not been run, or if a Makefile.am in a non-configured directory +# has been updated + +aclocal \ +&& autoheader \ +&& automake --foreign --add-missing \ +&& autoconf Index: squid/configure.in diff -u squid/configure.in:1.24 squid/configure.in:1.19.4.12 --- squid/configure.in:1.24 Fri Aug 24 08:44:04 2001 +++ squid/configure.in Fri Aug 31 02:31:28 2001 @@ -8,13 +8,25 @@ dnl dnl AC_INIT(src/main.c) -AC_CONFIG_HEADER(include/autoconf.h) +AC_CONFIG_AUX_DIR(cfgaux) +AM_INIT_AUTOMAKE(Squid, 2.5-DEVEL) +AM_CONFIG_HEADER(include/autoconf.h) AC_REVISION($Revision: 1.1 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) -AC_CONFIG_AUX_DIR(cfgaux) +dnl Set default LDFLAGS +if test -z "$LDFLAGS"; then + LDFLAGS="-g" +fi + +PRESET_CFLAGS="$CFLAGS" + +dnl Check for GNU cc +AC_PROG_CC +AM_PROG_CC_C_O AC_CANONICAL_HOST + CRYPTLIB='' REGEXLIB='' # -lregex LIBREGEX='' # libregex.a @@ -26,24 +38,26 @@ localstatedir='${prefix}' fi -dnl use .exe suffix for executables on cygwin32 platform +dnl find out the exe extension for this platform. If it's not empty, use it for CGI's as well. +AC_EXEEXT +AC_OBJEXT + +if test -z "$EXEEXT"; then + CGIEXT=".cgi" +else + CGIEXT="$EXEEXT" +fi + dnl this should be expanded to a list of platform sensible support requirements. dnl (adding an option like --enable-cygwin-support doesn't make sense :]) - R Collins 2001 case "$host_os" in -cygwin|cygwin32|os2) - exec_suffix=".exe" - cgi_suffix=".exe" - WIN32_OBJS="win32.o" +cygwin|cygwin32) + AM_CONDITIONAL(ENABLE_WIN32SPECIFIC, true) ;; *) - exec_suffix="" - cgi_suffix=".cgi" - WIN32_OBJS="" + AM_CONDITIONAL(ENABLE_WIN32SPECIFIC, false) ;; esac -AC_SUBST(exec_suffix) -AC_SUBST(cgi_suffix) -AC_SUBST(WIN32_OBJS) if test -z "$CACHE_HTTP_PORT"; then CACHE_HTTP_PORT="3128" @@ -58,15 +72,6 @@ AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host") -dnl Set default LDFLAGS -if test -z "$LDFLAGS"; then - LDFLAGS="-g" -fi - -PRESET_CFLAGS="$CFLAGS" - -dnl Check for GNU cc -AC_PROG_CC dnl Gerben Wierda case "$host" in @@ -321,7 +326,7 @@ for module in $srcdir/src/fs/*; do if test -f $module/Makefile.in; then STORE_MODULES="$STORE_MODULES `basename $module`" - fi + fi done ;; no) @@ -335,11 +340,21 @@ fi ]) echo "Store modules built: $STORE_MODULES" -AC_SUBST(STORE_MODULES) -STORE_OBJS="fs/`echo $STORE_MODULES|sed -e 's% %.a fs/%g'`.a" +STORE_OBJS="fs/lib`echo $STORE_MODULES|sed -e 's% %.a fs/lib%g'`.a" AC_SUBST(STORE_OBJS) STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`" AC_SUBST(STORE_LIBS) +dnl remove all but diskd - its the only module that needs to recurse +dnl into the sub directory +STORE_MODULE_SUBDIRS= +for fs in $STORE_MODULES none; do + if test $fs == diskd; then + STORE_MODULE_SUBDIRS="$STORE_MODULE_SUBDIRS $fs" + fi +done +AC_SUBST(STORE_MODULES) +AC_SUBST(STORE_MODULE_SUBDIRS) + dnl --enable-heap-replacement compability option AC_ARG_ENABLE(heap-replacement, @@ -381,7 +396,7 @@ ]) echo "Removal policies built: $REPL_POLICIES" AC_SUBST(REPL_POLICIES) -REPL_OBJS="repl/`echo $REPL_POLICIES|sed -e 's% %.a repl/%g'`.a" +REPL_OBJS="repl/lib`echo $REPL_POLICIES|sed -e 's% %.a repl/lib%g'`.a" AC_SUBST(REPL_OBJS) REPL_LIBS="`echo $REPL_OBJS|sed -e 's%repl/%%g'`" AC_SUBST(REPL_LIBS) @@ -392,20 +407,20 @@ [ if test "$enableval" = "yes" ; then echo "ICMP enabled" AC_DEFINE(USE_ICMP) - OPT_PINGER_EXE='$(OPT_PINGER_EXE)' + OPT_PINGER_EXE='pinger' fi ]) AC_SUBST(OPT_PINGER_EXE) +AM_CONDITIONAL(USE_DELAY_POOLS, false) AC_ARG_ENABLE(delay-pools, [ --enable-delay-pools Enable delay pools to limit bandwidth usage], [ if test "$enableval" = "yes" ; then echo "Delay pools enabled" - DELAY_OBJS='$(DELAY_OBJS)' AC_DEFINE(DELAY_POOLS) + AM_CONDITIONAL(USE_DELAY_POOLS, true) fi ]) -AC_SUBST(DELAY_OBJS) AC_ARG_ENABLE(mem-gen-trace, [ --enable-mem-gen-trace Do trace of memory stuff], @@ -450,19 +465,19 @@ fi ]) +AM_CONDITIONAL(USE_SNMP, false) AC_ARG_ENABLE(snmp, [ --enable-snmp Enable SNMP monitoring], [ if test "$enableval" = "yes" ; then echo "SNMP monitoring enabled" AC_DEFINE(SQUID_SNMP) SNMPLIB='-L../snmplib -lsnmp' - SNMP_OBJS='$(SNMP_OBJS)' + AM_CONDITIONAL(USE_SNMP, true) SNMP_MAKEFILE=./snmplib/Makefile makesnmplib=snmplib fi ]) AC_SUBST(SNMPLIB) -AC_SUBST(SNMP_OBJS) AC_SUBST(makesnmplib) AC_ARG_ENABLE(time-hack, @@ -508,22 +523,25 @@ fi ]) +AM_CONDITIONAL(ENABLE_HTCP, false) AC_ARG_ENABLE(htcp, [ --enable-htcp Enable HTCP protocol], [ if test "$enableval" = "yes" ; then echo "HTCP enabled" - HTCP_OBJS='$(HTCP_OBJS)' AC_DEFINE(USE_HTCP) + AM_CONDITIONAL(ENABLE_HTCP, true) fi ]) -AC_SUBST(HTCP_OBJS) + +AM_CONDITIONAL(ENABLE_SSL, false) +SSLINC="" AC_ARG_ENABLE(ssl, [ --enable-ssl Enable ssl gatewaying support using OpenSSL], [ if test "$enableval" != "no"; then echo "SSL gatewaying enabled" AC_DEFINE(USE_SSL) - SSL_OBJS='$(SSL_OBJS)' + AM_CONDITIONAL(ENABLE_SSL, true) SSLLIB='-lssl -lcrypto' USE_OPENSSL=1 fi @@ -539,6 +557,7 @@ case "$with_ssl" in yes) USE_OPENSSL=1 + AM_CONDITIONAL(ENABLE_SSL, true) ;; no) USE_OPENSSL= @@ -547,6 +566,7 @@ SSLLIBDIR="$with_ssl/lib" SSLINC="-I$with_ssl/include" USE_OPENSSL=1 + AM_CONDITIONAL(ENABLE_SSL, true) esac ]) @@ -559,11 +579,8 @@ if test -n "$SSLLIBDIR"; then SSLLIB="-L$SSLLIBDIR $SSLLIB" fi -if test -n "$SSLINC"; then - CFLAGS="$CFLAGS $SSLINC" -fi -AC_SUBST(SSL_OBJS) AC_SUBST(SSLLIB) +AC_SUBST(SSLINC) AC_ARG_ENABLE(forw-via-db, [ --enable-forw-via-db Enable Forw/Via database], @@ -662,6 +679,7 @@ fi ]) +AM_CONDITIONAL(MAKE_LEAKFINDER, false) dnl Enable Leak Finding Functions AC_ARG_ENABLE(leakfinder, [ --enable-leakfinder @@ -672,11 +690,10 @@ [ if test "$enableval" = "yes" ; then echo "Leak-Finding enabled" AC_DEFINE(USE_LEAKFINDER) - LEAKFINDER_OBJS='$(LEAKFINDER_OBJS)' USE_LEAKFINDER="yes" + AM_CONDITIONAL(MAKE_LEAKFINDER, true) fi ]) -AC_SUBST(LEAKFINDER_OBJS) AC_ARG_ENABLE(ident-lookups, [ --disable-ident-lookups @@ -690,6 +707,7 @@ fi ]) +AM_CONDITIONAL(USE_DNSSERVER, false) use_dnsserver= AC_ARG_ENABLE(internal-dns, [ --disable-internal-dns This prevents Squid from directly sending and @@ -703,13 +721,12 @@ if test "$use_dnsserver" = "yes"; then AC_DEFINE(USE_DNSSERVERS) OPT_DNSSERVER_EXE='$(OPT_DNSSERVER_EXE)' - DNS_OBJS='dns.o' + AM_CONDITIONAL(USE_DNSSERVER, true) else OPT_DNSSERVER_EXE='' - DNS_OBJS='dns_internal.o' fi AC_SUBST(OPT_DNSSERVER_EXE) -AC_SUBST(DNS_OBJS) +dnl AC_SUBST(DNSSOURCE) AC_ARG_ENABLE(truncate, @@ -768,7 +785,7 @@ ]) echo "Auth scheme modules built: $AUTH_MODULES" AC_SUBST(AUTH_MODULES) -AUTH_OBJS="auth/`echo $AUTH_MODULES|sed -e 's% %.a auth/%g'`.a" +AUTH_OBJS="auth/lib`echo $AUTH_MODULES|sed -e 's% %.a auth/lib%g'`.a" AC_SUBST(AUTH_OBJS) AUTH_LIBS="`echo $AUTH_OBJS|sed -e 's%auth/%%g'`" AC_SUBST(AUTH_LIBS) @@ -902,15 +919,11 @@ if test "$use_unlinkd" = "yes"; then echo "unlinkd enabled" AC_DEFINE(USE_UNLINKD) - OPT_UNLINKD_EXE='$(OPT_UNLINKD_EXE)' - UNLINKD_OBJS='unlinkd.o' + AM_CONDITIONAL(ENABLE_UNLINKD, true) else echo "unlinkd disabled" - OPT_UNLINKD_EXE='' - UNLINKD_OBJS='' + AM_CONDITIONAL(ENABLE_UNLINKD, false) fi -AC_SUBST(OPT_UNLINKD_EXE) -AC_SUBST(UNLINKD_OBJS) dnl Enable backtraces on fatal errors AC_ARG_ENABLE(stacktraces, @@ -966,7 +979,7 @@ AC_PATH_PROG(MKDIR, mkdir, $FALSE) AC_PATH_PROG(LN, ln, cp) AC_PATH_PROG(PERL, perl, none) -AC_PATH_PROG(MAKEDEPEND, makedepend, $TRUE) +dnl automake handles this AC_PATH_PROG(MAKEDEPEND, makedepend, $TRUE) AC_PATH_PROG(AR, ar, $FALSE) if test "$ac_cv_path_PERL" = "none"; then @@ -1967,44 +1980,76 @@ dnl Clean up after OSF/1 core dump bug rm -f core -FS_MAKEFILES="" -for fs in $STORE_MODULES none; do - if test $fs != none; then - FS_MAKEFILES="$FS_MAKEFILES ./src/fs/$fs/Makefile" - fi -done -REPL_MAKEFILES="" -for repl in $REPL_POLICIES none; do - if test $repl != none; then - REPL_MAKEFILES="$REPL_MAKEFILES ./src/repl/$repl/Makefile" - fi -done +dnl FS_MAKEFILES="" +dnl for fs in $STORE_MODULES none; do +dnl if test $fs != none; then +dnl FS_MAKEFILES="$FS_MAKEFILES ./src/fs/$fs/Makefile" +dnl fi +dnl done +dnl REPL_MAKEFILES="" +dnl for repl in $REPL_POLICIES none; do +dnl if test $repl != none; then +dnl REPL_MAKEFILES="$REPL_MAKEFILES ./src/repl/$repl/Makefile" +dnl fi +dnl done dnl This could actually be used to find all the Makefiles.. -AUTH_MAKEFILES="" -for auth in `find $srcdir/src/auth -type d -print`; do - if test -f $auth/Makefile.in; then - dir=`echo $auth | sed -e "s|^$srcdir/||"` - AUTH_MAKEFILES="$AUTH_MAKEFILES ./$dir/Makefile" - fi -done - -AC_OUTPUT(\ - ./makefile \ - ./lib/Makefile \ - ./include/config.h \ - ./scripts/Makefile \ - ./scripts/RunCache \ - ./scripts/RunAccel \ - ./src/Makefile \ - ./src/fs/Makefile \ - $FS_MAKEFILES \ - ./src/repl/Makefile \ - $REPL_MAKEFILES \ - ./src/auth/Makefile \ - $AUTH_MAKEFILES \ - ./contrib/Makefile \ - $SNMP_MAKEFILE \ - ./icons/Makefile \ - ./errors/Makefile \ +dnl One of Automake's limitations is that it needs to know all the created makefiles. +dnl AUTH_MAKEFILES="" +dnl for auth in `find $srcdir/src/auth -type d -print`; do +dnl if test -f $auth/Makefile.in; then +dnl dir=`echo $auth | sed -e "s|^$srcdir/||"` +dnl AUTH_MAKEFILES="$AUTH_MAKEFILES ./$dir/Makefile" +dnl fi +dnl done + + +dnl src/fs/aufs/Makefile \ +dnl src/fs/coss/Makefile \ +dnl src/fs/diskd/Makefile \ +dnl src/fs/null/Makefile \ +dnl src/fs/ufs/Makefile \ +dnl src/repl/heap/Makefile \ +dnl src/repl/lru/Makefile \ +AC_OUTPUT([\ + Makefile \ + lib/Makefile \ + include/config.h \ + scripts/Makefile \ + scripts/RunCache \ + scripts/RunAccel \ + src/Makefile \ + src/fs/Makefile \ + src/repl/Makefile \ + src/auth/Makefile \ + src/auth/basic/Makefile \ + src/auth/basic/helpers/Makefile \ + src/auth/basic/helpers/LDAP/Makefile \ + src/auth/basic/helpers/MSNT/Makefile \ + src/auth/basic/helpers/NCSA/Makefile \ + src/auth/basic/helpers/PAM/Makefile \ + src/auth/basic/helpers/SMB/Makefile \ + src/auth/basic/helpers/YP/Makefile \ + src/auth/basic/helpers/getpwnam/Makefile \ + src/auth/basic/helpers/multi-domain-NTLM/Makefile \ + src/auth/digest/Makefile \ + src/auth/digest/helpers/Makefile \ + src/auth/digest/helpers/password/Makefile \ + src/auth/ntlm/Makefile \ + src/auth/ntlm/helpers/Makefile \ + src/auth/ntlm/helpers/fakeauth/Makefile \ + src/auth/ntlm/helpers/no_check/Makefile \ + src/auth/ntlm/helpers/NTLMSSP/Makefile \ + src/auth/ntlm/helpers/NTLMSSP/smbval/Makefile \ + contrib/Makefile \ + snmplib/Makefile \ + icons/Makefile \ + errors/Makefile \ + src/fs/aufs/Makefile \ + src/fs/coss/Makefile \ + src/fs/diskd/Makefile \ + src/fs/null/Makefile \ + src/fs/ufs/Makefile \ + src/repl/heap/Makefile \ + src/repl/lru/Makefile \] ) Index: squid/makefile.in diff -u squid/makefile.in:1.5 squid/makefile.in:removed --- squid/makefile.in:1.5 Tue Jan 9 17:09:19 2001 +++ squid/makefile.in Sun Jan 25 06:42:13 2004 @@ -1,57 +0,0 @@ -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -srcdir = @srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -SHELL = /bin/sh - -# Where to install -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -SUBDIRS = lib @makesnmplib@ scripts src icons errors - -noargs: all - -all install: makefile - @for dir in $(SUBDIRS); do \ - echo "Making $@ in $$dir..."; \ - (cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \ - done - -clean: - @for dir in $(SUBDIRS); do \ - echo "Making $@ in $$dir..."; \ - (cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@); \ - done - - -install-pinger: - (cd src; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) - -almostclean: clean - rm -f config.log makefile - rm -f include/paths.h include/autoconf.h include/config.h - @for dir in $(SUBDIRS) contrib; do \ - echo Making distclean in $$dir; \ - (cd $$dir; $(MAKE) $(MFLAGS) prefix="$(prefix)" distclean); \ - done - -distclean: almostclean - rm -f config.status config.cache - -targz: distclean - tar cvf current.tar . ; gzip current.tar - -makefile: configure config.status makefile.in lib/Makefile.in include/config.h.in src/Makefile.in include/version.h - @echo "Package configuration updated. Cleaning and reconfiguring" ;\ - ./config.status --recheck;\ - ./config.status ;\ - $(MAKE) $(MFLAGS) clean - -depend: Index: squid/cfgaux/config.guess diff -u squid/cfgaux/config.guess:1.1.1.3 squid/cfgaux/config.guess:removed --- squid/cfgaux/config.guess:1.1.1.3 Tue Jan 25 19:25:00 2000 +++ squid/cfgaux/config.guess Sun Jan 25 06:42:13 2004 @@ -1,702 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc. -# -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit system type (host/target name). -# -# Only a few systems have been added to this list; please add others -# (but try to keep the structure clean). -# - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 8/24/94.) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - alpha:OSF1:*:*) - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'` - exit 0 ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 - exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-cbm-openbsd${UNAME_RELEASE} - exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit 0 ;; - NILE:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - atari*:NetBSD:*:*) - echo m68k-atari-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-atari-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3*:NetBSD:*:*) - echo m68k-sun-netbsd${UNAME_RELEASE} - exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-sun-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-apple-openbsd${UNAME_RELEASE} - exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit 0 ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >dummy.c - int main (argc, argv) int argc; char **argv; { - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - ${CC-cc} dummy.c -o dummy \ - && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit 0 ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit 0 ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit 0 ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit 0 ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit 0 ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit 0 ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit 0 ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit 0 ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i?86:AIX:*:*) - echo i386-ibm-aix - exit 0 ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - echo rs6000-ibm-aix3.2.5 - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit 0 ;; - *:AIX:*:4) - if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=4.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit 0 ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit 0 ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit 0 ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit 0 ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit 0 ;; - 9000/[3478]??:HP-UX:*:*) - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;; - 9000/8?? ) HP_ARCH=hppa1.0 ;; - esac - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; - 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - echo unknown-hitachi-hiuxwe2 - exit 0 ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit 0 ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i?86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit 0 ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit 0 ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit 0 ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit 0 ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} - exit 0 ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ - exit 0 ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} - exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; - F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; - F301:UNIX_System_V:*:*) - echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` - exit 0 ;; - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} - exit 0 ;; - hp3[0-9][05]:OpenBSD:*:*) - echo m68k-hp-openbsd${UNAME_RELEASE} - exit 0 ;; - i?86:BSD/386:*:* | *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - i*:CYGWIN*:*) - echo i386-pc-cygwin32 - exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin32 - exit 0 ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - *:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. - ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then - echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then - echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then - echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then - echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then - echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then - echo "powerpc-unknown-linux-gnu" ; exit 0 - elif test "${UNAME_MACHINE}" = "alpha" ; then - echo alpha-unknown-linux-gnu ; exit 0 - elif test "${UNAME_MACHINE}" = "sparc" ; then - echo sparc-unknown-linux-gnu ; exit 0 - else - # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us - # useful --help. Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout. - test ! -d /usr/lib/ldscripts/. \ - && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - # Determine whether the default compiler is a.out or elf - cat >dummy.c </dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - fi ;; -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions -# are messed up and put the nodename in both sysname and nodename. - i?86:DYNIX/ptx:4*:*) - echo i386-sequent-sysv4 - exit 0 ;; - i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} - fi - exit 0 ;; - i?86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit 0 ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit 0 ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit 0 ;; - i?86:LynxOS:2.*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit 0 ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit 0 ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; - news*:NEWS-OS:[56].*:*) - echo mips-sony-newsos${UNAME_RELEASE} - exit 0 ;; - *:Rhapsody:*:*) - echo `arch`-apple-rhapsody${UNAME_RELEASE} - exit 0;; - i?86:OS/2:*:*) - echo ${UNAME_MACHINE}-ibm-os2 - exit 0 ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -cat >dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -#if !defined (ultrix) - printf ("vax-dec-bsd\n"); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 -rm -f dummy.c dummy - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit 0 ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - c34*) - echo c34-convex-bsd - exit 0 ;; - c38*) - echo c38-convex-bsd - exit 0 ;; - c4*) - echo c4-convex-bsd - exit 0 ;; - esac -fi - -#echo '(Unable to guess system type)' 1>&2 - -exit 1 Index: squid/cfgaux/config.sub diff -u squid/cfgaux/config.sub:1.1.1.3 squid/cfgaux/config.sub:removed --- squid/cfgaux/config.sub:1.1.1.3 Tue Jan 25 19:25:00 2000 +++ squid/cfgaux/config.sub Sun Jan 25 06:42:14 2004 @@ -1,935 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi - -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - linux-gnu*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) - os= - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco5) - os=sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \ - | arme[lb] | pyramid \ - | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ - | alpha | we32k | ns16k | clipper | i370 | sh \ - | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \ - | pdp11 | mips64el | mips64orion | mips64orionel \ - | sparc | sparclet | sparclite | sparc64) - basic_machine=$basic_machine-unknown - ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i[3456]86) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \ - | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \ - | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ - | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ - | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* | f301-* | iE86-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-cbm - ;; - amigados) - basic_machine=m68k-cbm - os=-amigados - ;; - amigaunix | amix) - basic_machine=m68k-cbm - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | ymp) - basic_machine=ymp-cray - os=-unicos - ;; - cray2) - basic_machine=cray2-cray - os=-unicos - ;; - [ctj]90-cray) - basic_machine=c90-cray - os=-unicos - ;; - crds | unos) - basic_machine=m68k-crds - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - os=-mvs - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[3456]86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i[3456]86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i[3456]86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i[3456]86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - mab-next) - os=-nextstep3 - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - miniframe) - basic_machine=m68000-convergent - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - np1) - basic_machine=np1-gould - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pentium | p5) - basic_machine=i586-intel - ;; - pentiumpro | p6) - basic_machine=i686-intel - ;; - pentium-* | p5-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - k5) - # We don't have specific support for AMD's K5 yet, so just call it a Pentium - basic_machine=i586-amd - ;; - nexen) - # We don't have specific support for Nexgen yet, so just call it a Pentium - basic_machine=i586-nexgen - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=rs6000-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - xmp) - basic_machine=xmp-cray - os=-unicos - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - mips) - basic_machine=mips-mips - ;; - romp) - basic_machine=romp-ibm - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sparc) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -unixware* | svr4*) - os=-sysv4 - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -linux-gnu* | -uxpv*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -ctix* | -uts*) - os=-sysv - ;; - -ns2 ) - os=-nextstep2 - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -xenix) - os=-xenix - ;; - -rhapsody*) - os=-rhapsody - ;; - -none) - ;; - -os2) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - *-acorn) - os=-riscix1.2 - ;; - arm*-semi) - os=-aout - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-ibm) - os=-aix - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigados - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f301-fujitsu) - os=-uxpv - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -hpux*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -vxsim* | -vxworks*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os Index: squid/cfgaux/install-sh diff -u squid/cfgaux/install-sh:1.1.1.1 squid/cfgaux/install-sh:removed --- squid/cfgaux/install-sh:1.1.1.1 Tue Jan 25 19:21:46 2000 +++ squid/cfgaux/install-sh Sun Jan 25 06:42:14 2004 @@ -1,250 +0,0 @@ -#! /bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 Index: squid/contrib/Makefile.am diff -u /dev/null squid/contrib/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:14 2004 +++ squid/contrib/Makefile.am Fri Apr 6 07:08:02 2001 @@ -0,0 +1,55 @@ +# +# Makefile for installing Squid startup files on systems +# using a SVR4-based startup mechanism/file system layout +# + +SQUID_RC = squid.rc +SQUID_OPTIONS = squid.options + + +all: + +install: install-@host_os@ + +install-hpux10.10 install-hpux10.20: + $(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid + $(INSTALL_FILE) $(SQUID_OPTIONS) /etc/rc.config.d/squid + -$(LN_S) ../init.d/squid /sbin/rc2.d/S900squid + -$(LN_S) ../init.d/squid /sbin/rc1.d/K100squid + /usr/sbin/ch_rc -ap SQUID=1 + @echo "use 'ch_rc -ap SQUID=0' to disable squid at startup" + @echo "edit /etc/rc.config.d/squid to change options" + +install-solaris2.4 install-solaris2.5: + $(INSTALL_BIN) $(SQUID_RC) /etc/init.d/squid + -$(LN_S) ../init.d/squid /etc/rc2.d/S90squid + -$(LN_S) ../init.d/squid /etc/rc1.d/K10squid + -$(LN_S) ../init.d/squid /etc/rc0.d/K10squid + @echo "set SQUID=0 in /etc/init.d/squid to disable squid at startup" + @echo "edit /etc/init.d/squid to change options" + +install-irix6.2: + $(INSTALL_BIN) $(SQUID_RC) /etc/init.d/squid + $(INSTALL_FILE) $(SQUID_OPTIONS) /var/config/squid.options + -$(LN_S) ../init.d/squid /etc/rc2.d/S99squid + -$(LN_S) ../init.d/squid /etc/rc0.d/K01squid + /sbin/chkconfig -f squid on + @echo "use 'chkconfig squid off' to disable squid at startup" + @echo "edit /var/config/squid.options to change options" + +install-osf3.2: + $(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid + -$(LN_S) ../init.d/squid /sbin/rc2.d/S99squid + -$(LN_S) ../init.d/squid /sbin/rc0.d/K01squid + /usr/sbin/rcmgr set SQUID 1 + @echo "use 'rcmgr set SQUID 0' to disable squid at startup" + @echo "use 'rcmgr set SQUID_OPTIONS ...' to change options" + @echo "use 'rcmgr set SQUID_RESPAWN 0' to change option" + +install-linux: + $(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid + -$(LN_S) ../squid /sbin/init.d/rc3.d/S90squid + -$(LN_S) ../squid /sbin/init.d/rc3.d/K10squid + grep '^SQUID=' /etc/rc.config || echo SQUID=1 >>/etc/rc.config + @echo "set SQUID=0 in /etc/rc.config to disable squid at startup" + @echo "edit /sbin/init.d/squid to change options" Index: squid/contrib/Makefile.in diff -u squid/contrib/Makefile.in:1.1.1.1 squid/contrib/Makefile.in:removed --- squid/contrib/Makefile.in:1.1.1.1 Tue Jan 25 19:21:46 2000 +++ squid/contrib/Makefile.in Sun Jan 25 06:42:14 2004 @@ -1,67 +0,0 @@ -# -# Makefile for installing Squid startup files on systems -# using a SVR4-based startup mechanism/file system layout -# - -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -LN_S = @LN_S@ -RM = @RM@ - -SQUID_RC = squid.rc -SQUID_OPTIONS = squid.options - - -all: - -install: install-@host_os@ - -install-hpux10.10 install-hpux10.20: - $(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid - $(INSTALL_FILE) $(SQUID_OPTIONS) /etc/rc.config.d/squid - -$(LN_S) ../init.d/squid /sbin/rc2.d/S900squid - -$(LN_S) ../init.d/squid /sbin/rc1.d/K100squid - /usr/sbin/ch_rc -ap SQUID=1 - @echo "use 'ch_rc -ap SQUID=0' to disable squid at startup" - @echo "edit /etc/rc.config.d/squid to change options" - -install-solaris2.4 install-solaris2.5: - $(INSTALL_BIN) $(SQUID_RC) /etc/init.d/squid - -$(LN_S) ../init.d/squid /etc/rc2.d/S90squid - -$(LN_S) ../init.d/squid /etc/rc1.d/K10squid - -$(LN_S) ../init.d/squid /etc/rc0.d/K10squid - @echo "set SQUID=0 in /etc/init.d/squid to disable squid at startup" - @echo "edit /etc/init.d/squid to change options" - -install-irix6.2: - $(INSTALL_BIN) $(SQUID_RC) /etc/init.d/squid - $(INSTALL_FILE) $(SQUID_OPTIONS) /var/config/squid.options - -$(LN_S) ../init.d/squid /etc/rc2.d/S99squid - -$(LN_S) ../init.d/squid /etc/rc0.d/K01squid - /sbin/chkconfig -f squid on - @echo "use 'chkconfig squid off' to disable squid at startup" - @echo "edit /var/config/squid.options to change options" - -install-osf3.2: - $(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid - -$(LN_S) ../init.d/squid /sbin/rc2.d/S99squid - -$(LN_S) ../init.d/squid /sbin/rc0.d/K01squid - /usr/sbin/rcmgr set SQUID 1 - @echo "use 'rcmgr set SQUID 0' to disable squid at startup" - @echo "use 'rcmgr set SQUID_OPTIONS ...' to change options" - @echo "use 'rcmgr set SQUID_RESPAWN 0' to change option" - -install-linux: - $(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid - -$(LN_S) ../squid /sbin/init.d/rc3.d/S90squid - -$(LN_S) ../squid /sbin/init.d/rc3.d/K10squid - grep '^SQUID=' /etc/rc.config || echo SQUID=1 >>/etc/rc.config - @echo "set SQUID=0 in /etc/rc.config to disable squid at startup" - @echo "edit /sbin/init.d/squid to change options" - -clean: - -distclean: clean - $(RM) Makefile - Index: squid/errors/Makefile.am diff -u /dev/null squid/errors/Makefile.am:1.1.2.5 --- /dev/null Sun Jan 25 06:42:15 2004 +++ squid/errors/Makefile.am Mon May 21 03:57:10 2001 @@ -0,0 +1,66 @@ +## Process this file with automake to produce Makefile.in +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +errordir = $(sysconfdir)/errors + + +##dist-hook eveything + +DEFAULT_ERROR_DIR = $(errordir) + +LANGUAGE = @ERR_LANGUAGE@ +LANGUAGES = Bulgarian Czech Danish Dutch English Estonian Finnish French \ + German Hungarian Italian Japanese Korean Polish Portuguese \ + Romanian Russian-1251 Russian-koi8-r Serbian Simplify_Chinese \ + Slovak Spanish Swedish Traditional_Chinese Turkish + + +install-data-local: + -@$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR) + @for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \ + if test -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$f ; then \ + :; \ + else \ + echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)"; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR); \ + fi; \ + done + +uninstall-local: + @for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \ + if test -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"` ; then \ + rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"`; \ + fi; \ + done + +# undocumented hack. You can use this target to create multi-lingual +# error pages. For example: +# +# make ADDLANG=English addlang +# +# by Andres Kroonmaa +# +addlang: all + -@if test -d $(srcdir)/$(ADDLANG); then \ + cd $(srcdir)/$(ADDLANG)/ ; \ + for f in ERR_*; do \ + if test -f $(DEFAULT_ERROR_DIR)/$$f ; then \ + echo "appending $(ADDLANG)/$$f"; \ + echo "
" >> $(DEFAULT_ERROR_DIR)/$$f ; \ + cat $$f >> $(DEFAULT_ERROR_DIR)/$$f; \ + fi; \ + done; \ + fi + +dist-hook: + @ for lang in $(LANGUAGES); do \ + if test "$$lang" = .; then :; else \ + test -d $(distdir)/$$lang \ + || mkdir $(distdir)/$$lang \ + || exit 1; \ + cp -p $(srcdir)/$$lang/ERR_* $(distdir)/$$lang \ + || exit 1; \ + fi; \ + done Index: squid/errors/Makefile.in diff -u squid/errors/Makefile.in:1.4 squid/errors/Makefile.in:removed --- squid/errors/Makefile.in:1.4 Wed Jan 17 00:16:18 2001 +++ squid/errors/Makefile.in Sun Jan 25 06:42:15 2004 @@ -1,70 +0,0 @@ -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -prefix = @prefix@ -exec_prefix = @exec_prefix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -SH = @SH@ -RM = @RM@ -SHELL = @SH@ - -INSTALL = @INSTALL@ -INSTALL_FILE = @INSTALL_DATA@ -DEFAULT_ERROR_DIR = $(sysconfdir)/errors - -LANGUAGE = @ERR_LANGUAGE@ - -all: - -install: install-mkdirs - @for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \ - if test -f $(DEFAULT_ERROR_DIR)/$$f ; then \ - :; \ - else \ - echo "$(INSTALL_FILE) $$f $(DEFAULT_ERROR_DIR)"; \ - $(INSTALL_FILE) $$f $(DEFAULT_ERROR_DIR); \ - fi; \ - done - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(sysconfdir); then \ - echo "mkdir $(sysconfdir)"; \ - mkdir -p $(sysconfdir); \ - fi - -@if test ! -d $(DEFAULT_ERROR_DIR); then \ - echo "mkdir $(DEFAULT_ERROR_DIR)"; \ - mkdir -p $(DEFAULT_ERROR_DIR); \ - fi - -# undocumented hack. You can use this target to create multi-lingual -# error pages. For example: -# -# make ADDLANG=English addlang -# -# by Andres Kroonmaa -# -addlang: all - -@if test -d $(srcdir)/$(ADDLANG); then \ - cd $(srcdir)/$(ADDLANG)/ ; \ - for f in ERR_*; do \ - if test -f $(DEFAULT_ERROR_DIR)/$$f ; then \ - echo "appending $(ADDLANG)/$$f"; \ - echo "
" >> $(DEFAULT_ERROR_DIR)/$$f ; \ - cat $$f >> $(DEFAULT_ERROR_DIR)/$$f; \ - fi; \ - done; \ - fi - -clean: - -distclean: clean - -rm -f Makefile Index: squid/icons/Makefile.am diff -u /dev/null squid/icons/Makefile.am:1.1.2.4 --- /dev/null Sun Jan 25 06:42:44 2004 +++ squid/icons/Makefile.am Mon May 14 17:36:21 2001 @@ -0,0 +1,49 @@ +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +ICON1 = anthony-binhex.gif +ICON2 = anthony-bomb.gif \ + anthony-box.gif \ + anthony-box2.gif \ + anthony-c.gif \ + anthony-compressed.gif \ + anthony-dir.gif \ + anthony-dirup.gif \ + anthony-dvi.gif \ + anthony-f.gif \ + anthony-image.gif \ + anthony-image2.gif \ + anthony-layout.gif \ + anthony-link.gif \ + anthony-movie.gif \ + anthony-pdf.gif \ + anthony-portal.gif \ + anthony-ps.gif \ + anthony-quill.gif \ + anthony-script.gif \ + anthony-sound.gif \ + anthony-tar.gif \ + anthony-tex.gif \ + anthony-text.gif \ + anthony-unknown.gif \ + anthony-xbm.gif \ + anthony-xpm.gif + +icondir = $(sysconfdir)/icons +icon_DATA = $(ICON1) $(ICON2) +EXTRA_DIST = $(ICON1) $(ICON2) icons.shar +DISTCLEANFILES = $(EXTRA_DIST) + +# The magic with ICON1,2 is to have a single dependency +# for all of the icons. +$(ICON2): $(ICON1) + +$(ICON1): + @$(SHELL) "$(srcdir)/icons.shar" +## @$(SHELL) -c "cd $(srcdir); $(SHELL) icons.shar" + +icons.shar: + shar --no-timestamp $(ICON1) $(ICON2) > $@ + +## DEFAULT_ICON_DIR = $(sysconfdir)/icons + Index: squid/icons/Makefile.in diff -u squid/icons/Makefile.in:1.6 squid/icons/Makefile.in:removed --- squid/icons/Makefile.in:1.6 Wed Jan 17 00:16:19 2001 +++ squid/icons/Makefile.in Sun Jan 25 06:42:44 2004 @@ -1,88 +0,0 @@ -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -prefix = @prefix@ -exec_prefix = @exec_prefix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -SH = @SH@ -RM = @RM@ -SHELL = @SH@ - -INSTALL = @INSTALL@ -INSTALL_FILE = @INSTALL_DATA@ -DEFAULT_ICON_DIR = $(sysconfdir)/icons - -ICON1 = anthony-binhex.gif -ICON2 = anthony-bomb.gif \ - anthony-box.gif \ - anthony-box2.gif \ - anthony-c.gif \ - anthony-compressed.gif \ - anthony-dir.gif \ - anthony-dirup.gif \ - anthony-dvi.gif \ - anthony-f.gif \ - anthony-image.gif \ - anthony-image2.gif \ - anthony-layout.gif \ - anthony-link.gif \ - anthony-movie.gif \ - anthony-pdf.gif \ - anthony-portal.gif \ - anthony-ps.gif \ - anthony-quill.gif \ - anthony-script.gif \ - anthony-sound.gif \ - anthony-tar.gif \ - anthony-tex.gif \ - anthony-text.gif \ - anthony-unknown.gif \ - anthony-xbm.gif \ - anthony-xpm.gif -ICONS = $(ICON1) $(ICON2) - -all: $(ICONS) - -# The magic with ICON1,2 is to have a single dependency -# for all of the icons. -$(ICON2): $(ICON1) -$(ICON1): - @$(SHELL) -c "cd $(srcdir); $(SHELL) icons.shar" - -icons.shar: - shar --no-timestamp $(ICONS) > $@ - -install: install-mkdirs anthony-xpm.gif - @for f in $(ICONS); do \ - if test -f $(DEFAULT_ICON_DIR)/$$f ; then \ - :; \ - else \ - echo "$(INSTALL_FILE) $$f $(DEFAULT_ICON_DIR)"; \ - $(INSTALL_FILE) $(srcdir)/$$f $(DEFAULT_ICON_DIR); \ - fi; \ - done - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(sysconfdir); then \ - echo "mkdir $(sysconfdir)"; \ - mkdir -p $(sysconfdir); \ - fi - -@if test ! -d $(DEFAULT_ICON_DIR); then \ - echo "mkdir $(DEFAULT_ICON_DIR)"; \ - mkdir -p $(DEFAULT_ICON_DIR); \ - fi - -clean: - - -distclean: clean - -rm -f Makefile Index: squid/include/version.h diff -u squid/include/version.h:1.4 squid/include/version.h:1.4.40.1 --- squid/include/version.h:1.4 Tue Nov 14 05:03:47 2000 +++ squid/include/version.h Tue May 15 17:52:37 2001 @@ -3,9 +3,10 @@ * * SQUID_VERSION - String for version id of this distribution */ -#ifndef SQUID_VERSION -#define SQUID_VERSION "2.5.DEVEL" -#endif + +/* + * SQUID_VERSION is now the automake "VERSION" string. + */ #ifndef SQUID_RELEASE_TIME #define SQUID_RELEASE_TIME squid_curtime Index: squid/lib/Makefile.am diff -u /dev/null squid/lib/Makefile.am:1.1.2.3 --- /dev/null Sun Jan 25 06:42:44 2004 +++ squid/lib/Makefile.am Fri Apr 20 19:23:15 2001 @@ -0,0 +1,19 @@ +## Process this file with automake to produce Makefile.in +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +EXTRA_LIBRARIES = libregex.a libdlmalloc.a +noinst_LIBRARIES = libmiscutil.a @LIBREGEX@ @LIBDLMALLOC@ libntlmauth.a +libmiscutil_a_SOURCES = rfc1123.c rfc1738.c rfc1035.c rfc2617.c util.c \ + getfullhostname.c base64.c uudecode.c splay.c safe_inet_addr.c \ + iso3307.c snprintf.c md5.c radix.c stub_memaccount.c Array.c \ + Stack.c hash.c heap.c html_quote.c +libmiscutil_a_LIBADD = @LIBOBJS@ +# $(top_srcdir)/include/version.h should be a dependency +libregex_a_SOURCES = GNUregex.c +libdlmalloc_a_SOURCES = dlmalloc.c +libntlmauth_a_SOURCES = ntlmauth.c +libntlmauth_a_LIBADD = @LIBOBJS@ + +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include Index: squid/lib/Makefile.in diff -u squid/lib/Makefile.in:1.7 squid/lib/Makefile.in:removed --- squid/lib/Makefile.in:1.7 Wed Jan 31 14:20:27 2001 +++ squid/lib/Makefile.in Sun Jan 25 06:42:44 2004 @@ -1,87 +0,0 @@ -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -prefix = @prefix@ -top_srcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -RM = @RM@ -LIBOBJS = @LIBOBJS@ -AR_R = @AR_R@ - -INCLUDE = -I../include -I$(top_srcdir)/include -UTILOBJS = rfc1123.o \ - rfc1738.o \ - rfc1035.o \ - rfc2617.o \ - util.o \ - getfullhostname.o \ - base64.o \ - uudecode.o \ - splay.o \ - safe_inet_addr.o \ - iso3307.o \ - snprintf.o \ - md5.o \ - radix.o \ - stub_memaccount.o \ - Array.o \ - Stack.o \ - hash.o \ - heap.o \ - html_quote.o \ - $(LIBOBJS) -REGEXOBJS = GNUregex.o -DLMALLOCOBJS = dlmalloc.o -NTLMAUTHOBJS = ntlmauth.o -LIBS = libmiscutil.a @LIBREGEX@ @LIBDLMALLOC@ libntlmauth.a - -CFLAGS = $(AC_CFLAGS) $(INCLUDE) - -all: $(LIBS) - -$(UTILOBJS): $(top_srcdir)/include/version.h - -libmiscutil.a: $(UTILOBJS) - $(RM) -f $@ - $(AR_R) $@ $(UTILOBJS) - $(RANLIB) $@ - -libregex.a: $(REGEXOBJS) - $(RM) -f $@ - $(AR_R) $@ $(REGEXOBJS) - $(RANLIB) $@ - -libdlmalloc.a: $(DLMALLOCOBJS) - $(RM) -f $@ - $(AR_R) $@ $(DLMALLOCOBJS) - $(RANLIB) $@ - -libntlmauth.a: $(NTLMAUTHOBJS) - $(RM) -f $@ - $(AR_R) $@ $(NTLMAUTHOBJS) - $(RANLIB) $@ - -clean: - -rm -f *.o $(LIBS) core - -distclean: clean - -rm -f libregex.a - -rm -f Makefile Makefile.bak - -install: all - -depend: - $(MAKEDEPEND) -I../include -I. -fMakefile *.c - Index: squid/scripts/Makefile.am diff -u /dev/null squid/scripts/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:46 2004 +++ squid/scripts/Makefile.am Fri Apr 6 05:40:26 2001 @@ -0,0 +1,11 @@ +# +# This file is a Makefile for compiling and installing Cache Manager. +# Cache Manager is a manager program for Internet Object Cache. +# + + +bin_SCRIPTS = RunCache RunAccel +EXTRA_DIST = AnnounceCache.pl access-log-matrix.pl cache-compare.pl \ + cachetrace.pl check_cache.pl convert.configure.to.os2 \ + fileno-to-pathname.pl flag_truncs.pl icp-test.pl \ + icpserver.pl tcp-banger.pl udp-banger.pl upgrade-1.0-store.pl Index: squid/scripts/Makefile.in diff -u squid/scripts/Makefile.in:1.2 squid/scripts/Makefile.in:removed --- squid/scripts/Makefile.in:1.2 Wed Jan 17 00:16:19 2001 +++ squid/scripts/Makefile.in Sun Jan 25 06:42:46 2004 @@ -1,38 +0,0 @@ -# -# This file is a Makefile for compiling and installing Cache Manager. -# Cache Manager is a manager program for Internet Object Cache. -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -sysconfdir = @sysconfdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -RANLIB = @RANLIB@ -LN_S = @LN_S@ - -all: - -install: - @if test ! -d $(exec_prefix); then \ - echo "mkdir $(exec_prefix)"; \ - mkdir -p $(exec_prefix); \ - fi - @if test ! -d $(bindir); then \ - echo "mkdir $(bindir)"; \ - mkdir -p $(bindir); \ - fi - $(INSTALL_BIN) RunCache $(bindir) - $(INSTALL_BIN) RunAccel $(bindir) - -clean: - -distclean: - -rm -f RunCache RunAccel Makefile Index: squid/snmplib/Makefile.am diff -u /dev/null squid/snmplib/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:46 2004 +++ squid/snmplib/Makefile.am Fri Apr 6 05:40:27 2001 @@ -0,0 +1,14 @@ +## Process this file with automake to produce Makefile.in +## +## Makefile for libsnmp. +## +noinst_LIBRARIES = libsnmp.a +libsnmp_a_SOURCES = asn1.c parse.c snmp_vars.c \ + coexistance.c snmp_api.c snmp_error.c \ + mib.c snmp_api_error.c \ + snmp_msg.c \ + snmp_pdu.c snmplib_debug.c +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include + +VERSION = 3.4 +DEFS = -DSQUID_SNMP=1 Index: squid/snmplib/Makefile.in diff -u squid/snmplib/Makefile.in:1.1.1.1 squid/snmplib/Makefile.in:removed --- squid/snmplib/Makefile.in:1.1.1.1 Tue Jan 25 19:21:47 2000 +++ squid/snmplib/Makefile.in Sun Jan 25 06:42:46 2004 @@ -1,57 +0,0 @@ -## -## Makefile for libsnmp. -## -## because this is for Linux with ELF only, we are building -## a shared lib, to be installed in /lib. -## - -## set to installation prefix (overridden by configure --prefix=path): - -prefix = @prefix@ -top_srcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -VERSION = 3.4 -ALIB = libsnmp.a - -TARG = libsnmp.a - -CSRCS = asn1.c parse.c snmp_vars.c \ - coexistance.c snmp_api.c snmp_error.c \ - mib.c snmp_api_error.c \ - snmp_msg.c \ - snmp_pdu.c snmplib_debug.c - -OBJS = asn1.o parse.o snmp_vars.o \ - coexistance.o snmp_api.o snmp_error.o \ - mib.o snmp_api_error.o \ - snmp_msg.o \ - snmp_pdu.o snmplib_debug.o - -CC = @CC@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -DEFS = -DSQUID_SNMP=1 -INCLUDE = -I../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(DEFS) $(INCLUDE) - - -all: $(TARG) - -install: all - -$(ALIB): ${OBJS} - $(AR_R) $(ALIB) ${OBJS} - $(RANLIB) $(ALIB) - -## -## special rule to include -DMIBFILEPATH=...: -## - -distclean: clean - -rm -f Makefile - -clean: - rm -f core *.o ${TARG} shared/*.o *.a Index: squid/src/Makefile.am diff -u /dev/null squid/src/Makefile.am:1.1.2.33 --- /dev/null Sun Jan 25 06:42:46 2004 +++ squid/src/Makefile.am Fri Aug 31 02:30:09 2001 @@ -0,0 +1,230 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + +if USE_DNSSERVER +DNSSOURCE = dns.c +DNSSERVER = dnsserver +else +DNSSOURCE = dns_internal.c +endif + +if USE_SNMP +SNMPSOURCE = snmp_core.c snmp_agent.c +else +SNMPSOURCE = +endif + +if USE_DELAY_POOLS +DELAY_POOL_SOURCE = delay_pools.c +else +DELAY_POOL_SOURCE = +endif + +if ENABLE_HTCP +HTCPSOURCE = htcp.c +endif + +if MAKE_LEAKFINDER +LEAKFINDERSOURCE = leakfinder.c +else +LEAKFINDERSOURCE = +endif + +if ENABLE_UNLINKD +UNLINKDSOURCE = unlinkd.c +UNLINKD = unlinkd +else +UNLINKDSOURCE = +UNLINKD = +endif + +if ENABLE_SSL +SSLSOURCE = ssl_support.c +else +SSLSOURCE = +endif + +if ENABLE_WIN32SPECIFIC +WIN32SOURCE = win32.c +else +WIN32SOURCE = +endif + +SUBDIRS = fs repl auth +#look into pkgsbin.. +libexecdir = ${prefix}/libexec/squid + +INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include + +EXTRA_PROGRAMS = unlinkd pinger dnsserver +noinst_PROGRAMS = cf_gen +bin_PROGRAMS = squid client +libexec_PROGRAMS = @OPT_PINGER_EXE@ $(DNSSERVER) $(UNLINKD) cachemgr + +cf_gen_SOURCES = cf_gen.c defines.h +nodist_cf_gen_HEADER = cf_gen_defines.h +cf_gen.$(OBJEXT): cf_gen_defines.h +##Makefile defines.h ../include/autoconf.h +##cf_gen_LDADD = ../lib/libmiscutil.a + +EXTRA_squid_SOURCES = delay_pools.c dns.c dnsserver.c dns_internal.c htcp.c \ +leakfinder.c snmp_core.c snmp_agent.c unlinkd.c ssl_support.c win32.c +squid_SOURCES = \ +access_log.c acl.c asn.c authenticate.c cache_cf.c \ +CacheDigest.c cache_manager.c carp.c cbdata.c client_db.c client_side.c \ +comm.c comm_select.c debug.c defines.h $(DELAY_POOL_SOURCE) disk.c $(DNSSOURCE) enums.h \ +errorpage.c ETag.c event.c fd.c filemap.c forward.c fqdncache.c ftp.c \ +globals.h gopher.c helper.c $(HTCPSOURCE) http.c HttpStatusLine.c HttpHdrCc.c \ +HttpHdrRange.c HttpHdrContRange.c HttpHeader.c HttpHeaderTools.c HttpBody.c \ +HttpMsg.c HttpReply.c HttpRequest.c icmp.c icp_v2.c icp_v3.c ident.c internal.c \ +ipc.c ipcache.c $(LEAKFINDERSOURCE) logfile.c main.c mem.c MemPool.c MemBuf.c \ +mime.c multicast.c neighbors.c net_db.c Packer.c pconn.c peer_digest.c \ +peer_select.c protos.h redirect.c referer.c refresh.c send-announce.c $(SNMPSOURCE) \ +squid.h ssl.c $(SSLSOURCE) stat.c StatHist.c String.c stmem.c store.c store_io.c \ +store_client.c store_digest.c store_dir.c store_key_md5.c store_log.c store_rebuild.c \ +store_swapin.c store_swapmeta.c store_swapout.c structs.h tools.c typedefs.h \ +$(UNLINKDSOURCE) url.c urn.c useragent.c wais.c wccp.c whois.c $(WIN32SOURCE) +nodist_squid_SOURCES = repl_modules.c auth_modules.c store_modules.c \ + cf_parser.h globals.c string_arrays.c +squid_LDADD = @XTRA_OBJS@ @REPL_OBJS@ @STORE_OBJS@ @AUTH_OBJS@ \ + @CRYPTLIB@ @REGEXLIB@ @SQUID_AIO_LIB@ @SQUID_PTHREAD_LIB@ \ + @SNMPLIB@ @LIB_MALLOC@ @SSLLIB@ ../lib/libmiscutil.a @XTRA_LIBS@ + +unlinkd_SOURCES = +unlinkd_LDADD = unlinkd-daemon.o +unlinkd-daemon.o: unlinkd.c + $(COMPILE) -DUNLINK_DAEMON -c $(srcdir)/unlinkd.c -o $@ + +pinger_SOURCES = pinger.c debug.c globals.c + +BUILT_SOURCES = cf_gen_defines.h cf_parser.h globals.c string_arrays.c \ + repl_modules.c auth_modules.c store_modules.c + +sysconf_DATA = squid.conf.default mib.txt mime.conf.default + +LDADD = ../lib/libmiscutil.a @XTRA_LIBS@ + +EXTRA_DIST = cf_gen_defines cf.data.pre mk-globals-c.pl mk-string-arrays.pl \ + auth_modules.sh store_modules.sh repl_modules.sh mib.txt mime.conf.default + +DEFAULT_PREFIX = $(prefix) +DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf +DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf +DEFAULT_DNSSERVER = $(libexecdir)/$(DNSSERVER_EXE) +DEFAULT_CACHE_LOG = $(localstatedir)/logs/cache.log +DEFAULT_ACCESS_LOG = $(localstatedir)/logs/access.log +DEFAULT_STORE_LOG = $(localstatedir)/logs/store.log +DEFAULT_PID_FILE = $(localstatedir)/logs/squid.pid +DEFAULT_SWAP_DIR = $(localstatedir)/cache +DEFAULT_PINGER = $(libexecdir)/$(PINGER_EXE) +DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE) +DEFAULT_DISKD = $(libexecdir)/$(DISKD_EXE) +DEFAULT_ICON_DIR = $(sysconfdir)/icons +DEFAULT_ERROR_DIR = $(sysconfdir)/errors +DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt + +DEFS = -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" + +$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h + +snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h + +globals.c: globals.h mk-globals-c.pl + $(PERL) $(srcdir)/mk-globals-c.pl < $(srcdir)/globals.h > $@ + +string_arrays.c: enums.h mk-string-arrays.pl + $(PERL) $(srcdir)/mk-string-arrays.pl < $(srcdir)/enums.h > $@ + +cache_diff: cache_diff.o debug.o globals.o store_key_md5.o + $(CC) -o $@ $(LDFLAGS) $@.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS) + +test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key_md5.o + $(CC) -o $@ $(LDFLAGS) $@.o CacheDigest.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS) + +## If autodependency works well this is not needed anymore +cache_cf.o: cf_parser.h + +squid.conf.default: cf_parser.h + $(SHELL) -c "test -f squid.conf.default || ./cf_gen cf.data" + +cf_parser.h: cf.data cf_gen$(EXEEXT) + ./cf_gen cf.data + +cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre + awk -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >cf_gen_defines.h + + +## FIXME: generate a sed command file from configure. Then this doesn't +## depend on the Makefile. +cf.data: cf.data.pre Makefile + sed "\ + s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ + s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\ + s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\ + s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\ + s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g;\ + s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\ + s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\ + s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\ + s%@DEFAULT_PID_FILE@%$(DEFAULT_PID_FILE)%g;\ + s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g;\ + s%@DEFAULT_ICON_DIR@%$(DEFAULT_ICON_DIR)%g;\ + s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g;\ + s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\ + s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;"\ + < $(srcdir)/cf.data.pre >$@ + +store_modules.c: store_modules.sh + $(SHELL) $(srcdir)/store_modules.sh $(STORE_MODULES) >store_modules.c + +repl_modules.c: repl_modules.sh + $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.c + +auth_modules.c: auth_modules.sh + @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c + +install-data-local: + @if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/mime.conf" ; \ + else \ + echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(sysconfdir)/mime.conf" ;\ + $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(sysconfdir)/mime.conf; \ + fi + @if test -f $(DESTDIR)$(sysconfdir)/squid.conf ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/squid.conf" ; \ + else \ + echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(sysconfdir)/squid.conf"; \ + $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(sysconfdir)/squid.conf; \ + fi + +uninstall-local: + @if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \ + echo "rm -f $(DESTDIR)$(sysconfdir)/mime.conf"; \ + $(RM) -f $(DESTDIR)$(sysconfdir)/mime.conf; \ + fi + @if test -f $(DESTDIR)$(sysconfdir)/squid.conf ; then \ + echo "rm -f $(DESTDIR)$(sysconfdir)/squid.conf"; \ + $(RM) -f $(DESTDIR)$(sysconfdir)/squid.conf; \ + fi + +DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default \ + globals.c string_arrays.c repl_modules.c auth_modules.c store_modules.c + +##install-pinger: +## @f=$(PINGER_EXE); \ +## if test -f $(libexecdir)/$$f; then \ +## echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ +## $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ +## fi; \ +## echo $(INSTALL_SUID) $$f $(libexecdir); \ +## $(INSTALL_SUID) $$f $(libexecdir) || exit 1; \ +## if test -f $(libexecdir)/-$$f; then \ +## echo $(RM) -f $(libexecdir)/-$$f; \ +## $(RM) -f $(libexecdir)/-$$f; \ +## fi + Index: squid/src/Makefile.in diff -u squid/src/Makefile.in:1.14 squid/src/Makefile.in:removed --- squid/src/Makefile.in:1.14 Fri Aug 24 08:43:57 2001 +++ squid/src/Makefile.in Sun Jan 25 06:42:46 2004 @@ -1,448 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -cgi_suffix = @cgi_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -SUBDIRS = fs repl auth - -# Gotta love the DOS legacy -# -SQUID_EXE = squid$(exec_suffix) -CLIENT_EXE = client$(exec_suffix) -OPT_DNSSERVER_EXE = dnsserver$(exec_suffix) -DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ -OPT_UNLINKD_EXE = unlinkd$(exec_suffix) -UNLINKD_EXE = @OPT_UNLINKD_EXE@ -OPT_PINGER_EXE = pinger$(exec_suffix) -PINGER_EXE = @OPT_PINGER_EXE@ -CACHEMGR_EXE = cachemgr$(cgi_suffix) -DISKD_EXE = diskd$(exec_suffix) - -DEFAULT_PREFIX = $(prefix) -DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf -DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf -DEFAULT_DNSSERVER = $(libexecdir)/$(DNSSERVER_EXE) -DEFAULT_CACHE_LOG = $(localstatedir)/logs/cache.log -DEFAULT_ACCESS_LOG = $(localstatedir)/logs/access.log -DEFAULT_STORE_LOG = $(localstatedir)/logs/store.log -DEFAULT_PID_FILE = $(localstatedir)/logs/squid.pid -DEFAULT_SWAP_DIR = $(localstatedir)/cache -DEFAULT_PINGER = $(libexecdir)/$(PINGER_EXE) -DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE) -DEFAULT_DISKD = $(libexecdir)/$(DISKD_EXE) -DEFAULT_ICON_DIR = $(sysconfdir)/icons -DEFAULT_ERROR_DIR = $(sysconfdir)/errors -DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt - -AUTH_OBJS = @AUTH_OBJS@ -AUTH_MODULES = @AUTH_MODULES@ -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 -RANLIB = @RANLIB@ -LN_S = @LN_S@ -PERL = @PERL@ -CRYPTLIB = @CRYPTLIB@ -REGEXLIB = @REGEXLIB@ -PTHREADLIB = @PTHREADLIB@ -AIOLIB = @AIOLIB@ -SNMPLIB = @SNMPLIB@ -MALLOCLIB = @LIB_MALLOC@ -SSLLIB = @SSLLIB@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -STORE_OBJS = @STORE_OBJS@ -STORE_MODULES = @STORE_MODULES@ -REPL_OBJS = @REPL_OBJS@ -REPL_POLICIES = @REPL_POLICIES@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh - -INCLUDE = -I. -I../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -SQUID_LIBS = -L../lib $(CRYPTLIB) $(REGEXLIB) @SQUID_AIO_LIB@ @SQUID_PTHREAD_LIB@ \ - $(SNMPLIB) $(MALLOCLIB) $(SSLLIB) -lmiscutil $(XTRA_LIBS) -CLIENT_LIBS = -L../lib -lmiscutil $(XTRA_LIBS) -DNSSERVER_LIBS = -L../lib -lmiscutil $(XTRA_LIBS) -PINGER_LIBS = -L../lib -lmiscutil $(XTRA_LIBS) -STD_APP_LIBS = -L../lib -lmiscutil $(XTRA_LIBS) - -PROGS = $(SQUID_EXE) $(CLIENT_EXE) -UTILS = $(DNSSERVER_EXE) $(UNLINKD_EXE) -SUID_UTILS = $(PINGER_EXE) -CGIPROGS = $(CACHEMGR_EXE) -OBJS = \ - access_log.o \ - acl.o \ - asn.o \ - auth_modules.o \ - authenticate.o \ - cache_cf.o \ - CacheDigest.o \ - cache_manager.o \ - carp.o \ - cbdata.o \ - client_db.o \ - client_side.o \ - comm.o \ - comm_select.o \ - debug.o \ - @DELAY_OBJS@ \ - disk.o \ - @DNS_OBJS@ \ - errorpage.o \ - ETag.o \ - event.o \ - fd.o \ - filemap.o \ - forward.o \ - fqdncache.o \ - ftp.o \ - globals.o \ - gopher.o \ - helper.o \ - @HTCP_OBJS@ \ - http.o \ - HttpStatusLine.o \ - HttpHdrCc.o \ - HttpHdrRange.o \ - HttpHdrContRange.o \ - HttpHeader.o \ - HttpHeaderTools.o \ - HttpBody.o \ - HttpMsg.o \ - HttpReply.o \ - HttpRequest.o \ - icmp.o \ - icp_v2.o \ - icp_v3.o \ - ident.o \ - internal.o \ - ipc.o \ - ipcache.o \ - @LEAKFINDER_OBJS@ \ - logfile.o \ - main.o \ - mem.o \ - MemPool.o \ - MemBuf.o \ - mime.o \ - multicast.o \ - neighbors.o \ - net_db.o \ - Packer.o \ - pconn.o \ - peer_digest.o \ - peer_select.o \ - redirect.o \ - referer.o \ - refresh.o \ - repl_modules.o \ - send-announce.o \ - @SNMP_OBJS@ \ - ssl.o \ - @SSL_OBJS@ \ - stat.o \ - StatHist.o \ - String.o \ - stmem.o \ - store.o \ - store_io.o \ - store_client.o \ - store_digest.o \ - store_dir.o \ - store_key_md5.o \ - store_log.o \ - store_modules.o \ - store_rebuild.o \ - store_swapin.o \ - store_swapmeta.o \ - store_swapout.o \ - string_arrays.o \ - tools.o \ - @UNLINKD_OBJS@ \ - url.o \ - urn.o \ - useragent.o \ - wais.o \ - wccp.o \ - whois.o \ - @WIN32_OBJS@ \ - $(XTRA_OBJS) - -SNMP_OBJS = \ - snmp_core.o \ - snmp_agent.o - -HTCP_OBJS = htcp.o - -DELAY_OBJS = delay_pools.o - -LEAKFINDER_OBJS = \ - leakfinder.o - -SSL_OBJS = ssl_support.o - -DEFAULTS = \ - -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" - -all: squid.conf.default - @for dir in $(SUBDIRS); do \ - echo "Making $@ in $$dir..."; \ - (cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \ - done - @$(MAKE) $(MFLAGS) $(PROGS) $(UTILS) $(SUID_UTILS) $(CGIPROGS) - -$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h - -$(SNMP_OBJS): ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h - -$(SQUID_EXE): $(OBJS) $(STORE_OBJS) $(REPL_OBJS) $(AUTH_OBJS) - $(CC) -o $@ $(LDFLAGS) $(OBJS) $(STORE_OBJS) $(REPL_OBJS) $(AUTH_OBJS) $(SQUID_LIBS) - -globals.o: globals.c Makefile - $(CC) -c globals.c $(CFLAGS) -I$(srcdir) $(DEFAULTS) - -globals.c: globals.h mk-globals-c.pl - $(PERL) $(srcdir)/mk-globals-c.pl < $(srcdir)/globals.h > $@ - -string_arrays.c: enums.h mk-string-arrays.pl - $(PERL) $(srcdir)/mk-string-arrays.pl < $(srcdir)/enums.h > $@ - -$(CLIENT_EXE): client.o - $(CC) -o $@ $(LDFLAGS) client.o $(CLIENT_LIBS) - -$(DNSSERVER_EXE): dnsserver.o - $(CC) -o $@ $(LDFLAGS) dnsserver.o $(DNSSERVER_LIBS) - -$(CACHEMGR_EXE): cachemgr.o - $(CC) -o $@ $(LDFLAGS) cachemgr.o $(CLIENT_LIBS) - -$(PINGER_EXE): pinger.o debug.o globals.o - $(CC) -o $@ $(LDFLAGS) pinger.o debug.o globals.o $(PINGER_LIBS) - -$(UNLINKD_EXE): unlinkd-daemon.o - $(CC) $(LDFLAGS) unlinkd-daemon.o -o $@ - -unlinkd-daemon.o: unlinkd.c - $(CC) -c $(CFLAGS) -DUNLINK_DAEMON $(srcdir)/unlinkd.c -o $@ - -cache_diff: cache_diff.o debug.o globals.o store_key_md5.o - $(CC) -o $@ $(LDFLAGS) $@.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS) - -test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key_md5.o - $(CC) -o $@ $(LDFLAGS) $@.o CacheDigest.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS) - -cache_cf.o: cf_parser.h - -squid.conf.default: cf_parser.h - @sh -c "test -f squid.conf.default || ./cf_gen cf.data" - -cf_parser.h: cf.data cf_gen - ./cf_gen cf.data - -cf_gen: cf_gen.o - $(CC) -o $@ $(LDFLAGS) cf_gen.o $(STD_APP_LIBS) - -cf_gen.o: cf_gen.c cf_gen_defines.h Makefile defines.h ../include/autoconf.h - -cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre - awk -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >cf_gen_defines.h - -cf.data: cf.data.pre Makefile - sed "\ - s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ - s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\ - s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\ - s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\ - s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g;\ - s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\ - s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\ - s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\ - s%@DEFAULT_PID_FILE@%$(DEFAULT_PID_FILE)%g;\ - s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g;\ - s%@DEFAULT_ICON_DIR@%$(DEFAULT_ICON_DIR)%g;\ - s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g;\ - s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\ - s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;"\ - < $(srcdir)/cf.data.pre >$@ - -store_modules.c: store_modules.sh Makefile - sh $(srcdir)/store_modules.sh $(STORE_MODULES) >store_modules.c - -store_modules.o: store_modules.c - $(CC) -c store_modules.c $(CFLAGS) -I$(srcdir) - -$(STORE_OBJS): - @sh -c "cd `dirname $@` && $(MAKE) $(MFLAGS) `basename $@`" - -repl_modules.c: repl_modules.sh Makefile - sh $(srcdir)/repl_modules.sh $(REPL_POLICIES) >repl_modules.c - -repl_modules.o: repl_modules.c - $(CC) -c repl_modules.c $(CFLAGS) -I$(srcdir) - -$(REPL_OBJS): - @sh -c "cd `dirname $@` && $(MAKE) $(MFLAGS) `basename $@`" - -repl_modules repl/stamp: - @sh -c "cd repl && $(MAKE) all" - -auth_modules.c: auth_modules.sh Makefile - sh $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c - -auth_modules.o: auth_modules.c - $(CC) -c auth_modules.c $(CFLAGS) -I$(srcdir) - -$(AUTH_OBJS): - @sh -c "cd `dirname $@` && $(MAKE) $(MFLAGS) `basename $@`" - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(exec_prefix); then \ - echo "mkdir $(exec_prefix)"; \ - mkdir -p $(exec_prefix); \ - fi - -@if test ! -d $(bindir); then \ - echo "mkdir $(bindir)"; \ - mkdir -p $(bindir); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -@if test ! -d $(sysconfdir); then \ - echo "mkdir $(sysconfdir)"; \ - mkdir -p $(sysconfdir); \ - fi - -@if test ! -d $(localstatedir); then \ - echo "mkdir $(localstatedir)"; \ - mkdir -p $(localstatedir); \ - fi - -@if test ! -d $(localstatedir)/logs; then \ - echo "mkdir $(localstatedir)/logs"; \ - mkdir -p $(localstatedir)/logs; \ - fi - -# Michael Lupp wants to know about additions -# to the install target. -install: all install-mkdirs - @for dir in $(SUBDIRS); do \ - echo "Making $@ in $$dir..."; \ - (cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \ - done - @for f in $(PROGS); do \ - if test -f $(bindir)/$$f; then \ - echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \ - $(MV) $(bindir)/$$f $(bindir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(bindir); \ - $(INSTALL_BIN) $$f $(bindir); \ - if test -f $(bindir)/-$$f; then \ - echo $(RM) -f $(bindir)/-$$f; \ - $(RM) -f $(bindir)/-$$f; \ - fi; \ - done - @if test -n "$(UTILS)"; then \ - for f in $(UTILS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done; \ - fi - @for f in $(CGIPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - $(INSTALL_FILE) $(srcdir)/mib.txt $(DEFAULT_MIB_PATH) - $(INSTALL_FILE) squid.conf.default $(sysconfdir) - @if test -f $(sysconfdir)/squid.conf ; then \ - echo "$@ will not overwrite existing $(sysconfdir)/squid.conf" ; \ - else \ - echo "$(INSTALL_FILE) squid.conf.default $(sysconfdir)/squid.conf"; \ - $(INSTALL_FILE) squid.conf.default $(sysconfdir)/squid.conf; \ - fi - - $(INSTALL_FILE) $(srcdir)/mime.conf.default $(sysconfdir) - @if test -f $(sysconfdir)/mime.conf ; then \ - echo "$@ will not overwrite existing $(sysconfdir)/mime.conf" ; \ - else \ - echo "$(INSTALL_FILE) $(srcdir)/mime.conf.default $(sysconfdir)/mime.conf"; \ - $(INSTALL_FILE) $(srcdir)/mime.conf.default $(sysconfdir)/mime.conf; \ - fi - -install-pinger: - @f=$(PINGER_EXE); \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_SUID) $$f $(libexecdir); \ - $(INSTALL_SUID) $$f $(libexecdir) || exit 1; \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi - -clean: - -rm -rf *.o *pure_* core $(PROGS) $(UTILS) $(CGIPROGS) $(SUID_UTILS) - -rm -f cf_gen cf_gen_defines.h cf_parser.h cf.data globals.c string_arrays.c - -rm -f store_modules.c repl_modules.c auth_modules.c squid.conf.default - @for dir in $(SUBDIRS); do \ - echo "Making $@ in $$dir..."; \ - (cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \ - done - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - @for dir in $(SUBDIRS); do \ - echo "Making $@ in $$dir..."; \ - (cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \ - done - -tags: - ctags *.[ch] ../include/*.h ../lib/*.[ch] - -depend: cf_parser.h - $(MAKEDEPEND) $(INCLUDE) -fMakefile $(srcdir)/*.c Index: squid/src/cachemgr.c diff -u squid/src/cachemgr.c:1.4 squid/src/cachemgr.c:1.4.18.1 --- squid/src/cachemgr.c:1.4 Fri Jan 12 00:20:32 2001 +++ squid/src/cachemgr.c Tue May 15 17:52:37 2001 @@ -221,7 +221,7 @@ printf("
\n"); printf("
\n"); printf("Generated %s, by %s/%s@%s\n", - mkrfc1123(now), progname, SQUID_VERSION, getfullhostname()); + mkrfc1123(now), progname, VERSION, getfullhostname()); printf("
\n"); } Index: squid/src/dnsserver.c diff -u squid/src/dnsserver.c:1.4 squid/src/dnsserver.c:1.4.18.1 --- squid/src/dnsserver.c:1.4 Fri Jan 12 00:20:32 2001 +++ squid/src/dnsserver.c Tue May 15 17:52:37 2001 @@ -322,7 +322,7 @@ #endif /* HAVE_RES_INIT */ break; case 'v': - printf("dnsserver version %s\n", SQUID_VERSION); + printf("dnsserver version %s\n", VERSION); exit(0); break; case 'h': Index: squid/src/globals.h diff -u squid/src/globals.h:1.11 squid/src/globals.h:1.7.18.4 --- squid/src/globals.h:1.11 Thu Aug 16 00:39:03 2001 +++ squid/src/globals.h Sun Aug 19 16:16:23 2001 @@ -52,8 +52,8 @@ extern const char *const dash_str; /* "-" */ extern const char *const localhost; /* "127.0.0.1" */ extern const char *const null_string; /* "" */ -extern const char *const version_string; /* SQUID_VERSION */ -extern const char *const full_appname_string; /* "Squid/" SQUID_VERSION */ +extern const char *const version_string; /* VERSION */ +extern const char *const full_appname_string; /* PACKAGE "/" VERSION */ extern const char *const w_space; /* " \t\n\r" */ extern const char *fdTypeStr[]; extern const char *hier_strings[]; Index: squid/src/snmp_agent.c diff -u squid/src/snmp_agent.c:1.6 squid/src/snmp_agent.c:1.6.14.1 --- squid/src/snmp_agent.c:1.6 Wed Feb 7 11:11:48 2001 +++ squid/src/snmp_agent.c Tue May 15 17:52:37 2001 @@ -96,8 +96,8 @@ case CONF_VERSION_ID: Answer = snmp_var_new(Var->name, Var->name_length); Answer->type = ASN_OCTET_STR; - Answer->val_len = strlen(SQUID_VERSION); - Answer->val.string = (u_char *) xstrdup(SQUID_VERSION); + Answer->val_len = strlen(VERSION); + Answer->val.string = (u_char *) xstrdup(VERSION); break; case CONF_STORAGE: switch (Var->name[LEN_SQ_CONF + 1]) { Index: squid/src/auth/Makefile.am diff -u /dev/null squid/src/auth/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/Makefile.am Fri Apr 6 05:40:27 2001 @@ -0,0 +1,18 @@ +# Makefile for authentication modules in the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +AUTOMAKE_OPTIONS = subdir-objects + +DIST_SUBDIRS = basic digest ntlm +SUBDIRS = @AUTH_MODULES@ + +EXTRA_LIBRARIES = libbasic.a libdigest.a libntlm.a +noinst_LIBRARIES = @AUTH_LIBS@ + +libbasic_a_SOURCES = basic/auth_basic.c basic/auth_basic.h +libdigest_a_SOURCES = digest/auth_digest.c digest/auth_digest.h +libntlm_a_SOURCES = ntlm/auth_ntlm.c ntlm/auth_ntlm.h + +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ Index: squid/src/auth/Makefile.in diff -u squid/src/auth/Makefile.in:1.2 squid/src/auth/Makefile.in:removed --- squid/src/auth/Makefile.in:1.2 Sun Jan 7 15:53:37 2001 +++ squid/src/auth/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,36 +0,0 @@ -# Makefile for authentication modules in the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -SUBDIRS = @AUTH_MODULES@ -OUTLIBS = @AUTH_LIBS@ - -all install: - @test -z "$(SUBDIRS)" || for dir in $(SUBDIRS); do \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) $@" || exit 1; \ - done; - -$(OUTLIBS): - @sh -c "cd `basename $@ .a` && $(MAKE) $(MFLAGS) ../$@" - -clean: - -rm -f *.a stamp - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) $@" || exit 1;\ - fi; \ - done - -distclean: - -rm -f *.a Makefile - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) distclean"; \ - fi; \ - done - -.DEFAULT: - @test -z "$(SUBDIRS)" || for dir in $(SUBDIRS); do \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) $@" || exit 1; \ - done Index: squid/src/auth/basic/Makefile.am diff -u /dev/null squid/src/auth/basic/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/Makefile.am Fri Apr 6 05:40:28 2001 @@ -0,0 +1 @@ +SUBDIRS = helpers Index: squid/src/auth/basic/Makefile.in diff -u squid/src/auth/basic/Makefile.in:1.2 squid/src/auth/basic/Makefile.in:removed --- squid/src/auth/basic/Makefile.in:1.2 Sun Jan 7 15:53:37 2001 +++ squid/src/auth/basic/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,71 +0,0 @@ -# -# Makefile for the basic authenticcation scheme modulefor the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -AUTH = basic - -SUBDIRS = helpers - - -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(AUTH).a - -OBJS = \ - auth_basic.o - - -all install: $(OUT) - @for dir in $(SUBDIRS); do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $@" || exit 1; \ - fi; \ - done; - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h - -.c.o: - @rm -f ../stamp - $(CC) $(CFLAGS) -c $< - -clean: - -rm -rf *.o *pure_* core ../$(AUTH).a - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) clean"; \ - fi; \ - done - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) distclean"; \ - fi; \ - done - -tags: - ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c Index: squid/src/auth/basic/helpers/Makefile.am diff -u /dev/null squid/src/auth/basic/helpers/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/helpers/Makefile.am Fri Apr 6 05:40:28 2001 @@ -0,0 +1,7 @@ +# Makefile for storage modules in the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +DIST_SUBDIRS = getpwnam LDAP MSNT multi-domain-NTLM NCSA PAM SMB YP +SUBDIRS = @BASIC_AUTH_HELPERS@ Index: squid/src/auth/basic/helpers/Makefile.in diff -u squid/src/auth/basic/helpers/Makefile.in:1.3 squid/src/auth/basic/helpers/Makefile.in:removed --- squid/src/auth/basic/helpers/Makefile.in:1.3 Wed Jan 10 16:05:18 2001 +++ squid/src/auth/basic/helpers/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,38 +0,0 @@ -# Makefile for storage modules in the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -# The 'nop' is in the SUBDIRS list because some Unixes that can't -# handle empty for lists. - -SUBDIRS = @BASIC_AUTH_HELPERS@ nop - -all: - @for dir in $(SUBDIRS); do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) all" || exit 1; \ - fi; \ - done; - -clean: - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) clean"; \ - fi; \ - done - -distclean: - -rm -f Makefile - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) distclean"; \ - fi; \ - done - -.DEFAULT: - @for dir in $(SUBDIRS); do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $@" || exit 1; \ - fi; \ - done; Index: squid/src/auth/basic/helpers/LDAP/Makefile.am diff -u /dev/null squid/src/auth/basic/helpers/LDAP/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/helpers/LDAP/Makefile.am Fri Apr 6 05:40:28 2001 @@ -0,0 +1,5 @@ + +libexec_PROGRAMS = squid_ldap_auth + +squid_ldap_auth_SOURCES = squid_ldap_auth.c +LDADD = -lldap -llber Index: squid/src/auth/basic/helpers/LDAP/Makefile.in diff -u squid/src/auth/basic/helpers/LDAP/Makefile.in:1.4 squid/src/auth/basic/helpers/LDAP/Makefile.in:removed --- squid/src/auth/basic/helpers/LDAP/Makefile.in:1.4 Sun Apr 15 17:35:01 2001 +++ squid/src/auth/basic/helpers/LDAP/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,80 +0,0 @@ - -OBJS = squid_ldap_auth.o -LIBS = -lldap -llber -LDAP_EXE = squid_ldap_auth - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -cgi_suffix = @cgi_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 -RANLIB = @RANLIB@ -LN_S = @LN_S@ -PERL = @PERL@ -CRYPTLIB = @CRYPTLIB@ -REGEXLIB = @REGEXLIB@ -PTHREADLIB = @PTHREADLIB@ -MALLOCLIB = @LIB_MALLOC@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh - -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -all: $(LDAP_EXE) - -$(LDAP_EXE): $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XTRA_LIBS) - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -.c.o: - $(CC) $(CFLAGS) -c $< - -# Michael Lupp wants to know about additions -# to the install target. -install: all install-mkdirs - @for f in $(LDAP_EXE); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -$(RM) -f $(OBJS) - -$(RM) -f $(LDAP_EXE) - -distclean: clean - -$(RM) -f Makefile Index: squid/src/auth/basic/helpers/MSNT/Makefile.am diff -u /dev/null squid/src/auth/basic/helpers/MSNT/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/helpers/MSNT/Makefile.am Fri Apr 6 05:40:28 2001 @@ -0,0 +1,19 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + + +libexec_PROGRAMS = msnt_auth + +msnt_auth_SOURCES = md4.c rfcnb-io.c rfcnb-util.c session.c msntauth.c \ + smbdes.c smbencrypt.c smblib-util.c smblib.c \ + valid.c denyusers.c allowusers.c confload.c + +LDADD = @XTRA_LIBS@ + +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ Index: squid/src/auth/basic/helpers/MSNT/Makefile.in diff -u squid/src/auth/basic/helpers/MSNT/Makefile.in:1.3 squid/src/auth/basic/helpers/MSNT/Makefile.in:removed --- squid/src/auth/basic/helpers/MSNT/Makefile.in:1.3 Wed Jan 17 00:16:19 2001 +++ squid/src/auth/basic/helpers/MSNT/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,98 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -cgi_suffix = @cgi_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -AUTH_EXE = msnt_auth$(exec_suffix) - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 -RANLIB = @RANLIB@ -LN_S = @LN_S@ -PERL = @PERL@ -CRYPTLIB = @CRYPTLIB@ -REGEXLIB = @REGEXLIB@ -PTHREADLIB = @PTHREADLIB@ -SNMPLIB = @SNMPLIB@ -MALLOCLIB = @LIB_MALLOC@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh -DEFINES = - -INCLUDE = -I. -I../../../../../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = $(XTRA_LIBS) - -LIBPROGS = $(AUTH_EXE) -OBJS = md4.o rfcnb-io.o rfcnb-util.o session.o msntauth.o \ - smbdes.o smbencrypt.o smblib-util.o smblib.o \ - valid.o denyusers.o allowusers.o confload.o - -all: $(AUTH_EXE) - -$(AUTH_EXE): $(OBJS) - $(CC) $(LDFLAGS) $(OBJS) -o $@ $(AUTH_LIBS) - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -# Michael Lupp wants to know about additions -# to the install target. -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *.a *pure_* core $(LIBPROGS) - -distclean: clean - -rm -f Makefile - -tags: - ctags *.[ch] - -depend: - $(MAKEDEPEND) -fMakefile *.c Index: squid/src/auth/basic/helpers/NCSA/Makefile.am diff -u /dev/null squid/src/auth/basic/helpers/NCSA/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/helpers/NCSA/Makefile.am Fri Apr 6 05:40:28 2001 @@ -0,0 +1,13 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + +libexec_PROGRAMS = ncsa_auth +ncsa_auth_SOURCES = ncsa_auth.c +LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ Index: squid/src/auth/basic/helpers/NCSA/Makefile.in diff -u squid/src/auth/basic/helpers/NCSA/Makefile.in:1.4 squid/src/auth/basic/helpers/NCSA/Makefile.in:removed --- squid/src/auth/basic/helpers/NCSA/Makefile.in:1.4 Fri Apr 20 03:00:17 2001 +++ squid/src/auth/basic/helpers/NCSA/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,100 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -cgi_suffix = @cgi_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -NCSA_AUTH_EXE = ncsa_auth$(exec_suffix) - -DEFAULT_PASSWD_FILE = $(sysconfdir)/passwd - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 -RANLIB = @RANLIB@ -LN_S = @LN_S@ -PERL = @PERL@ -CRYPTLIB = @CRYPTLIB@ -REGEXLIB = @REGEXLIB@ -PTHREADLIB = @PTHREADLIB@ -SNMPLIB = @SNMPLIB@ -MALLOCLIB = @LIB_MALLOC@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh - - -INCLUDE = -I. -I../../../../../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) - -LIBPROGS = $(NCSA_AUTH_EXE) -OBJS = ncsa_auth.o - -all: $(LIBPROGS) - -$(OBJS): $(top_srcdir)/include/version.h - -$(NCSA_AUTH_EXE): ncsa_auth.o - $(CC) $(LDFLAGS) ncsa_auth.o -o $@ $(AUTH_LIBS) - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -# Michael Lupp wants to know about additions -# to the install target. -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *pure_* core $(LIBPROGS) - -distclean: clean - -rm -f Makefile - -tags: - ctags *.[ch] ../include/*.h ../lib/*.[ch] - -depend: - $(MAKEDEPEND) -I../include -I. -fMakefile *.c Index: squid/src/auth/basic/helpers/PAM/Makefile.am diff -u /dev/null squid/src/auth/basic/helpers/PAM/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/helpers/PAM/Makefile.am Fri Apr 6 05:40:28 2001 @@ -0,0 +1,13 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ + +libexec_PROGRAMS = pam_auth +LDADD = -lpam $(XTRA_LIBS) Index: squid/src/auth/basic/helpers/PAM/Makefile.in diff -u squid/src/auth/basic/helpers/PAM/Makefile.in:1.3 squid/src/auth/basic/helpers/PAM/Makefile.in:removed --- squid/src/auth/basic/helpers/PAM/Makefile.in:1.3 Wed Jan 17 00:16:20 2001 +++ squid/src/auth/basic/helpers/PAM/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,96 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -cgi_suffix = @cgi_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -PAM_AUTH_EXE = pam_auth$(exec_suffix) - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 -RANLIB = @RANLIB@ -LN_S = @LN_S@ -PERL = @PERL@ -CRYPTLIB = @CRYPTLIB@ -REGEXLIB = @REGEXLIB@ -PTHREADLIB = @PTHREADLIB@ -SNMPLIB = @SNMPLIB@ -MALLOCLIB = @LIB_MALLOC@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ @DLLIB@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh -DEFINES = - -INCLUDE = -I. -I../../../../../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = -lpam $(XTRA_LIBS) - -LIBPROGS = $(PAM_AUTH_EXE) -OBJS = pam_auth.o - -all: $(PAM_AUTH_EXE) - -$(PAM_AUTH_EXE): pam_auth.o - $(CC) $(LDFLAGS) pam_auth.o -o $@ $(AUTH_LIBS) - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -# Michael Lupp wants to know about additions -# to the install target. -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *pure_* core $(LIBPROGS) - -distclean: clean - -rm -f Makefile - -tags: - ctags *.[ch] - -depend: - $(MAKEDEPEND) -fMakefile *.c Index: squid/src/auth/basic/helpers/SMB/ChangeLog diff -u /dev/null squid/src/auth/basic/helpers/SMB/ChangeLog:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/helpers/SMB/ChangeLog Fri Apr 6 15:11:09 2001 @@ -0,0 +1,56 @@ +28 September 1999, version 0.05 + +- Easier debugging: added the -d option to smb_auth. + +- Bugfix: a password containing a backslash character was always + denied. Reported by Menno Stevens. + +- The -S option now accepts both slashes and backslashes and + allows the share name to be preceded by a (back)slash. + +5 June 1999, version 0.04 + +- Allow for both \n and \r\n end-of-line termination in the + proxyauth file located on the PDC. This eliminates the most + common installation problem. + +- The location of the proxyauth file can be changed (for each + domain) using the new -S option. Useful when the NETLOGON + share is located on a FAT filesystem. + Thanks to Colin Manning . + +2 Februari 1999, version 0.03 + +- Support for pass-through authentication (trust relationships) + added. Suggested by Matthew Wood . + +- Bugfix: smb_auth.sh searched for the PDC only. + +- Many documentation improvements. + +9 December 1998, version 0.02 + +- smb_auth now uses Samba instead of pam_smb. This simplifies the + installation of smb_auth and increases platform support. + +- Access control by user and group: smb_auth now tries to read + the file \netlogon\proxyauth. By restricting read access on + this file access to the proxy can be controlled. + +- Easier configuration: + + - smb_auth is now fully configurable with command-line options + (i.e. in squid.conf). No more hacking in the source code. + + - In most cases it is sufficient to specify just the domain name. + smb_auth searches for a working domain controller on each + authentication request (note that Squid caches valid requests). + +- Easier installation: Makefile added. Simply typing "make install" + will work for most people. + +- In a multi-domain situation, users must now enter domain\user + instead of user\domain. This conforms to NT notation. Thanks to + Jason Haar for pointing this out. + +31 July 1998, version 0.01 Index: squid/src/auth/basic/helpers/SMB/Changelog diff -u squid/src/auth/basic/helpers/SMB/Changelog:1.2 squid/src/auth/basic/helpers/SMB/Changelog:removed --- squid/src/auth/basic/helpers/SMB/Changelog:1.2 Sun Jan 7 16:02:38 2001 +++ squid/src/auth/basic/helpers/SMB/Changelog Sun Jan 25 06:42:48 2004 @@ -1,56 +0,0 @@ -28 September 1999, version 0.05 - -- Easier debugging: added the -d option to smb_auth. - -- Bugfix: a password containing a backslash character was always - denied. Reported by Menno Stevens. - -- The -S option now accepts both slashes and backslashes and - allows the share name to be preceded by a (back)slash. - -5 June 1999, version 0.04 - -- Allow for both \n and \r\n end-of-line termination in the - proxyauth file located on the PDC. This eliminates the most - common installation problem. - -- The location of the proxyauth file can be changed (for each - domain) using the new -S option. Useful when the NETLOGON - share is located on a FAT filesystem. - Thanks to Colin Manning . - -2 Februari 1999, version 0.03 - -- Support for pass-through authentication (trust relationships) - added. Suggested by Matthew Wood . - -- Bugfix: smb_auth.sh searched for the PDC only. - -- Many documentation improvements. - -9 December 1998, version 0.02 - -- smb_auth now uses Samba instead of pam_smb. This simplifies the - installation of smb_auth and increases platform support. - -- Access control by user and group: smb_auth now tries to read - the file \netlogon\proxyauth. By restricting read access on - this file access to the proxy can be controlled. - -- Easier configuration: - - - smb_auth is now fully configurable with command-line options - (i.e. in squid.conf). No more hacking in the source code. - - - In most cases it is sufficient to specify just the domain name. - smb_auth searches for a working domain controller on each - authentication request (note that Squid caches valid requests). - -- Easier installation: Makefile added. Simply typing "make install" - will work for most people. - -- In a multi-domain situation, users must now enter domain\user - instead of user\domain. This conforms to NT notation. Thanks to - Jason Haar for pointing this out. - -31 July 1998, version 0.01 Index: squid/src/auth/basic/helpers/SMB/Makefile.am diff -u /dev/null squid/src/auth/basic/helpers/SMB/Makefile.am:1.1.2.2 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/helpers/SMB/Makefile.am Thu Apr 19 16:56:53 2001 @@ -0,0 +1,27 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + +# SAMBAPREFIX must point to the directory where Samba has been installed. +# By default, Samba is installed in /usr/local/samba. If you changed this +# by using the --prefix option when configuring Samba, you need to change +# SAMBAPREFIX accordingly. + +## FIXME: autoconf should test for the samba path. + +SMB_AUTH_HELPER = smb_auth.sh +SAMBAPREFIX=/usr/local/samba +SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) + +libexec_SCRIPTS = $(SMB_AUTH_HELPER) +libexec_PROGRAMS = smb_auth +smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\" + +LDADD = $(XTRA_LIBS) + +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ Index: squid/src/auth/basic/helpers/SMB/Makefile.in diff -u squid/src/auth/basic/helpers/SMB/Makefile.in:1.3 squid/src/auth/basic/helpers/SMB/Makefile.in:removed --- squid/src/auth/basic/helpers/SMB/Makefile.in:1.3 Wed Jan 17 00:16:20 2001 +++ squid/src/auth/basic/helpers/SMB/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,118 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -# SAMBAPREFIX must point to the directory where Samba has been installed. -# By default, Samba is installed in /usr/local/samba. If you changed this -# by using the --prefix option when configuring Samba, you need to change -# SAMBAPREFIX accordingly. - -SAMBAPREFIX=/usr/local/samba - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -cgi_suffix = @cgi_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -SMB_AUTH_EXE = smb_auth$(exec_suffix) -SMB_AUTH_HELPER = smb_auth.sh -SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 -RANLIB = @RANLIB@ -LN_S = @LN_S@ -PERL = @PERL@ -CRYPTLIB = @CRYPTLIB@ -REGEXLIB = @REGEXLIB@ -PTHREADLIB = @PTHREADLIB@ -SNMPLIB = @SNMPLIB@ -MALLOCLIB = @LIB_MALLOC@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh -DEFINES = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\" - -INCLUDE = -I. -I../../../../../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = $(XTRA_LIBS) - -LIBPROGS = $(SMB_AUTH_EXE) -LIBSCRIPTS = $(SMB_AUTH_HELPER) -OBJS = smb_auth.o - -all: $(LIBPROGS) - -$(SMB_AUTH_EXE): smb_auth.o - $(CC) $(LDFLAGS) smb_auth.o -o $@ $(AUTH_LIBS) - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -# Michael Lupp wants to know about additions -# to the install target. -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - @for f in $(LIBSCRIPTS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $(srcdir)/$$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *pure_* core $(LIBPROGS) - -distclean: clean - -rm -f Makefile - -tags: - ctags *.[ch] - -depend: - $(MAKEDEPEND) -fMakefile *.c Index: squid/src/auth/basic/helpers/YP/Makefile.am diff -u /dev/null squid/src/auth/basic/helpers/YP/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/helpers/YP/Makefile.am Fri Apr 6 05:40:28 2001 @@ -0,0 +1,12 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# + +libexec_PROGRAMS = yp_auth +yp_auth_SOURCES = yp_auth.c nis_support.c +LDADD = -L$(top_builddir) -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ Index: squid/src/auth/basic/helpers/YP/Makefile.in diff -u squid/src/auth/basic/helpers/YP/Makefile.in:1.4 squid/src/auth/basic/helpers/YP/Makefile.in:removed --- squid/src/auth/basic/helpers/YP/Makefile.in:1.4 Fri Apr 20 03:00:17 2001 +++ squid/src/auth/basic/helpers/YP/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,100 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -cgi_suffix = @cgi_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -YP_AUTH_EXE = yp_auth$(exec_suffix) - -DEFAULT_PASSWD_FILE = $(sysconfdir)/passwd - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 -RANLIB = @RANLIB@ -LN_S = @LN_S@ -PERL = @PERL@ -CRYPTLIB = @CRYPTLIB@ -REGEXLIB = @REGEXLIB@ -PTHREADLIB = @PTHREADLIB@ -SNMPLIB = @SNMPLIB@ -MALLOCLIB = @LIB_MALLOC@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh - - -INCLUDE = -I. -I../../../../../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) - -LIBPROGS = $(YP_AUTH_EXE) -OBJS = yp_auth.o nis_support.o - -all: $(LIBPROGS) - -$(OBJS): $(top_srcdir)/include/version.h - -$(YP_AUTH_EXE): $(OBJS) - $(CC) $(LDFLAGS) $(OBJS) -o $@ $(AUTH_LIBS) - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -# Michael Lupp wants to know about additions -# to the install target. -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *pure_* core $(LIBPROGS) - -distclean: clean - -rm -f Makefile - -tags: - ctags *.[ch] ../include/*.h ../lib/*.[ch] - -depend: - $(MAKEDEPEND) -I../include -I. -fMakefile *.c Index: squid/src/auth/basic/helpers/getpwnam/Makefile.am diff -u /dev/null squid/src/auth/basic/helpers/getpwnam/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:48 2004 +++ squid/src/auth/basic/helpers/getpwnam/Makefile.am Fri Apr 6 05:40:29 2001 @@ -0,0 +1,17 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + + +libexec_PROGRAMS = getpwname_auth + +getpwname_auth_SOURCES = getpwnam_auth.c + +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ + +LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) Index: squid/src/auth/basic/helpers/getpwnam/Makefile.in diff -u squid/src/auth/basic/helpers/getpwnam/Makefile.in:1.4 squid/src/auth/basic/helpers/getpwnam/Makefile.in:removed --- squid/src/auth/basic/helpers/getpwnam/Makefile.in:1.4 Fri Apr 20 03:00:17 2001 +++ squid/src/auth/basic/helpers/getpwnam/Makefile.in Sun Jan 25 06:42:48 2004 @@ -1,80 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -top_srcdir = @top_srcdir@ -libexecdir = @libexecdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -GETPWNAM_AUTH_EXE = getpwnam_auth$(exec_suffix) - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -CRYPTLIB = @CRYPTLIB@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh - - -INCLUDE = -I. -I../../../../../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) - -LIBPROGS = $(GETPWNAM_AUTH_EXE) -OBJS = getpwnam_auth.o - -all: $(LIBPROGS) - -$(OBJS): $(top_srcdir)/include/version.h - -$(GETPWNAM_AUTH_EXE): $(OBJS) - $(CC) $(LDFLAGS) $(OBJS) -o $@ $(AUTH_LIBS) - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *pure_* core $(LIBPROGS) - -distclean: clean - -rm -f Makefile - -depend: - $(MAKEDEPEND) -I../include -I. -fMakefile *.c Index: squid/src/auth/basic/helpers/multi-domain-NTLM/Makefile.am diff -u /dev/null squid/src/auth/basic/helpers/multi-domain-NTLM/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:49 2004 +++ squid/src/auth/basic/helpers/multi-domain-NTLM/Makefile.am Fri Apr 6 05:40:29 2001 @@ -0,0 +1,9 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + +libexec_SCRIPTS = smb_auth.pl Index: squid/src/auth/digest/Makefile.am diff -u /dev/null squid/src/auth/digest/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:49 2004 +++ squid/src/auth/digest/Makefile.am Fri Apr 6 05:40:29 2001 @@ -0,0 +1 @@ +SUBDIRS = helpers Index: squid/src/auth/digest/Makefile.in diff -u squid/src/auth/digest/Makefile.in:1.2 squid/src/auth/digest/Makefile.in:removed --- squid/src/auth/digest/Makefile.in:1.2 Wed Jan 31 14:20:27 2001 +++ squid/src/auth/digest/Makefile.in Sun Jan 25 06:42:49 2004 @@ -1,70 +0,0 @@ -# -# Makefile for the Digest authentication scheme modulefor the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -AUTH = digest - -SUBDIRS = helpers - -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(AUTH).a - -OBJS = \ - auth_digest.o - - -all install: $(OUT) - @for dir in $(SUBDIRS); do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $@" || exit 1; \ - fi; \ - done; - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h - -.c.o: - @rm -f ../stamp - $(CC) $(CFLAGS) -c $< - -clean: - -rm -rf *.o *pure_* core ../$(AUTH).a - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) clean"; \ - fi; \ - done - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) distclean"; \ - fi; \ - done - -tags: - ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c Index: squid/src/auth/digest/helpers/Makefile.am diff -u /dev/null squid/src/auth/digest/helpers/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:49 2004 +++ squid/src/auth/digest/helpers/Makefile.am Fri Apr 6 05:40:29 2001 @@ -0,0 +1,7 @@ +# Makefile for digest auth helpers in the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +DIST_SUBDIRS = password +SUBDIRS = @DIGEST_AUTH_HELPERS@ Index: squid/src/auth/digest/helpers/Makefile.in diff -u squid/src/auth/digest/helpers/Makefile.in:1.2 squid/src/auth/digest/helpers/Makefile.in:removed --- squid/src/auth/digest/helpers/Makefile.in:1.2 Wed Jan 31 14:20:27 2001 +++ squid/src/auth/digest/helpers/Makefile.in Sun Jan 25 06:42:49 2004 @@ -1,38 +0,0 @@ -# Makefile for digest auth helpers in the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -# The 'nop' is in the SUBDIRS list because some Unixes that can't -# handle empty for lists. - -SUBDIRS = @DIGEST_AUTH_HELPERS@ nop - -all: - @for dir in $(SUBDIRS); do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) all" || exit 1; \ - fi; \ - done; - -clean: - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) clean"; \ - fi; \ - done - -distclean: - -rm -f Makefile - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) distclean"; \ - fi; \ - done - -.DEFAULT: - @for dir in $(SUBDIRS); do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $@" || exit 1; \ - fi; \ - done; Index: squid/src/auth/digest/helpers/password/Makefile.am diff -u /dev/null squid/src/auth/digest/helpers/password/Makefile.am:1.1.2.2 --- /dev/null Sun Jan 25 06:42:49 2004 +++ squid/src/auth/digest/helpers/password/Makefile.am Mon Apr 16 06:47:17 2001 @@ -0,0 +1,13 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + +libexec_PROGRAMS = digest_pw_auth +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ + +LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) Index: squid/src/auth/digest/helpers/password/Makefile.in diff -u squid/src/auth/digest/helpers/password/Makefile.in:1.4 squid/src/auth/digest/helpers/password/Makefile.in:removed --- squid/src/auth/digest/helpers/password/Makefile.in:1.4 Fri Apr 20 03:00:17 2001 +++ squid/src/auth/digest/helpers/password/Makefile.in Sun Jan 25 06:42:49 2004 @@ -1,100 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -cgi_suffix = @cgi_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -DIGEST_PW_AUTH_EXE = digest_pw_auth$(exec_suffix) - -DEFAULT_PASSWD_FILE = $(sysconfdir)/digest_passwd - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -INSTALL_SUID = @INSTALL_PROGRAM@ -o root -m 4755 -RANLIB = @RANLIB@ -LN_S = @LN_S@ -PERL = @PERL@ -CRYPTLIB = @CRYPTLIB@ -REGEXLIB = @REGEXLIB@ -PTHREADLIB = @PTHREADLIB@ -SNMPLIB = @SNMPLIB@ -MALLOCLIB = @LIB_MALLOC@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh -SSLLIB = @SSLLIB@ - -INCLUDE = -I. -I../../../../../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) - -LIBPROGS = $(DIGEST_PW_AUTH_EXE) -OBJS = digest_pw_auth.o - -all: $(LIBPROGS) - -$(OBJS): $(top_srcdir)/include/version.h - -$(DIGEST_PW_AUTH_EXE): digest_pw_auth.o - $(CC) $(LDFLAGS) digest_pw_auth.o -o $@ $(AUTH_LIBS) - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir $(libexecdir); \ - fi - -# Michael Lupp wants to know about additions -# to the install target. -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *pure_* core $(LIBPROGS) - -distclean: clean - -rm -f Makefile - -tags: - ctags *.[ch] ../include/*.h ../lib/*.[ch] - -depend: - $(MAKEDEPEND) -I../include -I. -fMakefile *.c Index: squid/src/auth/ntlm/Makefile.am diff -u /dev/null squid/src/auth/ntlm/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:49 2004 +++ squid/src/auth/ntlm/Makefile.am Fri Apr 6 05:40:29 2001 @@ -0,0 +1 @@ +SUBDIRS = helpers Index: squid/src/auth/ntlm/Makefile.in diff -u squid/src/auth/ntlm/Makefile.in:1.2 squid/src/auth/ntlm/Makefile.in:removed --- squid/src/auth/ntlm/Makefile.in:1.2 Sun Jan 7 16:02:38 2001 +++ squid/src/auth/ntlm/Makefile.in Sun Jan 25 06:42:49 2004 @@ -1,70 +0,0 @@ -# -# Makefile for the ntlm authentication scheme module for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -AUTH = ntlm - -SUBDIRS = helpers - -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(AUTH).a - -OBJS = \ - auth_ntlm.o - - -all install: $(OUT) - @for dir in $(SUBDIRS); do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $@" || exit 1; \ - fi; \ - done; - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h - -.c.o: - @rm -f ../stamp - $(CC) $(CFLAGS) -c $< - -clean: - -rm -rf *.o *pure_* core ../$(AUTH).a - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) clean"; \ - fi; \ - done - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) distclean"; \ - fi; \ - done - -tags: - ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c Index: squid/src/auth/ntlm/helpers/Makefile.am diff -u /dev/null squid/src/auth/ntlm/helpers/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:49 2004 +++ squid/src/auth/ntlm/helpers/Makefile.am Fri Apr 6 05:40:29 2001 @@ -0,0 +1,7 @@ +# Makefile for storage modules in the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +DIST_SUBDIRS = fakeauth no_check NTLMSSP +SUBDIRS = @NTLM_AUTH_HELPERS@ Index: squid/src/auth/ntlm/helpers/Makefile.in diff -u squid/src/auth/ntlm/helpers/Makefile.in:1.2 squid/src/auth/ntlm/helpers/Makefile.in:removed --- squid/src/auth/ntlm/helpers/Makefile.in:1.2 Sun Jan 7 16:02:38 2001 +++ squid/src/auth/ntlm/helpers/Makefile.in Sun Jan 25 06:42:49 2004 @@ -1,38 +0,0 @@ -# Makefile for storage modules in the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -# The 'nop' is in the SUBDIRS list because some Unixes that can't -# handle empty for lists. - -SUBDIRS = @NTLM_AUTH_HELPERS@ nop - -all: - @for dir in $(SUBDIRS); do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) all" || exit 1; \ - fi; \ - done; - -clean: - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) clean"; \ - fi; \ - done - -distclean: - -rm -f Makefile - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) distclean"; \ - fi; \ - done - -.DEFAULT: - @for dir in $(SUBDIRS); do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $@" || exit 1; \ - fi; \ - done; Index: squid/src/auth/ntlm/helpers/NTLMSSP/Makefile.am diff -u /dev/null squid/src/auth/ntlm/helpers/NTLMSSP/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:42:49 2004 +++ squid/src/auth/ntlm/helpers/NTLMSSP/Makefile.am Fri Apr 6 05:40:29 2001 @@ -0,0 +1,14 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +SUBDIRS = smbval + +libexec_PROGRAMS = ntlm_auth +ntlm_auth_SOURCES = libntlmssp.c ntlm_auth.c ntlm.h +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ -I$(srcdir)/smbval +LDADD = smbval/libsmbvalid.a -L$(top_builddir)/lib -lntlmauth \ + -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) Index: squid/src/auth/ntlm/helpers/NTLMSSP/Makefile.in diff -u squid/src/auth/ntlm/helpers/NTLMSSP/Makefile.in:1.4 squid/src/auth/ntlm/helpers/NTLMSSP/Makefile.in:removed --- squid/src/auth/ntlm/helpers/NTLMSSP/Makefile.in:1.4 Fri Apr 20 03:00:17 2001 +++ squid/src/auth/ntlm/helpers/NTLMSSP/Makefile.in Sun Jan 25 06:42:49 2004 @@ -1,86 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -top_srcdir = @top_srcdir@ -libexecdir = @libexecdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -NTLM_AUTH_EXE = ntlm_auth$(exec_suffix) - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -CRYPTLIB = @CRYPTLIB@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh - - -INCLUDE = -I. -I../../../../../include -I$(srcdir)/smbval -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = -L../../../../../lib -lntlmauth -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) - -LIBPROGS = $(NTLM_AUTH_EXE) -OBJS = ntlm_auth.o libntlmssp.o - -all: $(NTLM_AUTH_EXE) smbval/smbvalid.a - -$(OBJS): $(top_srcdir)/include/version.h ntlm.h - -$(NTLM_AUTH_EXE): $(OBJS) smbval/smbvalid.a - $(CC) $(LDFLAGS) $(OBJS) smbval/smbvalid.a -o $@ $(AUTH_LIBS) - -smbval/smbvalid.a: smbval/stamp - -smbval smbval/stamp: - @sh -c "cd smbval && $(MAKE) all" - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *pure_* core $(LIBPROGS) - cd smbval; make clean - -distclean: clean - -rm -f Makefile - -depend: - $(MAKEDEPEND) -I../include -I. -fMakefile *.c Index: squid/src/auth/ntlm/helpers/NTLMSSP/smbval/Makefile.am diff -u /dev/null squid/src/auth/ntlm/helpers/NTLMSSP/smbval/Makefile.am:1.1.2.2 --- /dev/null Sun Jan 25 06:42:49 2004 +++ squid/src/auth/ntlm/helpers/NTLMSSP/smbval/Makefile.am Thu Aug 23 05:01:31 2001 @@ -0,0 +1,13 @@ +# makefile for smblib + +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ + +noinst_LIBRARIES = libsmbvalid.a +libsmbvalid_a_SOURCES = valid.c session.c rfcnb-util.c rfcnb-io.c \ + smblib-util.c smblib.c smbencrypt.c smbdes.c md4.c byteorder.h \ + rfcnb-error.h rfcnb-util.h smbencrypt.h smblib.h valid.h \ + md4.h rfcnb-io.h rfcnb.h smblib-common.h std-defines.h \ + rfcnb-common.h rfcnb-priv.h smbdes.h smblib-priv.h std-includes.h + +##OBJS = smblib.o smblib-util.o file.o smb-errors.o exper.o smblib-api.o smbencrypt.o smbdes.o md4.o Index: squid/src/auth/ntlm/helpers/NTLMSSP/smbval/Makefile.in diff -u squid/src/auth/ntlm/helpers/NTLMSSP/smbval/Makefile.in:1.2 squid/src/auth/ntlm/helpers/NTLMSSP/smbval/Makefile.in:removed --- squid/src/auth/ntlm/helpers/NTLMSSP/smbval/Makefile.in:1.2 Sun Jan 7 16:02:38 2001 +++ squid/src/auth/ntlm/helpers/NTLMSSP/smbval/Makefile.in Sun Jan 25 06:42:49 2004 @@ -1,52 +0,0 @@ -# makefile for smblib -# Type make system, where system is ULTRIX, DU, DECOSF1, Solaris etc - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -INSTALL_FILE = @INSTALL_DATA@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -RM = @RM@ -AR_R = @AR_R@ - -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -# CFLAGS = -fpic -g - -INCLUDE = -I. -I../../../../../../include -I$(top_srcdir)/include -INCLUDES = smblib.h smblib-priv.h - -#RFCNB = session.o rfcnb-util.o rfcnb-io.o - -#OBJS = smblib.o smblib-util.o file.o smb-errors.o exper.o smblib-api.o smbencrypt.o smbdes.o md4.o - -VALIDATE = valid.o session.o rfcnb-util.o \ - rfcnb-io.o smblib-util.o smblib.o smbencrypt.o smbdes.o md4.o - -#.SUFFIXES: .c .o .h - -dummy: all - -smbvalid.a: $(VALIDATE) - $(RM) -f $@ - $(AR_R) $@ $(VALIDATE) - $(RANLIB) $@ - -all: smbvalid.a - -#.c.o: $(INCLUDES) - -clean: - $(RM) -f *.o smbvalid.a *~ - Index: squid/src/auth/ntlm/helpers/fakeauth/Makefile.am diff -u /dev/null squid/src/auth/ntlm/helpers/fakeauth/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:43:06 2004 +++ squid/src/auth/ntlm/helpers/fakeauth/Makefile.am Fri Apr 6 05:40:29 2001 @@ -0,0 +1,13 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + +libexec_PROGRAMS = fakeauth_auth +fakeauth_auth_SOURCES = fakeauth_auth.c ntlm.h +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ +LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) Index: squid/src/auth/ntlm/helpers/fakeauth/Makefile.in diff -u squid/src/auth/ntlm/helpers/fakeauth/Makefile.in:1.4 squid/src/auth/ntlm/helpers/fakeauth/Makefile.in:removed --- squid/src/auth/ntlm/helpers/fakeauth/Makefile.in:1.4 Fri Apr 20 03:00:17 2001 +++ squid/src/auth/ntlm/helpers/fakeauth/Makefile.in Sun Jan 25 06:43:06 2004 @@ -1,80 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -top_srcdir = @top_srcdir@ -libexecdir = @libexecdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -FAKEAUTH_AUTH_EXE = fakeauth_auth$(exec_suffix) - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -CRYPTLIB = @CRYPTLIB@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh - - -INCLUDE = -I. -I../../../../../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) - -LIBPROGS = $(FAKEAUTH_AUTH_EXE) -OBJS = fakeauth_auth.o - -all: $(FAKEAUTH_AUTH_EXE) - -$(OBJS): $(top_srcdir)/include/version.h - -$(FAKEAUTH_AUTH_EXE): $(OBJS) - $(CC) $(LDFLAGS) $(OBJS) -o $@ $(AUTH_LIBS) - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *pure_* core $(LIBPROGS) - -distclean: clean - -rm -f Makefile - -depend: - $(MAKEDEPEND) -I../include -I. -fMakefile *.c Index: squid/src/auth/ntlm/helpers/no_check/Makefile.am diff -u /dev/null squid/src/auth/ntlm/helpers/no_check/Makefile.am:1.1.2.1 --- /dev/null Sun Jan 25 06:43:06 2004 +++ squid/src/auth/ntlm/helpers/no_check/Makefile.am Fri Apr 6 05:40:29 2001 @@ -0,0 +1,9 @@ +# +# Makefile for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# +# Uncomment and customize the following to suit your needs: +# + +libexec_SCRIPTS = no_check.pl Index: squid/src/auth/ntlm/helpers/no_check/Makefile.in diff -u squid/src/auth/ntlm/helpers/no_check/Makefile.in:1.4 squid/src/auth/ntlm/helpers/no_check/Makefile.in:removed --- squid/src/auth/ntlm/helpers/no_check/Makefile.in:1.4 Fri Apr 20 03:00:17 2001 +++ squid/src/auth/ntlm/helpers/no_check/Makefile.in Sun Jan 25 06:43:06 2004 @@ -1,80 +0,0 @@ -# -# Makefile for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# -# Uncomment and customize the following to suit your needs: -# - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -top_srcdir = @top_srcdir@ -libexecdir = @libexecdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -# Gotta love the DOS legacy -# -NO_CHECK = no_check - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -CRYPTLIB = @CRYPTLIB@ -AC_CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -XTRA_LIBS = @XTRA_LIBS@ -XTRA_OBJS = @XTRA_OBJS@ -MV = @MV@ -RM = @RM@ -SHELL = /bin/sh - - -INCLUDE = -I. -I../../../../../include -I$(top_srcdir)/include -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) -AUTH_LIBS = -L../../../../../lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) - -LIBPROGS = $(NO_CHECK).pl -OBJS = $(NO_CHECK) - -all: $(LIBPROGS) - -#$(OBJS): - -$(NO_CHECK).pl: $(OBJS) - cp $(srcdir)/$(NO_CHECK) ./$(NO_CHECK).pl - -install-mkdirs: - -@if test ! -d $(prefix); then \ - echo "mkdir $(prefix)"; \ - mkdir -p $(prefix); \ - fi - -@if test ! -d $(libexecdir); then \ - echo "mkdir $(libexecdir)"; \ - mkdir -p $(libexecdir); \ - fi - -install: all install-mkdirs - @for f in $(LIBPROGS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - -clean: - -rm -rf *.o *pure_* core $(LIBPROGS) - -distclean: clean - -rm -f Makefile - -depend: - $(MAKEDEPEND) -I../include -I. -fMakefile *.c Index: squid/src/auth/ntlm/helpers/no_check/no_check diff -u squid/src/auth/ntlm/helpers/no_check/no_check:1.2 squid/src/auth/ntlm/helpers/no_check/no_check:removed --- squid/src/auth/ntlm/helpers/no_check/no_check:1.2 Sun Jan 7 16:02:38 2001 +++ squid/src/auth/ntlm/helpers/no_check/no_check Sun Jan 25 06:43:06 2004 @@ -1,210 +0,0 @@ -#!/usr/bin/perl -# (C) 2000 Francesco Chemolli -# -# TODO: use command-line arguments - -#use MIME::Base64; - -$|=1; -#$authdomain="your_domain_goes_here"; -$challenge="deadbeef"; - -$authdomain=$ARGV[0] if ($#ARGV >=0); - -die ("Edit $0 to configure a domain!") unless (defined($authdomain)); - -while() { - chop; - if ($_ eq "YR") { - print "TT ".encode_base64(&make_ntlm_static_challenge); - next; - } - $got=substr($_,3); - %res=decode_ntlm_any(decode_base64($got)); -# print STDERR "got: ".hash_to_string(%res); - if (!res) { # broken NTLM, deny - print "BH Couldn't decode NTLM packet\n"; - next; - } - if ($res{type} eq "negotiate") { # ok, send a challenge - print "BH Squid-helper protocol error: unexpected negotiate-request\n"; - next; - } - if ($res{type} eq "challenge") { # Huh? WE are the challengers. - print "BH Squid-helper protocol error: unexpected challenge-request\n"; - next; - } - if ($res{type} eq "authentication") { - print "AF $res{domain}\\$res{user}\n"; - next; - } - print "BH internal error\n"; # internal error -} - - -sub make_ntlm_static_challenge { - $rv = pack ("a8 V", "NTLMSSP", 0x2); - $payload = ""; - - $rv .= add_to_data(uc($authdomain),\$payload); - $rv .= pack ("V Z8 v8", 0x18206, $challenge,0,0,0,0,0,0,0x3a,0); - #flags, challenge, 8 bytes of unknown stuff - - return $rv.$payload; -} - -#gets as argument the decoded authenticate packet. -#returns either undef (failure to decode) or an hash with the decoded -# fields. -sub decode_ntlm_authentication { - my ($got)=$_[0]; - my ($signature, $type, %rv, $hdr, $rest); - ($signature, $type, $rest) = unpack ("a8 V a*",$got); - return unless ($signature eq "NTLMSSP\0"); - return unless ($type == 0x3); - $rv{type}="authentication"; - ($hdr, $rest) = unpack ("a8 a*", $rest); - $rv{lmresponse}=get_from_data($hdr,$got); - ($hdr, $rest) = unpack ("a8 a*", $rest); - $rv{ntresponse}=get_from_data($hdr,$got); - ($hdr, $rest) = unpack ("a8 a*", $rest); - $rv{domain}=get_from_data($hdr,$got); - ($hdr, $rest) = unpack ("a8 a*", $rest); - $rv{user}=get_from_data($hdr,$got); - ($hdr, $rest) = unpack ("a8 a*", $rest); - $rv{workstation}=get_from_data($hdr,$got); - ($hdr, $rest) = unpack ("a8 a*", $rest); - $rv{sessionkey}=get_from_data($hdr,$got); - $rv{flags}=unpack("V",$rest); - return %rv; -} - -#args: len, maxlen, offset -sub make_ntlm_hdr { - return pack ("v v V", @_); -} - -#args: string to add, ref to payload -# returns ntlm header. -sub add_to_data { - my ($toadd, $pl) = @_; - my ($offset); -# $toadd.='\0' unless ($toadd[-1]=='\0'); #broken - $offset=48+length $pl; #48 is the length of the header - $$pl.=$toadd; - return make_ntlm_hdr (length $toadd, length $toadd, $offset); -} - -#args: encoded descriptor, entire decoded packet -# returns the decoded data -sub get_from_data { - my($desc,$packet) = @_; - my($offset,$length, $rv); - ($length, undef, $offset) = unpack ("v v V", $desc); - return unless ($length+$offset <= length $packet); - $rv = unpack ("x$offset a$length",$packet); - return $rv; -} - -sub hash_to_string { - my (%hash) = @_; - my ($rv); - foreach (sort keys %hash) { - $rv.=$_." => ".$hash{$_}."\n"; - } - return $rv; -} - - -#more decoder functions, added more for debugging purposes -#than for any real use in the application. -#args: the base64-decoded packet -#returns: either undef or an hash describing the packet. -sub decode_ntlm_negotiate { - my($got)=$_[0]; - my($signature, $type, %rv, $hdr, $rest); - ($signature, $type, $rest) = unpack ("a8 V a*",$got); - return unless ($signature eq "NTLMSSP\0"); - return unless ($type == 0x1); - $rv{type}="negotiate"; - ($rv{flags}, $rest)=unpack("V a*",$rest); - ($hdr, $rest) = unpack ("a8 a*", $rest); - $rv{domain}=get_from_data($hdr,$got); - ($hdr, $rest) = unpack ("a8 a*", $rest); - $rv{workstation}=get_from_data($hdr,$got); - return %rv; -} - -sub decode_ntlm_challenge { - my($got)=$_[0]; - my($signature, $type, %rv, $hdr, $rest, $j); - ($signature, $type, $rest) = unpack ("a8 V a*",$got); - return unless ($signature eq "NTLMSSP\0"); - return unless ($type == 0x2); - $rv{type}="challenge"; - ($rv{flags}, $rest)=unpack("V a*",$rest); - ($rv{challenge}, $rest)=unpack("a8 a*",$rest); - for ($j=0;$j<8;$j++) { # don't shoot on the programmer, please. - ($rv{"context.$j"},$rest)=unpack("v a*",$rest); - } - return %rv; -} - -#decodes any NTLMSSP packet. -#arg: the encoded packet, returns an hash with packet info -sub decode_ntlm_any { - my($got)=$_[0]; - my ($signature, $type); - ($signature, $type, undef) = unpack ("a8 V a*",$got); - return unless ($signature eq "NTLMSSP\0"); - return decode_ntlm_negotiate($got) if ($type == 1); - return decode_ntlm_challenge($got) if ($type == 2); - return decode_ntlm_authentication($got) if ($type == 3); - return undef; # default -} - - -use integer; - -sub encode_base64 ($;$) -{ - my $res = ""; - my $eol = $_[1]; - $eol = "\n" unless defined $eol; - pos($_[0]) = 0; # ensure start at the beginning - while ($_[0] =~ /(.{1,45})/gs) { - $res .= substr(pack('u', $1), 1); - chop($res); - } - $res =~ tr|` -_|AA-Za-z0-9+/|; # `# help emacs - # fix padding at the end - my $padding = (3 - length($_[0]) % 3) % 3; - $res =~ s/.{$padding}$/'=' x $padding/e if $padding; - # break encoded string into lines of no more than 76 characters each - if (length $eol) { - $res =~ s/(.{1,76})/$1$eol/g; - } - $res; -} - - -sub decode_base64 ($) -{ - local($^W) = 0; # unpack("u",...) gives bogus warning in 5.00[123] - - my $str = shift; - my $res = ""; - - $str =~ tr|A-Za-z0-9+=/||cd; # remove non-base64 chars - if (length($str) % 4) { - require Carp; - Carp::carp("Length of base64 data not a multiple of 4") - } - $str =~ s/=+$//; # remove padding - $str =~ tr|A-Za-z0-9+/| -_|; # convert to uuencoded format - while ($str =~ /(.{1,60})/gs) { - my $len = chr(32 + length($1)*3/4); # compute length byte - $res .= unpack("u", $len . $1 ); # uudecode - } - $res; -} Index: squid/src/auth/ntlm/helpers/no_check/no_check.pl diff -u /dev/null squid/src/auth/ntlm/helpers/no_check/no_check.pl:1.1.2.1 --- /dev/null Sun Jan 25 06:43:06 2004 +++ squid/src/auth/ntlm/helpers/no_check/no_check.pl Fri Apr 6 05:55:40 2001 @@ -0,0 +1,210 @@ +#!/usr/bin/perl +# (C) 2000 Francesco Chemolli +# +# TODO: use command-line arguments + +#use MIME::Base64; + +$|=1; +#$authdomain="your_domain_goes_here"; +$challenge="deadbeef"; + +$authdomain=$ARGV[0] if ($#ARGV >=0); + +die ("Edit $0 to configure a domain!") unless (defined($authdomain)); + +while() { + chop; + if ($_ eq "YR") { + print "TT ".encode_base64(&make_ntlm_static_challenge); + next; + } + $got=substr($_,3); + %res=decode_ntlm_any(decode_base64($got)); +# print STDERR "got: ".hash_to_string(%res); + if (!res) { # broken NTLM, deny + print "BH Couldn't decode NTLM packet\n"; + next; + } + if ($res{type} eq "negotiate") { # ok, send a challenge + print "BH Squid-helper protocol error: unexpected negotiate-request\n"; + next; + } + if ($res{type} eq "challenge") { # Huh? WE are the challengers. + print "BH Squid-helper protocol error: unexpected challenge-request\n"; + next; + } + if ($res{type} eq "authentication") { + print "AF $res{domain}\\$res{user}\n"; + next; + } + print "BH internal error\n"; # internal error +} + + +sub make_ntlm_static_challenge { + $rv = pack ("a8 V", "NTLMSSP", 0x2); + $payload = ""; + + $rv .= add_to_data(uc($authdomain),\$payload); + $rv .= pack ("V Z8 v8", 0x18206, $challenge,0,0,0,0,0,0,0x3a,0); + #flags, challenge, 8 bytes of unknown stuff + + return $rv.$payload; +} + +#gets as argument the decoded authenticate packet. +#returns either undef (failure to decode) or an hash with the decoded +# fields. +sub decode_ntlm_authentication { + my ($got)=$_[0]; + my ($signature, $type, %rv, $hdr, $rest); + ($signature, $type, $rest) = unpack ("a8 V a*",$got); + return unless ($signature eq "NTLMSSP\0"); + return unless ($type == 0x3); + $rv{type}="authentication"; + ($hdr, $rest) = unpack ("a8 a*", $rest); + $rv{lmresponse}=get_from_data($hdr,$got); + ($hdr, $rest) = unpack ("a8 a*", $rest); + $rv{ntresponse}=get_from_data($hdr,$got); + ($hdr, $rest) = unpack ("a8 a*", $rest); + $rv{domain}=get_from_data($hdr,$got); + ($hdr, $rest) = unpack ("a8 a*", $rest); + $rv{user}=get_from_data($hdr,$got); + ($hdr, $rest) = unpack ("a8 a*", $rest); + $rv{workstation}=get_from_data($hdr,$got); + ($hdr, $rest) = unpack ("a8 a*", $rest); + $rv{sessionkey}=get_from_data($hdr,$got); + $rv{flags}=unpack("V",$rest); + return %rv; +} + +#args: len, maxlen, offset +sub make_ntlm_hdr { + return pack ("v v V", @_); +} + +#args: string to add, ref to payload +# returns ntlm header. +sub add_to_data { + my ($toadd, $pl) = @_; + my ($offset); +# $toadd.='\0' unless ($toadd[-1]=='\0'); #broken + $offset=48+length $pl; #48 is the length of the header + $$pl.=$toadd; + return make_ntlm_hdr (length $toadd, length $toadd, $offset); +} + +#args: encoded descriptor, entire decoded packet +# returns the decoded data +sub get_from_data { + my($desc,$packet) = @_; + my($offset,$length, $rv); + ($length, undef, $offset) = unpack ("v v V", $desc); + return unless ($length+$offset <= length $packet); + $rv = unpack ("x$offset a$length",$packet); + return $rv; +} + +sub hash_to_string { + my (%hash) = @_; + my ($rv); + foreach (sort keys %hash) { + $rv.=$_." => ".$hash{$_}."\n"; + } + return $rv; +} + + +#more decoder functions, added more for debugging purposes +#than for any real use in the application. +#args: the base64-decoded packet +#returns: either undef or an hash describing the packet. +sub decode_ntlm_negotiate { + my($got)=$_[0]; + my($signature, $type, %rv, $hdr, $rest); + ($signature, $type, $rest) = unpack ("a8 V a*",$got); + return unless ($signature eq "NTLMSSP\0"); + return unless ($type == 0x1); + $rv{type}="negotiate"; + ($rv{flags}, $rest)=unpack("V a*",$rest); + ($hdr, $rest) = unpack ("a8 a*", $rest); + $rv{domain}=get_from_data($hdr,$got); + ($hdr, $rest) = unpack ("a8 a*", $rest); + $rv{workstation}=get_from_data($hdr,$got); + return %rv; +} + +sub decode_ntlm_challenge { + my($got)=$_[0]; + my($signature, $type, %rv, $hdr, $rest, $j); + ($signature, $type, $rest) = unpack ("a8 V a*",$got); + return unless ($signature eq "NTLMSSP\0"); + return unless ($type == 0x2); + $rv{type}="challenge"; + ($rv{flags}, $rest)=unpack("V a*",$rest); + ($rv{challenge}, $rest)=unpack("a8 a*",$rest); + for ($j=0;$j<8;$j++) { # don't shoot on the programmer, please. + ($rv{"context.$j"},$rest)=unpack("v a*",$rest); + } + return %rv; +} + +#decodes any NTLMSSP packet. +#arg: the encoded packet, returns an hash with packet info +sub decode_ntlm_any { + my($got)=$_[0]; + my ($signature, $type); + ($signature, $type, undef) = unpack ("a8 V a*",$got); + return unless ($signature eq "NTLMSSP\0"); + return decode_ntlm_negotiate($got) if ($type == 1); + return decode_ntlm_challenge($got) if ($type == 2); + return decode_ntlm_authentication($got) if ($type == 3); + return undef; # default +} + + +use integer; + +sub encode_base64 ($;$) +{ + my $res = ""; + my $eol = $_[1]; + $eol = "\n" unless defined $eol; + pos($_[0]) = 0; # ensure start at the beginning + while ($_[0] =~ /(.{1,45})/gs) { + $res .= substr(pack('u', $1), 1); + chop($res); + } + $res =~ tr|` -_|AA-Za-z0-9+/|; # `# help emacs + # fix padding at the end + my $padding = (3 - length($_[0]) % 3) % 3; + $res =~ s/.{$padding}$/'=' x $padding/e if $padding; + # break encoded string into lines of no more than 76 characters each + if (length $eol) { + $res =~ s/(.{1,76})/$1$eol/g; + } + $res; +} + + +sub decode_base64 ($) +{ + local($^W) = 0; # unpack("u",...) gives bogus warning in 5.00[123] + + my $str = shift; + my $res = ""; + + $str =~ tr|A-Za-z0-9+=/||cd; # remove non-base64 chars + if (length($str) % 4) { + require Carp; + Carp::carp("Length of base64 data not a multiple of 4") + } + $str =~ s/=+$//; # remove padding + $str =~ tr|A-Za-z0-9+/| -_|; # convert to uuencoded format + while ($str =~ /(.{1,60})/gs) { + my $len = chr(32 + length($1)*3/4); # compute length byte + $res .= unpack("u", $len . $1 ); # uudecode + } + $res; +} Index: squid/src/fs/Makefile.am diff -u /dev/null squid/src/fs/Makefile.am:1.1.2.4 --- /dev/null Sun Jan 25 06:43:07 2004 +++ squid/src/fs/Makefile.am Sun Aug 19 20:41:08 2001 @@ -0,0 +1,34 @@ +# Makefile for storage modules in the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +AUTOMAKE_OPTIONS = subdir-objects + +DIST_SUBDIRS = aufs coss diskd null ufs +SUBDIRS = @STORE_MODULE_SUBDIRS@ + +EXTRA_LIBRARIES = libaufs.a libcoss.a libdiskd.a libnull.a libufs.a +noinst_LIBRARIES = @STORE_LIBS@ + +libaufs_a_SOURCES = aufs/aiops.c aufs/async_io.c aufs/store_asyncufs.h \ + aufs/store_dir_aufs.c aufs/store_io_aufs.c +libcoss_a_SOURCES = coss/store_coss.h coss/store_io_coss.c coss/store_dir_coss.c \ + coss/async_io.c coss/async_io.h +libdiskd_a_SOURCES = diskd/diskd.c diskd/store_dir_diskd.c diskd/store_diskd.h \ + diskd/store_io_diskd.c +libnull_a_SOURCES = null/store_null.c +libufs_a_SOURCES = ufs/store_dir_ufs.c ufs/store_io_ufs.c ufs/store_ufs.h + +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ + +## targets below to emulate distributed makefiles +aufs/all: libaufs.a +aufs/clean: clean +coss/all: libcoss.a +coss/clean: clean +null/all: libnull.a +null/clean: clean +ufs/all: libufs.a +ufs/clean: clean Index: squid/src/fs/Makefile.in diff -u squid/src/fs/Makefile.in:1.2 squid/src/fs/Makefile.in:removed --- squid/src/fs/Makefile.in:1.2 Sat Oct 21 09:44:45 2000 +++ squid/src/fs/Makefile.in Sun Jan 25 06:43:07 2004 @@ -1,36 +0,0 @@ -# Makefile for storage modules in the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -SUBDIRS = @STORE_MODULES@ -OUTLIBS = @STORE_LIBS@ - -all: - @test -z "$(SUBDIRS)" || for dir in $(SUBDIRS); do \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) all" || exit 1; \ - done - -$(OUTLIBS): - @sh -c "cd `basename $@ .a` && $(MAKE) $(MFLAGS) ../$@" - -clean: - -rm -f *.a stamp - @for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) $@" || exit 1;\ - fi; \ - done - -distclean: - -rm -f *.a Makefile - @for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) distclean"; \ - fi; \ - done - -.DEFAULT: - @test -z "$(SUBDIRS)" || for dir in $(SUBDIRS); do \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) $@" || exit 1; \ - done Index: squid/src/fs/aufs/Makefile.am diff -u /dev/null squid/src/fs/aufs/Makefile.am:1.1.2.2 --- /dev/null Sun Jan 25 06:43:07 2004 +++ squid/src/fs/aufs/Makefile.am Sun Aug 19 16:11:28 2001 @@ -0,0 +1,2 @@ +all clean: + @cd .. && $(MAKE) $(MFLAGS) aufs/$@ Index: squid/src/fs/aufs/Makefile.in diff -u squid/src/fs/aufs/Makefile.in:1.3 squid/src/fs/aufs/Makefile.in:removed --- squid/src/fs/aufs/Makefile.in:1.3 Sat Nov 11 01:40:02 2000 +++ squid/src/fs/aufs/Makefile.in Sun Jan 25 06:43:07 2004 @@ -1,59 +0,0 @@ -# -# Makefile for the AUFS storage driver for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -FS = aufs - -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(FS).a - -OBJS = \ - aiops.o \ - async_io.o \ - store_dir_aufs.o \ - store_io_aufs.o - - -all: $(OUT) - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h -$(OBJS): store_asyncufs.h - -.c.o: - @rm -f ../stamp - $(CC) $(CFLAGS) -c $< - -clean: - -rm -rf *.o *pure_* core ../$(FS).a - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -install: - -tags: - ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c Index: squid/src/fs/coss/Makefile.am diff -u /dev/null squid/src/fs/coss/Makefile.am:1.1.2.2 --- /dev/null Sun Jan 25 06:43:07 2004 +++ squid/src/fs/coss/Makefile.am Sun Aug 19 16:11:28 2001 @@ -0,0 +1,2 @@ +all clean: + @cd .. && $(MAKE) $(MFLAGS) coss/$@ Index: squid/src/fs/coss/Makefile.in diff -u squid/src/fs/coss/Makefile.in:1.3 squid/src/fs/coss/Makefile.in:removed --- squid/src/fs/coss/Makefile.in:1.3 Sun Aug 12 08:20:29 2001 +++ squid/src/fs/coss/Makefile.in Sun Jan 25 06:43:07 2004 @@ -1,57 +0,0 @@ -# -# Makefile for the COSS storage driver for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -FS = coss - -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(FS).a - -OBJS = \ - store_dir_coss.o \ - store_io_coss.o \ - async_io.o - - -all: $(OUT) - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h - -.c.o: - @rm -f ../stamp - $(CC) $(CFLAGS) -c $< - -clean: - -rm -rf *.o *pure_* core ../$(FS).a - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -install: - -tags: - ctags *.[ch] ../../*.[ch] ../../../include/*.h ../lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c Index: squid/src/fs/diskd/Makefile.am diff -u /dev/null squid/src/fs/diskd/Makefile.am:1.1.2.3 --- /dev/null Sun Jan 25 06:43:07 2004 +++ squid/src/fs/diskd/Makefile.am Sun Aug 19 16:11:06 2001 @@ -0,0 +1,11 @@ +# +# Makefile for the DISKD storage driver for the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +libexec_PROGRAMS = diskd +LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@ + +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ Index: squid/src/fs/diskd/Makefile.in diff -u squid/src/fs/diskd/Makefile.in:1.2 squid/src/fs/diskd/Makefile.in:removed --- squid/src/fs/diskd/Makefile.in:1.2 Sat Oct 21 09:44:45 2000 +++ squid/src/fs/diskd/Makefile.in Sun Jan 25 06:43:07 2004 @@ -1,93 +0,0 @@ -# -# Makefile for the DISKD storage driver for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -FS = diskd - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -exec_suffix = @exec_suffix@ -cgi_suffix = @cgi_suffix@ -top_srcdir = @top_srcdir@ -bindir = @bindir@ -libexecdir = @libexecdir@ -sysconfdir = @sysconfdir@ -localstatedir = @localstatedir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh -LDFLAGS = @LDFLAGS@ -INSTALL = @INSTALL@ -INSTALL_BIN = @INSTALL_PROGRAM@ -MV = @MV@ -RM = @RM@ - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(FS).a -DISKD_EXE = diskd$(exec_suffix) - - -OBJS = \ - store_dir_diskd.o \ - store_io_diskd.o - -UTILS = \ - $(DISKD_EXE) - -all: $(OUT) $(UTILS) - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h - -.c.o: - @rm -f ../stamp - $(CC) -DSQUID_PREFIX=\"$(prefix)\" $(CFLAGS) -c $< - -clean: - -rm -rf *.o *pure_* core ../$(FS).a diskd - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -tags: - ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c - -diskd.o: $(srcdir)/diskd.c - $(CC) $(CFLAGS) $(srcdir)/diskd.c -c -o diskd.o - -$(DISKD_EXE): diskd.o - $(CC) $(LDFLAGS) -L../../../lib/ $(CFLAGS) diskd.o -o $(DISKD_EXE) -lmiscutil -lm - -install: $(UTILS) - @for f in $(UTILS); do \ - if test -f $(libexecdir)/$$f; then \ - echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \ - fi; \ - echo $(INSTALL_BIN) $$f $(libexecdir); \ - $(INSTALL_BIN) $$f $(libexecdir); \ - if test -f $(libexecdir)/-$$f; then \ - echo $(RM) -f $(libexecdir)/-$$f; \ - $(RM) -f $(libexecdir)/-$$f; \ - fi; \ - done - Index: squid/src/fs/null/Makefile.am diff -u /dev/null squid/src/fs/null/Makefile.am:1.1.2.2 --- /dev/null Sun Jan 25 06:43:07 2004 +++ squid/src/fs/null/Makefile.am Sun Aug 19 16:11:28 2001 @@ -0,0 +1,2 @@ +all clean: + @cd .. && $(MAKE) $(MFLAGS) null/$@ Index: squid/src/fs/null/Makefile.in diff -u squid/src/fs/null/Makefile.in:1.2 squid/src/fs/null/Makefile.in:removed --- squid/src/fs/null/Makefile.in:1.2 Wed Feb 7 11:11:50 2001 +++ squid/src/fs/null/Makefile.in Sun Jan 25 06:43:07 2004 @@ -1,55 +0,0 @@ -# -# Makefile for the UFS storage driver for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -FS = null - -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(FS).a - -OBJS = \ - store_null.o \ - - -all: $(OUT) - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h - -.c.o: - @rm -f ../stamp - $(CC) $(CFLAGS) -c $< - -clean: - -rm -rf *.o *pure_* core ../$(FS).a - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -install: - -tags: - ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c Index: squid/src/fs/ufs/Makefile.am diff -u /dev/null squid/src/fs/ufs/Makefile.am:1.1.2.2 --- /dev/null Sun Jan 25 06:43:07 2004 +++ squid/src/fs/ufs/Makefile.am Sun Aug 19 16:05:25 2001 @@ -0,0 +1,2 @@ +all clean: + @cd .. && $(MAKE) $(MFLAGS) ufs/$@ Index: squid/src/fs/ufs/Makefile.in diff -u squid/src/fs/ufs/Makefile.in:1.2 squid/src/fs/ufs/Makefile.in:removed --- squid/src/fs/ufs/Makefile.in:1.2 Sat Oct 21 09:44:46 2000 +++ squid/src/fs/ufs/Makefile.in Sun Jan 25 06:43:07 2004 @@ -1,56 +0,0 @@ -# -# Makefile for the UFS storage driver for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -FS = ufs - -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(FS).a - -OBJS = \ - store_dir_ufs.o \ - store_io_ufs.o - - -all: $(OUT) - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h - -.c.o: - @rm -f ../stamp - $(CC) $(CFLAGS) -c $< - -clean: - -rm -rf *.o *pure_* core ../$(FS).a - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -install: - -tags: - ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c Index: squid/src/repl/Makefile.am diff -u /dev/null squid/src/repl/Makefile.am:1.1.2.3 --- /dev/null Sun Jan 25 06:43:09 2004 +++ squid/src/repl/Makefile.am Sat Sep 1 18:09:58 2001 @@ -0,0 +1,52 @@ +# Makefile for storage modules in the Squid Object Cache server +# +# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ +# + +AUTOMAKE_OPTIONS = subdir-objects + +DIST_SUBDIRS = lru heap +SUBDIRS = +# No recursion is needed for the subdirs, we build from here. // @REPL_POLICIES@ +OUTLIBS = @REPL_LIBS@ + +EXTRA_LIBRARIES = liblru.a libheap.a +noinst_LIBRARIES = @REPL_LIBS@ + +liblru_a_SOURCES = lru/store_repl_lru.c +libheap_a_SOURCES = heap/store_heap_replacement.c heap/store_repl_heap.c + +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ + +##all: +## @test -z "$(SUBDIRS)" || for dir in $(SUBDIRS); do \ +## sh -c "cd $$dir && $(MAKE) $(MFLAGS) all" || exit 1; \ +## done; \ +## if [ ! -f stamp ]; then \ +## touch stamp; \ +## fi + +##$(OUTLIBS): +## @sh -c "cd `basename $@ .a` && $(MAKE) $(MFLAGS) ../$@" + +##clean: +## -rm -f *.a stamp +## -for dir in *; do \ +## if [ -f $$dir/Makefile ]; then \ +## sh -c "cd $$dir && $(MAKE) $(MFLAGS) $@" || exit 1;\ +## fi; \ +## done + +##distclean: +## -rm -f *.a Makefile +## -for dir in *; do \ +## if [ -f $$dir/Makefile ]; then \ +## sh -c "cd $$dir && $(MAKE) $(MFLAGS) distclean"; \ +## fi; \ +## done + +##.DEFAULT: +## @test -z "$(SUBDIRS)" || for dir in $(SUBDIRS); do \ +## sh -c "cd $$dir && $(MAKE) $(MFLAGS) $@" || exit 1; \ +## done Index: squid/src/repl/Makefile.in diff -u squid/src/repl/Makefile.in:1.2 squid/src/repl/Makefile.in:removed --- squid/src/repl/Makefile.in:1.2 Sat Oct 21 09:44:46 2000 +++ squid/src/repl/Makefile.in Sun Jan 25 06:43:09 2004 @@ -1,39 +0,0 @@ -# Makefile for storage modules in the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -SUBDIRS = @REPL_POLICIES@ -OUTLIBS = @REPL_LIBS@ - -all: - @test -z "$(SUBDIRS)" || for dir in $(SUBDIRS); do \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) all" || exit 1; \ - done; \ - if [ ! -f stamp ]; then \ - touch stamp; \ - fi - -$(OUTLIBS): - @sh -c "cd `basename $@ .a` && $(MAKE) $(MFLAGS) ../$@" - -clean: - -rm -f *.a stamp - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) $@" || exit 1;\ - fi; \ - done - -distclean: - -rm -f *.a Makefile - -for dir in *; do \ - if [ -f $$dir/Makefile ]; then \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) distclean"; \ - fi; \ - done - -.DEFAULT: - @test -z "$(SUBDIRS)" || for dir in $(SUBDIRS); do \ - sh -c "cd $$dir && $(MAKE) $(MFLAGS) $@" || exit 1; \ - done Index: squid/src/repl/heap/Makefile.in diff -u squid/src/repl/heap/Makefile.in:1.2 squid/src/repl/heap/Makefile.in:removed --- squid/src/repl/heap/Makefile.in:1.2 Sat Oct 21 09:44:46 2000 +++ squid/src/repl/heap/Makefile.in Sun Jan 25 06:43:09 2004 @@ -1,55 +0,0 @@ -# -# Makefile for the UFS storage driver for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -REPL = heap - -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(REPL).a - -OBJS = \ - store_repl_$(REPL).o \ - store_heap_replacement.o - -all: $(OUT) - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h - -.c.o: - @rm -f ../stamp - $(CC) $(CFLAGS) -c $< - -clean: - -rm -rf *.o *pure_* core ../$(FS).a - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -install: - -tags: - ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c Index: squid/src/repl/lru/Makefile.in diff -u squid/src/repl/lru/Makefile.in:1.2 squid/src/repl/lru/Makefile.in:removed --- squid/src/repl/lru/Makefile.in:1.2 Sat Oct 21 09:44:46 2000 +++ squid/src/repl/lru/Makefile.in Sun Jan 25 06:43:10 2004 @@ -1,54 +0,0 @@ -# -# Makefile for the UFS storage driver for the Squid Object Cache server -# -# $Id: squid-squid-amake-HEAD,v 1.1 2004/08/17 20:55:13 hno Exp $ -# - -REPL = lru - -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -CC = @CC@ -MAKEDEPEND = @MAKEDEPEND@ -AR_R = @AR_R@ -RANLIB = @RANLIB@ -AC_CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -INCLUDE = -I../../../include -I$(top_srcdir)/include -I$(top_srcdir)/src/ -CFLAGS = $(AC_CFLAGS) $(INCLUDE) $(DEFINES) - -OUT = ../$(REPL).a - -OBJS = \ - store_repl_$(REPL).o - -all: $(OUT) - -$(OUT): $(OBJS) - @rm -f ../stamp - $(AR_R) $(OUT) $(OBJS) - $(RANLIB) $(OUT) - -$(OBJS): $(top_srcdir)/include/version.h ../../../include/autoconf.h - -.c.o: - @rm -f ../stamp - $(CC) $(CFLAGS) -c $< - -install: - -clean: - -rm -rf *.o *pure_* core ../$(FS).a - -distclean: clean - -rm -f Makefile - -rm -f Makefile.bak - -rm -f tags - -tags: - ctags *.[ch] $(top_srcdir)/src/*.[ch] $(top_srcdir)/include/*.h $(top_srcdir)/lib/*.[ch] - -depend: - $(MAKEDEPEND) $(INCLUDE) -fMakefile *.c squid-squid-amake-HEAD.new squid-squid-amake-HEAD differ: char 71, line 2