Attachment 214409 Details for Bug 246355 – port patch fixed plist bumped

[patch] port patch fixed plist bumped

www_squid-devel.patch (text/plain), 4.54 KB, created by Pavel Timofeev on 2020-05-12 08:47:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2020-05-12 08:47:35 UTC

Size: 4.54 KB

patch

obsolete

>diff -ruN /root/squid-devel.old/Makefile squid-devel/Makefile
>--- /root/squid-devel.old/Makefile	2020-05-12 11:38:07.503278000 +0300
>+++ squid-devel/Makefile	2020-05-12 11:41:58.600729000 +0300
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	squid
> PORTVERSION=	5.0.2
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://www.squid-cache.org/Versions/v5/ \
> 		http://www2.us.squid-cache.org/Versions/v5/ \
>diff -ruN /root/squid-devel.old/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc
>--- /root/squid-devel.old/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc	2020-05-12 11:38:07.504320000 +0300
>+++ squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc	2020-05-12 11:41:24.169822000 +0300
>@@ -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
>diff -ruN /root/squid-devel.old/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc
>--- /root/squid-devel.old/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc	1970-01-01 03:00:00.000000000 +0300
>+++ squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc	2020-05-12 11:41:24.170335000 +0300
>@@ -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 -ruN /root/squid-devel.old/files/patch-src_acl_external_session_ext__session__acl.cc squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc
>--- /root/squid-devel.old/files/patch-src_acl_external_session_ext__session__acl.cc	2020-05-12 11:38:07.505619000 +0300
>+++ squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc	2020-05-12 11:41:24.170687000 +0300
>@@ -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);
>diff -ruN /root/squid-devel.old/pkg-plist squid-devel/pkg-plist
>--- /root/squid-devel.old/pkg-plist	2020-05-12 11:38:07.503476000 +0300
>+++ squid-devel/pkg-plist	2020-05-12 11:41:45.631493000 +0300
>@@ -50,11 +50,7 @@
> %%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

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 246355: 214343 | 214408 | 214409