Bug 64061 - [Maintainer] www/squid: update to 2.5.STABLE5+patches
Summary: [Maintainer] www/squid: update to 2.5.STABLE5+patches
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Sergei Kolobov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-03-10 18:50 UTC by Thomas-Martin Seck
Modified: 2004-03-17 07:08 UTC (History)
0 users

See Also:


Attachments
file.diff (44.89 KB, patch)
2004-03-10 18:50 UTC, Thomas-Martin Seck
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas-Martin Seck 2004-03-10 18:50:18 UTC
This PR supercedes PR 63651 which can be closed.

- 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

Information for committers:

Please 'cvs add' these files:

files/follow_xff-2.5.patch
files/follow_xff-configure.patch
files/patch-configure
files/patch-helpers-basic_auth-SMB-smb_auth.sh

Please document in the Porter's Handbook that squid claims id 100:100

Fix: Apply this patch:
Comment 1 Sergei Kolobov freebsd_committer freebsd_triage 2004-03-10 22:07:37 UTC
Responsible Changed
From-To: freebsd-ports-bugs->sergei

Take it.
Comment 2 Thomas-Martin Seck 2004-03-13 12:18:54 UTC
Correct OPTIONS parser: this option defaults to "on" but because OPTIONS
are not (yet) parsed when PACKAGE_BUILDING or BATCH are set it will not
be set in these cases:

Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/projekte/FreeBSD/ports/www/squid/Makefile,v
retrieving revision 1.5.2.32
retrieving revision 1.5.2.33
diff -u -r1.5.2.32 -r1.5.2.33
--- Makefile	10 Mar 2004 18:20:39 -0000	1.5.2.32
+++ Makefile	13 Mar 2004 12:12:35 -0000	1.5.2.33
@@ -163,7 +163,7 @@
 .if defined(WITHOUT_SQUID_WCCP)
 CONFIGURE_ARGS+=	--disable-wccp
 .endif
-.if defined(WITH_SQUID_UNDERSCORES)
+.if !defined(WITHOUT_SQUID_UNDERSCORES)
 CONFIGURE_ARGS+=	--enable-underscores
 .endif
 .if defined(WITHOUT_SQUID_CHECK_HOSTNAME)
Comment 3 Sergei Kolobov freebsd_committer freebsd_triage 2004-03-17 07:08:25 UTC
State Changed
From-To: open->closed

Committed, thanks!