Date: Wed, 24 Dec 2008 16:15:05 +0100 (CET) From: Thomas-Martin Seck <tmseck@web.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/129913: [Maintainer] www/squid30: update to 3.0.STABLE11 Message-ID: <200812241515.mBOFF4H0076517@hardy.tmseck.homedns.org> Resent-Message-ID: <200812241550.mBOFo450090799@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129913 >Category: ports >Synopsis: [Maintainer] www/squid30: update to 3.0.STABLE11 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Dec 24 15:50:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 7.0-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of December 24, 2008. >Description: - Update to 3.0.STABLE11 - Enable the squid_kerb_auth helper as in www/squid Added file: files/patch-squid_kerb_auth >How-To-Repeat: >Fix: Apply this patch: Index: Makefile =================================================================== --- Makefile (.../www/squid30) (revision 1522) +++ Makefile (.../local/squid30) (revision 1522) @@ -48,8 +48,6 @@ # Do not use "unlinkd" # --with-aufs-threads=N_THREADS # Tune the number of worker threads for the aufs object -# --with-coss-membuf-size -# COSS membuf size (default: 1048576 bytes) # --with-filedescriptors=N # Force Squid to use N filedescriptors. # --enable-ntlm-fail-open @@ -94,20 +92,17 @@ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www1.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v3/3.0/changesets -PATCHFILES= b8920.patch +PATCHFILES= MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy LATEST_LINK= squid30 -SQUID_STABLE_VER= 10 +SQUID_STABLE_VER= 11 CONFLICTS= squid-2.[0-9].* cacheboy-[0-9]* GNU_CONFIGURE= yes -# disable autotools bootstrapping for now, 3.0.STABLE does not currently -# require it: -#USE_AUTOTOOLS= autoconf:262 automake:19 libtool:15 USE_BZIP2= yes USE_PERL5= yes USE_RC_SUBR= squid @@ -231,11 +226,17 @@ basic_auth+= YP libexec+= yp_auth .endif -CONFIGURE_ARGS+= --enable-auth="basic ntlm digest" \ +CONFIGURE_ARGS+= --enable-auth="basic digest negotiate ntlm" \ --enable-basic-auth-helpers="${basic_auth}" \ --enable-digest-auth-helpers="${digest_auth}" \ --enable-external-acl-helpers="${external_acl}" \ --enable-ntlm-auth-helpers="SMB" +.if !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS) +# XXX This currently only works with heimdal from the base system, +# see files/patch-squid_kerb_auth: +CONFIGURE_ARGS+= --enable-negotiate-auth-helpers="squid_kerb_auth" +libexec+= squid_kerb_auth +.endif # Storage schemes: @@ -448,7 +449,7 @@ @${CAT} ${PKGMESSAGE} @${ECHO_CMD} "" .if defined(WITH_SQUID_COSS) - @${ECHO_CMD} "Note: COSS support is currently disabled in Squid-3 by the Squid developers." + @${ECHO_CMD} "Note: COSS support is currently not available in Squid-3." @${ECHO_CMD} "Please check your squid.conf and comment out any 'cache_dir coss' definitions." @${ECHO_CMD} "" .endif Index: distinfo =================================================================== --- distinfo (.../www/squid30) (revision 1522) +++ distinfo (.../local/squid30) (revision 1522) @@ -1,6 +1,3 @@ -MD5 (squid3.0/squid-3.0.STABLE10.tar.bz2) = cfd37717230220a9f47177594e235f18 -SHA256 (squid3.0/squid-3.0.STABLE10.tar.bz2) = 5e55568f65eee3b96e5cc9f63f4bf9729853dcc0ab94c044250a216b92f091a8 -SIZE (squid3.0/squid-3.0.STABLE10.tar.bz2) = 1797628 -MD5 (squid3.0/b8920.patch) = 110cb1823430cec022d1e06c294998a8 -SHA256 (squid3.0/b8920.patch) = 63e6fa89a72762e2dbcdbebca139d697a266cf778892e53fc021481ed4bbeda3 -SIZE (squid3.0/b8920.patch) = 1296 +MD5 (squid3.0/squid-3.0.STABLE11.tar.bz2) = c6218ecf636a4a9ac9579d1a58e1fbe9 +SHA256 (squid3.0/squid-3.0.STABLE11.tar.bz2) = 031d24d4dc47abf08632feb079093e2366690cf4bb63ba6d46fa46432cbdc2ef +SIZE (squid3.0/squid-3.0.STABLE11.tar.bz2) = 1806079 Index: files/patch-squid_kerb_auth =================================================================== --- files/patch-squid_kerb_auth (.../www/squid30) (revision 0) +++ files/patch-squid_kerb_auth (.../local/squid30) (revision 1522) @@ -0,0 +1,468 @@ +This file contains various patches that in general try to enable the +compilation of the squid_kerb_auth authentication helper program on +all versions of FreeBSD that are currently supported by the FreeBSD +ports framework where Heimdal is part of the base system. + +--- configure.orig 2008-12-23 05:19:34.000000000 +0100 ++++ configure 2008-12-24 15:05:33.000000000 +0100 +@@ -964,6 +964,9 @@ + NTLM_AUTH_HELPERS + NEGOTIATE_AUTH_HELPERS + DIGEST_AUTH_HELPERS ++KRB5CONFIG ++KERBLIBS ++KERBINC + EXTERNAL_ACL_HELPERS + LIBSASL + ENABLE_UNLINKD_TRUE +@@ -23261,6 +23264,368 @@ + fi + + ++ ++if `echo "$NEGOTIATE_AUTH_HELPERS" | grep -q squid_kerb_auth`; then ++ # Extract the first word of "krb5-config", so it can be a program name with args. ++set dummy krb5-config; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_KRB5CONFIG+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ case $KRB5CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_KRB5CONFIG="$KRB5CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_KRB5CONFIG" && ac_cv_path_KRB5CONFIG="false" ++ ;; ++esac ++fi ++KRB5CONFIG=$ac_cv_path_KRB5CONFIG ++if test -n "$KRB5CONFIG"; then ++ { $as_echo "$as_me:$LINENO: result: $KRB5CONFIG" >&5 ++$as_echo "$KRB5CONFIG" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ if test -z "$KRB5CONFIG"; then ++ { { $as_echo "$as_me:$LINENO: error: sorry" >&5 ++$as_echo "$as_me: error: sorry" >&2;} ++ { (exit need krb5-config to determine compilation settings); exit need krb5-config to determine compilation settings; }; } ++ else ++ KERBLIBS=`$KRB5CONFIG --libs gssapi` ++ KERBINC=`$KRB5CONFIG --cflags` ++ ++ ++ fi ++ ++for ac_header in gssapi/gssapi.h ++do ++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++$as_echo_n "checking for $ac_header... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ $as_echo_n "(cached) " >&6 ++fi ++ac_res=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++$as_echo_n "checking $ac_header usability... " >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++$as_echo_n "checking $ac_header presence... " >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## ----------------------------------------------- ## ++## Report this to http://www.squid-cache.org/bugs/ ## ++## ----------------------------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++$as_echo_n "checking for $ac_header... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ ++fi ++if test `eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ if test x"$ac_cv_header_gssapi_gssapi_h" != x"yes"; then ++ ++for ac_header in gssapi.h ++do ++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++$as_echo_n "checking for $ac_header... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ $as_echo_n "(cached) " >&6 ++fi ++ac_res=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++$as_echo_n "checking $ac_header usability... " >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++$as_echo_n "checking $ac_header presence... " >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## ----------------------------------------------- ## ++## Report this to http://www.squid-cache.org/bugs/ ## ++## ----------------------------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++$as_echo_n "checking for $ac_header... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ ++fi ++if test `eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++else ++ { { $as_echo "$as_me:$LINENO: error: neither <gssapi/gssapi.h> nor <gssapi.h> found" >&5 ++$as_echo "$as_me: error: neither <gssapi/gssapi.h> nor <gssapi.h> found" >&2;} ++ { (exit 1); exit 1; }; } ++ ++fi ++ ++done ++ ++ fi ++fi ++ + # Check whether --enable-ntlm-fail-open was given. + if test "${enable_ntlm_fail_open+set}" = set; then + enableval=$enable_ntlm_fail_open; if test "$enableval" = "yes" ; then +--- include/autoconf.h.in.orig 2008-12-23 05:19:29.000000000 +0100 ++++ include/autoconf.h.in 2008-12-24 15:05:33.000000000 +0100 +@@ -188,6 +188,12 @@ + /* Define to 1 if you have the `htole16' function. */ + #undef HAVE_HTOLE16 + ++/* Define to 1 if you have the <gssapi/gssapi.h> header file. */ ++#undef HAVE_GSSAPI_GSSAPI_H ++ ++/* Define to 1 if you have the <gssapi.h> header file. */ ++#undef HAVE_GSSAPI_H ++ + /* Define to 1 if you have the `initgroups' function. */ + #undef HAVE_INITGROUPS + +--- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig 2008-12-23 05:19:26.000000000 +0100 ++++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in 2008-12-24 15:05:33.000000000 +0100 +@@ -154,6 +154,18 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) ++ ++# HEIMDAL ++#KERBINC = -DHEIMDAL -I/usr/include/heimdal ++#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken ++ ++# MIT ++#KERBINC = ++#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err ++KERBINC = -DHEIMDAL @KERBINC@ ++KERBLIBS = @KERBLIBS@ ++KRB5CONFIG = @KRB5CONFIG@ + LDFLAGS = @LDFLAGS@ + LIBADD_DL = @LIBADD_DL@ + LIBOBJS = @LIBOBJS@ +@@ -305,15 +317,6 @@ + squid_kerb_auth_SOURCES = $(SOURCE) $(SPNEGO) + #-I$(top_srcdir)/include -I$(top_srcdir)/src + LDADD = $(KERBLIBS) +-#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) +- +-# HEIMDAL +-#KERBINC = -DHEIMDAL -I/usr/include/heimdal +-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken +- +-# MIT +-KERBINC = +-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err + all: all-am + + .SUFFIXES: +--- helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c.orig 2008-12-23 05:19:29.000000000 +0100 ++++ helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c 2008-12-24 15:05:33.000000000 +0100 +@@ -24,6 +24,7 @@ + /* + * Hosted at http://sourceforge.net/projects/squidkerbauth + */ ++#include "config.h" + #include <string.h> + #include <stdio.h> + #include <stdlib.h> +@@ -31,6 +32,7 @@ + #include <unistd.h> + #include <time.h> + #include <sys/time.h> ++#include <sys/param.h> + + #include "base64.h" + #ifndef HAVE_SPNEGO +@@ -51,7 +53,11 @@ + #define PROGRAM "squid_kerb_auth" + + #ifdef HEIMDAL ++#ifdef HAVE_GSSAPI_GSSAPI_H ++#include <gssapi/gssapi.h> ++#else + #include <gssapi.h> ++#endif + #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE + #else + #include <gssapi/gssapi.h> >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812241515.mBOFF4H0076517>