cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- check that PATCH_DEBUG is set to yes instead of just being defined

Browse Source 
- change MAINTAINER, ports@ -> brad@
- add 2 distribution patches;

squid-2.2.stable5-domain-match.patch
Matching a hostname and a domain name doesn't always work, depending on
leading dots and other edge conditions. Plus, the code for matching in
ACL's worked one way, while the code for matching 'cache_peer_domain' list
worked slighly different.

The patch below makes all host/domain matching operate the same way. It
also changes the rules a bit, so your current configuration probably will
not work the way you want after applying this patch.

- patch was included in the patches dir because of the difference in
relative path in comparison to all the other distribution patches.

squid-2.2.stable5-mkhttpdlogtime-end-of-year.patch = patch-ai
mkhttpdlogtime() generates a date string of the form 31/Dec/1999:23:59:59 +0900.
But when the year changes, the timezone offset will be wrong, for example:
01/Jan/2000:00:00:00 -1500.
This commit is contained in:
brad 2000-01-17 15:38:38 +00:00
parent 7687469a8e
commit 4e70dc50d5
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/squid/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 1999/12/09 19:48:17 brad Exp $
# $OpenBSD: Makefile,v 1.8 2000/01/17 15:38:38 brad Exp $
DISTNAME= squid-2.2.STABLE5
PKGNAME= squid-2.2
@ -9,14 +9,15 @@ EXTRACT_SUFX= -src.tar.gz
PATCH_SITES= http://squid.nlanr.net/Versions/v2/2.2/bugs/
PATCHFILES= squid-2.2.stable5-no_cache.patch \
squid-2.2.stable5-ipcache_negative.patch \
squid-2.2.stable5-newlines_in_auth.patch
.if defined(PATCH_DEBUG)
squid-2.2.stable5-newlines_in_auth.patch \
squid-2.2.stable5-domain-match.patch
.if defined(PATCH_DEBUG) && ${PATCH_DEBUG:U} == YES
PATCH_DIST_ARGS=-d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
.else
PATCH_DIST_ARGS=-d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
.endif
MAINTAINER= ports@openbsd.org
MAINTAINER= brad@openbsd.org
SYSCONFDIR= /etc/squid
GNU_CONFIGURE= yes

3
www/squid/files/md5
View File

@ -1,12 +1,15 @@
MD5 (squid-2.2.STABLE5-src.tar.gz) = e5b02867a4c58ac5db191041a9c298b6
MD5 (squid-2.2.stable5-domain-match.patch) = 4731e1f7f7886b7e733432fb3a9496c1
MD5 (squid-2.2.stable5-ipcache_negative.patch) = 20bfacdf3722a9957ea5ca6c64626aa2
MD5 (squid-2.2.stable5-newlines_in_auth.patch) = 5860cdc5613486f04571b81da40d4958
MD5 (squid-2.2.stable5-no_cache.patch) = adb98dcb868da61ffcf5035cbf7f1049
RMD160 (squid-2.2.STABLE5-src.tar.gz) = ea2dada08f2d63cb83be8a97717e403ee62330e7
RMD160 (squid-2.2.stable5-domain-match.patch) = a9fa78b0891bee8aec684b91fe3af58b408ae75a
RMD160 (squid-2.2.stable5-ipcache_negative.patch) = dcb9ac05647d92f476704c3f24d5984cac1d90e1
RMD160 (squid-2.2.stable5-newlines_in_auth.patch) = b81e3e685ebeb8503eb2ab79b8f90be4c2552802
RMD160 (squid-2.2.stable5-no_cache.patch) = 8677052f0f57549e3bc4859f05a0caf650d44e7d
SHA1 (squid-2.2.STABLE5-src.tar.gz) = ab03c701a3e21805bcf313b54f95dd3fe435a67f
SHA1 (squid-2.2.stable5-domain-match.patch) = b03c2bbd7da4f89e724badae4d977289de2deb7b
SHA1 (squid-2.2.stable5-ipcache_negative.patch) = 23bb13dbe470a31b190b6ce6e0982591f9fe4a66
SHA1 (squid-2.2.stable5-newlines_in_auth.patch) = 5fa99dce569b9e297890e4fe275d6b97f38d8456
SHA1 (squid-2.2.stable5-no_cache.patch) = 3dadd96c7b9081d1c4b79a7137ced42459fcd744

22
www/squid/patches/patch-ai Normal file
View File

@ -0,0 +1,22 @@
--- lib/rfc1123.c.orig Fri Feb 12 14:38:15 1999
+++ lib/rfc1123.c Mon Jan 17 09:16:29 2000
@@ -237,15 +237,16 @@
gmt_yday = gmt->tm_yday;
lt = localtime(t);
- day_offset = lt->tm_yday - gmt_yday;
- min_offset = day_offset * 1440 + (lt->tm_hour - gmt_hour) * 60
- + (lt->tm_min - gmt_min);
+ day_offset = lt->tm_yday - gmt_yday;
/* wrap round on end of year */
if (day_offset > 1)
day_offset = -1;
else if (day_offset < -1)
day_offset = 1;
+
+ min_offset = day_offset * 1440 + (lt->tm_hour - gmt_hour) * 60
+ + (lt->tm_min - gmt_min);
len = strftime(buf, 127 - 5, "%d/%b/%Y:%H:%M:%S ", lt);
snprintf(buf + len, 128 - len, "%+03d%02d",