head	1.7;
access;
symbols
	RELEASE_8_3_0:1.6
	RELEASE_9_0_0:1.6
	RELEASE_7_4_0:1.6
	RELEASE_8_2_0:1.6
	RELEASE_6_EOL:1.6
	RELEASE_8_1_0:1.6
	old_old_RELEASE_5_3_0:1.1
	old_old_RELEASE_4_10_0:1.1;
locks; strict;
comment	@# @;


1.7
date	2012.09.27.21.59.32;	author madpilot;	state dead;
branches;
next	1.6;

1.6
date	2010.05.31.00.00.14;	author sylvio;	state Exp;
branches;
next	1.5;

1.5
date	2008.04.05.00.01.19;	author beech;	state dead;
branches;
next	1.4;

1.4
date	2008.03.29.23.15.51;	author miwi;	state Exp;
branches;
next	1.3;

1.3
date	2008.03.13.17.58.51;	author beech;	state Exp;
branches;
next	1.2;

1.2
date	2004.10.13.09.43.48;	author sergei;	state dead;
branches;
next	1.1;

1.1
date	2004.03.17.07.06.46;	author sergei;	state Exp;
branches;
next	;


desc
@@


1.7
log
@SVN rev 304977 on 2012-09-27 21:59:32Z by madpilot

- Update to 3.1.21

PR:		ports/172098
Submitted by:	Thomas-Martin Seck <tmseck@@web.de> (maintainer)
Approved by:	crees, tabthorpe (mentors, implicit)
@
text
@Correct two configure tests that fail whenn g++ is used instead of gcc.
--- configure.orig	2010-05-30 16:00:03.000000000 +0200
+++ configure	2010-05-30 16:00:33.000000000 +0200
@@@@ -48547,7 +48547,10 @@@@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <sys/types.h> /* for setresuid(2) on FreeBSD */
+#include <stdio.h> /* for perror(3) on FreeBSD */
 #include <stdlib.h>
+#include <unistd.h> /* for setresuid(2) on FreeBSD */
   int main(int argc, char **argv) {
     if(setresuid(-1,-1,-1)) {
       perror("setresuid:");
@@@@ -48632,7 +48635,7 @@@@
 int main(int argc, char **argv)
 {
     int size = 20;
-    char *str = malloc(size);
+    char *str = (char *)malloc(size);
     memset(str, 'x', size);
     strnstr(str, "fubar", size);
     return 0;
@


1.6
log
@- Squid 3.1 uses g++ to compile the configuration test programs. This
causes two tests (for setresuid(2) and strnstr(3)) to fail due to
g++ complaining about programming errors within the tests itself.
These tests do work on earlier versions of Squid where gcc is used
to compile them.
- Add a patch to correct these issues
- BUMP PORTREVISION

PR:		ports/147219
Submitted by:	Thomas-Martin Seck <tmseck@@web.de> (maintainer)
@
text
@@


1.5
log
@- Update to 3.0.STABLE4
- Remove two patches that are no longer needed

PR:		ports/122382
Submitted by:	Thomas-Martin Seck <tmseck@@web.de> (maintainer)
@
text
@d1 6
a6 8
Patch for Squid bug #2203:

LDFLAGS gets unset when --with-filedescriptors=n is added to
SQUID_CONFIGURE_ARGS.

--- configure.orig	2008-03-26 21:16:54.000000000 +0100
+++ configure	2008-03-26 21:18:40.000000000 +0100
@@@@ -43819,12 +43819,12 @@@@
d8 16
a23 12
 { echo "$as_me:$LINENO: checking Maximum number of filedescriptors we can open" >&5
 echo $ECHO_N "checking Maximum number of filedescriptors we can open... $ECHO_C" >&6; }
+TLDFLAGS="$LDFLAGS"
 if test -n "$squid_filedescriptors_num" ; then
   SQUID_MAXFD=$squid_filedescriptors_num
   { echo "$as_me:$LINENO: result: $SQUID_MAXFD (user-forced)" >&5
 echo "${ECHO_T}$SQUID_MAXFD (user-forced)" >&6; }
 else
-  TLDFLAGS="$LDFLAGS"
   case $host in
   i386-unknown-freebsd*)
       if echo "$LDFLAGS" | grep -q pthread; then
@


1.4
log
@- Include a (temporary) vendor patch for Squid bug #2206
	("no proxy-Authenticate header in 407 response") from Squid bugzilla
- Correct the patch for Squid bug #2203 to use the fix prefered by the
	Squid developers (see this bug's bugzilla entry)
- Bump PORTREVISION

PR:		122133
Submitted by:	Thomas-Martin Seck <tmseck@@web.de> (maintainer)
@
text
@@


1.3
log
@- Update to 3.0.STABLE2
- Add a patch for Squid bug #2203: compilation of authentication helper
  applications that required additional libraries from $LOCALBASE broke when
  --with-maxfd=N was set via SQUID_CONFIGURE_ARGS

PR:		ports/121649
Submitted by:	Thomas-Martin Seck <tmseck@@web.de> (maintainer)
@
text
@d6 3
a8 8
--- configure.orig	Fri Dec 14 01:25:27 2007
+++ configure	Thu Jan 24 19:56:32 2008
@@@@ -43934,6 +43934,7 @@@@
   esac
   { echo "$as_me:$LINENO: result: $SQUID_MAXFD" >&5
 echo "${ECHO_T}$SQUID_MAXFD" >&6; }
+  LDFLAGS="$TLDFLAGS"
 fi
d10 12
a21 9
 cat >>confdefs.h <<_ACEOF
@@@@ -43947,7 +43948,6 @@@@
     echo "         on how to increase your filedescriptor limit"
     sleep 10
 fi
-LDFLAGS="$TLDFLAGS"
 
 if test `expr $SQUID_MAXFD % 64` != 0; then
     echo "WARNING: $SQUID_MAXFD is not an multiple of 64. This may cause issues"
@


1.2
log
@- Update to 2.5-STABLE7; this release fixes a security issue regarding
  the SNMP module
- Remove a patch that is now part of the distribution
- Miscellaneuous small fixes:
  + in squid.sh, make stop_command poll for the squid processes' exit in
    the rcNG case too; this eliminates the need to do this in restart_command
  + make the information regarding rcNG'ness in pkg-install easier to read
  + install unstripped binaries if WITH_SQUID_STACKTRACES is defined

PR:		ports/72581
Submitted by:	Thomas-Martin Seck (maintainer)
@
text
@d1 23
a23 11
--- configure.orig	Tue Mar  2 11:29:57 2004
+++ configure	Tue Mar  2 11:30:34 2004
@@@@ -2236,6 +2236,8 @@@@
 	    ;;
 	*-solaris-*)
 	    ;;
+	*-freebsd*)
+	    ;;
 	*)
 	    echo "WARNING: ARP ACL support probably won't work on $host."
 	    sleep 10
@


1.1
log
@- update to squid-2.5.STABLE5, including two vendor patches issued so far
- provide more OPTIONS, including (untested) support for pf(4)
- integrate the follow-XFF-patch from devel.squid-cache.org (submitted by
  Michael Ranner), this should improve interaction with dansguardian
- use id 100 for the squid pseudo user instead of choosing the first free
  id greater than 3127, a behaviour introduced with PORTVERSION 2.5.4_6.
  Provide a 'changeuser' target to make migration from a high id to id 100
  possible (requested by Kris Kennaway)
- don't let the port CONFLICT with itself (criticized by Oliver Eikemeier)
- provide rcNG support in squid.sh only on systems with /etc/rc.subr

PR:		ports/64061
Submitted by:	Thomas-Martin Seck (maintainer)
@
text
@@

