Attachment 168888 Details for Bug 208463 – port patch

[patch] port patch

squid-3.5.16.patch (text/plain), 5.28 KB, created by Pavel Timofeev on 2016-04-02 07:03:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2016-04-02 07:03:56 UTC

Size: 5.28 KB

patch

obsolete

>diff -ruN /home/timp/squid.bak/Makefile squid/Makefile
>--- /home/timp/squid.bak/Makefile	2016-04-02 09:52:59.802846000 +0300
>+++ squid/Makefile	2016-04-02 09:53:43.955511000 +0300
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/www/squid/Makefile 412351 2016-04-01 14:33:55Z mat $
> 
> PORTNAME=	squid
>-PORTVERSION=	3.5.15
>-PORTREVISION=	2
>+PORTVERSION=	3.5.16
> CATEGORIES=	www ipv6
> MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
> 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
>@@ -18,22 +17,7 @@
> 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
> 		http://master.squid-cache.org/~amosjeffries/patches/:nosid
> PATCH_SITE_SUBDIR=	Versions/v3/${PORTVERSION:R}/changesets
>-PATCHFILES=	squid-3.5-13997.patch \
>-		squid-3.5-13998.patch \
>-		squid-3.5-13999.patch \
>-		squid-3.5-14000.patch \
>-		squid-3.5-14001.patch \
>-		squid-3.5-14002.patch \
>-		squid-3.5-14003.patch \
>-		squid-3.5-14004.patch \
>-		squid-3.5-14005.patch \
>-		squid-3.5-14006.patch \
>-		squid-3.5-14007.patch \
>-		squid-3.5-14008.patch \
>-		squid-3.5-14009.patch \
>-		squid-3.5-14010.patch \
>-		squid-3.5-14011.patch \
>-		squid-3.5-14012.patch
>+#PATCHFILES=	
> 
> MAINTAINER=	timp87@gmail.com
> COMMENT=	HTTP Caching Proxy
>diff -ruN /home/timp/squid.bak/distinfo squid/distinfo
>--- /home/timp/squid.bak/distinfo	2016-04-02 09:52:59.802990000 +0300
>+++ squid/distinfo	2016-04-02 09:53:43.955964000 +0300
>@@ -1,34 +1,2 @@
>-SHA256 (squid3.5/squid-3.5.15.tar.xz) = 9cfce3231c7b3b33816fc54414d8720a51ac5e723663e0685a8bb995b9f450d2
>-SIZE (squid3.5/squid-3.5.15.tar.xz) = 2315628
>-SHA256 (squid3.5/squid-3.5-13997.patch) = 43533b41af0e5d067c576de87842b85a33bac9b293c19d816fa1475324eb89fd
>-SIZE (squid3.5/squid-3.5-13997.patch) = 1509
>-SHA256 (squid3.5/squid-3.5-13998.patch) = c53a9d3e48224b06eedb5867b248e1b1c1226deab73c7c4d9ce8f72524e91214
>-SIZE (squid3.5/squid-3.5-13998.patch) = 8184
>-SHA256 (squid3.5/squid-3.5-13999.patch) = 07e82e0b7f0d766de443277f1153165177c867cbc75514890f2fe4de8d43c820
>-SIZE (squid3.5/squid-3.5-13999.patch) = 1585
>-SHA256 (squid3.5/squid-3.5-14000.patch) = 36578a13e87150d1604b543c68b419de1c941be3f90e80fbf464f9c23139e2de
>-SIZE (squid3.5/squid-3.5-14000.patch) = 1676
>-SHA256 (squid3.5/squid-3.5-14001.patch) = 127720c408c368070b7807092faae7980d900888f8bbaee0e2689b86573fea94
>-SIZE (squid3.5/squid-3.5-14001.patch) = 14099
>-SHA256 (squid3.5/squid-3.5-14002.patch) = 49c8dea344473c103fefce2b830e96fe94af14bc20640a0c244eea01ac03469d
>-SIZE (squid3.5/squid-3.5-14002.patch) = 2054
>-SHA256 (squid3.5/squid-3.5-14003.patch) = 27ccd9aeabf4e66fbf25a914cc614c8f8020c8010e94d2b6bf499def79fce8b6
>-SIZE (squid3.5/squid-3.5-14003.patch) = 1636
>-SHA256 (squid3.5/squid-3.5-14004.patch) = fc515a51866d518f4ff7e57ef92f2554d2715b59f547927af63192302238690f
>-SIZE (squid3.5/squid-3.5-14004.patch) = 1948
>-SHA256 (squid3.5/squid-3.5-14005.patch) = e7f17a11cb49742f6b535e8e4e8558e03f71335524c524f84f1ef68f71f99b93
>-SIZE (squid3.5/squid-3.5-14005.patch) = 1249
>-SHA256 (squid3.5/squid-3.5-14006.patch) = 88dd50a459ed68fb7c797a840f92a0ada6655b3fb92052f679088704eb1d9f32
>-SIZE (squid3.5/squid-3.5-14006.patch) = 2500
>-SHA256 (squid3.5/squid-3.5-14007.patch) = 1e2e14809e7ca8608300cfc3be027cd55c21fbe3084cc4568c8091adebc256c0
>-SIZE (squid3.5/squid-3.5-14007.patch) = 1214
>-SHA256 (squid3.5/squid-3.5-14008.patch) = 6c2f511ee33d74d1c91cae5ef0a9645facf0104067397866dd542bf3ff975255
>-SIZE (squid3.5/squid-3.5-14008.patch) = 1559
>-SHA256 (squid3.5/squid-3.5-14009.patch) = addc7dd78c5632b428f747eab93382195d2d4a820742afd2661ec920f1dc9a77
>-SIZE (squid3.5/squid-3.5-14009.patch) = 1902
>-SHA256 (squid3.5/squid-3.5-14010.patch) = bed1fb437b3f3925293d42c7032c44c7aa4e1944cc6ed17e9cc9e498a06ada7c
>-SIZE (squid3.5/squid-3.5-14010.patch) = 2974
>-SHA256 (squid3.5/squid-3.5-14011.patch) = c87ce0edb4dcb1f0ae49fb10006009534ce1e5922a4ceb8d784386681ce4b164
>-SIZE (squid3.5/squid-3.5-14011.patch) = 2400
>-SHA256 (squid3.5/squid-3.5-14012.patch) = 6f749e014907150cc9692b16edcb9d9a73fdb3831c718d908bd7c48561702b3c
>-SIZE (squid3.5/squid-3.5-14012.patch) = 1287
>+SHA256 (squid3.5/squid-3.5.16.tar.xz) = e73d821180eed8bed230f357c680c0b19f1efa51a24725e810f2b48a2079d385
>+SIZE (squid3.5/squid-3.5.16.tar.xz) = 2317320
>diff -ruN /home/timp/squid.bak/files/patch-configure squid/files/patch-configure
>--- /home/timp/squid.bak/files/patch-configure	2016-04-02 09:52:59.803743000 +0300
>+++ squid/files/patch-configure	2016-04-02 09:53:43.958016000 +0300
>@@ -1,23 +1,5 @@
> --- configure.orig	2015-11-01 10:46:19 UTC
> +++ configure
>-@@ -27731,7 +27731,7 @@
>-   squid_pc_krb5_name="heimdal-gssapi"
>- fi
>-   fi
>--  if test "x$squid_pc_krb5_name" != "x" -a "$cross_compiling" = "no"; then
>-+  if test "x$squid_pc_krb5_name" = "x" -a "$cross_compiling" = "no"; then
>-     # Look for krb5-config (unless cross-compiling)
>-     # Extract the first word of "krb5-config", so it can be a program name with args.
>- set dummy krb5-config; ac_word=$2
>-@@ -27777,7 +27777,7 @@
>-     if test "x$ac_cv_path_krb5_config" != "xno" ; then
>-       krb5confpath="`dirname $ac_cv_path_krb5_config`"
>-       ac_heimdal="`$ac_cv_path_krb5_config --version 2>/dev/null | grep -c -i heimdal`"
>--      if test "x$with_heimdal_krb5" = "xyes"; then
>-+      if test "x$with_heimdal_krb5" = "xyes" -a $ac_heimdal = 0; then
>-         as_fn_error $? "Could not find pkg-config or krb5-config for Heimdal Kerberos" "$LINENO" 5
>-       fi
>-     else
> @@ -32038,7 +32040,7 @@ done
>  ##
>

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 208463: 168888