svn commit: r391555 - in head/www/squid: . files

[John Marino]

Author: marino
Date: Wed Jul  8 09:30:17 2015
New Revision: 391555
URL: https://svnweb.freebsd.org/changeset/ports/391555

Log:
  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)

Added:
  head/www/squid/files/patch-compat_shm.cc   (contents, props changed)
Modified:
  head/www/squid/Makefile
  head/www/squid/pkg-plist

Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile	Wed Jul  8 09:17:44 2015	(r391554)
+++ head/www/squid/Makefile	Wed Jul  8 09:30:17 2015	(r391555)
@@ -355,7 +355,6 @@ post-install:
 	@${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>
 

Added: head/www/squid/files/patch-compat_shm.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/squid/files/patch-compat_shm.cc	Wed Jul  8 09:30:17 2015	(r391555)
@@ -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

Modified: head/www/squid/pkg-plist
==============================================================================
--- head/www/squid/pkg-plist	Wed Jul  8 09:17:44 2015	(r391554)
+++ head/www/squid/pkg-plist	Wed Jul  8 09:30:17 2015	(r391555)
@@ -2176,6 +2176,7 @@ 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
 @dir(squid,squid,750) /var/squid/logs