Commit Graph

118 Commits

Author SHA1 Message Date
Kirill Ponomarev
9a0e35fd7d - Integrate two new vendor patches, please see
<http://www.squid-cache.org/Versions/v2/2.5/bugs/> for details
- Correct OpenSSL support and, while at it, clean up CFLAGS and
  LDFLAGS handling (thanks to dinoex for lots of helpful advice!).
- better be safe than sorry and pass PTHREAD_CFLAGS through in
  case we are compiling with threads
- try to remove the errorpages directory silently since user
  defined directories might legitimately be present
- clean up shell scripting:
  + do not use too many variables
  + use /bin/sh's features instead of external commands

PR:		ports/65356
Submitted by:	maintainer
2004-04-09 18:54:13 +00:00
Pav Lucistnik
5f969ee8e0 - Integrate four new vendor patches applicable to FreeBSD, see
http://www.squid-cache.org/Versions/v2/2.5/bugs/ for details
- Fix OPTIONS parser to handle a default-to-on option correctly
  when either the portoptions file does not exist and/or is not read
  (i.e. the PACKAGE_BUILDING and BATCH cases)
- use IGNORE instead of .error to abort
- use ${ID} consistently
- inform the user of squid.sh's rcNG-ness when /etc/rc.subr is present
  at installation time
- bump PORTREVISION

PR:		ports/64946
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
2004-04-01 14:12:37 +00:00
Sergei Kolobov
a0c6cf9fc4 - 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)
2004-03-17 07:06:46 +00:00
Oliver Eikemeier
5db9646726 - Integrate a new set of vendor patches, see
http://www.squid-cache.org/Versions/v2/2.5/bugs/ for details
- Remove two local patches in favour of the respective vendor patches
- Bump PORTREVISION

PR:		63030
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de>
Obtained from:	http://www.squid-cache.org/Versions/v2/2.5/bugs/
2004-02-23 16:41:51 +00:00
Sergei Kolobov
429f7b8550 - integrate a new patch from squid-cache.org, see
http://www.squid-cache.org/Versions/v2/2.5/bugs/#squid-2.5.STABLE4-ftp_telnet
  for details
- integrate a patch by Glen Gibb to enable ARP based ACLs and make this an
  OPTION; see also http://www.squid-cache.org/bugs/show_bug.cgi?id=909
  for his original bug report
- integrate additional vendor patches
- make --enable-underscores an OPTION
- set a tighter ACL on libexec/pinger
- use $SQUID_USER and $SQUID_GROUP in pkg-install
- wordsmith comments
- bump PORTREVISION

PR:		ports/62442
Submitted by:	maintainer

- Fix checksum for updated errorpages patch

PR:		ports/62923
Submitted by:	Michal Pasternak <dotz@irc.pl>
Approved by:	maintainer
2004-02-17 11:07:18 +00:00
Sergei Kolobov
f7a539c509 - Update distinfo for the http_workarounds patch (again)
Please see http://www.squid-cache.org/bugs/show_bug.cgi?id=890 for details.
  Bump PORTREVISION
- Update to use new ports collection features:
  + USE_SIZE
  + use PORTDOCS and PLIST_FILES and extend the dynamic package list creation
    to include squid's icon files, too
  + move file and directory cleanup on deinstallation to pkg-deinstall
  + get rid of pkg-plist
  + use OPTIONS for the most commonly used options,
    leave SQUID_CONFIGURE_OPTIONS for more obscure options
- document known non-working features
- use lowercase for local variables
- other minor cleanups

PR:		ports/62222
Submitted by:	maintainer
2004-02-02 15:28:16 +00:00
Ying-Chieh Liao
8cbabeb774 - integrate another patch from squid-cache.org, see
http://www.squid-cache.org/Versions/v2/2.5/bugs/ for details
- cleanup dynamic plist generation:
  sort files, replace needlessly complex ex-scripting with a ${REINPLACE_CMD}
  one-liner
- integrate a patch to make the SMB-NTLM helper compile on 5.x and hook this
  helper up to the build (thanks to Stefano Tagliaferri for reporting the bug
  and testing the patch)
- bump PORTREVISION

PR:		61543
Submitted by:	maintainer
2004-01-19 03:03:11 +00:00
Sergei Kolobov
07a7de4337 - configure squid to run under a dedicated "squid" user by default; make use
of SQUID_{UID,GID} which other squid-related ports already implemented.
  The user/group will be created on the fly if they do not already exist.
- introduce WITH_SQUID_LDAP_AUTH to pull in the necessary bits to compile and
  use the ldap_auth helper
- install some more authentication helper applications by default
- install helper applications to ${PREFIX}/libexec/squid instead of
  ${PREFIX}/libexec, add notes about it in pkg-install and pkg-descr
- cleanup the pre-installation tasks and move them from Makefile and pkg-plist
  into the pkg-install script; make 'make install' and 'pkg_add' actually do
  the same thing
- introduce a pkg-deinstall script
- make squid.sh rcNG compatible (when either /etc/rc_subr or
  ${PREFIX}/etc/rc_subr is present, the first one will be used, otherwise the
  script will work as a "rc classic" script so no additional dependency on
  the rc_subr port should be needed)
- some Makefile cleanups:
  + the squid installation procedure now correctly strips binaries, so there
    is no need to do this manually anymore
  + generate those parts of pkg-plist dynamically that may be affected by user
    set tunables (currently the localized error pages and helper applications)
  + document the available configuration options in a slightly different style
  + remove some obsolete variable declarations and comments
  + honor NOPORTDOCS
- add CONFLICTS
- add another vendor patch, see
  http://www.squid-cache.org/bugs/show_bug.cgi?id=890 for a thorough
  explanation of what has been fixed.
- since we can no longer take the presence of Lithuanian error pages for
  granted, wrap the workaround for the errorpages.patch with '.if exists()'
- bump PORTREVISION

PR:		61315
Submitted by:	maintainer
2004-01-16 21:18:20 +00:00
Sergei Kolobov
be4fbdeab5 - Integrate another patch for the LDAP authentication helper
(see <http://www.squid-cache.org/Versions/v2/2.5/bugs/> for details)
- Correct MASTER_SITES:
  + fix URL for Melbourne University's ftp server
  + replace unreachable ftp mirror at Loughborough University with
    the one at LEO.org, Munich
- Bump PORTREVISION

PR:		61128
Submitted by:	maintainer
2004-01-09 17:19:32 +00:00
Sergei Kolobov
f34fe178a0 - Integrate a new patch issued by the squid development team
to correct the behaviour of the LDAP authentication helper wrt TLS,
  see <http://www.squid-cache.org/Versions/v2/2.5/bugs/> for details
- Reinstate the errorpages.patch and work around its partial brokenness
  by installing some Lithuanian error pages manually.
- Bump PORTREVISION

PR:		60950
Submitted by:	maintainer
2004-01-06 08:12:54 +00:00
Will Andrews
f86c3e7f09 Change maintainer to Thomas-Martin Seck.
Approved by:	adrian
2004-01-05 09:54:57 +00:00
Edwin Groothuis
a8f032a31d More patches for squid, to keep up to date with the squid distribution.
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (privately)
Approved by:	maintainer timeout (still)
2004-01-02 00:28:12 +00:00
Edwin Groothuis
0c807e28a4 Add more patch files for www/squid
PR:		ports/59091 (based on)
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de>
2003-12-30 09:22:31 +00:00
Edwin Groothuis
6596ca7372 Uncomment the lines I needed to test the port. Mea Culpa.
*grabs pointy hat*
2003-12-28 11:03:28 +00:00
Edwin Groothuis
23f0a346aa [PATCH] www/squid: update to 2.5-STABLE4 (+ vendor patches)
[...]
- Add 2.5-STABLE4 vendor patches
  - cache.log message on "squid -k reconfigure" confusing
  - digest auth never detects password changes
  - login with space confuses redirector helpers
  - FQDNcache discards negative responses when using internal DNS
  - Full details at http://www.squid-cache.org/Versions/v2/2.5/bugs/#STABLE4
[...]

PR:		ports/58090
Submitted by:	Jonathan Noack <noackj@concordiacrusaders.org>
Approved by: 	MAINTAINER TIMEOUT
2003-12-28 09:58:21 +00:00
Edwin Groothuis
888ac61430 [PATCH] www/squid: update to 2.5 STABLE 4
- Update to 2.5-STABLE4
	- plist is correct -- see ports/56392 for details on extra files

PR:		ports/56926
Submitted by:	Jonathan Noack <noackj@concordiacrusaders.org>
Approved by:	MAINTAINER TIMEOUT
2003-12-28 09:46:35 +00:00
Jun Kuriyama
6133b977dd o Allow to use $SQUID_CONFIGURE_ARGS in /etc/make.conf for additional
$CONFIGURE_ARGS.

No response from:	maintainer
2003-12-13 13:35:48 +00:00
Adrian Chadd
30ebff3f31 Massive upgrade to 2.5-stable3. Thanks!
PR:		ports/54153
Submitted by:	Jon Noack <noackjr@alumni.rice.edu>
2003-07-27 08:45:11 +00:00
Adrian Chadd
f1257b0a60 Bring the squid-2.5 port up to 2.5.STABLE2.
Expect another few commits soon to improve features :)
2003-04-09 08:31:30 +00:00
Alexander Leidinger
9cabafdc76 Add vendor patches:
- fixes for some security issues
 - fixes for Samba 2.2.6 or later
 - fixes for OpenSSL 0.9.7 or later
 - performance fixes
 - reliability fixes
 - stability fixes
 - documentation fixes
 - fixes/improvements for OpenLDAP 2.1.x or later
 - ...

Have a look at http://www.squid-cache.org/Versions/v2/2.5/bugs/ for a
more detailed description.

Maintainer timeout after:	~3 months
Submitted by:	marius@alchemy.franken.de
Approved by:	kris
2003-03-09 10:59:07 +00:00
Ade Lovett
7e52725f2a Clear moonlight beckons.
Requiem mors pacem pkg-comment,
And be calm ports tree.

E Nomini Patri, E Fili, E Spiritu Sancti.
2003-03-07 06:14:21 +00:00
Adrian Chadd
2314294cfd Grab the patch against squid24 from a PR..
PR:		42747
2003-01-31 09:02:49 +00:00
Sean Chittenden
c3076efeb3 Document the configure argument for reverse SSL proxies. 2003-01-02 20:21:40 +00:00
Edwin Groothuis
fb6be6b3b3 Removed double USE_PERL5
Submitted by:	marius@alchemy.franken.de
2002-11-05 00:48:06 +00:00
Edwin Groothuis
5019ffc91b Half of these ones missed yesterday while converting to USE_REINPLACE.
The other half needs perl to build.

Noticed on bento and others (full mailbox :-)
2002-11-04 22:57:37 +00:00
Edwin Groothuis
b9c12aa595 PERL -> REINPLACE
Noticed by: bento
2002-11-04 01:15:06 +00:00
Adrian Chadd
03e3464175 Update the port to squid-2.5.stable1.
Notable features:

* I'm building _all_ of the error page languages now
* I'm building a handful of the helper modules (the ones that don't
  require ldap or samba to be installed)
* underscores in hostnames are enabled - every few weeks we squid people
  get emails asking why someone can't get to some_user.geocities.com .
  Bad geocities. :)
2002-10-14 05:51:12 +00:00
Akinori MUSHA
46723b1c08 - Use MASTER_SITE_SUBDIR.
- Add MASTER_SITE_RINGSERVER to MASTER_SITES.
2002-10-13 21:07:00 +00:00
Adrian Chadd
3a063f9045 Update squid port to squid-2.4stable7.
This fixes a few security bugs so users should upgrade.
(Thanks for the reminder! :)

PR:		40175
2002-07-05 09:39:38 +00:00
Adrian Chadd
4e8d40ae7a Update the squid24 port to Squid-2.4.STABLE6.
STABLE5 was a buggy release, so we're skipping that one.
2002-03-22 00:19:55 +00:00
Adrian Chadd
42f0bf9749 Fix a typo, spotted by des. 2002-02-20 03:44:04 +00:00
Adrian Chadd
70be6c595f Update the port to squid-2.4stable4 . 2002-02-19 13:46:22 +00:00
Adrian Chadd
066b60ed0c Update the port to squid-2.4STABLE3.
From the ChangeLog:

Changes to Squid-2.4.STABLE3 (Nov 28, 2001):

        - Fixed bug #255: core dump on SSL/CONNECT if access denied by
          miss_access
        - Fixed bug #246: corrupt on-disk meta information preventing
          rebuilds of lost swap.state files
        - Fixed bug #243: squid_ldap_auth now supports spaces in passwords
        - Fixed a coredump when creating FTP directories
        - Fixed a compile time problem with statHistDump prototype
	  mistmatch, reported by some compilers
        - Fixed a potential coredump situation on snmpwalk in certain
          configurations
        - Fixed bug #229: filedescriptor leakage in the "aufs" cache_dir
          store implementation
        - Serbian error message translations
2001-12-03 03:39:14 +00:00
Adrian Chadd
5fa3173ffa Remove the RunCache stuff and let squid handle its own child maintainence.
This now means that 'stop' as an argument works correctly, and doesn't
end up having squid restarted.

I've added some sleep code to wait for squid to complete its shutdown,
but I have commented it out for the time being as I don't know whether
its good practice to have your machine sleep during shutdown.
I'll research it some more. :)
2001-09-01 08:34:14 +00:00
Adrian Chadd
dab5cbaf8a * Update the port to use the newly-release squid-2.4STABLE2
* Fix the Makefile to actually chown our log/cache dirs to nobody
  when they're created
2001-08-28 16:48:35 +00:00
Adrian Chadd
a0cf24270f Make sure we don't delete mime.conf and squid.conf at package
uninstallation time if they've been modified.
2001-06-17 22:24:02 +00:00
Adrian Chadd
bdcd6c305d PR: 26339
Fix the diskd path issue. diskd should now be found by squid and work happy.
2001-04-10 14:41:19 +00:00
Adrian Chadd
33c9c61150 Add the latest patch - a HTCP (cache control protocol, not a HTTP extension)
fix.
2001-04-03 09:06:34 +00:00
Adrian Chadd
42e0c7c84e Add some PATCHFILES to this port, and bump its PORTREVISION.
I ran off and updated the patch files on the squid website for 2.4.stable1,
and then updated this port to use them.

Note that diskd is still broken here - I haven't actually
committed a fix to squid yet .. :-P
2001-03-31 11:41:18 +00:00
Maxim Sobolev
4ca0e60800 -pthread --> ${PTHREAD_LIBS}
-D_THREAD_SAFE --> ${PTHREAD_CFLAGS}

Note: my first intention was to test this out on bento/beta, but per ade's
requiest I opted to do it quickly.
2001-03-29 16:35:19 +00:00
Adrian Chadd
4ec1030ca3 .. and update the Makefile to indicate that its my port, built by me. :) 2001-03-27 12:56:41 +00:00
Adrian Chadd
88dd211266 PR: 26059
Update the squid-2.4 port to actually _be_ squid-2.4 . Phew.
This port builds, installs, packages, pkg_delete's cleanly.

I'm going to run it through some more linting and tidying up before
I'm completely done with it.

Differences from squid22/squid23 :

* install-pinger isn't built. I'll tackle this later, possibly by creating
  a squid user/group. I don't like having suid binaries installed,
  even more so when 99% of the users of this port won't even enable
  ICMP pinging.

* I've enabled the lru and heap replacement policies. LRU is used by
  default, the beauty here is that the user can choose one or the other
  without needing a recompile.

* I've enabled ufs (sync), diskd (async) and null (no caching, only proxying).
  This again lets users choose what they want without needing a recompile.
  The default is still a 100mb cache in /usr/local/squid/cache/ running
  ufs. I would change it to diskd but if the user hasn't tweaked their
  sysV shm/msg parameters sufficiently they'll just be puzzled when squid
  gives mysterious sysV errors (and if they load it up enough to have UFS
  become an issue, they'd be better off reading the squid FAQ anyhow..)
2001-03-27 12:28:47 +00:00
Jimmy Olgeni
046b1114c5 Fix typo: othervise -> otherwise. 2001-02-19 13:15:19 +00:00
Jimmy Olgeni
d2f3fc0d14 Some spaces -> tabs for ports/www. 2001-02-05 15:33:58 +00:00
Peter Wemm
529787e5c4 Pass the maintainership bit to adrian (who happens to be a squid committer) 2001-01-12 06:46:04 +00:00
Peter Wemm
2d740e43f7 Long overdue update. Add some vendor supplied patches.
Nagged by: many folks
2001-01-05 10:49:01 +00:00
Maxim Sobolev
7d2b0dbb5c Update to the latest 2.3.STABLE4 version plus official patches.
PR:		20211
Submitted by:	Naoki IDO <ido@hitachi-ms.co.jp>
Reviewed by:	adrian
2000-07-28 07:27:36 +00:00
Thomas Gellekum
546041ba31 As threatened on freebsd-ports: all startup scripts know about the two
options `start' and `stop' now (unless I have forgotten any). This allows
us to call the scripts from /etc/rc.shutdown with the correct option.

The (42 or so) ports that already DTRT before are unchanged.
2000-07-05 12:37:06 +00:00
Maxim Sobolev
415b1f6a31 Add an official patch.
Synopsis:

"If you fill up your squid cache, CPU will go to 100% but the cache will not be
cleaned up."

PR:		18920
Submitted by:	Mike Harding <mvh@ix.netcom.com>
Obtained from:	http://www.squid-cache.org/Versions/v2/2.3/bugs/
2000-06-01 06:49:51 +00:00
Steve Price
d95c34faac Correct a typo.
PR:		16476
Submitted by:	Christopher J. Michaels <cjm2@altavista.net>
2000-05-29 23:48:03 +00:00