Date: Sat, 17 Jan 2015 12:50:57 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377223 - in head/www/squid: . files Message-ID: <201501171250.t0HCovew034336@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Jan 17 12:50:56 2015 New Revision: 377223 URL: https://svnweb.freebsd.org/changeset/ports/377223 QAT: https://qat.redports.org/buildarchive/r377223/ Log: - Update to 3.4.11 - Fix STACKTRACES option - Put correct permissions on /var directories creted by the port PR: 196711 Submitted by: timp87 at gmail.com Added: head/www/squid/files/patch-compat_compat.h (contents, props changed) Modified: head/www/squid/Makefile head/www/squid/distinfo head/www/squid/files/extra-patch-gen-stacktrace head/www/squid/pkg-plist Modified: head/www/squid/Makefile ============================================================================== --- head/www/squid/Makefile Sat Jan 17 12:15:38 2015 (r377222) +++ head/www/squid/Makefile Sat Jan 17 12:50:56 2015 (r377223) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.4.10 -PORTREVISION= 2 +PORTVERSION= 3.4.11 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ @@ -98,6 +97,7 @@ SSL_CONFIGURE_ENABLE= ssl SSL_CRTD_CONFIGURE_ENABLE= ssl-crtd STACKTRACES_CONFIGURE_ENABLE= stacktraces STACKTRACES_LIB_DEPENDS= libunwind.so:${PORTSDIR}/devel/libunwind +STACKTRACES_CONFIGURE_ON= --disable-strict-error-checking TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent TP_IPF_CONFIGURE_ENABLE= ipf-transparent TP_PF_CONFIGURE_ENABLE= pf-transparent Modified: head/www/squid/distinfo ============================================================================== --- head/www/squid/distinfo Sat Jan 17 12:15:38 2015 (r377222) +++ head/www/squid/distinfo Sat Jan 17 12:50:56 2015 (r377223) @@ -1,2 +1,2 @@ -SHA256 (squid3.4/squid-3.4.10.tar.xz) = fb6dccf9ba426eddfc7b5dfe8786971f9779c571a53739a8a41024b09b12f888 -SIZE (squid3.4/squid-3.4.10.tar.xz) = 2161192 +SHA256 (squid3.4/squid-3.4.11.tar.xz) = b4ede14221d043bbde94655aee195b090fe33a9a0a3d4ed83a9b41fcd46cac1d +SIZE (squid3.4/squid-3.4.11.tar.xz) = 2162148 Modified: head/www/squid/files/extra-patch-gen-stacktrace ============================================================================== --- head/www/squid/files/extra-patch-gen-stacktrace Sat Jan 17 12:15:38 2015 (r377222) +++ head/www/squid/files/extra-patch-gen-stacktrace Sat Jan 17 12:50:56 2015 (r377223) @@ -60,65 +60,3 @@ #endif /* PRINT_STACK_TRACE */ #if SA_RESETHAND == 0 && !_SQUID_WINDOWS_ ---- src/tools.cc.orig 2014-10-31 12:36:43.000000000 +0300 -+++ src/tools.cc 2014-11-21 14:11:25.000000000 +0300 -@@ -71,6 +71,13 @@ - #include <errno.h> - #endif - -+#if PRINT_STACK_TRACE -+#ifdef __FreeBSD__ -+#define UNW_LOCAL_ONLY -+#include <libunwind.h> -+#endif -+#endif -+ - #define DEAD_MSG "\ - The Squid Cache (version %s) died.\n\ - \n\ -@@ -411,6 +418,45 @@ - } - - #endif -+#ifdef __FreeBSD__ -+ do { -+ unw_context_t unw_ctx; -+ unw_cursor_t unw_cp; -+ unw_word_t sp, ip, off; -+ int rc = 0; -+ char procname[256]; -+ size_t frame; -+ -+ bzero((void *)&unw_ctx, sizeof(unw_ctx)); -+ bzero((void *)&unw_cp, sizeof(unw_cp)); -+ -+ if ((rc = unw_getcontext(&unw_ctx))) { -+ fprintf(debug_log, "Failed to trace own stack: " -+ "unw_context() said '%s'.\n", unw_strerror(rc)); -+ break; -+ } -+ if ((rc = unw_init_local(&unw_cp, &unw_ctx))) { -+ fprintf(debug_log, "Failed to trace own stack: " -+ "unw_init_local() said '%s'.\n", unw_strerror(rc)); -+ break; -+ } -+ frame = 0; -+ fprintf(debug_log, "Backtrace follows (deepest frame first):\n"); -+ while ((rc = unw_step(&unw_cp)) > 0) { -+ frame++; -+ ip = 0; sp = 0; -+ unw_get_reg(&unw_cp, UNW_REG_IP, &ip); -+ unw_get_reg(&unw_cp, UNW_REG_SP, &sp); -+ off = 0; -+ rc = unw_get_proc_name(&unw_cp, procname, sizeof(procname), &off); -+ if (rc) -+ snprintf (procname, sizeof(procname), "[unknown]"); -+ fprintf(debug_log, "#%zd: %s + 0x%zx, ip = 0x%zx, sp = 0x%zx\n", -+ frame, procname, (size_t)off, (size_t)ip, (size_t)sp); -+ } -+ fprintf(debug_log, "Use addr2line of similar to translate offsets to line information.\n"); -+ } while (0); -+#endif /* __FreeBSD__ */ - #endif /* PRINT_STACK_TRACE */ - - #if SA_RESETHAND == 0 && !_SQUID_WINDOWS_ Added: head/www/squid/files/patch-compat_compat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid/files/patch-compat_compat.h Sat Jan 17 12:50:56 2015 (r377223) @@ -0,0 +1,20 @@ +--- compat/compat.h.orig 2015-01-13 11:53:17 UTC ++++ compat/compat.h +@@ -34,17 +34,6 @@ + #endif + #endif + +-/* Solaris 10 has a broken definition for minor_t in IPFilter compat. +- * We must pre-define before doing anything with OS headers so the OS +- * do not. Then un-define it before using the IPFilter *_compat.h headers. +- */ +-#if IPF_TRANSPARENT && USE_SOLARIS_IPFILTER_MINOR_T_HACK +-/* But we only need do this nasty thing for src/ip/Intercept.cc */ +-#if BUILDING_SQUID_IP_INTERCEPT_CC +-#define minor_t solaris_minor_t_fubar +-#endif +-#endif +- + /*****************************************************/ + /* FDSETSIZE is messy and needs to be done before */ + /* sys/types.h are defined. */ Modified: head/www/squid/pkg-plist ============================================================================== --- head/www/squid/pkg-plist Sat Jan 17 12:15:38 2015 (r377222) +++ head/www/squid/pkg-plist Sat Jan 17 12:50:56 2015 (r377223) @@ -2118,7 +2118,7 @@ man/man8/squid.8.gz sbin/purge sbin/squid sbin/squidclient -@dir /var/log/squid -@dir /var/squid/cache -@dir /var/squid/logs -@dir /var/squid +@dir(squid,squid,750) /var/log/squid +@dir(squid,squid,750) /var/squid/cache +@dir(squid,squid,750) /var/squid/logs +@dir(squid,squid,750) /var/squid
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501171250.t0HCovew034336>