Attachment 36168 Details for Bug 58090 – squid-2.5.4.patch

[patch] squid-2.5.4.patch

squid-2.5.4.patch (text/plain), 9.92 KB, created by Jonathan Noack on 2003-12-16 22:27:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Noack

Created: 2003-12-16 22:27:02 UTC

Size: 9.92 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/www/squid/Makefile /usr/home/noackjr/ports/www/squid/Makefile
>--- /usr/ports/www/squid/Makefile	Sat Dec 13 14:49:50 2003
>+++ /usr/home/noackjr/ports/www/squid/Makefile	Tue Dec 16 15:53:23 2003
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME=	squid
>-PORTVERSION=	2.5
>-PORTREVISION=	4
>+PORTVERSION=	2.5.4
>+PORTREVISION=
> CATEGORIES=	www
> MASTER_SITES=	\
> 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
>@@ -16,34 +16,35 @@
> 	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
> 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
> MASTER_SITE_SUBDIR=	squid-2/STABLE
>-DISTNAME=	squid-2.5.STABLE3
>+DISTNAME=	squid-2.5.STABLE4
> EXTRACT_SUFX=	.tar.bz2
> DIST_SUBDIR=	squid2.5
> 
> PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
>-PATCHFILES=	squid-2.5.STABLE3-deny_info.patch \
>-		squid-2.5.STABLE3-cache_dir_doc.patch \
>-		squid-2.5.STABLE3-devnull.patch \
>-		squid-2.5.STABLE3-log_quote.patch \
>-		squid-2.5.STABLE3-rfc_reference.patch \
>-		squid-2.5.STABLE3-external_acl_ident.patch \
>-		squid-2.5.STABLE3-gcc-3_3.patch \
>-		squid-2.5.STABLE3-carpfactor.patch \
>-		squid-2.5.STABLE3-neighbor_type_domain.patch \
>-		squid-2.5.STABLE3-header_access_peer.patch \
>-		squid-2.5.STABLE3-memwarnsbrk.patch \
>-		squid-2.5.STABLE3-hostscomments.patch \
>-		squid-2.5.STABLE3-store_check_cachable_stats.patch \
>-		squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch \
>-		squid-2.5.STABLE3-minimum_retry_timeout.patch \
>-		squid-2.5.STABLE3-tcp_reset_leak.patch \
>-		squid-2.5.STABLE3-hostheader.patch \
>-		squid-2.5.STABLE3-reply_body_max_size.patch \
>-		squid-2.5.STABLE3-ie_refresh.patch \
>-		squid-2.5.STABLE3-http_reply_access-denied.patch \
>-		squid-2.5.STABLE3-SENT_PASV.patch \
>-		squid-2.5.STABLE3-peer_digest_not_found_assertion.patch \
>-		squid-2.5.STABLE3-round_robin_max_size.patch
>+PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
>+		squid-2.5.STABLE4-digest_auth_pwchange.patch \
>+		squid-2.5.STABLE4-redirect_login_space.patch \
>+		squid-2.5.STABLE4-fqdnnegcache.patch \
>+		pam_auth-2.2.patch \
>+		squid-2.5.STABLE4_auth_param_doc.patch \
>+		squid-2.5.STABLE4-errorpages.patch \
>+		squid-2.5.STABLE4-error_load_text.patch \
>+		squid-2.5.STABLE4-xpi_mime.patch \
>+		squid-2.5.STABLE4-size_overflow.patch \
>+		squid-2.5.STABLE4-extacl_auth_loop.patch \
>+		squid-2.5.STABLE4-squid_ldap_group.patch \
>+		squid-2.5.STABLE4-positive_dns_ttl.patch \
>+		squid-2.5.STABLE4-gopherhtml.patch \
>+		squid-2.5.STABLE4-netroute.patch \
>+		squid-2.5.STABLE4-synflood.patch \
>+		squid-2.5.STABLE4-fqdn.patch \
>+		squid-2.5.STABLE4-connect_cleanup.patch \
>+		squid-2.5.STABLE4-pconn_post.patch \
>+		squid-2.5.STABLE4-ftp_put.patch \
>+		squid-2.5.STABLE4-pconn-load.patch \
>+		squid-2.5.STABLE4-icon_urls.patch \
>+		squid-2.5.STABLE4-redirector_access.patch \
>+		squid-2.5.STABLE4-pconn-lifo.patch
> PATCH_DIST_STRIP=	-p1
> 
> MAINTAINER=	adrian@freebsd.org
>@@ -106,7 +107,7 @@
> #CONFIGURE_ARGS+= --enable-htcp
> #  - Enable Forw/Via database
> #CONFIGURE_ARGS+= --enable-forw-via-db
>-#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
>+#  - Use Cache Digests - see http://www.squid-cache.org/Doc/FAQ/FAQ-16.html
> #CONFIGURE_ARGS+= --enable-cache-digests
> #  - Select language for Error pages (see errors dir)
> #CONFIGURE_ARGS+= --enable-err-language=lang
>@@ -130,6 +131,8 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/doc/squid.8
>+# Prevent installation of .orig files by deleting them.
>+	@${FIND} ${WRKSRC} -name \*.orig -delete
> 
> post-install:
> #	I don't think many people use the pinger nowadays, and if you
>diff -ruN --exclude=CVS /usr/ports/www/squid/distinfo /usr/home/noackjr/ports/www/squid/distinfo
>--- /usr/ports/www/squid/distinfo	Sun Jul 27 03:45:11 2003
>+++ /usr/home/noackjr/ports/www/squid/distinfo	Tue Dec 16 14:44:20 2003
>@@ -1,24 +1,25 @@
>-MD5 (squid2.5/squid-2.5.STABLE3.tar.bz2) = ed5eb7835d00fdecc7dd7c1837542df2
>-MD5 (squid2.5/squid-2.5.STABLE3-deny_info.patch) = fd6d2d1a5a75b06e86b743f51866c861
>-MD5 (squid2.5/squid-2.5.STABLE3-cache_dir_doc.patch) = e7f6d2bd28430e10999b12001cbb4cae
>-MD5 (squid2.5/squid-2.5.STABLE3-devnull.patch) = a31d669461e2893996f27b5d10ab06b9
>-MD5 (squid2.5/squid-2.5.STABLE3-log_quote.patch) = 9e391cbb39226abc89281cd4138ddb98
>-MD5 (squid2.5/squid-2.5.STABLE3-rfc_reference.patch) = 48996215282d80caf3b5cbbbdb7965b7
>-MD5 (squid2.5/squid-2.5.STABLE3-external_acl_ident.patch) = a7ab2152b202bf9941ee8200f20b3032
>-MD5 (squid2.5/squid-2.5.STABLE3-gcc-3_3.patch) = 49195dd7f3745c0f54c0ca07068b2d67
>-MD5 (squid2.5/squid-2.5.STABLE3-carpfactor.patch) = ac2a5f8304b29951ee3579cce10a6ea6
>-MD5 (squid2.5/squid-2.5.STABLE3-neighbor_type_domain.patch) = 3edd72ec42e0b49b36096a6a8fff6b2a
>-MD5 (squid2.5/squid-2.5.STABLE3-header_access_peer.patch) = 5015f95e0db20ddcb25082a92f8861a8
>-MD5 (squid2.5/squid-2.5.STABLE3-memwarnsbrk.patch) = 47cc7566f9584c6f8c764afcb95ce636
>-MD5 (squid2.5/squid-2.5.STABLE3-hostscomments.patch) = dabea14824e5b3d48b211c933471036a
>-MD5 (squid2.5/squid-2.5.STABLE3-store_check_cachable_stats.patch) = 04477bf0722026a67bbd6954b02c9374
>-MD5 (squid2.5/squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch) = b0ecd095062a21d72b15a817f4e821b5
>-MD5 (squid2.5/squid-2.5.STABLE3-minimum_retry_timeout.patch) = b265b000b2f5d48a385f68c6d987cbea
>-MD5 (squid2.5/squid-2.5.STABLE3-tcp_reset_leak.patch) = 49c5aeb54467e7cbf44edd2271006bb3
>-MD5 (squid2.5/squid-2.5.STABLE3-hostheader.patch) = b786122d2353e1e607d1d02e18a86b61
>-MD5 (squid2.5/squid-2.5.STABLE3-reply_body_max_size.patch) = f869e793478ad6c3c706424d0236dcaa
>-MD5 (squid2.5/squid-2.5.STABLE3-ie_refresh.patch) = 82bfba0cde950541c6aef5e8b52db010
>-MD5 (squid2.5/squid-2.5.STABLE3-http_reply_access-denied.patch) = 2abe9bd50e6561251dfd96d2583d15bc
>-MD5 (squid2.5/squid-2.5.STABLE3-SENT_PASV.patch) = c394ec388054b1f86d419006250400bd
>-MD5 (squid2.5/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = f071e6e3ba5a56ce5d0350d7528b597c
>-MD5 (squid2.5/squid-2.5.STABLE3-round_robin_max_size.patch) = 081a220c874765395394baa4482a8913
>+MD5 (squid2.5/squid-2.5.STABLE4.tar.bz2) = 9894a1fe855b0cccdc14fbf014060990
>+MD5 (squid2.5/squid-2.5.STABLE4-reconfigure_message.patch) = a746143deab8b609730660916a297618
>+MD5 (squid2.5/squid-2.5.STABLE4-digest_auth_pwchange.patch) = e5020f5b87a92c4d9621ce25403d691b
>+MD5 (squid2.5/squid-2.5.STABLE4-redirect_login_space.patch) = 2374ed6dae7ef57c009e2428284d6b65
>+MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25
>+MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8
>+MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15
>+MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7
>+MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647
>+MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4
>+MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce
>+MD5 (squid2.5/squid-2.5.STABLE4-extacl_auth_loop.patch) = de06bbc89f5408b7ab83733d894d4fe7
>+MD5 (squid2.5/squid-2.5.STABLE4-squid_ldap_group.patch) = a5d0a8730aacf129401aabdfa61d60f7
>+MD5 (squid2.5/squid-2.5.STABLE4-positive_dns_ttl.patch) = 7fca4475d86acc7db242c261b08751d7
>+MD5 (squid2.5/squid-2.5.STABLE4-gopherhtml.patch) = 2c6c50a4a8f4d0d0017ab7c15bacfe26
>+MD5 (squid2.5/squid-2.5.STABLE4-netroute.patch) = f83e66712f37f34a04571b31be6c2db8
>+MD5 (squid2.5/squid-2.5.STABLE4-synflood.patch) = b92e7a56e87374ebf2eb50e044f07f6d
>+MD5 (squid2.5/squid-2.5.STABLE4-fqdn.patch) = dbf2c020e3c3c52ae540d96a724fac87
>+MD5 (squid2.5/squid-2.5.STABLE4-connect_cleanup.patch) = ee0398f51a22ab2c82048c8935d6d11c
>+MD5 (squid2.5/squid-2.5.STABLE4-pconn_post.patch) = 4a5b7ab04fe8b73906db441448534bbb
>+MD5 (squid2.5/squid-2.5.STABLE4-ftp_put.patch) = d3b69c8e79c96c13005d6dbeb72e5c76
>+MD5 (squid2.5/squid-2.5.STABLE4-pconn-load.patch) = a432f9eff9e0963b7338e41a91230d95
>+MD5 (squid2.5/squid-2.5.STABLE4-icon_urls.patch) = cf28143216b1364e56e820dddbb66dfc
>+MD5 (squid2.5/squid-2.5.STABLE4-redirector_access.patch) = 9c534a3d58fe0e3545cd4ed9af92a0e8
>+MD5 (squid2.5/squid-2.5.STABLE4-pconn-lifo.patch) = f41051c248764749d9d9ca5704925da7
>diff -ruN --exclude=CVS /usr/ports/www/squid/pkg-plist /usr/home/noackjr/ports/www/squid/pkg-plist
>--- /usr/ports/www/squid/pkg-plist	Sun Jul 27 03:45:11 2003
>+++ /usr/home/noackjr/ports/www/squid/pkg-plist	Tue Sep 16 14:40:00 2003
>@@ -461,6 +461,30 @@
> etc/squid/errors/Korean/ERR_URN_RESOLVE
> etc/squid/errors/Korean/ERR_WRITE_ERROR
> etc/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
>+etc/squid/errors/Lithuanian/ERR_ACCESS_DENIED
>+etc/squid/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
>+etc/squid/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
>+etc/squid/errors/Lithuanian/ERR_CANNOT_FORWARD
>+etc/squid/errors/Lithuanian/ERR_CONNECT_FAIL
>+etc/squid/errors/Lithuanian/ERR_DNS_FAIL
>+etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
>+etc/squid/errors/Lithuanian/ERR_FTP_DISABLED
>+etc/squid/errors/Lithuanian/ERR_FTP_FAILURE
>+etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED
>+etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR
>+etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
>+etc/squid/errors/Lithuanian/ERR_INVALID_REQ
>+etc/squid/errors/Lithuanian/ERR_INVALID_URL
>+etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP
>+etc/squid/errors/Lithuanian/ERR_NO_RELAY
>+etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
>+etc/squid/errors/Lithuanian/ERR_READ_ERROR
>+etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT
>+etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE
>+etc/squid/errors/Lithuanian/ERR_UNSUP_REQ
>+etc/squid/errors/Lithuanian/ERR_URN_RESOLVE
>+etc/squid/errors/Lithuanian/ERR_WRITE_ERROR
>+etc/squid/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
> etc/squid/errors/Polish/ERR_ACCESS_DENIED
> etc/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
> etc/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
>@@ -847,6 +871,7 @@
> @dirrm etc/squid/errors/Italian
> @dirrm etc/squid/errors/Japanese
> @dirrm etc/squid/errors/Korean
>+@dirrm etc/squid/errors/Lithuanian
> @dirrm etc/squid/errors/Polish
> @dirrm etc/squid/errors/Portuguese
> @dirrm etc/squid/errors/Romanian

Actions: View | Diff

Attachments on bug 58090: 36167 | 36168