mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-31 10:46:16 +00:00
Code Issues Releases Activity

www/squid-devel: add patch to fix kerberos_ldap_group helper, fix pinger

Browse Source 
- 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 <timp87@gmail.com> (maintainer)
This commit is contained in:
Kurt Jaeger 2020-05-18 08:20:51 +00:00
parent c6d6461c24
commit 7ae92c7413
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=535729
5 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/squid-devel/Makefile
View File

@ -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/ \

9
www/squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc
View File

@ -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 <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

19
www/squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc Normal file
View File

@ -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);

12
www/squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc
View File

@ -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);

6
www/squid-devel/pkg-plist
View File

@ -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