Date: Mon, 18 May 2020 09:09:06 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535732 - in head/www/squid: . files Message-ID: <202005180909.04I996x0051377@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon May 18 09:09:06 2020 New Revision: 535732 URL: https://svnweb.freebsd.org/changeset/ports/535732 Log: www/squid: 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 permissions PR: 245861, 246410 Submitted by: Pavel Timofeev <timp87@gmail.com> (maintainer) Added: head/www/squid/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc (contents, props changed) Modified: head/www/squid/files/patch-src-cf.data.pre head/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc head/www/squid/pkg-plist Modified: head/www/squid/files/patch-src-cf.data.pre ============================================================================== --- head/www/squid/files/patch-src-cf.data.pre Mon May 18 08:51:28 2020 (r535731) +++ head/www/squid/files/patch-src-cf.data.pre Mon May 18 09:09:06 2020 (r535732) @@ -1,6 +1,6 @@ --- src/cf.data.pre.orig 2020-04-19 12:38:51 UTC +++ src/cf.data.pre -@@ -5062,6 +5057,10 @@ DEFAULT: @DEFAULT_PID_FILE@ +@@ -5062,6 +5062,10 @@ DEFAULT: @DEFAULT_PID_FILE@ LOC: Config.pidFilename DOC_START A filename to write the process-id to. To disable, enter "none". Modified: head/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc ============================================================================== --- head/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc Mon May 18 08:51:28 2020 (r535731) +++ head/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc Mon May 18 09:09:06 2020 (r535732) @@ -1,12 +1,15 @@ --- 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 <netdb.h> #endif -+#include <sys/types.h> ++#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> ++#endif ++#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> ++#endif #ifdef HELPER_INPUT_BUFFER #define EDUI_MAXLEN HELPER_INPUT_BUFFER Added: head/www/squid/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/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc Mon May 18 09:09:06 2020 (r535732) @@ -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/pkg-plist ============================================================================== --- head/www/squid/pkg-plist Mon May 18 08:51:28 2020 (r535731) +++ head/www/squid/pkg-plist Mon May 18 09:09:06 2020 (r535732) @@ -46,11 +46,7 @@ libexec/squid/basic_db_auth %%UNLINKD%%libexec/squid/unlinkd %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005180909.04I996x0051377>