From owner-svn-ports-all@freebsd.org Mon May 18 08:20:52 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BBBBC13A52A; Mon, 18 May 2020 08:20:52 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49QX5c4WTpz4MNG; Mon, 18 May 2020 08:20:52 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 965351E889; Mon, 18 May 2020 08:20:52 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04I8KqCM019747; Mon, 18 May 2020 08:20:52 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04I8Kp8d019742; Mon, 18 May 2020 08:20:51 GMT (envelope-from pi@FreeBSD.org) Message-Id: <202005180820.04I8Kp8d019742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 18 May 2020 08:20:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535729 - in head/www/squid-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/www/squid-devel: . files X-SVN-Commit-Revision: 535729 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2020 08:20:52 -0000 Author: pi Date: Mon May 18 08:20:51 2020 New Revision: 535729 URL: https://svnweb.freebsd.org/changeset/ports/535729 Log: www/squid-devel: add patch to fix kerberos_ldap_group helper, fix pinger - add patch to fix kerberos_ldap_group helper work with heimdal - regenerate two patches to follow upstreamed versions - fix pinger in plist and bump portrevision PR: 246355 Submitted by: Pavel Timofeev (maintainer) Added: head/www/squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc (contents, props changed) Modified: head/www/squid-devel/Makefile 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_session_ext__session__acl.cc head/www/squid-devel/pkg-plist Modified: head/www/squid-devel/Makefile ============================================================================== --- head/www/squid-devel/Makefile Mon May 18 08:18:32 2020 (r535728) +++ head/www/squid-devel/Makefile Mon May 18 08:20:51 2020 (r535729) @@ -2,7 +2,7 @@ PORTNAME= squid PORTVERSION= 5.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v5/ \ http://www2.us.squid-cache.org/Versions/v5/ \ Modified: 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_eDirectory__userip_ext__edirectory__userip__acl.cc Mon May 18 08:18:32 2020 (r535728) +++ head/www/squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc Mon May 18 08:20:51 2020 (r535729) @@ -1,12 +1,15 @@ ---- src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc.orig 2020-04-19 10:50:48 UTC +--- src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc.orig 2020-04-19 12:38:51 UTC +++ src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc -@@ -69,6 +69,9 @@ +@@ -69,6 +69,12 @@ #ifdef HAVE_NETDB_H #include #endif -+#include ++#ifdef HAVE_SYS_SOCKET_H +#include ++#endif ++#ifdef HAVE_NETINET_IN_H +#include ++#endif #ifdef HELPER_INPUT_BUFFER #define EDUI_MAXLEN HELPER_INPUT_BUFFER Added: head/www/squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc Mon May 18 08:20:51 2020 (r535729) @@ -0,0 +1,19 @@ +--- src/acl/external/kerberos_ldap_group/support_krb5.cc.orig 2020-04-19 12:38:51 UTC ++++ src/acl/external/kerberos_ldap_group/support_krb5.cc +@@ -467,10 +467,15 @@ krb5_create_cache(char *domain, char *service_principa + } + + // overwrite limitation of enctypes ++#if USE_HEIMDAL_KRB5 ++ creds->session.keytype = 0; ++ if (creds->session.keyvalue.length>0) ++ krb5_free_keyblock_contents(kparam.context, &creds->session); ++#else + creds->keyblock.enctype = 0; + if (creds->keyblock.contents) + krb5_free_keyblock_contents(kparam.context, &creds->keyblock); +- ++#endif + code = krb5_get_credentials(kparam.context, 0, kparam.cc[ccindex], creds, &tgt_creds); + if (code) { + k5_error("Error while getting tgt", code); Modified: head/www/squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc ============================================================================== --- head/www/squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc Mon May 18 08:18:32 2020 (r535728) +++ head/www/squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc Mon May 18 08:20:51 2020 (r535729) @@ -1,11 +1,13 @@ ---- src/acl/external/session/ext_session_acl.cc.orig 2020-04-19 10:50:48 UTC +--- src/acl/external/session/ext_session_acl.cc.orig 2020-05-10 08:32:32 UTC +++ src/acl/external/session/ext_session_acl.cc -@@ -137,7 +137,7 @@ static void init_db(void) +@@ -137,6 +137,10 @@ static void init_db(void) } } #elif USE_TRIVIALDB -- db = tdb_open(db_path, 0, TDB_CLEAR_IF_FIRST, O_CREAT|O_DSYNC, 0666); -+ db = tdb_open(db_path, 0, TDB_CLEAR_IF_FIRST, O_CREAT|O_SYNC, 0666); ++#if _SQUID_FREEBSD_ && !defined(O_DSYNC) ++ // FreeBSD lacks O_DSYNC, O_SYNC is closest to correct behaviour ++#define O_DSYNC O_SYNC ++#endif + db = tdb_open(db_path, 0, TDB_CLEAR_IF_FIRST, O_CREAT|O_DSYNC, 0666); #endif if (!db) { - fprintf(stderr, "FATAL: %s: Failed to open session db '%s'\n", program_name, db_path); Modified: head/www/squid-devel/pkg-plist ============================================================================== --- head/www/squid-devel/pkg-plist Mon May 18 08:18:32 2020 (r535728) +++ head/www/squid-devel/pkg-plist Mon May 18 08:20:51 2020 (r535729) @@ -50,11 +50,7 @@ libexec/squid/basic_db_auth %%TDB%%libexec/squid/ext_session_acl %%SSL%%man/man8/security_file_certgen.8.gz %%SSL%%libexec/squid/security_file_certgen -%%ICMP%%libexec/squid/pinger -%%ICMP%%@mode 4510 -%%ICMP%%@mode -%%ICMP%%@group squid -%%ICMP%%@group +%%ICMP%%@(,squid,4510) libexec/squid/pinger %%FS_DISKD%%libexec/squid/diskd %%ETCDIR%%/squid.conf.documented %%ETCDIR%%/mib.txt