Date: Wed, 12 Apr 2017 18:03:55 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r438399 - in branches/2017Q2/www/squid-devel: . files Message-ID: <201704121803.v3CI3tTT065690@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Wed Apr 12 18:03:55 2017 New Revision: 438399 URL: https://svnweb.freebsd.org/changeset/ports/438399 Log: MFH: r438126 Update to upstream version 4.0.19 Detailed maintainer log: - Update to 4.0.19 - Make it possible to set alternative squid_krb5_config via rc script - Unbreak build with openssl-devel - Add bdb to USES since some helpers need it (see http://www.squid-cache.org/Versions/v4/changesets/squid-4-15013.patch) PR: 218505 Submitted by: timp87@gmail.com (maintainer) Approved by: ports-secteam (junovitch) Modified: branches/2017Q2/www/squid-devel/Makefile branches/2017Q2/www/squid-devel/distinfo branches/2017Q2/www/squid-devel/files/squid.in Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/www/squid-devel/Makefile ============================================================================== --- branches/2017Q2/www/squid-devel/Makefile Wed Apr 12 17:27:29 2017 (r438398) +++ branches/2017Q2/www/squid-devel/Makefile Wed Apr 12 18:03:55 2017 (r438399) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 4.0.18 -PORTREVISION= 3 +PORTVERSION= 4.0.19 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \ http://www2.us.squid-cache.org/Versions/v4/ \ @@ -29,11 +28,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= squid*-3.* -USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz +USES= compiler:c++11-lib cpe perl5 shebangfix tar:xz bdb CPE_VENDOR= squid-cache SHEBANG_FILES= scripts/*.pl contrib/*.pl tools/*.pl GNU_CONFIGURE= yes USE_RC_SUBR= squid +CPPFLAGS+= -I${BDB_INCLUDE_DIR} +LDFLAGS+= -L${BDB_LIB_DIR} USERS= squid GROUPS= squid @@ -304,10 +305,6 @@ post-install: .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MSSL} && ${SSL_DEFAULT:Mopenssl-devel} -BROKEN= Does not build with openssl-devel -.endif - .if ${CHOSEN_COMPILER_TYPE} == clang #CXXFLAGS+= -Wno-unused-private-field CXXFLAGS+= -Wno-unknown-warning-option Modified: branches/2017Q2/www/squid-devel/distinfo ============================================================================== --- branches/2017Q2/www/squid-devel/distinfo Wed Apr 12 17:27:29 2017 (r438398) +++ branches/2017Q2/www/squid-devel/distinfo Wed Apr 12 18:03:55 2017 (r438399) @@ -1,3 +1,3 @@ TIMESTAMP = 1467941699 -SHA256 (squid4.0/squid-4.0.18.tar.xz) = 6e5d2dd9477085b023c4c8ebfc2124ed2bc9795fdc74d190c9273c70ba6f2560 -SIZE (squid4.0/squid-4.0.18.tar.xz) = 2411340 +SHA256 (squid4.0/squid-4.0.19.tar.xz) = 355a7f816afd8b9b5d0d785e9c80c28a7e4c6edb8832ac865ad267d5e3360050 +SIZE (squid4.0/squid-4.0.19.tar.xz) = 2414764 Modified: branches/2017Q2/www/squid-devel/files/squid.in ============================================================================== --- branches/2017Q2/www/squid-devel/files/squid.in Wed Apr 12 17:27:29 2017 (r438398) +++ branches/2017Q2/www/squid-devel/files/squid.in Wed Apr 12 18:03:55 2017 (r438399) @@ -42,6 +42,9 @@ # squid_krb5_ktname: # Alternative Kerberos 5 Key Table. # Default: none +# squid_krb5_config: +# Alternative Kerberos 5 config file +# Default: none . /etc/rc.subr @@ -90,6 +93,12 @@ squid_prestart() export KRB5_KTNAME=${squid_krb5_ktname} fi + # setup KRB5_CONFIG: + squid_krb5_config=${squid_krb5_config:-"NONE"} + if [ "${squid_krb5_config}" != "NONE" ]; then + export KRB5_CONFIG=${squid_krb5_config} + fi + # setup FIB tables: if command -v check_namevarlist > /dev/null 2>&1; then check_namevarlist fib && return 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704121803.v3CI3tTT065690>