head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.30 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.28 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.26 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.24 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.22 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.20 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.18 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.16 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.14 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.12 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.10 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.8 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.6 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.4 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.2 pkgsrc-2022Q3-base:1.1; locks; strict; comment @# @; 1.1 date 2022.08.31.16.08.44; author taca; state Exp; branches; next ; commitid tNOyJTyMekLI43SD; desc @@ 1.1 log @www/squid5: add package version 5.6 Squid is a fully-featured HTTP/1.0 proxy with partial HTTP/1.1 support The 5 series brings many new features and upgrades to the basic networking protocols. A short list of the major new features is: Squid 5 represents a new feature release above 4.17. The most important of these new features are: * Configurable helper queue size * Helper concurrency channels changes * SSL support removal * Helper Binary Changes * Secure ICAP * Improved SMP support * Improved process management * Initial GnuTLS support * ESI Custom Parser removal @ text @$NetBSD$ * More support for OpenSSL 1.1; not only check SSL_Library_init() but also check OPENSSL_init_ssl(). * Fix syntax error by accidental new line. * Utilize on BSD. * Do not override CFLAGS/CXXFLAGS except linux. * Prevent WRKDIR reference. --- configure.orig 2022-06-05 22:42:04.000000000 +0000 +++ configure @@@@ -1119,9 +1119,6 @@@@ CXXFLAGS CCC BUILDCXX CPP -PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR LT_SYS_LIBRARY_PATH CXXCPP LIBXML2_CFLAGS @@@@ -24545,10 +24542,12 @@@@ do done # GLIBC 2.30 deprecates sysctl.h. Test with the same flags that (may) break includes later. - CFLAGS=$SQUID_CFLAGS - CXXFLAGS=$SQUID_CXXFLAGS case "$squid_host_os" in - linux|solaris|freebsd|openbsd|netbsd|cygwin) + linux) + CFLAGS=$SQUID_CFLAGS + CXXFLAGS=$SQUID_CXXFLAGS + ;; + solaris|freebsd|openbsd|netbsd|cygwin) ${TRUE} ;; mingw) @@@@ -24598,6 +24597,7 @@@@ then : fi ac_fn_cxx_check_header_compile "$LINENO" "net/if_arp.h" "ac_cv_header_net_if_arp_h" " +#include #include #include @@@@ -24608,6 +24608,7 @@@@ then : fi ac_fn_cxx_check_header_compile "$LINENO" "net/route.h" "ac_cv_header_net_route_h" " +#include #include #include @@@@ -25501,7 +25502,51 @@@@ then : LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS" else $as_nop - as_fn_error $? "library 'ssl' is required for OpenSSL" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5 +$as_echo_n "checking for OPENSSL_init_ssl in -lssl... " >&6; } +if ${ac_cv_lib_ssl_OPENSSL_init_ssl+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $LIBOPENSSL_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OPENSSL_init_ssl (); +int +main () +{ +return OPENSSL_init_ssl (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_ssl_OPENSSL_init_ssl=yes +else + ac_cv_lib_ssl_OPENSSL_init_ssl=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_OPENSSL_init_ssl" >&5 +$as_echo "$ac_cv_lib_ssl_OPENSSL_init_ssl" >&6; } +if test "x$ac_cv_lib_ssl_OPENSSL_init_ssl" = xyes; then : + LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS" +else + + as_fn_error $? "library 'ssl' is required for OpenSSL" "$LINENO" 5 + +fi + + fi @@@@ -25602,7 +25647,51 @@@@ then : LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS" else $as_nop - as_fn_error $? "library 'ssl' is required for OpenSSL" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5 +$as_echo_n "checking for OPENSSL_init_ssl in -lssl... " >&6; } +if ${ac_cv_lib_ssl_OPENSSL_init_ssl+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $LIBOPENSSL_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char OPENSSL_init_ssl (); +int +main () +{ +return OPENSSL_init_ssl (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_ssl_OPENSSL_init_ssl=yes +else + ac_cv_lib_ssl_OPENSSL_init_ssl=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_OPENSSL_init_ssl" >&5 +$as_echo "$ac_cv_lib_ssl_OPENSSL_init_ssl" >&6; } +if test "x$ac_cv_lib_ssl_OPENSSL_init_ssl" = xyes; then : + LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS" +else + + as_fn_error $? "library 'ssl' is required for OpenSSL" "$LINENO" 5 + +fi + + fi @@@@ -42840,6 +42929,8 @@@@ else # elif defined _MSC_VER # include # define alloca _alloca +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +# include # else # ifdef __cplusplus extern "C" @@@@ -45787,6 +45878,9 @@@@ printf "%s\n" "#define USE_SOLARIS_IPFIL #if USE_SOLARIS_IPFILTER_MINOR_T_HACK #define minor_t fubar #endif +#if HAVE_SYS_PARAM_H +#include +#endif #if HAVE_SYS_TYPES_H #include #endif @