diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2020-05-18 09:09:06 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2020-05-18 09:09:06 +0000 |
| commit | 1a2924f406b28a92383e22a04502da9436673668 (patch) | |
| tree | be2e51e2a8474888ffb97a80f34a8eb4842a1f6f /www/squid | |
| parent | x11/linux-nvidia-libs: Install libnvidia-glvkspirv.so, libnvidia-rtcore.so, l... (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=535732
Diffstat (limited to 'www/squid')
4 files changed, 26 insertions, 8 deletions
diff --git a/www/squid/files/patch-src-cf.data.pre b/www/squid/files/patch-src-cf.data.pre index 0c36b0239bea..a9ae9f73a33a 100644 --- a/www/squid/files/patch-src-cf.data.pre +++ b/www/squid/files/patch-src-cf.data.pre @@ -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". diff --git a/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc b/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc index a9c115014e18..e5189a91bc1a 100644 --- a/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc +++ b/www/squid/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc @@ -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 diff --git a/www/squid/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc b/www/squid/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc new file mode 100644 index 000000000000..8aaf7af308d1 --- /dev/null +++ b/www/squid/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc @@ -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); diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist index 926479cf07d4..b353b05a8775 100644 --- a/www/squid/pkg-plist +++ b/www/squid/pkg-plist @@ -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 |