svn commit: r539292 - in head/www/squid-devel: . files

[Carlo Strub]

Author: cs
Date: Mon Jun 15 21:27:20 2020
New Revision: 539292
URL: https://svnweb.freebsd.org/changeset/ports/539292

Log:
  Update to 5.0.3
  
  PR:		247174
  Submitted by:	maintainer

Deleted:
  head/www/squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc
  head/www/squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc
  head/www/squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc
Modified:
  head/www/squid-devel/Makefile
  head/www/squid-devel/distinfo
  head/www/squid-devel/files/patch-configure

Modified: head/www/squid-devel/Makefile
==============================================================================
--- head/www/squid-devel/Makefile	Mon Jun 15 21:24:36 2020	(r539291)
+++ head/www/squid-devel/Makefile	Mon Jun 15 21:27:20 2020	(r539292)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	squid
-PORTVERSION=	5.0.2
-PORTREVISION=	2
+PORTVERSION=	5.0.3
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v5/ \
 		http://www2.us.squid-cache.org/Versions/v5/ \
@@ -27,7 +26,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lib cpe perl5 shebangfix tar:xz
 
-CONFLICTS=	squid3-* squid-*
+CONFLICTS=	squid3-* squid-4.*
 CPE_VENDOR=	squid-cache
 SHEBANG_FILES=	scripts/*.pl contrib/*.pl tools/*.pl
 GNU_CONFIGURE=	yes

Modified: head/www/squid-devel/distinfo
==============================================================================
--- head/www/squid-devel/distinfo	Mon Jun 15 21:24:36 2020	(r539291)
+++ head/www/squid-devel/distinfo	Mon Jun 15 21:27:20 2020	(r539292)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588325736
-SHA256 (squid-5.0.2.tar.xz) = c163e8d5432198b7e5b490b72d1bdb50c953394e3123f0629ff1eb89a6dc2b96
-SIZE (squid-5.0.2.tar.xz) = 2509540
+TIMESTAMP = 1591779543
+SHA256 (squid-5.0.3.tar.xz) = c09dd43121ce7fe006b8afd8ddfe6ca064aadf0ab342303f4e6c6678463bb4d0
+SIZE (squid-5.0.3.tar.xz) = 2518568

Modified: head/www/squid-devel/files/patch-configure
==============================================================================
--- head/www/squid-devel/files/patch-configure	Mon Jun 15 21:24:36 2020	(r539291)
+++ head/www/squid-devel/files/patch-configure	Mon Jun 15 21:27:20 2020	(r539292)
@@ -1,6 +1,6 @@
---- configure.orig	2020-04-19 12:08:55 UTC
+--- configure.orig	2020-06-09 06:58:26 UTC
 +++ configure
-@@ -35054,7 +35054,7 @@ done
+@@ -35068,7 +35068,7 @@ done
  ##
  
  BUILD_HELPER="NIS"
@@ -9,7 +9,7 @@
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-@@ -35069,8 +35069,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+@@ -35083,8 +35083,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
@@ -22,7 +22,7 @@
  fi
  
  done
-@@ -35543,7 +35545,7 @@ done
+@@ -35557,7 +35559,7 @@ done
  
    # unconditionally requires crypt(3), for now
    if test "x$ac_cv_func_crypt" != "x"; then
@@ -31,7 +31,7 @@
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-@@ -38307,7 +38309,7 @@ for ac_header in \
+@@ -38321,7 +38323,7 @@ for ac_header in \
    arpa/nameser.h \
    assert.h \
    bstring.h \
@@ -40,7 +40,7 @@
    ctype.h \
    direct.h \
    errno.h \
-@@ -38515,6 +38517,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
+@@ -38529,6 +38531,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
  #include <netinet/ip.h>
  #endif
  #if HAVE_NETINET_IP_COMPAT_H
@@ -48,7 +48,7 @@
  #include <netinet/ip_compat.h>
  #endif
  #if HAVE_NETINET_IP_FIL_H
-@@ -42562,6 +42565,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
+@@ -42576,6 +42579,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
  #     include <sys/ioccom.h>
  #     include <netinet/in.h>
  
@@ -56,7 +56,7 @@
  #     include <netinet/ip_compat.h>
  #     include <netinet/ip_fil.h>
  #     include <netinet/ip_nat.h>
-@@ -42592,6 +42596,7 @@ else
+@@ -42606,6 +42610,7 @@ else
  #       include <sys/ioccom.h>
  #       include <netinet/in.h>
  #undef minor_t
@@ -64,7 +64,7 @@
  #       include <netinet/ip_compat.h>
  #       include <netinet/ip_fil.h>
  #       include <netinet/ip_nat.h>
-@@ -42636,6 +42641,7 @@ _ACEOF
+@@ -42650,6 +42655,7 @@ _ACEOF
  	ip_fil_compat.h \
  	ip_fil.h \
  	ip_nat.h \
@@ -72,7 +72,7 @@
  	netinet/ip_compat.h \
  	netinet/ip_fil_compat.h \
  	netinet/ip_fil.h \
-@@ -42665,6 +42671,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
+@@ -42679,6 +42685,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
  #if HAVE_IP_COMPAT_H
  #include <ip_compat.h>
  #elif HAVE_NETINET_IP_COMPAT_H
@@ -80,13 +80,12 @@
  #include <netinet/ip_compat.h>
  #endif
  #if HAVE_IP_FIL_H
-@@ -42728,8 +42735,7 @@ _ACEOF
+@@ -42749,7 +42756,7 @@ _ACEOF
  
  
  fi
--ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6"
--   "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
-+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
+-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6" "
++ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6__" "
  #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
  #define minor_t fubar
  #endif