Attachment #63445 for bug #94642

View | Details | Raw Unified | Return to bug 94642
Collapse All | Expand All




#!/bin/sh
#
# $FreeBSD: ports/www/squid/pkg-install,v 1.21 2006/01/09 13:37:54 jylefort Exp $
#

PATH=/bin:/usr/bin:/usr/sbin
pkgname=$1
squid_base=${PKG_PREFIX:-/usr/local}/squid
squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid
if [ -x /usr/sbin/nologin ]; then
	nologin=/usr/sbin/nologin
else
	nologin=/sbin/nologin
fi
squid_user=${squid_user:-squid}
squid_group=${squid_group:-squid}
squid_gid=100
squid_uid=100
# Try to catch the case where the $squid_user might have been created with an
# id greater than or equal 3128. The valid exception is "nobody".
nobody_uid=65534
nobody_gid=65534
squid_oldgid=3128
squid_olduid=3128
unset wrong_id
case $2 in
PRE-INSTALL)
	echo "===> Pre-installation configuration for ${pkgname}"
	if ! pw groupshow ${squid_group} -q >/dev/null ; then
		echo "There is no group '${squid_group}' on this system, so I will try to create it:"
		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
			echo "Failed to create group \"${squid_group}\"!" >&2
			echo "Please create it manually." >&2
			exit 1
		else
			echo "Group '${squid_group}' created successfully:"
		fi
	else
		echo "I will use the existing group '${squid_group}':"
		current_gid=`pw groupshow ${squid_group}|cut -f 3 -d :`
		if [ ${current_gid} -ge ${squid_oldgid} \
		    -a ${current_gid} -ne ${nobody_gid} ]; then
			wrong_id=1
		fi	
	fi
	pw groupshow ${squid_group}

	if ! pw usershow ${squid_user} -q >/dev/null ; then
		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
		if ! pw useradd -q -n ${squid_user} \
		    -u ${squid_uid} -g ${squid_group} \
	  	    -c "squid caching-proxy pseudo user" \
		    -d "${squid_base}" -s "${nologin}" \
		    -h - ; then
			echo "Failed to create user '${squid_user}'!" >&2
			echo "Please create it manually." >&2
			exit 1
		else
			echo "User '${squid_user}' created successfully:"
		fi
	else
		echo "I will use the existing user '${squid_user}':"
		current_uid=`id -u ${squid_user}`
		if [ ${current_uid} -ge ${squid_olduid} \
		    -a ${current_uid} -ne ${nobody_uid} ];
		then
			wrong_id=1
		fi
	fi
	pw usershow ${squid_user}
	if [ "${wrong_id}" ]; then
		echo ""
		echo " * NOTICE *"
		echo ""
		echo "The squid pseudo-user's uid and/or gid have been found"
		echo "to be greater than or equal 3128."
		echo ""
		echo "This is not a problem as such, but violates the FreeBSD"
		echo "ports' principle that a ports must not claim a uid greater"
		echo "than 999."
		echo ""
		echo "Since version 2.5.4_11, the squid user is thus created"
		echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this"
		echo "port used the first unused uid/gid greater than or"
		echo "equal 3128."
		echo ""
		echo "If you want to change the existing squid user's id, run"
		echo "'make changeuser' after the installation has completed."
		echo "If you installed this port via a package, issue the"
		echo "following commands as root:"
		echo ""
		echo "pw userdel -u ${current_uid}"
		echo "pw groupadd -n ${squid_group} -g ${squid_gid}"
		echo "pw useradd -n ${squid_user} -u ${squid_uid} \\"
		echo "    -c \"squid caching-proxy pseudo user\" \\"
		echo "    -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\"
		echo "    -h -"
		echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;"
		echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
		echo ""
		echo "In case you have installed third party software for squid"
		echo "like squidGuard, you should additionally run:"
		echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;"
		echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
		echo ""
		if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
			sleep 30
		fi
	fi
	for dir in cache logs; do
	if [ ! -d ${squid_base}/${dir} ]; then
		echo "Creating ${squid_base}/${dir}..."
		install -d -o ${squid_user} -g ${squid_group} \
		    -m 0750 ${squid_base}/${dir}
	fi
	done
	if [ ! -d ${squid_confdir} ]; then
		echo "Creating ${squid_confdir}..."
		install -d -o root -g ${squid_group} \
		    -m 0750 ${squid_confdir}
	fi
	;;
POST-INSTALL)
	for file in cachemgr.conf mime.conf squid.conf; do
		if [ ! -f ${squid_confdir}/${file} \
		    -a -f ${squid_confdir}/${file}.default ]; then
			echo "Creating ${file} from default..."
			install -c -o root -g ${squid_group} -m 0640 \
		    	    ${squid_confdir}/${file}.default \
			    ${squid_confdir}/${file}
		fi
	done

	echo "===> Post-installation informations for ${pkgname}"
	echo ""
	echo "     o You can find the configuration files for this package"
	echo "       in the directory ${squid_confdir}."
	echo ""
	echo "     o A cache directory has been created in ${squid_base}/cache."
	echo "       Log files will be written to ${squid_base}/logs."
	echo ""
	echo "     o The default configuration will deny everyone access to the"
	echo "       proxy service. Edit the \"http_access\" directives in"
	echo "       ${squid_confdir}/squid.conf to suit your needs."
	echo ""
	echo "     o If you never ran squid on this system before, you need to"
	echo "       initialize the cache directory by running \"squid -z\""
	echo "       as 'root' or '${squid_user}' before starting squid."
	echo ""
	echo "     Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh is a"
	echo "     new style rc script. This means that squid will not"
	echo "     start automatically at boot time."
	echo ""
	echo "     To enable squid, set squid_enable=yes in either"
	echo "     /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid"
	echo "     See ${PKG_PREFIX}/etc/rc.d/squid.sh for more"
	echo "     configuration options."
	echo ""
	echo "     If you want the port to install an old style rc script, run"
	echo "     'make config' and deselect the option to install an"
	echo "     rcNG script."
	echo ""
	;;
*)
	exit 64
	;;
esac
exit 0




#!/bin/sh
#
# $FreeBSD: ports/www/squid/pkg-deinstall,v 1.6 2005/11/01 14:05:59 krion Exp $
#

PATH=/bin:/usr/bin:/usr/sbin

case $2 in
DEINSTALL)
	cd ${PKG_PREFIX}/etc/squid || exit 1
	for f in cachemgr.conf mime.conf msntauth.conf squid.conf; do
		cmp -s -z ${f} ${f}.default && rm ${f}
	done
	;;
POST-DEINSTALL)
	echo "===> post-deinstallation information for $1"
	echo ""
	echo "     Note:"
	echo "     squid related user accounts and groups were not removed."
	echo ""
	echo "     To remove the 'squid' user and the 'squid' group which were"
	echo "     created by a default installation of this package, run"
	echo ""
	echo "     pw userdel -r -n squid -u 100"
	echo ""
	if  [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then
		echo ""
		echo "     To ease updates, the cache and log directories and"
		echo "     all configuration files modified by you were preserved."
		echo ""
		echo "     Please remove them manually if you do not want to use"
	       	echo "     squid any longer."
	fi
	echo ""
	;;
*)
	exit 64
	;;
esac
exit 0




MD5 (squid2.5/squid-2.5.STABLE13.tar.bz2) = 3e64468e123be1246d17486dab6bee87
SHA256 (squid2.5/squid-2.5.STABLE13.tar.bz2) = c4a7cde3d63559576f704b8a10561d61135a3788423ae417fb728d112b1962a8
SIZE (squid2.5/squid-2.5.STABLE13.tar.bz2) = 1074112
MD5 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 8e83b776c0d015bd4137cc1ca08f6d38
SHA256 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 9ca8427c2eb9e5cbdb5a49fb5cb94fc00853ad965f87666f8fc35236e98bc0ae
SIZE (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826
MD5 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = fe0ab5839d282fda67ffd8eb17f2588d
SHA256 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 9aa671be4022f1126071cf83ca800795f609b731aac74237bc70e11d8f069046
SIZE (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 1615
MD5 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 70485fac2c02d836f7027122e65d5767
SHA256 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 39bf2ca95a3c1fc90a40c437253dbbf6d71f37763369ada287039340a68b873f
SIZE (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 497




#!/bin/sh
#
# $FreeBSD: ports/www/squid/files/squid.sh,v 1.11 2005/12/25 23:38:48 edwin Exp $
#
# --begin rcng
# PROVIDE: squid
# REQUIRE: LOGIN
# KEYWORD: shutdown
# 
# Note:
# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
# /etc/rc.conf.d/squid to make this script actually do something. There
# you can also set squid_chdir, squid_user, and squid_flags.
#
# Please see squid(8), rc.conf(5) and rc(8) for further details.
#
# --end rcng

name=squid
command=%%PREFIX%%/sbin/squid
# --begin rcng
extra_commands=reload
reload_cmd="${command} -k reconfigure"
# --end rcng
stop_cmd="squid_stop"
squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
squid_enable=${squid_enable:-"NO"}
squid_flags=${squid_flags-"-D"}
squid_user=${squid_user:-%%SQUID_UID%%}
default_config=%%PREFIX%%/etc/squid/squid.conf

# --begin rcold
squid_stop() {
	echo -n " ${name}"
	${command} -k shutdown
	while ps -xcU ${squid_user} | grep -q squid; do
		sleep 2
	done
}

# --end rcold
# --begin rcng
squid_stop() {
	${command} -k shutdown
	run_rc_command poll
}

. %%RC_SUBR%%
rcvar=`set_rcvar`
load_rc_config ${name}

# squid(8) will not start if ${default_config} is not present so try
# to catch that beforehand via ${required_files} rather than make
# squid(8) crash.
# If you remove the default configuration file make sure to add
# '-f /path/to/your/squid.conf' to squid_flags

if [ -z "${squid_flags}" ]; then
	required_files=${default_config}
fi
required_dirs=${squid_chdir}
run_rc_command "$1"
# --end rcng
# --begin rcold
case $1 in
start)
	if [ -x "${command}" -a \
		\( -f "${default_config}" -o "${squid_flags}" \) ]; then
		echo -n " ${name}"
		(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
			"${command} ${squid_flags}")
	fi
	;;
stop)
	if [ -x "${command}" ]; then
		${stop_cmd}
	fi
	;;
*)
	echo "usage: ${0##*/} {start|stop}" >&2
	exit 64
	;;
esac
exit 0
# --end rcold




See http://devel.squid-cache.org/icap/ for further information
about the ICAP client project.

Patch last updated: 2006-03-17

Index: errors/Azerbaijani/ERR_ICAP_FAILURE
===================================================================
RCS file: errors/Azerbaijani/ERR_ICAP_FAILURE
diff -N errors/Azerbaijani/ERR_ICAP_FAILURE
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ errors/Azerbaijani/ERR_ICAP_FAILURE	8 Dec 2003 12:30:56 -0000	1.1.2.1
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD>
+<TITLE>ERROR: The requested URL could not be retrieved</TITLE>
+<STYLE type="text/css"><!--BODY{background-color:#ffffff; font-family:verdana,sans-serif}--></STYLE>
+</HEAD><BODY>
+<H1>ERROR</H1>
+<H2>The requested URL could not be retrieved</H2>
+<HR noshade size="1px">
+<P>
+While attempting to retrieve the URL:
+<A HREF="%U">%U</A>
+<P>
+the following error was encountered:
+<UL>
+<LI>
+<STRONG>
+ICAP protocol error.
+</STRONG>
+</UL>
+
+<P>
+<P>
+Some aspect of the ICAP communication failed. Possible problems:
+<UL>
+<LI>ICAP server is not reachable.
+<LI>Illegal response from ICAP server.
+</UL>
+</P>
+
+<P>Your cache administrator is <A HREF="mailto:%w">%w</A>. 
+
Index: errors/Bulgarian/ERR_ICAP_FAILURE
===================================================================
RCS file: errors/Bulgarian/ERR_ICAP_FAILURE

Index: src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid/squid/src/cf.data.pre,v
retrieving revision 1.49.2.86
retrieving revision 1.49.2.33.2.33
diff -p -u -b -r1.49.2.86 -r1.49.2.33.2.33
--- src/cf.data.pre	26 Feb 2006 03:13:57 -0000	1.49.2.86
+++ src/cf.data.pre	16 Feb 2006 17:21:45 -0000	1.49.2.33.2.33
@@ -2397,7 +2397,6 @@ DOC_START
 	ensure correct results it is best to set server_persisten_connections
 	to off when using this directive in such configurations.

 NAME: reply_header_max_size
 COMMENT: (KB)
 TYPE: b_size_t
@@ -2716,6 +2715,187 @@ DOC_START
 DOC_END
 
 COMMENT_START

+LOC: Config.icapcfg.send_client_ip
+DEFAULT: off
+DOC_START
+	Allows Squid to add the "X-Client-IP" header if requested by
+	an ICAP service in it's response to OPTIONS.
+DOC_END
+
+NAME: icap_send_server_ip
+TYPE: onoff
+IFDEF: HS_FEAT_ICAP
+COMMENT: on|off
+LOC: Config.icapcfg.send_server_ip
+DEFAULT: off
+DOC_START
+	Allows Squid to add the "X-Server-IP" header if requested by
+	an ICAP service in it's response to OPTIONS.
+DOC_END
+
+NAME: icap_send_auth_user
+TYPE: onoff
+IFDEF: HS_FEAT_ICAP

+LOC: Config.icapcfg.send_auth_user
+DEFAULT: off
+DOC_START
+	Allows Squid to add the "X-Authenticated-User" header if requested
+	by an ICAP service in it's response to OPTIONS.
+	response to OPTIONS.
+DOC_END
+
+NAME: icap_auth_scheme

Index: src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.47.2.76
retrieving revision 1.47.2.28.2.40
diff -p -u -b -r1.47.2.76 -r1.47.2.28.2.40
--- src/client_side.c	11 Mar 2006 03:16:31 -0000	1.47.2.76
+++ src/client_side.c	6 Dec 2005 21:53:44 -0000	1.47.2.28.2.40
@@ -109,7 +109,7 @@ static const char *const crlf = "\r\n";
 static CWCB clientWriteComplete;

 connStateFree(int fd, void *data)
 {
     ConnStateData *connState = data;
@@ -963,7 +976,6 @@ connStateFree(int fd, void *data)
     } else
 	safe_free(connState->in.buf);
     /* XXX account connState->in.buf */

     cbdataFree(connState);
 #ifdef _SQUID_LINUX_
     /* prevent those nasty RST packets */
@@ -1108,7 +1120,7 @@ clientSetKeepaliveFlag(clientHttpRequest
     }
 }
 

 clientCheckContentLength(request_t * r)
 {
     switch (r->method) {
@@ -1127,7 +1139,7 @@ clientCheckContentLength(request_t * r)
     /* NOT REACHED */
 }
 

 clientCachable(clientHttpRequest * http)
 {
     request_t *req = http->request;
@@ -1153,7 +1165,7 @@ clientCachable(clientHttpRequest * http)
 }
 
 /* Return true if we can query our neighbors for this object */

 clientProcessRequest(clientHttpRequest * http)
 {
     char *url = http->uri;
@@ -2457,6 +2466,11 @@ clientProcessRequest(clientHttpRequest *
     debug(33, 4) ("clientProcessRequest: %s '%s'\n",
 	RequestMethodStr[r->method],
 	url);

     if (r->method == METHOD_CONNECT && !http->redirect.status) {
 	http->log_type = LOG_TCP_MISS;
 	sslStart(http, &http->out.size, &http->al.http.code);
@@ -3001,6 +3015,20 @@ clientReadRequest(int fd, void *data)
 	    (long) conn->in.offset, (long) conn->in.size);
 	len = conn->in.size - conn->in.offset - 1;
     }

     statCounter.syscalls.sock.reads++;
     size = FD_READ_METHOD(fd, conn->in.buf + conn->in.offset, len);
     if (size > 0) {
@@ -3104,7 +3132,8 @@ clientReadRequest(int fd, void *data)
 	    /* add to the client request queue */
 	    for (H = &conn->chr; *H; H = &(*H)->next);
 	    *H = http;

 	    /*
 	     * I wanted to lock 'http' here since its callback data for 
 	     * clientLifetimeTimeout(), but there's no logical place to
@@ -3274,7 +3303,7 @@ clientReadRequest(int fd, void *data)
 }
 
 /* file_read like function, for reading body content */

 clientReadBody(request_t * request, char *buf, size_t size, CBCB * callback, void *cbdata)
 {
     ConnStateData *conn = request->body_reader_data;
@@ -3398,7 +3427,7 @@ clientProcessBody(ConnStateData * conn)
 }
 
 /* Abort a body request */

 	/*
 	 * assume its a persistent connection; just close it
 	 */
@@ -3956,3 +3985,49 @@ varyEvaluateMatch(StoreEntry * entry, re
 	}
     }
 }

Index: src/forward.c
===================================================================
RCS file: /cvsroot/squid/squid/src/forward.c,v
retrieving revision 1.13.6.16
retrieving revision 1.13.6.3.2.15
diff -p -u -b -r1.13.6.16 -r1.13.6.3.2.15
--- src/forward.c	11 Mar 2006 03:16:31 -0000	1.13.6.16
+++ src/forward.c	30 Nov 2005 21:52:15 -0000	1.13.6.3.2.15
@@ -262,7 +262,8 @@ fwdConnectDone(int server_fd, int status
 	else

===================================================================
RCS file: /cvsroot/squid/squid/src/http.c,v
retrieving revision 1.17.6.32
retrieving revision 1.17.6.3.6.40
diff -p -u -b -r1.17.6.32 -r1.17.6.3.6.40
--- src/http.c	19 Oct 2005 02:13:21 -0000	1.17.6.32
+++ src/http.c	17 Feb 2006 12:45:21 -0000	1.17.6.3.6.40
@@ -47,7 +47,7 @@ static CWCB httpSendRequestEntry;
 
 static PF httpReadReply;

     if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
 	comm_close(fd);
 	return;
@@ -579,6 +605,37 @@ httpReadReply(int fd, void *data)
     else
 	delay_id = delayMostBytesAllowed(entry->mem_obj, &read_sz);
 #endif

+	    commSetSelect(fd, COMM_SELECT_READ, httpReadReply, httpState, 0);
+	    return;
+	}
+
+       if(icap->flags.no_content == 1) {
+	 commSetDefer(fd, fwdCheckDeferRead, icap->respmod.entry);
+       }
+    }
+#endif
+
     errno = 0;
     statCounter.syscalls.sock.reads++;
     len = FD_READ_METHOD(fd, buf, read_sz);
@@ -595,7 +652,13 @@ httpReadReply(int fd, void *data)
 	    clen >>= 1;
 	IOStats.Http.read_hist[bin]++;
     }

 	/* Skip whitespace */
 	while (len > 0 && xisspace(*buf))
 	    xmemmove(buf, buf + 1, len--);
@@ -625,6 +688,12 @@ httpReadReply(int fd, void *data)
     } else if (len == 0) {
 	/* Connection closed; retrieval done. */
 	httpState->eof = 1;

 	if (httpState->reply_hdr_state < 2)
 	    /*
 	     * Yes Henrik, there is a point to doing this.  When we
@@ -677,7 +746,28 @@ httpReadReply(int fd, void *data)
 		    EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
 	    }
 	}

 	if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
 	    /*
 	     * the above storeAppend() call could ABORT this entry,
@@ -724,10 +814,21 @@ httpReadReply(int fd, void *data)
 			    ("httpReadReply: Excess data from \"%s %s\"\n",
 			    RequestMethodStr[httpState->orig_request->method],
 			    storeUrl(entry));

 		if (keep_alive) {
 		    /* yes we have to clear all these! */
 		    commSetDefer(fd, NULL, NULL);
@@ -766,6 +867,10 @@ httpReadReply(int fd, void *data)
 		("httpReadReply: Excess data from \"%s %s\"\n",
 		RequestMethodStr[httpState->orig_request->method],
 		storeUrl(entry));

 	    fwdComplete(httpState->fwd);
 	    comm_close(fd);
 	    return;
@@ -776,6 +881,34 @@ httpReadReply(int fd, void *data)
     }
 }
 

 /* This will be called when request write is complete. Schedule read of
  * reply. */
 static void
@@ -803,6 +936,63 @@ httpSendComplete(int fd, char *bufnotuse
 	comm_close(fd);
 	return;
     } else {

 	/*
 	 * Set the read timeout here because it hasn't been set yet.
 	 * We only set the read timeout after the request has been
@@ -811,8 +1001,18 @@ httpSendComplete(int fd, char *bufnotuse
 	 * the timeout for POST/PUT requests that have very large
 	 * request bodies.
 	 */

     }
     httpState->flags.request_sent = 1;
 }
@@ -1010,8 +1210,11 @@ httpBuildRequestHeader(request_t * reque
 	if (!EBIT_TEST(cc->mask, CC_MAX_AGE)) {
 	    const char *url = entry ? storeUrl(entry) : urlCanonical(orig_request);
 	    httpHdrCcSetMaxAge(cc, getMaxAge(url));

 	}
 	/* Set no-cache if determined needed but not found */
 	if (orig_request->flags.nocache && !httpHeaderHas(hdr_in, HDR_PRAGMA))
@@ -1119,6 +1322,7 @@ httpStart(FwdState * fwd)
     int fd = fwd->server_fd;
     HttpStateData *httpState;
     request_t *proxy_req;

     request_t *orig_req = fwd->request;
     debug(11, 3) ("httpStart: \"%s %s\"\n",
 	RequestMethodStr[orig_req->method],
@@ -1156,12 +1360,22 @@ httpStart(FwdState * fwd)
 	httpState->request = requestLink(orig_req);
 	httpState->orig_request = requestLink(orig_req);
     }

RCS file: src/icap_common.c
diff -N src/icap_common.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/icap_common.c	16 Feb 2006 17:21:45 -0000	1.1.2.40
@@ -0,0 +1,817 @@
+/*
+ * $Id$
+ *

+    memBufPrintf(mb, "X-Authenticated-User: %s\r\n", base64_encode(authuser));
+    xfree(authuser);
+}
+
+/*
+ *  icapAddOriginIP
+ *
+ *  Builds and adds the X-Server-IP header to an ICAP request headers.
+ */
+void
+icapAddOriginIP(MemBuf *mb, const char *host)
+{
+  const ipcache_addrs *addrs;
+  struct in_addr s;
+
+  if (host == NULL) {
+    debug(81, 5)("icapAddOriginIP: NULL host\n");
+    return;
+  }
+    
+  addrs = ipcache_gethostbyname(host, IP_LOOKUP_IF_MISS);
+  if (addrs == NULL) {
+    /*
+     * http://www.i-cap.org/spec/draft-stecher-icap-subid-00.txt :
+     *
+     * [...] If the meta information for some header is not available,
+     * the header field MUST be omitted.
+     */
+    debug(81, 5)("icapAddOriginIP: can't tell IP address\n");
+    return;
+  }
+
+  s = addrs->in_addrs[0];
+  memBufPrintf(mb, "X-Server-IP: %s\r\n", inet_ntoa(s));
+}
Index: src/icap_opt.c
===================================================================
RCS file: src/icap_opt.c
diff -N src/icap_opt.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/icap_opt.c	16 Feb 2006 17:21:45 -0000	1.1.2.18
@@ -0,0 +1,523 @@
+
+/*
+ * $Id$

+	    debug(81, 5) ("icapOptParseEntry: X-Include: found X-Client-IP\n");
+	    s->flags.need_x_client_ip = 1;
+	}
+	if (strstr(value_start, "X-Server-IP")) {
+	    debug(81, 5) ("icapOptParseEntry: X-Include: found X-Server-IP\n");
+	    s->flags.need_x_server_ip = 1;
+	}
+	if (strstr(value_start, "X-Authenticated-User")) {
+	    debug(81, 5) ("icapOptParseEntry: X-Include: found X-Authenticated-User\n");
+	    s->flags.need_x_authenticated_user = 1;

RCS file: src/icap_reqmod.c
diff -N src/icap_reqmod.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/icap_reqmod.c	17 Feb 2006 12:50:52 -0000	1.1.2.60
@@ -0,0 +1,981 @@
+
+/*
+ * $Id$

+    else
+	memBufPrintf(&mb, ", null-body=%d", mb_hdr.size);
+    memBufAppend(&mb, crlf, 2);
+
+    if (service->flags.need_x_client_ip && Config.icapcfg.send_client_ip)
+	memBufPrintf(&mb, "X-Client-IP: %s\r\n", client_addr);
+
+    if (service->flags.need_x_server_ip && Config.icapcfg.send_server_ip)
+        icapAddOriginIP(&mb, icap->request->host);
+
+    if ((service->flags.need_x_authenticated_user
+	    && Config.icapcfg.send_auth_user)
+	&& (icap->request->auth_user_request != NULL))
+	icapAddAuthUserHeader(&mb, icap->request->auth_user_request);
+    if (service->keep_alive) {

RCS file: src/icap_respmod.c
diff -N src/icap_respmod.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/icap_respmod.c	17 Feb 2006 12:45:23 -0000	1.1.2.64
@@ -0,0 +1,1057 @@
+
+/*
+ * $Id$

+	memBufPrintf(mb, ", res-body=%1d", o3);
+    else
+	memBufPrintf(mb, ", null-body=%1d", -o3);
+    memBufPrintf(mb, crlf);
+
+    if (service->flags.need_x_client_ip && Config.icapcfg.send_client_ip) {
+    if (Config.icapcfg.send_client_ip || service->flags.need_x_client_ip) {
+	memBufPrintf(mb, "X-Client-IP: %s\r\n", client_addr);
+    }
+
+    if (service->flags.need_x_server_ip && Config.icapcfg.send_server_ip)
+        icapAddOriginIP(mb, icap->request->host);
+
+    if ((service->flags.need_x_authenticated_user
+	    && Config.icapcfg.send_auth_user)
+	&& (icap->request->auth_user_request != NULL)) {
+	icapAddAuthUserHeader(mb, icap->request->auth_user_request);
+    }

+	consumed = -1;
+	o2 = -1;
+	memBufDefInit(&mb_hdr);
+	httpBuildRequestPrefix(icap->request, icap->request,
+			       icap->respmod.entry, &mb_hdr, icap->http_flags);
+	o3 = mb_hdr.size;
+    } else {
+
+	hlen = headersEnd(icap->respmod.req_hdr_copy.buf,

+	httpBuildRequestPrefix(icap->request, icap->request,
+	    icap->respmod.entry, &mb_hdr, icap->http_flags);
+	o2 = mb_hdr.size;
+
+    	/* Copy response header - Append to request header mbuffer */
+	memBufAppend(&mb_hdr,
+		     icap->respmod.req_hdr_copy.buf, icap->respmod.req_hdr_copy.size);
+	o3 = mb_hdr.size;
+    }
+
+    /* Copy response header - Append to request header mbuffer */
+    memBufAppend(&mb_hdr,
+	icap->respmod.req_hdr_copy.buf, icap->respmod.req_hdr_copy.size);
+    o3 = mb_hdr.size;
+
+    service = icap->current_service;
+    assert(service);
+    client_addr = inet_ntoa(icap->request->client_addr);

+#endif
+
+    if (icap->sc == 0) {
+        // http connection has been closed without sending us anything
+        if(len == 0 && theEnd == 1) {
+	    ErrorState *err;
+	    err = errorCon(ERR_INVALID_RESP, HTTP_BAD_GATEWAY);
+	    err->request = requestLink(icap->request);
+	    errorAppendEntry(icap->respmod.entry, err);
+	    comm_close(icap->icap_fd);
+	    return;
+        }
+
+	/* No data sent yet. Start with headers */
+	if ((icap->sc = buildRespModHeader(&mb, icap, buf, len, theEnd)) > 0) {
+	    buf += icap->sc;

+	commSetSelect(fd, COMM_SELECT_READ, icapRespModReadReply, icap, 0);
+#if 1
+	commSetTimeout(fd, Config.Timeout.read, icapReadTimeout, icap);
+	commSetDefer(fd, fwdCheckDeferRead, icap->respmod.entry);
+#else
+	if (icap->flags.wait_for_preview_reply || icap->flags.http_server_eof) {
+	    /*

Index: src/protos.h
===================================================================
RCS file: /cvsroot/squid/squid/src/protos.h,v
retrieving revision 1.41.6.34
retrieving revision 1.41.6.13.2.38
diff -p -u -b -r1.41.6.34 -r1.41.6.13.2.38
--- src/protos.h	26 Feb 2006 03:13:57 -0000	1.41.6.34
+++ src/protos.h	16 Feb 2006 17:21:45 -0000	1.41.6.13.2.38
@@ -292,6 +292,8 @@ extern void whoisStart(FwdState *);
 /* http.c */
 extern int httpCachable(method_t);

 
 extern char *mime_get_header(const char *mime, const char *header);
 extern char *mime_get_header_field(const char *mime, const char *name, const char *prefix);
@@ -1341,4 +1344,53 @@ extern void externalAclShutdown(void);
 extern int externalAclRequiresAuth(void *acl_data);
 extern char *strtokFile(void);
 

+void icapOptInit(void);
+void icapOptShutdown(void);
+void icapOptSetUnreachable(icap_service * s);
+
+/* X-Server-IP support */
+void icapAddOriginIP(MemBuf *, const char *);
+
+/* for debugging purposes only */
+void dump_icap_config(IcapConfig * cfg);
+#endif

Index: src/squid.h
===================================================================
RCS file: /cvsroot/squid/squid/src/squid.h,v
retrieving revision 1.13.6.9
retrieving revision 1.13.6.6.2.11
diff -p -u -b -r1.13.6.9 -r1.13.6.6.2.11
--- src/squid.h	11 Mar 2006 03:16:31 -0000	1.13.6.9
+++ src/squid.h	15 May 2005 20:10:33 -0000	1.13.6.6.2.11
@@ -38,6 +38,14 @@
 #include "config.h"

Index: src/structs.h
===================================================================
RCS file: /cvsroot/squid/squid/src/structs.h,v
retrieving revision 1.48.2.46
retrieving revision 1.48.2.9.2.49
diff -p -u -b -r1.48.2.46 -r1.48.2.9.2.49
--- src/structs.h	11 Mar 2006 03:16:31 -0000	1.48.2.46
+++ src/structs.h	16 Feb 2006 17:21:45 -0000	1.48.2.9.2.49
@@ -384,6 +384,23 @@ struct _RemovalPolicySettings {
     wordlist *args;
 };
 

+    int preview_size;
+    int check_interval;
+    int send_client_ip;
+    int send_server_ip;
+    int send_auth_user;
+    char *auth_scheme;
+};

 };
 
 struct _SquidConfig2 {
@@ -788,7 +807,10 @@ struct _fde {
     } flags;
     squid_off_t bytes_read;
     squid_off_t bytes_written;

     struct _fde_disk {
 	DWCB *wrt_handle;
 	void *wrt_handle_data;
@@ -983,6 +1005,131 @@ struct _http_state_flags {
     unsigned int request_sent:1;
 };
 

+    struct {
+	unsigned int allow_204:1;
+	unsigned int need_x_client_ip:1;
+	unsigned int need_x_server_ip:1;
+	unsigned int need_x_authenticated_user:1;
+    } flags;
+    int preview;

 struct _HttpStateData {
     StoreEntry *entry;
     request_t *request;
@@ -994,10 +1141,14 @@ struct _HttpStateData {
     int fd;
     http_state_flags flags;
     FwdState *fwd;

 	unsigned int hit:1;
     } flags;
     struct {
@@ -1107,6 +1253,9 @@ struct _clientHttpRequest {
     } redirect;
     dlink_node active;
     squid_off_t maxBodySize;

 };
 
 struct _ConnStateData {
@@ -1134,7 +1283,6 @@ struct _ConnStateData {
     struct sockaddr_in me;
     struct in_addr log_addr;
     char rfc931[USER_IDENT_SZ];

     struct {
 	int n;
 	time_t until;
@@ -1685,6 +1833,9 @@ struct _request_t {
     char *peer_login;		/* Configured peer login:password */
     time_t lastmod;		/* Used on refreshes */
     const char *vary_headers;	/* Used when varying entities are detected. Changes how the store key is calculated */

Index: src/url.c
===================================================================
RCS file: /cvsroot/squid/squid/src/url.c,v
retrieving revision 1.7.6.7
retrieving revision 1.7.6.5.2.2
diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.2
--- src/url.c	11 Mar 2006 03:16:31 -0000	1.7.6.7
+++ src/url.c	23 Nov 2005 20:38:56 -0000	1.7.6.5.2.2
@@ -103,6 +103,9 @@ const char *ProtocolStr[] =
     "whois",




#!/bin/sh
#
# $FreeBSD: ports/www/squid/pkg-deinstall,v 1.6 2005/11/01 14:05:59 krion Exp $
#

PATH=/bin:/usr/bin:/usr/sbin

case $2 in
DEINSTALL)
	cd ${PKG_PREFIX}/etc/squid || exit 1
	for f in cachemgr.conf mime.conf msntauth.conf squid.conf; do
		cmp -s -z ${f} ${f}.default && rm ${f}
	done
	;;
POST-DEINSTALL)
	echo "===> post-deinstallation information for $1:"
	echo ""
	echo "     Note:"
	echo "     squid related user accounts and groups were not removed."
	echo ""
	echo "     To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were"
	echo "     created by a default installation of this package, run"
	echo ""
	echo "     pw userdel -r -n %%SQUID_UID%% -u 100"
	echo ""
	if  [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then
		echo ""
		echo "     To ease updates, the cache and log directories and"
		echo "     all configuration files modified by you were preserved."
		echo ""
		echo "     Please remove them manually if you do not want to use"
	       	echo "     squid any longer."
	fi
	echo ""
	;;
*)
	exit 64
	;;
esac
exit 0




#!/bin/sh
#
# $FreeBSD: ports/www/squid/files/squid.sh,v 1.11 2005/12/25 23:38:48 edwin Exp $
#
# --begin rcng
# PROVIDE: squid
# REQUIRE: LOGIN
# KEYWORD: shutdown
# 
# Note:
# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
# /etc/rc.conf.d/squid to make this script actually do something. There
# you can also set squid_chdir, squid_user, and squid_flags.
#
# Please see squid(8), rc.conf(5) and rc(8) for further details.
#
# --end rcng

name=squid
command=%%PREFIX%%/sbin/squid
# --begin rcng
extra_commands=reload
reload_cmd="${command} -k reconfigure"
# --end rcng
stop_cmd="squid_stop"
squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
# --begin rcng
squid_enable=${squid_enable:-"NO"}
# --end rcng
squid_flags=${squid_flags-"-D"}
squid_user=${squid_user:-%%SQUID_UID%%}
default_config=%%PREFIX%%/etc/squid/squid.conf

# --begin rcold
squid_stop() {
	echo -n " ${name}"
	${command} -k shutdown
	while ps -xcU ${squid_user} | grep -q squid; do
		sleep 2
	done
}

# --end rcold
# --begin rcng
squid_stop() {
	${command} -k shutdown
	run_rc_command poll
}

. %%RC_SUBR%%
rcvar=`set_rcvar`
load_rc_config ${name}

# squid(8) will not start if ${default_config} is not present so try
# to catch that beforehand via ${required_files} rather than make
# squid(8) crash.
# If you remove the default configuration file make sure to add
# '-f /path/to/your/squid.conf' to squid_flags

if [ -z "${squid_flags}" ]; then
	required_files=${default_config}
fi
required_dirs=${squid_chdir}
run_rc_command "$1"
# --end rcng
# --begin rcold
case $1 in
start)
	if [ -x "${command}" -a \
		\( -f "${default_config}" -o "${squid_flags}" \) ]; then
		echo -n " ${name}"
		(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
			"${command} ${squid_flags}")
	fi
	;;
stop)
	if [ -x "${command}" ]; then
		${stop_cmd}
	fi
	;;
*)
	echo "usage: ${0##*/} {start|stop}" >&2
	exit 64
	;;
esac
exit 0
# --end rcold




     o You can find the configuration files for this package in the
       directory %%PREFIX%%/etc/squid.
     
     o A cache directory has been created in %%PREFIX%%/squid/cache.
       Log files will be written to %%PREFIX%%/squid/logs.
     
       Note:
       You must initialize new cache directories before you can start
       squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
       If your cache directories are already initialized (e.g. after an
       upgrade of squid) you do not need to initialize them again.

     o The default configuration will deny everyone access to the
       proxy service. Edit the "http_access" directives in
       %%PREFIX%%/etc/squid.conf to suit your needs.
--begin rcng

     Please note that the squid start script is an rc.d style script.
     This means that squid will not start automatically at boot time.

     To enable squid, set squid_enable=yes in either
     etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
     Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
--end rcng




#!/bin/sh
#
# $FreeBSD: ports/www/squid/pkg-install,v 1.21 2006/01/09 13:37:54 jylefort Exp $
#

PATH=/bin:/usr/bin:/usr/sbin
pkgname=$1
squid_base="${PKG_PREFIX:-%%PREFIX%%}/squid"
squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid"
if [ -x /usr/sbin/nologin ]; then
	nologin=/usr/sbin/nologin
else
	nologin=/sbin/nologin
fi
squid_user="%%SQUID_UID%%"
squid_group="%%SQUID_GID%%"
squid_gid=100
squid_uid=100
# Try to catch the case where the $squid_user might have been created with an
# id greater than or equal 3128. The valid exception is "nobody".
nobody_uid=65534
nobody_gid=65534
squid_oldgid=3128
squid_olduid=3128
unset wrong_id
case $2 in
PRE-INSTALL)
	echo "===> Pre-installation configuration for ${pkgname}"
	if ! pw groupshow ${squid_group} -q >/dev/null ; then
		echo "There is no group '${squid_group}' on this system, so I will try to create it:"
		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
			echo "Failed to create group \"${squid_group}\"!" >&2
			echo "Please create it manually." >&2
			exit 1
		else
			echo "Group '${squid_group}' created successfully:"
		fi
	else
		echo "I will use the existing group '${squid_group}':"
		current_gid=`pw groupshow ${squid_group}|cut -f 3 -d :`
		if [ ${current_gid} -ge ${squid_oldgid} \
		    -a ${current_gid} -ne ${nobody_gid} ]; then
			wrong_id=1
		fi	
	fi
	pw groupshow ${squid_group}

	if ! pw usershow ${squid_user} -q >/dev/null ; then
		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
		if ! pw useradd -q -n ${squid_user} \
		    -u ${squid_uid} -g ${squid_group} \
	  	    -c "squid caching-proxy pseudo user" \
		    -d "${squid_base}" -s "${nologin}" \
		    -h - ; then
			echo "Failed to create user '${squid_user}'!" >&2
			echo "Please create it manually." >&2
			exit 1
		else
			echo "User '${squid_user}' created successfully:"
		fi
	else
		echo "I will use the existing user '${squid_user}':"
		current_uid=`id -u ${squid_user}`
		if [ ${current_uid} -ge ${squid_olduid} \
		    -a ${current_uid} -ne ${nobody_uid} ];
		then
			wrong_id=1
		fi
	fi
	pw usershow ${squid_user}
	if [ "${wrong_id}" ]; then
		echo ""
		echo " * NOTICE *"
		echo ""
		echo "The squid pseudo-user's uid and/or gid have been found"
		echo "to be greater than or equal 3128."
		echo ""
		echo "This is not a problem as such, but violates the FreeBSD"
		echo "ports' principle that a ports must not claim a uid greater"
		echo "than 999."
		echo ""
		echo "Since version 2.5.4_11, the squid user is thus created"
		echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this"
		echo "port used the first unused uid/gid greater than or"
		echo "equal 3128."
		echo ""
		echo "If you want to change the existing squid user's id, run"
		echo "'make changeuser' after the installation has completed."
		echo "If you installed this port via a package, issue the"
		echo "following commands as root:"
		echo ""
		echo "pw userdel -u ${current_uid}"
		echo "pw groupadd -n ${squid_group} -g ${squid_gid}"
		echo "pw useradd -n ${squid_user} -u ${squid_uid} \\"
		echo "    -c \"squid caching-proxy pseudo user\" \\"
		echo "    -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\"
		echo "    -h -"
		echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;"
		echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
		echo ""
		echo "In case you have installed third party software for squid"
		echo "like squidGuard, you should additionally run:"
		echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;"
		echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
		echo ""
		if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
			sleep 30
		fi
	fi
	for dir in cache logs; do
	if [ ! -d ${squid_base}/${dir} ]; then
		echo "Creating ${squid_base}/${dir}..."
		install -d -o ${squid_user} -g ${squid_group} \
		    -m 0750 ${squid_base}/${dir}
	fi
	done
	if [ ! -d ${squid_confdir} ]; then
		echo "Creating ${squid_confdir}..."
		install -d -o root -g ${squid_group} \
		    -m 0750 ${squid_confdir}
	fi
	;;
POST-INSTALL)
	for file in cachemgr.conf mime.conf squid.conf; do
		if [ ! -f ${squid_confdir}/${file} \
		    -a -f ${squid_confdir}/${file}.default ]; then
			echo "Creating ${file} from default..."
			install -c -o root -g ${squid_group} -m 0640 \
		    	    ${squid_confdir}/${file}.default \
			    ${squid_confdir}/${file}
		fi
	done
	;;
*)
	exit 64
	;;
esac
exit 0




#

PORTNAME=	squid
PORTVERSION=	2.5.13
PORTREVISION=	4
CATEGORIES=	www
MASTER_SITES=	\
		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \

		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
MASTER_SITE_SUBDIR=	squid-2/STABLE
DISTNAME=	squid-2.5.STABLE13
DIST_SUBDIR=	squid2.5

PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
		squid-2.5.STABLE12-wbinfo_group.patch \
		squid-2.5.STABLE12-asyncio_counters.patch
PATCH_DIST_STRIP=	-p1

MAINTAINER=	tmseck@netcologne.de

GNU_CONFIGURE=	yes
USE_BZIP2=	yes
USE_PERL5=	yes
USE_REINPLACE=	yes

SQUID_UID?=	squid
SQUID_GID?=	squid

MAN8=		cachemgr.cgi.8 squid.8
docs=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
PORTDOCS=	${docs:T}
SUB_FILES+=	pkg-deinstall pkg-install pkg-message
SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}

OPTIONS=	SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
		SQUID_SASL_AUTH "Install SASL authentication helpers" off \
		SQUID_DELAY_POOLS "Enable delay pools" off \
		SQUID_SNMP "Enable SNMP support" off \
		SQUID_CARP "Enable CARP support" off \

		SQUID_COSS "Enable the COSS storage scheme" off \
		SQUID_LARGEFILE "Support log and cache files >2GB" off \
		SQUID_STACKTRACES "Create backtraces on fatal errors" off \
		SQUID_RCNG "Install an rc.d style startup script" on

etc_files=	squid/cachemgr.conf.default \
		squid/mib.txt squid/mime.conf.default \
		squid/msntauth.conf.default squid/squid.conf.default


external_acl+=	ldap_group
libexec+=	squid_ldap_auth squid_ldap_group
.endif
.if defined(WITH_SQUID_SASL_AUTH)
LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CFLAGS+=	-I${LOCALBASE}/include
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
basic_auth+=	SASL
libexec+=	sasl_auth
.endif
.if !defined(NO_NIS)
basic_auth+=	YP
libexec+=	yp_auth

STRIP=			""
.endif
.if !defined(WITHOUT_SQUID_RCNG)
USE_RC_SUBR=	squid.sh
rc_del=		rcold
rc_state=	rcng
.else
SUB_FILES+=	squid.sh
etc_files+=	rc.d/squid.sh
rc_del=		rcng
rc_state=	rcold
.endif

# will be installed; the default language will be English.

SQUID_LANGUAGES?=	\
	Azerbaijani Bulgarian Catalan Czech Danish Dutch English Estonian Finnish      \
	French German Greek Hebrew Hungarian Italian Japanese Korean Lithuanian \
	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian     \
	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish

CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}

CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" \
			CPPFLAGS="${CPPFLAGS}"\
			LDFLAGS="${LDFLAGS}"

PLIST_DIRS=	etc/squid/icons libexec/squid

	@${FIND} ${WRKSRC} -name '*.bak' -delete
	@${FIND} ${WRKSRC} -name '*.orig' -delete
# create the start script:
	@${REINPLACE_CMD} \
	    -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
	    -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
	    -e '/--begin ${rc_del}/,/--end ${rc_del}/d' \
	    -e '/--.*${rc_state}/d' ${WRKDIR}/squid.sh
# create variable information in pkg-message:
	@${REINPLACE_CMD} \
	    -e '/--begin ${rc_del}/,/--end ${rc_del}/d' \
	    -e '/--.*${rc_state}/d' ${PKGMESSAGE}

pre-su-install:
	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
	    squid_user=${SQUID_UID} squid_group=${SQUID_GID} \
	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

post-install:

	@${SETENV} PKG_PREFIX=${PREFIX} \
	    ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

	@${ECHO_CMD} "===> post-installation information for ${PKGNAME}:"
	@${ECHO_CMD} ""
	@${CAT} ${PKGMESSAGE}
	@${ECHO_CMD} ""
changeuser:
# Recover from the problem that earlier versions of this port created the
# squid pseudo-user with an id greater than 999 which is not allowed in

Return to bug 94642

Lines 1-168 Link Here

(-)pkg-install (-168 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/www/squid/pkg-install,v 1.21 2006/01/09 13:37:54 jylefort Exp $
4	#
5
6	PATH=/bin:/usr/bin:/usr/sbin
7	pkgname=$1
8	squid_base=${PKG_PREFIX:-/usr/local}/squid
9	squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid
10	if [ -x /usr/sbin/nologin ]; then
11	nologin=/usr/sbin/nologin
12	else
13	nologin=/sbin/nologin
14	fi
15	squid_user=${squid_user:-squid}
16	squid_group=${squid_group:-squid}
17	squid_gid=100
18	squid_uid=100
19	# Try to catch the case where the $squid_user might have been created with an
20	# id greater than or equal 3128. The valid exception is "nobody".
21	nobody_uid=65534
22	nobody_gid=65534
23	squid_oldgid=3128
24	squid_olduid=3128
25	unset wrong_id
26	case $2 in
27	PRE-INSTALL)
28	echo "===> Pre-installation configuration for ${pkgname}"
29	if ! pw groupshow ${squid_group} -q >/dev/null ; then
30	echo "There is no group '${squid_group}' on this system, so I will try to create it:"
31	if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
32	echo "Failed to create group \"${squid_group}\"!" >&2
33	echo "Please create it manually." >&2
34	exit 1
35	else
36	echo "Group '${squid_group}' created successfully:"
37	fi
38	else
39	echo "I will use the existing group '${squid_group}':"
40	current_gid=`pw groupshow ${squid_group}\|cut -f 3 -d :`
41	if [ ${current_gid} -ge ${squid_oldgid} \
42	-a ${current_gid} -ne ${nobody_gid} ]; then
43	wrong_id=1
44	fi
45	fi
46	pw groupshow ${squid_group}
47
48	if ! pw usershow ${squid_user} -q >/dev/null ; then
49	echo "There is no account '${squid_user}' on this system, so I will try to create it:"
50	if ! pw useradd -q -n ${squid_user} \
51	-u ${squid_uid} -g ${squid_group} \
52	-c "squid caching-proxy pseudo user" \
53	-d "${squid_base}" -s "${nologin}" \
54	-h - ; then
55	echo "Failed to create user '${squid_user}'!" >&2
56	echo "Please create it manually." >&2
57	exit 1
58	else
59	echo "User '${squid_user}' created successfully:"
60	fi
61	else
62	echo "I will use the existing user '${squid_user}':"
63	current_uid=`id -u ${squid_user}`
64	if [ ${current_uid} -ge ${squid_olduid} \
65	-a ${current_uid} -ne ${nobody_uid} ];
66	then
67	wrong_id=1
68	fi
69	fi
70	pw usershow ${squid_user}
71	if [ "${wrong_id}" ]; then
72	echo ""
73	echo " * NOTICE *"
74	echo ""
75	echo "The squid pseudo-user's uid and/or gid have been found"
76	echo "to be greater than or equal 3128."
77	echo ""
78	echo "This is not a problem as such, but violates the FreeBSD"
79	echo "ports' principle that a ports must not claim a uid greater"
80	echo "than 999."
81	echo ""
82	echo "Since version 2.5.4_11, the squid user is thus created"
83	echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this"
84	echo "port used the first unused uid/gid greater than or"
85	echo "equal 3128."
86	echo ""
87	echo "If you want to change the existing squid user's id, run"
88	echo "'make changeuser' after the installation has completed."
89	echo "If you installed this port via a package, issue the"
90	echo "following commands as root:"
91	echo ""
92	echo "pw userdel -u ${current_uid}"
93	echo "pw groupadd -n ${squid_group} -g ${squid_gid}"
94	echo "pw useradd -n ${squid_user} -u ${squid_uid} \\"
95	echo " -c \"squid caching-proxy pseudo user\" \\"
96	echo " -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\"
97	echo " -h -"
98	echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;"
99	echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
100	echo ""
101	echo "In case you have installed third party software for squid"
102	echo "like squidGuard, you should additionally run:"
103	echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;"
104	echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
105	echo ""
106	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
107	sleep 30
108	fi
109	fi
110	for dir in cache logs; do
111	if [ ! -d ${squid_base}/${dir} ]; then
112	echo "Creating ${squid_base}/${dir}..."
113	install -d -o ${squid_user} -g ${squid_group} \
114	-m 0750 ${squid_base}/${dir}
115	fi
116	done
117	if [ ! -d ${squid_confdir} ]; then
118	echo "Creating ${squid_confdir}..."
119	install -d -o root -g ${squid_group} \
120	-m 0750 ${squid_confdir}
121	fi
122	;;
123	POST-INSTALL)
124	for file in cachemgr.conf mime.conf squid.conf; do
125	if [ ! -f ${squid_confdir}/${file} \
126	-a -f ${squid_confdir}/${file}.default ]; then
127	echo "Creating ${file} from default..."
128	install -c -o root -g ${squid_group} -m 0640 \
129	${squid_confdir}/${file}.default \
130	${squid_confdir}/${file}
131	fi
132	done
133
134	echo "===> Post-installation informations for ${pkgname}"
135	echo ""
136	echo " o You can find the configuration files for this package"
137	echo " in the directory ${squid_confdir}."
138	echo ""
139	echo " o A cache directory has been created in ${squid_base}/cache."
140	echo " Log files will be written to ${squid_base}/logs."
141	echo ""
142	echo " o The default configuration will deny everyone access to the"
143	echo " proxy service. Edit the \"http_access\" directives in"
144	echo " ${squid_confdir}/squid.conf to suit your needs."
145	echo ""
146	echo " o If you never ran squid on this system before, you need to"
147	echo " initialize the cache directory by running \"squid -z\""
148	echo " as 'root' or '${squid_user}' before starting squid."
149	echo ""
150	echo " Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh is a"
151	echo " new style rc script. This means that squid will not"
152	echo " start automatically at boot time."
153	echo ""
154	echo " To enable squid, set squid_enable=yes in either"
155	echo " /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid"
156	echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more"
157	echo " configuration options."
158	echo ""
159	echo " If you want the port to install an old style rc script, run"
160	echo " 'make config' and deselect the option to install an"
161	echo " rcNG script."
162	echo ""
163	;;
164	*)
165	exit 64
166	;;
167	esac
168	exit 0

Lines 1-40 Link Here

(-)pkg-deinstall (-40 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/www/squid/pkg-deinstall,v 1.6 2005/11/01 14:05:59 krion Exp $
4	#
5
6	PATH=/bin:/usr/bin:/usr/sbin
7
8	case $2 in
9	DEINSTALL)
10	cd ${PKG_PREFIX}/etc/squid \|\| exit 1
11	for f in cachemgr.conf mime.conf msntauth.conf squid.conf; do
12	cmp -s -z ${f} ${f}.default && rm ${f}
13	done
14	;;
15	POST-DEINSTALL)
16	echo "===> post-deinstallation information for $1"
17	echo ""
18	echo " Note:"
19	echo " squid related user accounts and groups were not removed."
20	echo ""
21	echo " To remove the 'squid' user and the 'squid' group which were"
22	echo " created by a default installation of this package, run"
23	echo ""
24	echo " pw userdel -r -n squid -u 100"
25	echo ""
26	if [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then
27	echo ""
28	echo " To ease updates, the cache and log directories and"
29	echo " all configuration files modified by you were preserved."
30	echo ""
31	echo " Please remove them manually if you do not want to use"
32	echo " squid any longer."
33	fi
34	echo ""
35	;;
36	*)
37	exit 64
38	;;
39	esac
40	exit 0

Lines 1-12 Link Here

(-)distinfo (-12 / +3 lines)
1	MD5 (squid2.5/squid-2.5.STABLE12.tar.bz2) = 7354255015b3772a1e024dfac173e48c	1	MD5 (squid2.5/squid-2.5.STABLE13.tar.bz2) = 3e64468e123be1246d17486dab6bee87
2	SHA256 (squid2.5/squid-2.5.STABLE12.tar.bz2) = ba0ccd956323f0dad46c19aa8d40c537846fedfc3778b5730e5610f16c0d9af1	2	SHA256 (squid2.5/squid-2.5.STABLE13.tar.bz2) = c4a7cde3d63559576f704b8a10561d61135a3788423ae417fb728d112b1962a8
3	SIZE (squid2.5/squid-2.5.STABLE12.tar.bz2) = 1075111	3	SIZE (squid2.5/squid-2.5.STABLE13.tar.bz2) = 1074112
4	MD5 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 8e83b776c0d015bd4137cc1ca08f6d38
5	SHA256 (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 9ca8427c2eb9e5cbdb5a49fb5cb94fc00853ad965f87666f8fc35236e98bc0ae
6	SIZE (squid2.5/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826
7	MD5 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = fe0ab5839d282fda67ffd8eb17f2588d
8	SHA256 (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 9aa671be4022f1126071cf83ca800795f609b731aac74237bc70e11d8f069046
9	SIZE (squid2.5/squid-2.5.STABLE12-wbinfo_group.patch) = 1615
10	MD5 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 70485fac2c02d836f7027122e65d5767
11	SHA256 (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 39bf2ca95a3c1fc90a40c437253dbbf6d71f37763369ada287039340a68b873f
12	SIZE (squid2.5/squid-2.5.STABLE12-asyncio_counters.patch) = 497

Lines 1-85 Link Here

(-)files/squid.sh (-85 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/www/squid/files/squid.sh,v 1.11 2005/12/25 23:38:48 edwin Exp $
4	#
5	# --begin rcng
6	# PROVIDE: squid
7	# REQUIRE: LOGIN
8	# KEYWORD: shutdown
9	#
10	# Note:
11	# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
12	# /etc/rc.conf.d/squid to make this script actually do something. There
13	# you can also set squid_chdir, squid_user, and squid_flags.
14	#
15	# Please see squid(8), rc.conf(5) and rc(8) for further details.
16	#
17	# --end rcng
18
19	name=squid
20	command=%%PREFIX%%/sbin/squid
21	# --begin rcng
22	extra_commands=reload
23	reload_cmd="${command} -k reconfigure"
24	# --end rcng
25	stop_cmd="squid_stop"
26	squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
27	squid_enable=${squid_enable:-"NO"}
28	squid_flags=${squid_flags-"-D"}
29	squid_user=${squid_user:-%%SQUID_UID%%}
30	default_config=%%PREFIX%%/etc/squid/squid.conf
31
32	# --begin rcold
33	squid_stop() {
34	echo -n " ${name}"
35	${command} -k shutdown
36	while ps -xcU ${squid_user} \| grep -q squid; do
37	sleep 2
38	done
39	}
40
41	# --end rcold
42	# --begin rcng
43	squid_stop() {
44	${command} -k shutdown
45	run_rc_command poll
46	}
47
48	. %%RC_SUBR%%
49	rcvar=`set_rcvar`
50	load_rc_config ${name}
51
52	# squid(8) will not start if ${default_config} is not present so try
53	# to catch that beforehand via ${required_files} rather than make
54	# squid(8) crash.
55	# If you remove the default configuration file make sure to add
56	# '-f /path/to/your/squid.conf' to squid_flags
57
58	if [ -z "${squid_flags}" ]; then
59	required_files=${default_config}
60	fi
61	required_dirs=${squid_chdir}
62	run_rc_command "$1"
63	# --end rcng
64	# --begin rcold
65	case $1 in
66	start)
67	if [ -x "${command}" -a \
68	\( -f "${default_config}" -o "${squid_flags}" \) ]; then
69	echo -n " ${name}"
70	(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
71	"${command} ${squid_flags}")
72	fi
73	;;
74	stop)
75	if [ -x "${command}" ]; then
76	${stop_cmd}
77	fi
78	;;
79	*)
80	echo "usage: ${0##*/} {start\|stop}" >&2
81	exit 64
82	;;
83	esac
84	exit 0
85	# --end rcold

Line 0 Link Here

(-)files/pkg-deinstall.in (+40 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD: ports/www/squid/pkg-deinstall,v 1.6 2005/11/01 14:05:59 krion Exp $
	4	#
	5
	6	PATH=/bin:/usr/bin:/usr/sbin
	7
	8	case $2 in
	9	DEINSTALL)
	10	cd ${PKG_PREFIX}/etc/squid \|\| exit 1
	11	for f in cachemgr.conf mime.conf msntauth.conf squid.conf; do
	12	cmp -s -z ${f} ${f}.default && rm ${f}
	13	done
	14	;;
	15	POST-DEINSTALL)
	16	echo "===> post-deinstallation information for $1:"
	17	echo ""
	18	echo " Note:"
	19	echo " squid related user accounts and groups were not removed."
	20	echo ""
	21	echo " To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were"
	22	echo " created by a default installation of this package, run"
	23	echo ""
	24	echo " pw userdel -r -n %%SQUID_UID%% -u 100"
	25	echo ""
	26	if [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then
	27	echo ""
	28	echo " To ease updates, the cache and log directories and"
	29	echo " all configuration files modified by you were preserved."
	30	echo ""
	31	echo " Please remove them manually if you do not want to use"
	32	echo " squid any longer."
	33	fi
	34	echo ""
	35	;;
	36	*)
	37	exit 64
	38	;;
	39	esac
	40	exit 0

Line 0 Link Here

(-)files/squid.sh.in (+87 lines)
		1	#!/bin/sh
		2	#
		3	# $FreeBSD: ports/www/squid/files/squid.sh,v 1.11 2005/12/25 23:38:48 edwin Exp $
		4	#
		5	# --begin rcng
		6	# PROVIDE: squid
		7	# REQUIRE: LOGIN
		8	# KEYWORD: shutdown
		9	#
		10	# Note:
		11	# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
		12	# /etc/rc.conf.d/squid to make this script actually do something. There
		13	# you can also set squid_chdir, squid_user, and squid_flags.
		14	#
		15	# Please see squid(8), rc.conf(5) and rc(8) for further details.
		16	#
		17	# --end rcng
		18
		19	name=squid
		20	command=%%PREFIX%%/sbin/squid
		21	# --begin rcng
		22	extra_commands=reload
		23	reload_cmd="${command} -k reconfigure"
		24	# --end rcng
		25	stop_cmd="squid_stop"
		26	squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
		27	# --begin rcng
		28	squid_enable=${squid_enable:-"NO"}
		29	# --end rcng
		30	squid_flags=${squid_flags-"-D"}
		31	squid_user=${squid_user:-%%SQUID_UID%%}
		32	default_config=%%PREFIX%%/etc/squid/squid.conf
		33
		34	# --begin rcold
		35	squid_stop() {
		36	echo -n " ${name}"
		37	${command} -k shutdown
		38	while ps -xcU ${squid_user} \| grep -q squid; do
		39	sleep 2
		40	done
		41	}
		42
		43	# --end rcold
		44	# --begin rcng
		45	squid_stop() {
		46	${command} -k shutdown
		47	run_rc_command poll
		48	}
		49
		50	. %%RC_SUBR%%
		51	rcvar=`set_rcvar`
		52	load_rc_config ${name}
		53
		54	# squid(8) will not start if ${default_config} is not present so try
		55	# to catch that beforehand via ${required_files} rather than make
		56	# squid(8) crash.
		57	# If you remove the default configuration file make sure to add
		58	# '-f /path/to/your/squid.conf' to squid_flags
		59
		60	if [ -z "${squid_flags}" ]; then
		61	required_files=${default_config}
		62	fi
		63	required_dirs=${squid_chdir}
		64	run_rc_command "$1"
65	# --end rcng
66	# --begin rcold
67	case $1 in
68	start)
69	if [ -x "${command}" -a \
70	\( -f "${default_config}" -o "${squid_flags}" \) ]; then
71	echo -n " ${name}"
72	(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
73	"${command} ${squid_flags}")
74	fi
75	;;
76	stop)
77	if [ -x "${command}" ]; then
78	${stop_cmd}
79	fi
80	;;
81	*)
82	echo "usage: ${0##*/} {start\|stop}" >&2
83	exit 64
84	;;
85	esac
86	exit 0
87	# --end rcold

Line 0 Link Here

(-)files/pkg-message.in (+24 lines)
	1	o You can find the configuration files for this package in the
	2	directory %%PREFIX%%/etc/squid.
	3
	4	o A cache directory has been created in %%PREFIX%%/squid/cache.
	5	Log files will be written to %%PREFIX%%/squid/logs.
	6
	7	Note:
	8	You must initialize new cache directories before you can start
	9	squid. Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
	10	If your cache directories are already initialized (e.g. after an
	11	upgrade of squid) you do not need to initialize them again.
	12
	13	o The default configuration will deny everyone access to the
	14	proxy service. Edit the "http_access" directives in
	15	%%PREFIX%%/etc/squid.conf to suit your needs.
	16	--begin rcng
	17
	18	Please note that the squid start script is an rc.d style script.
	19	This means that squid will not start automatically at boot time.
	20
	21	To enable squid, set squid_enable=yes in either
	22	etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
	23	Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
	24	--end rcng

Line 0 Link Here

(-)files/pkg-install.in (+138 lines)
		1	#!/bin/sh
		2	#
		3	# $FreeBSD: ports/www/squid/pkg-install,v 1.21 2006/01/09 13:37:54 jylefort Exp $
		4	#
		5
		6	PATH=/bin:/usr/bin:/usr/sbin
		7	pkgname=$1
		8	squid_base="${PKG_PREFIX:-%%PREFIX%%}/squid"
		9	squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid"
		10	if [ -x /usr/sbin/nologin ]; then
		11	nologin=/usr/sbin/nologin
		12	else
		13	nologin=/sbin/nologin
		14	fi
		15	squid_user="%%SQUID_UID%%"
		16	squid_group="%%SQUID_GID%%"
		17	squid_gid=100
		18	squid_uid=100
		19	# Try to catch the case where the $squid_user might have been created with an
		20	# id greater than or equal 3128. The valid exception is "nobody".
		21	nobody_uid=65534
		22	nobody_gid=65534
		23	squid_oldgid=3128
		24	squid_olduid=3128
		25	unset wrong_id
		26	case $2 in
		27	PRE-INSTALL)
		28	echo "===> Pre-installation configuration for ${pkgname}"
		29	if ! pw groupshow ${squid_group} -q >/dev/null ; then
		30	echo "There is no group '${squid_group}' on this system, so I will try to create it:"
		31	if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
		32	echo "Failed to create group \"${squid_group}\"!" >&2
		33	echo "Please create it manually." >&2
		34	exit 1
		35	else
		36	echo "Group '${squid_group}' created successfully:"
		37	fi
		38	else
		39	echo "I will use the existing group '${squid_group}':"
		40	current_gid=`pw groupshow ${squid_group}\|cut -f 3 -d :`
		41	if [ ${current_gid} -ge ${squid_oldgid} \
		42	-a ${current_gid} -ne ${nobody_gid} ]; then
		43	wrong_id=1
		44	fi
		45	fi
		46	pw groupshow ${squid_group}
		47
		48	if ! pw usershow ${squid_user} -q >/dev/null ; then
		49	echo "There is no account '${squid_user}' on this system, so I will try to create it:"
		50	if ! pw useradd -q -n ${squid_user} \
		51	-u ${squid_uid} -g ${squid_group} \
		52	-c "squid caching-proxy pseudo user" \
		53	-d "${squid_base}" -s "${nologin}" \
		54	-h - ; then
		55	echo "Failed to create user '${squid_user}'!" >&2
		56	echo "Please create it manually." >&2
		57	exit 1
		58	else
		59	echo "User '${squid_user}' created successfully:"
		60	fi
		61	else
		62	echo "I will use the existing user '${squid_user}':"
		63	current_uid=`id -u ${squid_user}`
		64	if [ ${current_uid} -ge ${squid_olduid} \
65	-a ${current_uid} -ne ${nobody_uid} ];
66	then
67	wrong_id=1
68	fi
69	fi
70	pw usershow ${squid_user}
71	if [ "${wrong_id}" ]; then
72	echo ""
73	echo " * NOTICE *"
74	echo ""
75	echo "The squid pseudo-user's uid and/or gid have been found"
76	echo "to be greater than or equal 3128."
77	echo ""
78	echo "This is not a problem as such, but violates the FreeBSD"
79	echo "ports' principle that a ports must not claim a uid greater"
80	echo "than 999."
81	echo ""
82	echo "Since version 2.5.4_11, the squid user is thus created"
83	echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this"
84	echo "port used the first unused uid/gid greater than or"
85	echo "equal 3128."
86	echo ""
87	echo "If you want to change the existing squid user's id, run"
88	echo "'make changeuser' after the installation has completed."
89	echo "If you installed this port via a package, issue the"
90	echo "following commands as root:"
91	echo ""
92	echo "pw userdel -u ${current_uid}"
93	echo "pw groupadd -n ${squid_group} -g ${squid_gid}"
94	echo "pw useradd -n ${squid_user} -u ${squid_uid} \\"
95	echo " -c \"squid caching-proxy pseudo user\" \\"
96	echo " -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\"
97	echo " -h -"
98	echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;"
99	echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
100	echo ""
101	echo "In case you have installed third party software for squid"
102	echo "like squidGuard, you should additionally run:"
103	echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;"
104	echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
105	echo ""
106	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
107	sleep 30
108	fi
109	fi
110	for dir in cache logs; do
111	if [ ! -d ${squid_base}/${dir} ]; then
112	echo "Creating ${squid_base}/${dir}..."
113	install -d -o ${squid_user} -g ${squid_group} \
114	-m 0750 ${squid_base}/${dir}
115	fi
116	done
117	if [ ! -d ${squid_confdir} ]; then
118	echo "Creating ${squid_confdir}..."
119	install -d -o root -g ${squid_group} \
120	-m 0750 ${squid_confdir}
121	fi
122	;;
123	POST-INSTALL)
124	for file in cachemgr.conf mime.conf squid.conf; do
125	if [ ! -f ${squid_confdir}/${file} \
126	-a -f ${squid_confdir}/${file}.default ]; then
127	echo "Creating ${file} from default..."
128	install -c -o root -g ${squid_group} -m 0640 \
129	${squid_confdir}/${file}.default \
130	${squid_confdir}/${file}
131	fi
132	done
133	;;
134	*)
135	exit 64
136	;;
137	esac
138	exit 0

Lines 72-79 Link Here

(-)Makefile (-17 / +31 lines)
72	#	72	#
73		73
74	PORTNAME= squid	74	PORTNAME= squid
75	PORTVERSION= 2.5.12	75	PORTVERSION= 2.5.13
76	PORTREVISION= 4
77	CATEGORIES= www	76	CATEGORIES= www
78	MASTER_SITES= \	77	MASTER_SITES= \
79	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	78	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
Lines 82-94 Link Here
82	ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \	81	ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
83	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}	82	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
84	MASTER_SITE_SUBDIR= squid-2/STABLE	83	MASTER_SITE_SUBDIR= squid-2/STABLE
85	DISTNAME= squid-2.5.STABLE12	84	DISTNAME= squid-2.5.STABLE13
86	DIST_SUBDIR= squid2.5	85	DIST_SUBDIR= squid2.5
87		86
88	PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/	87	PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
89	PATCHFILES= squid-2.5.STABLE12-SMB_BadFetch.patch \	88	PATCHFILES=
90	squid-2.5.STABLE12-wbinfo_group.patch \
91	squid-2.5.STABLE12-asyncio_counters.patch
92	PATCH_DIST_STRIP= -p1	89	PATCH_DIST_STRIP= -p1
93		90
94	MAINTAINER= tmseck@netcologne.de	91	MAINTAINER= tmseck@netcologne.de
Lines 98-104 Link Here
98	GNU_CONFIGURE= yes	95	GNU_CONFIGURE= yes
99	USE_BZIP2= yes	96	USE_BZIP2= yes
100	USE_PERL5= yes	97	USE_PERL5= yes
101	USE_REINPLACE= yes
102		98
103	SQUID_UID?= squid	99	SQUID_UID?= squid
104	SQUID_GID?= squid	100	SQUID_GID?= squid
Lines 106-113 Link Here
106	MAN8= cachemgr.cgi.8 squid.8	102	MAN8= cachemgr.cgi.8 squid.8
107	docs= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt	103	docs= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
108	PORTDOCS= ${docs:T}	104	PORTDOCS= ${docs:T}
		105	SUB_FILES+= pkg-deinstall pkg-install pkg-message
		106	SUB_LIST+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
109		107
110	OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \	108	OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
		109	SQUID_SASL_AUTH "Install SASL authentication helpers" off \
111	SQUID_DELAY_POOLS "Enable delay pools" off \	110	SQUID_DELAY_POOLS "Enable delay pools" off \
112	SQUID_SNMP "Enable SNMP support" off \	111	SQUID_SNMP "Enable SNMP support" off \
113	SQUID_CARP "Enable CARP support" off \	112	SQUID_CARP "Enable CARP support" off \
Lines 133-141 Link Here
133	SQUID_COSS "Enable the COSS storage scheme" off \	132	SQUID_COSS "Enable the COSS storage scheme" off \
134	SQUID_LARGEFILE "Support log and cache files >2GB" off \	133	SQUID_LARGEFILE "Support log and cache files >2GB" off \
135	SQUID_STACKTRACES "Create backtraces on fatal errors" off \	134	SQUID_STACKTRACES "Create backtraces on fatal errors" off \
136	SQUID_RCNG "Install an rcNG startup script" on	135	SQUID_RCNG "Install an rc.d style startup script" on
137		136
138	etc_files= rc.d/squid.sh squid/cachemgr.conf.default \	137	etc_files= squid/cachemgr.conf.default \
139	squid/mib.txt squid/mime.conf.default \	138	squid/mib.txt squid/mime.conf.default \
140	squid/msntauth.conf.default squid/squid.conf.default	139	squid/msntauth.conf.default squid/squid.conf.default
141		140
Lines 193-198 Link Here
193	external_acl+= ldap_group	192	external_acl+= ldap_group
194	libexec+= squid_ldap_auth squid_ldap_group	193	libexec+= squid_ldap_auth squid_ldap_group
195	.endif	194	.endif
		195	.if defined(WITH_SQUID_SASL_AUTH)
		196	LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
		197	CFLAGS+= -I${LOCALBASE}/include
		198	CPPFLAGS+= -I${LOCALBASE}/include
		199	LDFLAGS+= -L${LOCALBASE}/lib
		200	basic_auth+= SASL
		201	libexec+= sasl_auth
		202	.endif
196	.if !defined(NO_NIS)	203	.if !defined(NO_NIS)
197	basic_auth+= YP	204	basic_auth+= YP
198	libexec+= yp_auth	205	libexec+= yp_auth
Lines 320-329 Link Here
320	STRIP= ""	327	STRIP= ""
321	.endif	328	.endif
322	.if !defined(WITHOUT_SQUID_RCNG)	329	.if !defined(WITHOUT_SQUID_RCNG)
323	USE_RC_SUBR= yes	330	USE_RC_SUBR= squid.sh
324	rc_del= rcold	331	rc_del= rcold
325	rc_state= rcng	332	rc_state= rcng
326	.else	333	.else
		334	SUB_FILES+= squid.sh
		335	etc_files+= rc.d/squid.sh
327	rc_del= rcng	336	rc_del= rcng
328	rc_state= rcold	337	rc_state= rcold
329	.endif	338	.endif
Lines 334-340 Link Here
334	# will be installed; the default language will be English.	343	# will be installed; the default language will be English.
335		344
336	SQUID_LANGUAGES?= \	345	SQUID_LANGUAGES?= \
337	Bulgarian Catalan Czech Danish Dutch English Estonian Finnish \	346	Azerbaijani Bulgarian Catalan Czech Danish Dutch English Estonian Finnish \
338	French German Greek Hebrew Hungarian Italian Japanese Korean Lithuanian \	347	French German Greek Hebrew Hungarian Italian Japanese Korean Lithuanian \
339	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian \	348	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian \
340	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish	349	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish
Lines 346-351 Link Here
346	CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS}	355	CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS}
347		356
348	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \	357	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
		358	CPPFLAGS="${CPPFLAGS}"\
349	LDFLAGS="${LDFLAGS}"	359	LDFLAGS="${LDFLAGS}"
350		360
351	PLIST_DIRS= etc/squid/icons libexec/squid	361	PLIST_DIRS= etc/squid/icons libexec/squid
Lines 371-386 Link Here
371	@${FIND} ${WRKSRC} -name '*.bak' -delete	381	@${FIND} ${WRKSRC} -name '*.bak' -delete
372	@${FIND} ${WRKSRC} -name '*.orig' -delete	382	@${FIND} ${WRKSRC} -name '*.orig' -delete
373	# create the start script:	383	# create the start script:
374	@${SED} -e 's\|%%PREFIX%%\|${PREFIX}\|g' \	384	@${REINPLACE_CMD} \
375	-e 's\|%%SQUID_UID%%\|${SQUID_UID}\|g' \
376	-e 's\|%%RC_SUBR%%\|${RC_SUBR}\|g' \
377	-e '/--begin ${rc_del}/,/--end ${rc_del}/d' \	385	-e '/--begin ${rc_del}/,/--end ${rc_del}/d' \
378	-e '/--.*${rc_state}/d' ${FILESDIR}/squid.sh \	386	-e '/--.*${rc_state}/d' ${WRKDIR}/squid.sh
379	>${WRKDIR}/squid.sh	387	# create variable information in pkg-message:
		388	@${REINPLACE_CMD} \
		389	-e '/--begin ${rc_del}/,/--end ${rc_del}/d' \
		390	-e '/--.*${rc_state}/d' ${PKGMESSAGE}
380		391
381	pre-su-install:	392	pre-su-install:
382	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \	393	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
383	squid_user=${SQUID_UID} squid_group=${SQUID_GID} \
384	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	394	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
385		395
386	post-install:	396	post-install:
Lines 400-405 Link Here
400	@${SETENV} PKG_PREFIX=${PREFIX} \	410	@${SETENV} PKG_PREFIX=${PREFIX} \
401	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	411	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
402		412
		413	@${ECHO_CMD} "===> post-installation information for ${PKGNAME}:"
		414	@${ECHO_CMD} ""
		415	@${CAT} ${PKGMESSAGE}
		416	@${ECHO_CMD} ""
403	changeuser:	417	changeuser:
404	# Recover from the problem that earlier versions of this port created the	418	# Recover from the problem that earlier versions of this port created the
405	# squid pseudo-user with an id greater than 999 which is not allowed in	419	# squid pseudo-user with an id greater than 999 which is not allowed in