svn commit: r397486 - in branches/2015Q3/www/squid: . files
Jason Unovitch
junovitch at FreeBSD.org
Mon Sep 21 11:08:26 UTC 2015
Author: junovitch
Date: Mon Sep 21 11:08:22 2015
New Revision: 397486
URL: https://svnweb.freebsd.org/changeset/ports/397486
Log:
MFH r391555, r392222, r393602, r396106, r396185, r397215, r397476
r391555
www/squid: Support DragonFly SHM segments
Out of the box, squid would not run on dragonfly due to its handling
of SHM segments. On DragonFly, SHM segments are always treated as files
but on FreeBSD it depends on whether or not application is inside a jail.
In any case, the case for DragonFly was no supported, so it has been
added via patch. This also requires the return of /var/run/squid
directory which is where the SHM files are stored (defined by
localstatedir and supported by RC script). The RC script would define
this directory if missing, but let's make sure it is always available.
PR: 201405
Submitted by: marino
Approved by: maintainer (timp87/gmail)
r392222
www/squid: pkg-list fix
- add missing pkg-plist entry (SSL_CRTD option)
PR: 201463
Submitted by: s3erios at gmail.com
Approved by: timp87 at gmail.com (maintainer)
r393602
www/squid: update 3.5.6 -> 3.5.7
- Fix build with ecap by clang
- Get rid of useless and always empty /var/squid/logs
- Rework patches to make portlint a bit happier
PR: 202053
Submitted by: Pavel Timofeev <timp87 at gmail.com> (maintainer)
r396106
www/squid: update 3.5.7 -> 3.5.8
PR: 202826
Submitted by: Pavel Timofeev <timp87 at gmail.com> (maintainer)
Approved by: feld (mentor)
r396185
Fix TP_IPF build.
r397215
Rather than produce a warning message that IPv6 is not supported
under ipfilter 4 (FreeBSD 9) every tenth time, reduce the message
to one in a million. This has the effect of displaying the message
at or shortly after startup with a reminder every blue moon.
PR: 202950
r397476
www/squid: security update and build fix
- security update 3.5.8 -> 3.5.9 [1]
- Fix TP_IPF build on FreeBSD 9 [2]
PR: 203186 [1]
PR: 202950 [2]
Approved by: Pavel Timofeev <timp87 at gmail.com> (maintainer) [1]
Security: d3a98c2d-5da1-11e5-9909-002590263bf5
Approved by: portmgr (erwin)
Added:
branches/2015Q3/www/squid/files/patch-compat_shm.cc
- copied unchanged from r391555, head/www/squid/files/patch-compat_shm.cc
branches/2015Q3/www/squid/files/patch-configure
- copied, changed from r393602, head/www/squid/files/patch-configure
branches/2015Q3/www/squid/files/patch-src__ip__Intercept.cc
- copied, changed from r397215, head/www/squid/files/patch-src__ip__Intercept.cc
Deleted:
branches/2015Q3/www/squid/files/patch-bug4190
branches/2015Q3/www/squid/files/patch-configure_GSSAPI_NONE
branches/2015Q3/www/squid/files/patch-configure_NIS
branches/2015Q3/www/squid/files/patch-configure_crypt.h
Modified:
branches/2015Q3/www/squid/Makefile
branches/2015Q3/www/squid/distinfo
branches/2015Q3/www/squid/files/extra-patch-build-8-9
branches/2015Q3/www/squid/files/patch-compat_compat.h
branches/2015Q3/www/squid/files/patch-src-cf.data.pre
branches/2015Q3/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc
branches/2015Q3/www/squid/files/patch-src_ipc_mem_Segment.cc
branches/2015Q3/www/squid/files/patch-src_tools.cc
branches/2015Q3/www/squid/pkg-plist
Directory Properties:
branches/2015Q3/ (props changed)
Modified: branches/2015Q3/www/squid/Makefile
==============================================================================
--- branches/2015Q3/www/squid/Makefile Mon Sep 21 11:02:21 2015 (r397485)
+++ branches/2015Q3/www/squid/Makefile Mon Sep 21 11:08:22 2015 (r397486)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= squid
-PORTVERSION= 3.5.6
+PORTVERSION= 3.5.9
CATEGORIES= www ipv6
MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
@@ -255,12 +255,6 @@ CONFIGURE_ARGS+= --enable-auth-basic="${
--enable-auth-negotiate="${negotiate_auth}" \
--enable-auth-ntlm="${ntlm_auth}"
-.if ${PORT_OPTIONS:MECAP}
-. if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-BROKEN= Squid with eCAP enabled can't be compiled by clang
-. endif
-.endif
-
# Storage schemes:
storage_schemes= ufs
diskio_modules= AIO Blocking IpcIo Mmapped
@@ -354,8 +348,6 @@ post-install:
${STAGEDIR}${EXAMPLESDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})
- ${MKDIR} ${STAGEDIR}/var/squid/logs
- ${RMDIR} ${STAGEDIR}/var/run/squid
.include <bsd.port.pre.mk>
Modified: branches/2015Q3/www/squid/distinfo
==============================================================================
--- branches/2015Q3/www/squid/distinfo Mon Sep 21 11:02:21 2015 (r397485)
+++ branches/2015Q3/www/squid/distinfo Mon Sep 21 11:08:22 2015 (r397486)
@@ -1,2 +1,2 @@
-SHA256 (squid3.5/squid-3.5.6.tar.xz) = cd080e8d5eaabebf6808792751322bd05f2a9c8fe4377f54c7155682ef6c38d5
-SIZE (squid3.5/squid-3.5.6.tar.xz) = 2291152
+SHA256 (squid3.5/squid-3.5.9.tar.xz) = 9e9a3dc16e6f97258f2c3589dc6163bec20fb9369aec1fe03612dbca76d185d3
+SIZE (squid3.5/squid-3.5.9.tar.xz) = 2296384
Modified: branches/2015Q3/www/squid/files/extra-patch-build-8-9
==============================================================================
--- branches/2015Q3/www/squid/files/extra-patch-build-8-9 Mon Sep 21 11:02:21 2015 (r397485)
+++ branches/2015Q3/www/squid/files/extra-patch-build-8-9 Mon Sep 21 11:08:22 2015 (r397486)
@@ -1,6 +1,6 @@
---- helpers/negotiate_auth/kerberos/negotiate_kerberos.h.orig 2015-04-04 11:08:51.000000000 +0400
-+++ helpers/negotiate_auth/kerberos/negotiate_kerberos.h 2015-04-04 11:11:10.000000000 +0400
-@@ -135,7 +135,7 @@
+--- helpers/negotiate_auth/kerberos/negotiate_kerberos.h.orig 2015-08-01 06:08:17 UTC
++++ helpers/negotiate_auth/kerberos/negotiate_kerberos.h
+@@ -140,7 +140,7 @@ int check_gss_err(OM_uint32 major_status
char *gethost_name(void);
Modified: branches/2015Q3/www/squid/files/patch-compat_compat.h
==============================================================================
--- branches/2015Q3/www/squid/files/patch-compat_compat.h Mon Sep 21 11:02:21 2015 (r397485)
+++ branches/2015Q3/www/squid/files/patch-compat_compat.h Mon Sep 21 11:08:22 2015 (r397486)
@@ -1,5 +1,5 @@
---- compat/compat.h.orig 2015-02-26 17:09:19.142090018 +0300
-+++ compat/compat.h 2015-02-26 17:09:42.440097986 +0300
+--- compat/compat.h.orig 2015-08-01 06:08:17 UTC
++++ compat/compat.h
@@ -42,17 +42,6 @@
#endif
#endif
Copied: branches/2015Q3/www/squid/files/patch-compat_shm.cc (from r391555, head/www/squid/files/patch-compat_shm.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q3/www/squid/files/patch-compat_shm.cc Mon Sep 21 11:08:22 2015 (r397486, copy of r391555, head/www/squid/files/patch-compat_shm.cc)
@@ -0,0 +1,11 @@
+--- compat/shm.cc.orig 2015-05-28 11:06:38 UTC
++++ compat/shm.cc
+@@ -29,6 +29,8 @@ shm_portable_segment_name_is_path()
+ size_t len = sizeof(jailed);
+ ::sysctlbyname("security.jail.jailed", &jailed, &len, NULL, 0);
+ return !jailed;
++#elif defined (__DragonFly__)
++ return true;
+ #else
+ return false;
+ #endif
Copied and modified: branches/2015Q3/www/squid/files/patch-configure (from r393602, head/www/squid/files/patch-configure)
==============================================================================
--- head/www/squid/files/patch-configure Wed Aug 5 18:32:18 2015 (r393602, copy source)
+++ branches/2015Q3/www/squid/files/patch-configure Mon Sep 21 11:08:22 2015 (r397486)
@@ -1,6 +1,6 @@
---- configure.orig 2015-08-05 08:12:21 UTC
-+++ configure
-@@ -23559,7 +23559,9 @@ fi
+--- configure.orig 2015-09-01 12:53:55.000000000 -0700
++++ configure 2015-09-05 00:14:50.050817462 -0700
+@@ -23624,7 +23624,9 @@
if test $ac_with_krb5_count -gt 1 ; then
as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5
@@ -11,7 +11,7 @@
# 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
-@@ -31973,7 +31975,7 @@ done
+@@ -32038,7 +32040,7 @@
##
BUILD_HELPER="NIS"
@@ -20,7 +20,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-@@ -31988,8 +31990,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
+@@ -32053,8 +32055,10 @@
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -33,7 +33,7 @@
fi
done
-@@ -32454,7 +32458,7 @@ done
+@@ -32519,7 +32523,7 @@
# unconditionally requires crypt(3), for now
if test "x$ac_cv_func_crypt" != "x"; then
@@ -42,7 +42,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-@@ -34509,7 +34513,7 @@ for ac_header in \
+@@ -34574,7 +34578,7 @@
arpa/nameser.h \
assert.h \
bstring.h \
@@ -51,3 +51,43 @@
ctype.h \
direct.h \
errno.h \
+@@ -34785,6 +34789,7 @@
+ #include <netinet/ip.h>
+ #endif
+ #if HAVE_NETINET_IP_COMPAT_H
++#include <net/if.h> /* IFNAMSIZ */
+ #include <netinet/ip_compat.h>
+ #endif
+ #if HAVE_NETINET_IP_FIL_H
+@@ -38773,6 +38778,7 @@
+ # include <sys/ioccom.h>
+ # include <netinet/in.h>
+
++# include <net/if.h> /* IFNAMSIZ */
+ # include <netinet/ip_compat.h>
+ # include <netinet/ip_fil.h>
+ # include <netinet/ip_nat.h>
+@@ -38803,6 +38809,7 @@
+ # include <sys/ioccom.h>
+ # include <netinet/in.h>
+ #undef minor_t
++# include <net/if.h> /* IFNAMSIZ */
+ # include <netinet/ip_compat.h>
+ # include <netinet/ip_fil.h>
+ # include <netinet/ip_nat.h>
+@@ -38847,6 +38854,7 @@
+ ip_fil_compat.h \
+ ip_fil.h \
+ ip_nat.h \
++ net/if.h \
+ netinet/ip_compat.h \
+ netinet/ip_fil_compat.h \
+ netinet/ip_fil.h \
+@@ -38876,6 +38884,7 @@
+ #if HAVE_IP_COMPAT_H
+ #include <ip_compat.h>
+ #elif HAVE_NETINET_IP_COMPAT_H
++#include <net/if.h> /* IFNAMSIZ */
+ #include <netinet/ip_compat.h>
+ #endif
+ #if HAVE_IP_FIL_H
Modified: branches/2015Q3/www/squid/files/patch-src-cf.data.pre
==============================================================================
--- branches/2015Q3/www/squid/files/patch-src-cf.data.pre Mon Sep 21 11:02:21 2015 (r397485)
+++ branches/2015Q3/www/squid/files/patch-src-cf.data.pre Mon Sep 21 11:08:22 2015 (r397486)
@@ -1,13 +1,13 @@
---- src/cf.data.pre.orig 2015-02-26 17:56:12.817890613 +0300
-+++ src/cf.data.pre 2015-02-26 17:56:41.556917775 +0300
-@@ -4461,6 +4461,10 @@
+--- src/cf.data.pre.orig 2015-08-01 06:08:17 UTC
++++ src/cf.data.pre
+@@ -4537,6 +4537,10 @@ DEFAULT: @DEFAULT_PID_FILE@
LOC: Config.pidFilename
DOC_START
A filename to write the process-id to. To disable, enter "none".
+
+ Note: If you change this setting, you need to set squid_pidfile
+ in /etc/rc.conf to reflect the new value. Please see
-+ %%PREFIX%%/etc/rc.d/squid for details.
++ /usr/local/etc/rc.d/squid for details.
DOC_END
NAME: client_netmask
Modified: branches/2015Q3/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc
==============================================================================
--- branches/2015Q3/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc Mon Sep 21 11:02:21 2015 (r397485)
+++ branches/2015Q3/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc Mon Sep 21 11:08:22 2015 (r397486)
@@ -1,6 +1,6 @@
---- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-04-15 10:39:56.146312000 +0300
-+++ src/DiskIO/Mmapped/MmappedFile.cc 2015-04-15 10:40:53.487834000 +0300
-@@ -235,7 +235,7 @@
+--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-08-01 06:08:17 UTC
++++ src/DiskIO/Mmapped/MmappedFile.cc
+@@ -235,7 +235,7 @@ Mmapping::map()
static const int pageSize = getpagesize();
delta = offset % pageSize;
Copied and modified: branches/2015Q3/www/squid/files/patch-src__ip__Intercept.cc (from r397215, head/www/squid/files/patch-src__ip__Intercept.cc)
==============================================================================
--- head/www/squid/files/patch-src__ip__Intercept.cc Fri Sep 18 05:12:12 2015 (r397215, copy source)
+++ branches/2015Q3/www/squid/files/patch-src__ip__Intercept.cc Mon Sep 21 11:08:22 2015 (r397486)
@@ -9,7 +9,7 @@
static int warningLevel = DBG_CRITICAL;
debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1");
- warningLevel = ++warningLevel % 10;
-+ warningLevel = ++warningLevel % 1048576;
++ warningLevel = (warningLevel + 1) % 1048576;
return false;
#else
natLookup.nl_v = 6;
Modified: branches/2015Q3/www/squid/files/patch-src_ipc_mem_Segment.cc
==============================================================================
--- branches/2015Q3/www/squid/files/patch-src_ipc_mem_Segment.cc Mon Sep 21 11:02:21 2015 (r397485)
+++ branches/2015Q3/www/squid/files/patch-src_ipc_mem_Segment.cc Mon Sep 21 11:08:22 2015 (r397486)
@@ -1,6 +1,6 @@
---- src/ipc/mem/Segment.cc.orig 2015-04-15 10:38:29.724278000 +0300
-+++ src/ipc/mem/Segment.cc 2015-04-15 10:39:37.130756000 +0300
-@@ -150,7 +150,7 @@
+--- src/ipc/mem/Segment.cc.orig 2015-08-01 06:08:17 UTC
++++ src/ipc/mem/Segment.cc
+@@ -150,7 +150,7 @@ Ipc::Mem::Segment::attach()
assert(theSize == static_cast<off_t>(static_cast<size_t>(theSize)));
void *const p =
Modified: branches/2015Q3/www/squid/files/patch-src_tools.cc
==============================================================================
--- branches/2015Q3/www/squid/files/patch-src_tools.cc Mon Sep 21 11:02:21 2015 (r397485)
+++ branches/2015Q3/www/squid/files/patch-src_tools.cc Mon Sep 21 11:08:22 2015 (r397486)
@@ -1,6 +1,6 @@
---- src/tools.cc.orig 2014-08-19 13:38:40.000000000 +0400
-+++ src/tools.cc 2014-08-19 13:39:00.000000000 +0400
-@@ -735,7 +735,7 @@
+--- src/tools.cc.orig 2015-08-01 06:08:17 UTC
++++ src/tools.cc
+@@ -635,7 +635,7 @@ no_suid(void)
uid = geteuid();
debugs(21, 3, "no_suid: PID " << getpid() << " giving up root priveleges forever");
Modified: branches/2015Q3/www/squid/pkg-plist
==============================================================================
--- branches/2015Q3/www/squid/pkg-plist Mon Sep 21 11:02:21 2015 (r397485)
+++ branches/2015Q3/www/squid/pkg-plist Mon Sep 21 11:08:22 2015 (r397486)
@@ -2171,11 +2171,12 @@ man/man8/ext_unix_group_acl.8.gz
%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz
%%AUTH_KERB%%man/man8/negotiate_kerberos_auth.8.gz
man/man8/squid.8.gz
+%%SSL_CRTD%%man/man8/ssl_crtd.8.gz
man/man8/storeid_file_rewrite.8.gz
sbin/purge
sbin/squid
sbin/squidclient
@dir(squid,squid,750) /var/log/squid
+ at dir(squid,squid,750) /var/run/squid
@dir(squid,squid,750) /var/squid
@dir(squid,squid,750) /var/squid/cache
- at dir(squid,squid,750) /var/squid/logs
More information about the svn-ports-branches
mailing list