Attachment 156662 Details for Bug 200070 – patch

[patch] patch

squid-3.5.4.patch (text/plain), 2.24 KB, created by Pavel Timofeev on 2015-05-11 17:25:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2015-05-11 17:25:24 UTC

Size: 2.24 KB

patch

obsolete

>diff -ruN /home/timp/squid.orig/Makefile /usr/ports/www/squid/Makefile
>--- /home/timp/squid.orig/Makefile	2015-05-08 21:49:46.143053000 +0300
>+++ /usr/ports/www/squid/Makefile	2015-05-09 13:31:11.295853000 +0300
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/www/squid/Makefile 385128 2015-05-01 17:00:38Z marino $
> 
> PORTNAME=	squid
>-PORTVERSION=	3.5.3
>-PORTREVISION=	1
>+PORTVERSION=	3.5.4
> CATEGORIES=	www ipv6
> MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
> 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
>@@ -257,8 +256,8 @@
> 			--enable-auth-negotiate="${negotiate_auth}" \
> 			--enable-auth-ntlm="${ntlm_auth}"
> 
>-.if ${PORT_OPTIONS:MECAP}
>-BROKEN=			It needs eCAP 1.0 lib, which isn't in ports tree now
>+.if ${PORT_OPTIONS:MECAP} && ${OSVERSION} >= 1000000
>+BROKEN=			Squid with eCAP enabled can't be compiled by clang
> .endif
> 
> # Storage schemes:
>diff -ruN /home/timp/squid.orig/distinfo /usr/ports/www/squid/distinfo
>--- /home/timp/squid.orig/distinfo	2015-05-02 20:20:03.308530000 +0300
>+++ /usr/ports/www/squid/distinfo	2015-05-02 20:21:22.226030000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (squid3.5/squid-3.5.3.tar.xz) = 73ec65a08384a3ec93ccc17e89ef7a06ba221816551946f2f051cc736c2981c0
>-SIZE (squid3.5/squid-3.5.3.tar.xz) = 2283580
>+SHA256 (squid3.5/squid-3.5.4.tar.xz) = dce615d08e349caf3975fc5d51ce4c3c69b9995fb83f51dc5d55ae873d8bf6a4
>+SIZE (squid3.5/squid-3.5.4.tar.xz) = 2289772
>diff -ruN /home/timp/squid.orig/files/patch-configure_GSSAPI_NONE /usr/ports/www/squid/files/patch-configure_GSSAPI_NONE
>--- /home/timp/squid.orig/files/patch-configure_GSSAPI_NONE	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/www/squid/files/patch-configure_GSSAPI_NONE	2015-05-09 10:07:26.782529000 +0300
>@@ -0,0 +1,11 @@
>+--- configure.orig	2015-04-17 17:02:35.628352000 +0300
>++++ configure	2015-04-17 17:02:49.171299000 +0300
>+@@ -23544,7 +23544,7 @@
>+ 
>+ if test $ac_with_krb5_count -gt 1 ; then
>+   as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5
>+-elif test $ac_with_krb5_count -eq 0 ; then
>++elif test $ac_with_krb5_count -eq 100 ; then
>+   # find installed libs via pkg-config or krb5-config
>+   if test -n "$PKG_CONFIG" && \
>+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gssapi-krb5 krb5\""; } >&5

Actions: View | Diff

Attachments on bug 200070: 156556 | 156557 | 156662 | 156684 | 157243 | 157246