diff options
-rw-r--r-- | www/squid30/Makefile | 32 | ||||
-rw-r--r-- | www/squid30/distinfo | 147 | ||||
-rw-r--r-- | www/squid30/files/patch-errors__Armenian | 71 | ||||
-rw-r--r-- | www/squid30/pkg-descr | 2 | ||||
-rw-r--r-- | www/squid31/Makefile | 32 | ||||
-rw-r--r-- | www/squid31/distinfo | 147 | ||||
-rw-r--r-- | www/squid31/files/patch-errors__Armenian | 71 | ||||
-rw-r--r-- | www/squid31/pkg-descr | 2 |
8 files changed, 186 insertions, 318 deletions
diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 73ef1c292acd..046b8f7382aa 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -61,9 +61,8 @@ # together with other code that adds custom HTTP headers to the # requests. -PORTREVISION= 1 PORTNAME= squid -PORTVERSION= 3.0.p7.${PATCHSET_DATE} +PORTVERSION= 3.0.r1.${PATCHSET_DATE} CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ @@ -82,7 +81,7 @@ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://www1.jp.squid-cache.org/Versions/v3/3.0/ \ http://www2.tw.squid-cache.org/Versions/v3/3.0/ MASTER_SITE_SUBDIR= squid-3/DEVEL -DISTNAME= squid-3.0.PRE7 +DISTNAME= squid-3.0.RC1 DIST_SUBDIR= squid3.0 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ @@ -98,11 +97,10 @@ PATCH_SITE_SUBDIR= Versions/v3/3.0/changesets # Inspired by editors/vim: # (I know that portlint is not happy with this, but putting this code at any # other location makes it even unhappier.) -PATCHSET_DATE= 20070919 -FIRST_PATCHSET= 11069 -LAST_PATCHSET= 11107 -IGNORE_PATCHSETS= 11070 11071 11077 11080 11083 11087 11090 11095 \ - 11097 11103 11105 11106 +PATCHSET_DATE= 20071001 +FIRST_PATCHSET= 11149 +LAST_PATCHSET= 11149 +IGNORE_PATCHSETS= PATCHFILES!= jot -w "%d.patch" - ${FIRST_PATCHSET} ${LAST_PATCHSET} 1 .for ps in ${IGNORE_PATCHSETS} PATCHFILES:= ${PATCHFILES:N${ps}\.patch} @@ -116,7 +114,8 @@ LATEST_LINK= squid30 CONFLICTS= squid-2.[0-9].* GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:261 automake:19 libtool:15 +# disable autotools bootstrapping for now, RC1 does not currently require it: +#USE_AUTOTOOLS= autoconf:261 automake:19 libtool:15 USE_BZIP2= yes USE_PERL5= yes USE_RC_SUBR= squid @@ -352,7 +351,10 @@ CONFIGURE_ARGS+= --enable-icap-client .endif .if defined(WITH_SQUID_ESI) CONFIGURE_ARGS+= --enable-esi -LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2 +LIB_DEPENDS+= expat:${PORTSDIR}/textproc/expat2 \ + xml2:${PORTSDIR}/textproc/libxml2 +CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2 +LDFLAGS+= -L${LOCALBASE}/lib .endif .if defined(WITHOUT_SQUID_KQUEUE) # Squid-3's kqueue support is still marked as experimental, so it is not yet @@ -380,11 +382,7 @@ WITH_DEBUG?= yes # # If you do not define SQUID_LANGUAGES yourself, all available language files # will be installed; the default language will be English. -# -# XXX: Support for Armenian error pages is disabled for now because two -# pages are lacking from the distribution. - -SQUID_LANGUAGES?= Azerbaijani Bulgarian Catalan Czech Danish \ +SQUID_LANGUAGES?= Armenian Azerbaijani Bulgarian Catalan Czech Danish \ Dutch English Estonian Finnish French German Greek \ Hebrew Hungarian Italian Japanese Korean Lithuanian \ Polish Portuguese Romanian Russian-1251 Russian-koi8-r \ @@ -413,8 +411,8 @@ PLIST_DIRS+= etc/squid/errors etc/squid squid/logs squid/cache squid post-patch: # add this version's datestamp so that Squid identifies itself as patched-up: - @${REINPLACE_CMD} -e 's|3.0.PRE7|&+PatchSets-${PATCHSET_DATE}|' \ - ${WRKSRC}/configure.in + @${REINPLACE_CMD} -e 's|3.0.RC1|&+PatchSets-${PATCHSET_DATE}|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/src/cf.data.pre @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ diff --git a/www/squid30/distinfo b/www/squid30/distinfo index 0b4d57debdc1..addcf2f7afeb 100644 --- a/www/squid30/distinfo +++ b/www/squid30/distinfo @@ -1,141 +1,6 @@ -MD5 (squid3.0/squid-3.0.PRE7.tar.bz2) = 3b774e6b089c45fab2afbf3123f9f3c1 -SHA256 (squid3.0/squid-3.0.PRE7.tar.bz2) = ad6612b551c97ccd7fb494032d664102ddd317ec5e204c40338b77c88cc4d09c -SIZE (squid3.0/squid-3.0.PRE7.tar.bz2) = 1807811 -MD5 (squid3.0/11069.patch) = a3e1a701fe254448be75cd81c1391886 -SHA256 (squid3.0/11069.patch) = 44d29714625e759fe38c19cd22ccb6936b95a0bcc5d6948f12862df492543d61 -SIZE (squid3.0/11069.patch) = 982 -MD5 (squid3.0/11072.patch) = b03399f1ea7c062a14c52ab898f8d9bb -SHA256 (squid3.0/11072.patch) = 26c6bfe9a9ac7bd7e62d534b9aacc2ae42a5a2813319afee9559a122effb0661 -SIZE (squid3.0/11072.patch) = 1976 -MD5 (squid3.0/11073.patch) = 79fe27dc5259289ce811d0ad33a09f18 -SHA256 (squid3.0/11073.patch) = a7dec8d3ceb983f245a23bcbdc38060f82f69e292207fa97fa3cdee56a977f38 -SIZE (squid3.0/11073.patch) = 9046 -MD5 (squid3.0/11074.patch) = 476e98681d8ca0b178c65b6545cb59a4 -SHA256 (squid3.0/11074.patch) = e128d270ee1bbc0fe5730428bcb1b1e1e3089002736683e7f412fc72944a0d0b -SIZE (squid3.0/11074.patch) = 4151 -MD5 (squid3.0/11075.patch) = 06bf6b45d97165c0e02f3a53bdfc6472 -SHA256 (squid3.0/11075.patch) = 76407927157ce92949edf45d8842890b2b8fe6cd3779c455a235f26a1e3557dc -SIZE (squid3.0/11075.patch) = 23969 -MD5 (squid3.0/11076.patch) = e4e7dcbf6a0f410ab3dfd1225b09f1dc -SHA256 (squid3.0/11076.patch) = 50535cbb88186c83e80e6c61d9a69bfc0763fde44fe7142e4fd85327c046b13e -SIZE (squid3.0/11076.patch) = 1112 -MD5 (squid3.0/11078.patch) = 4e6bef27dd52ffe3cc25c77f70804912 -SHA256 (squid3.0/11078.patch) = dcb8d41d7daeb7b0f985414bfb6fad4d78d41e01045715e7f91602279636b341 -SIZE (squid3.0/11078.patch) = 1835 -MD5 (squid3.0/11079.patch) = b7e05b850e747151c0432a13334902a0 -SHA256 (squid3.0/11079.patch) = 550a9ded9adf948054d9b6d17a57b6b90f7ab881454b6aa54674c726bd59f35b -SIZE (squid3.0/11079.patch) = 1556 -MD5 (squid3.0/11081.patch) = a0384b0559604c072abd77f6de54c8b6 -SHA256 (squid3.0/11081.patch) = 5c9bd9738e7c603f4b087a9b6ff528fe399257e8468e2a2be4d9ae47b0d5e755 -SIZE (squid3.0/11081.patch) = 203838 -MD5 (squid3.0/11082.patch) = 459cfe82d3c8c9cdbd341e952bfb6a4e -SHA256 (squid3.0/11082.patch) = f94db038c0d61da616a3d43ef3647abc38c851935ffdc4b09d4ad11c2e482e30 -SIZE (squid3.0/11082.patch) = 930 -MD5 (squid3.0/11084.patch) = 0e89aecbcc591bed9bbce12c7132dd95 -SHA256 (squid3.0/11084.patch) = f03b446fc734dc6da6ff8b68f2d2c0555cc092b0cfbc560bae1376631a08eab7 -SIZE (squid3.0/11084.patch) = 2778 -MD5 (squid3.0/11085.patch) = 6963562fc0cf42506132ce84c09122a5 -SHA256 (squid3.0/11085.patch) = 58ad94fe604a3196afc3be0745fea433a7b3988dbab84f84e76c3bd4edb30ab8 -SIZE (squid3.0/11085.patch) = 1160 -MD5 (squid3.0/11086.patch) = eb392846d7341e0b5cc73ef4b04b401d -SHA256 (squid3.0/11086.patch) = 0091d675bd4f8ebc69236660504acd9df6cd476ceddf3566fe26a5dfdd8b07cd -SIZE (squid3.0/11086.patch) = 18688 -MD5 (squid3.0/11088.patch) = 5899d46640880572374f3b13ec13317e -SHA256 (squid3.0/11088.patch) = f7bc94a33882d45796d4267ba0724f2d0aea2eff9f5e45c8095684749b086407 -SIZE (squid3.0/11088.patch) = 1365 -MD5 (squid3.0/11089.patch) = f0868f1010d6bb9d1078c1009b4e9a42 -SHA256 (squid3.0/11089.patch) = 83166ce50312b9af1b8abf43cf7894d91233c0ff9da29d7852f8ebb818406634 -SIZE (squid3.0/11089.patch) = 997 -MD5 (squid3.0/11091.patch) = 576b59067e2b3a7e4a17f1355fdb1510 -SHA256 (squid3.0/11091.patch) = 0759cb35fca3cae595a5b2cc26729a2da5e66b1ef19c00704fc58a3ac244f2eb -SIZE (squid3.0/11091.patch) = 1083 -MD5 (squid3.0/11092.patch) = 006c7d7bb958a1e4200e7e3ace453e4e -SHA256 (squid3.0/11092.patch) = 30cd978df8327e6e4324fdff73370cad6ca2399530cbfb4f981f7e219ea55802 -SIZE (squid3.0/11092.patch) = 1367 -MD5 (squid3.0/11093.patch) = 51591a8d58266ef4747151e5f11a26a0 -SHA256 (squid3.0/11093.patch) = c15f053abed89dcd07b6412014969921f0e5ab7b824ad479fd35b8a428a1fca2 -SIZE (squid3.0/11093.patch) = 1515 -MD5 (squid3.0/11094.patch) = 268523d58735e1d980b9c15cb41770aa -SHA256 (squid3.0/11094.patch) = 543c10f09c9d45db11e746cb952cdde6c17ed55e28c3e739c4e3e1d4801be55a -SIZE (squid3.0/11094.patch) = 1214 -MD5 (squid3.0/11096.patch) = b241a11dffd6f3006917a61083fc1a54 -SHA256 (squid3.0/11096.patch) = 430bd1aad4887c7536afeb641014a5556de13128432f36e937751b3166fe6242 -SIZE (squid3.0/11096.patch) = 1250 -MD5 (squid3.0/11098.patch) = 6defca62a09a22a6d1639ed07079a049 -SHA256 (squid3.0/11098.patch) = f96aa882aad8838b2c0924b5c45f1586367710185a6457874e09f650f32fc62c -SIZE (squid3.0/11098.patch) = 2152 -MD5 (squid3.0/11099.patch) = d5e906b030b1d0856e09bc78567bdb15 -SHA256 (squid3.0/11099.patch) = addac90866112e2aab824595cf1061ed8090365671cfd5356a80347341669b30 -SIZE (squid3.0/11099.patch) = 1144 -MD5 (squid3.0/11100.patch) = 7dfad56be4b89c90ddd8249c4e4fe48e -SHA256 (squid3.0/11100.patch) = 44daa008f4c81060b066cb8ca81201999f3f0fc5a2803b3a8714869efc02f74b -SIZE (squid3.0/11100.patch) = 1149 -MD5 (squid3.0/11101.patch) = ec74f734ba8b0719d2c36f3f35d40019 -SHA256 (squid3.0/11101.patch) = fe60dd79aeef7afd7c63db16dfef1a5f100a39a032303dd088d480bc3aa21509 -SIZE (squid3.0/11101.patch) = 1943 -MD5 (squid3.0/11102.patch) = 296ffa972e96b21ba1c9b36112d8adb9 -SHA256 (squid3.0/11102.patch) = eebf3c65862fcb2e3559cc33376b6ff6c2bb89e9e7d4f4a6e6c430d910e00a25 -SIZE (squid3.0/11102.patch) = 1254 -MD5 (squid3.0/11103.patch) = 09d6103cdcf358b93a9fc1a87c684966 -SHA256 (squid3.0/11103.patch) = b21244eb588bfd5669cd6d287974a0f3426a14041fa8e2043c153cc015fc37a3 -SIZE (squid3.0/11103.patch) = 4054 -MD5 (squid3.0/11104.patch) = 87fe49a6cd0ef5bbdf17d8cfbc83d222 -SHA256 (squid3.0/11104.patch) = faefd03cd40ffcf9b5a5bdffefdbc440da97040f25bca7ff3a5a6f56eb0ac7a4 -SIZE (squid3.0/11104.patch) = 1278 -MD5 (squid3.0/11105.patch) = ea32f36fd5219a80e63b910e14b3787f -SHA256 (squid3.0/11105.patch) = 4fdbfae8be2c172a109232f0a82d0ca892374b4cb36416be086f823542233795 -SIZE (squid3.0/11105.patch) = 29877 -MD5 (squid3.0/11107.patch) = 7599037492801fbc32c500be0051ac7f -SHA256 (squid3.0/11107.patch) = ec65bed4329343bcc90f9f5570162430ba3a933d3e75569fffa89327dd2942dc -SIZE (squid3.0/11107.patch) = 4106 -MD5 (squid3.0/11108.patch) = 80d3160e29f0bd34a285b12c587197c1 -SHA256 (squid3.0/11108.patch) = bbc6beec6674f793b9a47423860fb94eaa438cbcc49376c72ece2e1e1c1fc3c3 -SIZE (squid3.0/11108.patch) = 1381 -MD5 (squid3.0/11109.patch) = f99c38049ce3609bd05a249edea6cbb6 -SHA256 (squid3.0/11109.patch) = f05874c6ff6a3a34e4dd7fc6ed3d31a09d632ea7959ddb1f18f5022d6678c544 -SIZE (squid3.0/11109.patch) = 5403 -MD5 (squid3.0/11111.patch) = 62255b7fff26e08f0163e251ee3af283 -SHA256 (squid3.0/11111.patch) = c210464fff2a349d11e90a317db4a6fd6f75f5ea368f76d87974b329bf7a2e4e -SIZE (squid3.0/11111.patch) = 994 -MD5 (squid3.0/11112.patch) = f1fd72bad3761cf0eba5c289862f03bf -SHA256 (squid3.0/11112.patch) = d45456f4eaefc39055302e820a4074f88d7bbc09ec32bb7773f8665f23955c42 -SIZE (squid3.0/11112.patch) = 1911 -MD5 (squid3.0/11113.patch) = b30d429d3477cad481e1becdc68237a9 -SHA256 (squid3.0/11113.patch) = d60e818f6a2849081bdfa5bf50b69d576d1dca845ea528e86bc8ccd512e74e62 -SIZE (squid3.0/11113.patch) = 2171 -MD5 (squid3.0/11115.patch) = c4255a5a0c63f8fb078e426ddaffd157 -SHA256 (squid3.0/11115.patch) = 999f7a5ceef96f0ab0206cb991b3bcd0c2422c051a24596e7ee2a8792859e1c1 -SIZE (squid3.0/11115.patch) = 916 -MD5 (squid3.0/11116.patch) = a4803b64951047ffe7b4212d458d6803 -SHA256 (squid3.0/11116.patch) = 7ca2db30b64e7c236967d6f55b5461e34f99cb627188307441ed8d47776f4554 -SIZE (squid3.0/11116.patch) = 8214 -MD5 (squid3.0/11117.patch) = 80de32e73c559175dccc85bb12a95fa2 -SHA256 (squid3.0/11117.patch) = fba30bbc0f9ae77d592ebaa0cd0598e8b9c347ae6a806d6a0a88cd9369678119 -SIZE (squid3.0/11117.patch) = 1581 -MD5 (squid3.0/11118.patch) = 4fa9a82de7f11833faea594a8d5664eb -SHA256 (squid3.0/11118.patch) = 2ef3a35375ab3ed8baee56bf08e4f226e057b052ba2b01487cec17cc82df5ded -SIZE (squid3.0/11118.patch) = 901 -MD5 (squid3.0/11119.patch) = b7988ec78046e6710af795ea1cae60fe -SHA256 (squid3.0/11119.patch) = 47b2d315439b2a185fdde690a84b7eb3b197c366cef0cfffad3f03b5fead6150 -SIZE (squid3.0/11119.patch) = 1129 -MD5 (squid3.0/11120.patch) = 3bc71fe6b7bdbf2ffa1f8e66e9af2110 -SHA256 (squid3.0/11120.patch) = 07b5dafe58401999f65c4e285b208fb62ba5cd74393a9caf16a679e6d61d2192 -SIZE (squid3.0/11120.patch) = 99604 -MD5 (squid3.0/11121.patch) = c1a2bd5c050afab7f28922cb6cfaf63f -SHA256 (squid3.0/11121.patch) = 3c438d2e39851d6e4cfe8c481072b0766cfd915d407ac960a0457e5c5533fb3f -SIZE (squid3.0/11121.patch) = 13181 -MD5 (squid3.0/11122.patch) = 83c575764752364c6ef9b7d4acc16f27 -SHA256 (squid3.0/11122.patch) = 8c77985192e5211d41f6f3996f4809afc83b4a2c019e8efbf1c3e85e545177e6 -SIZE (squid3.0/11122.patch) = 1555 -MD5 (squid3.0/11123.patch) = 6e7044eed718316790f3fa6ee5f8fc7d -SHA256 (squid3.0/11123.patch) = 0f7d383349e7455a1a2f6870ee122934a3b05348f3d0f149a38f5a6815670dd5 -SIZE (squid3.0/11123.patch) = 4274 -MD5 (squid3.0/11124.patch) = 427e868b28ea6a7b7e407f5e1eb8e90e -SHA256 (squid3.0/11124.patch) = d0efa7429f68f911bd3dd358eabdc6387d13ebe5e7a58a602dd0ee4272c44742 -SIZE (squid3.0/11124.patch) = 1319 -MD5 (squid3.0/11125.patch) = 221d8fe35654dc03113b1507842d95e3 -SHA256 (squid3.0/11125.patch) = 69aee1addecc3a5998135156401b73f92749f1cea4e31a5fa1e06fed53ac253a -SIZE (squid3.0/11125.patch) = 1085 -MD5 (squid3.0/11126.patch) = 9a3697c3fdf582972031c6e1551fc4dd -SHA256 (squid3.0/11126.patch) = 7e60baa56f3202735075d6a96ad214db7113d224e4da93f01fc2e197563056eb -SIZE (squid3.0/11126.patch) = 8646 +MD5 (squid3.0/squid-3.0.RC1.tar.bz2) = d4c53f92514db85322dc8a799a3b2e83 +SHA256 (squid3.0/squid-3.0.RC1.tar.bz2) = cf261e445b5037f049e1b0e7cf41fd4dcc02b438ee7af764290adb5e188bcda3 +SIZE (squid3.0/squid-3.0.RC1.tar.bz2) = 1813556 +MD5 (squid3.0/11149.patch) = a4226636df193cb5419ec6fb63afd2d4 +SHA256 (squid3.0/11149.patch) = 30c8d21b96cc51d2c701ddd53e560bc4a0d5feae0b90bd8ff1d7c9f28a728a89 +SIZE (squid3.0/11149.patch) = 1954 diff --git a/www/squid30/files/patch-errors__Armenian b/www/squid30/files/patch-errors__Armenian new file mode 100644 index 000000000000..a420206f669e --- /dev/null +++ b/www/squid30/files/patch-errors__Armenian @@ -0,0 +1,71 @@ +Add copies of the respective English language documents to the errors/Armenian +directory. This allows the port to install the complete set of Armenian +language documents. This patch has been submitted as Squid bug #2094 and will +hopefully be added to mainline Squid in the next release. +--- errors/Armenian/ERR_ESI Thu Jan 1 01:00:00 1970 ++++ errors/Armenian/ERR_ESI Wed Oct 3 17:07:05 2007 +@@ -0,0 +1,28 @@ ++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> ++<HTML><HEAD> ++<TITLE>ERROR: The requested URL could not be retrieved</TITLE> ++<STYLE type="text/css"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}PRE{font-family:sans-serif}--></STYLE> ++</HEAD><BODY> ++<H2>The requested URL could not be retrieved</H2> ++<HR noshade size="1px"> ++<P> ++While trying to retrieve the URL: ++<A HREF="%U">%U</A> ++<P> ++The following error was encountered: ++<BLOCKQUOTE> ++ESI Processing failed. ++</BLOCKQUOTE> ++ ++<P> ++The ESI processor returned: ++<BLOCKQUOTE> ++%Z ++</BLOCKQUOTE> ++ ++<P> ++This means that: ++<PRE> ++ The surrogate was not able to process the ESI template. Please report this error to the webmaster. ++</PRE> ++<P>Your webmaster is <A HREF="mailto:%w">%w</A>. +--- errors/Armenian/ERR_ICAP_FAILURE Thu Jan 1 01:00:00 1970 ++++ errors/Armenian/ERR_ICAP_FAILURE Wed Oct 3 17:07:05 2007 +@@ -0,0 +1,33 @@ ++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> ++<HTML><HEAD> ++<TITLE>ERROR: The requested URL could not be retrieved</TITLE> ++<STYLE type="text/css"><!--BODY{background-color:#ffffff; font-family:verdana,sans-serif}--></STYLE> ++</HEAD><BODY> ++<H1>ERROR</H1> ++<H2>The requested URL could not be retrieved</H2> ++<HR noshade size="1px"> ++<P> ++While trying to retrieve the URL: ++<A HREF="%U">%U</A> ++<P> ++The following error was encountered: ++<UL> ++<LI> ++<STRONG> ++ICAP protocol error. ++</STRONG> ++</UL> ++ ++<P> ++The system returned: ++<PRE><I> %E</I></PRE> ++ ++<P> ++This means that: ++Some aspect of the ICAP communication failed. Possible problems: ++<UL> ++<LI>ICAP server is not reachable. ++<LI>Illegal response from ICAP server. ++</UL> ++</P> ++ diff --git a/www/squid30/pkg-descr b/www/squid30/pkg-descr index 1338a8bd547b..7e1a96e85534 100644 --- a/www/squid30/pkg-descr +++ b/www/squid30/pkg-descr @@ -8,7 +8,7 @@ By using the lightweight Internet Cache Protocol, Squid caches can be arranged in a hierarchy or mesh for additional bandwidth savings. This version of Squid is a pre-release snapshot of the upcoming Squid 3. -It is primarily meant for testing new features and not meant to be put +It is primarily meant for pre-release testing and should not yet be put into production use. WWW: http://www.squid-cache.org/ diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 73ef1c292acd..046b8f7382aa 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -61,9 +61,8 @@ # together with other code that adds custom HTTP headers to the # requests. -PORTREVISION= 1 PORTNAME= squid -PORTVERSION= 3.0.p7.${PATCHSET_DATE} +PORTVERSION= 3.0.r1.${PATCHSET_DATE} CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ @@ -82,7 +81,7 @@ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://www1.jp.squid-cache.org/Versions/v3/3.0/ \ http://www2.tw.squid-cache.org/Versions/v3/3.0/ MASTER_SITE_SUBDIR= squid-3/DEVEL -DISTNAME= squid-3.0.PRE7 +DISTNAME= squid-3.0.RC1 DIST_SUBDIR= squid3.0 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ @@ -98,11 +97,10 @@ PATCH_SITE_SUBDIR= Versions/v3/3.0/changesets # Inspired by editors/vim: # (I know that portlint is not happy with this, but putting this code at any # other location makes it even unhappier.) -PATCHSET_DATE= 20070919 -FIRST_PATCHSET= 11069 -LAST_PATCHSET= 11107 -IGNORE_PATCHSETS= 11070 11071 11077 11080 11083 11087 11090 11095 \ - 11097 11103 11105 11106 +PATCHSET_DATE= 20071001 +FIRST_PATCHSET= 11149 +LAST_PATCHSET= 11149 +IGNORE_PATCHSETS= PATCHFILES!= jot -w "%d.patch" - ${FIRST_PATCHSET} ${LAST_PATCHSET} 1 .for ps in ${IGNORE_PATCHSETS} PATCHFILES:= ${PATCHFILES:N${ps}\.patch} @@ -116,7 +114,8 @@ LATEST_LINK= squid30 CONFLICTS= squid-2.[0-9].* GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:261 automake:19 libtool:15 +# disable autotools bootstrapping for now, RC1 does not currently require it: +#USE_AUTOTOOLS= autoconf:261 automake:19 libtool:15 USE_BZIP2= yes USE_PERL5= yes USE_RC_SUBR= squid @@ -352,7 +351,10 @@ CONFIGURE_ARGS+= --enable-icap-client .endif .if defined(WITH_SQUID_ESI) CONFIGURE_ARGS+= --enable-esi -LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2 +LIB_DEPENDS+= expat:${PORTSDIR}/textproc/expat2 \ + xml2:${PORTSDIR}/textproc/libxml2 +CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2 +LDFLAGS+= -L${LOCALBASE}/lib .endif .if defined(WITHOUT_SQUID_KQUEUE) # Squid-3's kqueue support is still marked as experimental, so it is not yet @@ -380,11 +382,7 @@ WITH_DEBUG?= yes # # If you do not define SQUID_LANGUAGES yourself, all available language files # will be installed; the default language will be English. -# -# XXX: Support for Armenian error pages is disabled for now because two -# pages are lacking from the distribution. - -SQUID_LANGUAGES?= Azerbaijani Bulgarian Catalan Czech Danish \ +SQUID_LANGUAGES?= Armenian Azerbaijani Bulgarian Catalan Czech Danish \ Dutch English Estonian Finnish French German Greek \ Hebrew Hungarian Italian Japanese Korean Lithuanian \ Polish Portuguese Romanian Russian-1251 Russian-koi8-r \ @@ -413,8 +411,8 @@ PLIST_DIRS+= etc/squid/errors etc/squid squid/logs squid/cache squid post-patch: # add this version's datestamp so that Squid identifies itself as patched-up: - @${REINPLACE_CMD} -e 's|3.0.PRE7|&+PatchSets-${PATCHSET_DATE}|' \ - ${WRKSRC}/configure.in + @${REINPLACE_CMD} -e 's|3.0.RC1|&+PatchSets-${PATCHSET_DATE}|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/src/cf.data.pre @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 0b4d57debdc1..addcf2f7afeb 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,141 +1,6 @@ -MD5 (squid3.0/squid-3.0.PRE7.tar.bz2) = 3b774e6b089c45fab2afbf3123f9f3c1 -SHA256 (squid3.0/squid-3.0.PRE7.tar.bz2) = ad6612b551c97ccd7fb494032d664102ddd317ec5e204c40338b77c88cc4d09c -SIZE (squid3.0/squid-3.0.PRE7.tar.bz2) = 1807811 -MD5 (squid3.0/11069.patch) = a3e1a701fe254448be75cd81c1391886 -SHA256 (squid3.0/11069.patch) = 44d29714625e759fe38c19cd22ccb6936b95a0bcc5d6948f12862df492543d61 -SIZE (squid3.0/11069.patch) = 982 -MD5 (squid3.0/11072.patch) = b03399f1ea7c062a14c52ab898f8d9bb -SHA256 (squid3.0/11072.patch) = 26c6bfe9a9ac7bd7e62d534b9aacc2ae42a5a2813319afee9559a122effb0661 -SIZE (squid3.0/11072.patch) = 1976 -MD5 (squid3.0/11073.patch) = 79fe27dc5259289ce811d0ad33a09f18 -SHA256 (squid3.0/11073.patch) = a7dec8d3ceb983f245a23bcbdc38060f82f69e292207fa97fa3cdee56a977f38 -SIZE (squid3.0/11073.patch) = 9046 -MD5 (squid3.0/11074.patch) = 476e98681d8ca0b178c65b6545cb59a4 -SHA256 (squid3.0/11074.patch) = e128d270ee1bbc0fe5730428bcb1b1e1e3089002736683e7f412fc72944a0d0b -SIZE (squid3.0/11074.patch) = 4151 -MD5 (squid3.0/11075.patch) = 06bf6b45d97165c0e02f3a53bdfc6472 -SHA256 (squid3.0/11075.patch) = 76407927157ce92949edf45d8842890b2b8fe6cd3779c455a235f26a1e3557dc -SIZE (squid3.0/11075.patch) = 23969 -MD5 (squid3.0/11076.patch) = e4e7dcbf6a0f410ab3dfd1225b09f1dc -SHA256 (squid3.0/11076.patch) = 50535cbb88186c83e80e6c61d9a69bfc0763fde44fe7142e4fd85327c046b13e -SIZE (squid3.0/11076.patch) = 1112 -MD5 (squid3.0/11078.patch) = 4e6bef27dd52ffe3cc25c77f70804912 -SHA256 (squid3.0/11078.patch) = dcb8d41d7daeb7b0f985414bfb6fad4d78d41e01045715e7f91602279636b341 -SIZE (squid3.0/11078.patch) = 1835 -MD5 (squid3.0/11079.patch) = b7e05b850e747151c0432a13334902a0 -SHA256 (squid3.0/11079.patch) = 550a9ded9adf948054d9b6d17a57b6b90f7ab881454b6aa54674c726bd59f35b -SIZE (squid3.0/11079.patch) = 1556 -MD5 (squid3.0/11081.patch) = a0384b0559604c072abd77f6de54c8b6 -SHA256 (squid3.0/11081.patch) = 5c9bd9738e7c603f4b087a9b6ff528fe399257e8468e2a2be4d9ae47b0d5e755 -SIZE (squid3.0/11081.patch) = 203838 -MD5 (squid3.0/11082.patch) = 459cfe82d3c8c9cdbd341e952bfb6a4e -SHA256 (squid3.0/11082.patch) = f94db038c0d61da616a3d43ef3647abc38c851935ffdc4b09d4ad11c2e482e30 -SIZE (squid3.0/11082.patch) = 930 -MD5 (squid3.0/11084.patch) = 0e89aecbcc591bed9bbce12c7132dd95 -SHA256 (squid3.0/11084.patch) = f03b446fc734dc6da6ff8b68f2d2c0555cc092b0cfbc560bae1376631a08eab7 -SIZE (squid3.0/11084.patch) = 2778 -MD5 (squid3.0/11085.patch) = 6963562fc0cf42506132ce84c09122a5 -SHA256 (squid3.0/11085.patch) = 58ad94fe604a3196afc3be0745fea433a7b3988dbab84f84e76c3bd4edb30ab8 -SIZE (squid3.0/11085.patch) = 1160 -MD5 (squid3.0/11086.patch) = eb392846d7341e0b5cc73ef4b04b401d -SHA256 (squid3.0/11086.patch) = 0091d675bd4f8ebc69236660504acd9df6cd476ceddf3566fe26a5dfdd8b07cd -SIZE (squid3.0/11086.patch) = 18688 -MD5 (squid3.0/11088.patch) = 5899d46640880572374f3b13ec13317e -SHA256 (squid3.0/11088.patch) = f7bc94a33882d45796d4267ba0724f2d0aea2eff9f5e45c8095684749b086407 -SIZE (squid3.0/11088.patch) = 1365 -MD5 (squid3.0/11089.patch) = f0868f1010d6bb9d1078c1009b4e9a42 -SHA256 (squid3.0/11089.patch) = 83166ce50312b9af1b8abf43cf7894d91233c0ff9da29d7852f8ebb818406634 -SIZE (squid3.0/11089.patch) = 997 -MD5 (squid3.0/11091.patch) = 576b59067e2b3a7e4a17f1355fdb1510 -SHA256 (squid3.0/11091.patch) = 0759cb35fca3cae595a5b2cc26729a2da5e66b1ef19c00704fc58a3ac244f2eb -SIZE (squid3.0/11091.patch) = 1083 -MD5 (squid3.0/11092.patch) = 006c7d7bb958a1e4200e7e3ace453e4e -SHA256 (squid3.0/11092.patch) = 30cd978df8327e6e4324fdff73370cad6ca2399530cbfb4f981f7e219ea55802 -SIZE (squid3.0/11092.patch) = 1367 -MD5 (squid3.0/11093.patch) = 51591a8d58266ef4747151e5f11a26a0 -SHA256 (squid3.0/11093.patch) = c15f053abed89dcd07b6412014969921f0e5ab7b824ad479fd35b8a428a1fca2 -SIZE (squid3.0/11093.patch) = 1515 -MD5 (squid3.0/11094.patch) = 268523d58735e1d980b9c15cb41770aa -SHA256 (squid3.0/11094.patch) = 543c10f09c9d45db11e746cb952cdde6c17ed55e28c3e739c4e3e1d4801be55a -SIZE (squid3.0/11094.patch) = 1214 -MD5 (squid3.0/11096.patch) = b241a11dffd6f3006917a61083fc1a54 -SHA256 (squid3.0/11096.patch) = 430bd1aad4887c7536afeb641014a5556de13128432f36e937751b3166fe6242 -SIZE (squid3.0/11096.patch) = 1250 -MD5 (squid3.0/11098.patch) = 6defca62a09a22a6d1639ed07079a049 -SHA256 (squid3.0/11098.patch) = f96aa882aad8838b2c0924b5c45f1586367710185a6457874e09f650f32fc62c -SIZE (squid3.0/11098.patch) = 2152 -MD5 (squid3.0/11099.patch) = d5e906b030b1d0856e09bc78567bdb15 -SHA256 (squid3.0/11099.patch) = addac90866112e2aab824595cf1061ed8090365671cfd5356a80347341669b30 -SIZE (squid3.0/11099.patch) = 1144 -MD5 (squid3.0/11100.patch) = 7dfad56be4b89c90ddd8249c4e4fe48e -SHA256 (squid3.0/11100.patch) = 44daa008f4c81060b066cb8ca81201999f3f0fc5a2803b3a8714869efc02f74b -SIZE (squid3.0/11100.patch) = 1149 -MD5 (squid3.0/11101.patch) = ec74f734ba8b0719d2c36f3f35d40019 -SHA256 (squid3.0/11101.patch) = fe60dd79aeef7afd7c63db16dfef1a5f100a39a032303dd088d480bc3aa21509 -SIZE (squid3.0/11101.patch) = 1943 -MD5 (squid3.0/11102.patch) = 296ffa972e96b21ba1c9b36112d8adb9 -SHA256 (squid3.0/11102.patch) = eebf3c65862fcb2e3559cc33376b6ff6c2bb89e9e7d4f4a6e6c430d910e00a25 -SIZE (squid3.0/11102.patch) = 1254 -MD5 (squid3.0/11103.patch) = 09d6103cdcf358b93a9fc1a87c684966 -SHA256 (squid3.0/11103.patch) = b21244eb588bfd5669cd6d287974a0f3426a14041fa8e2043c153cc015fc37a3 -SIZE (squid3.0/11103.patch) = 4054 -MD5 (squid3.0/11104.patch) = 87fe49a6cd0ef5bbdf17d8cfbc83d222 -SHA256 (squid3.0/11104.patch) = faefd03cd40ffcf9b5a5bdffefdbc440da97040f25bca7ff3a5a6f56eb0ac7a4 -SIZE (squid3.0/11104.patch) = 1278 -MD5 (squid3.0/11105.patch) = ea32f36fd5219a80e63b910e14b3787f -SHA256 (squid3.0/11105.patch) = 4fdbfae8be2c172a109232f0a82d0ca892374b4cb36416be086f823542233795 -SIZE (squid3.0/11105.patch) = 29877 -MD5 (squid3.0/11107.patch) = 7599037492801fbc32c500be0051ac7f -SHA256 (squid3.0/11107.patch) = ec65bed4329343bcc90f9f5570162430ba3a933d3e75569fffa89327dd2942dc -SIZE (squid3.0/11107.patch) = 4106 -MD5 (squid3.0/11108.patch) = 80d3160e29f0bd34a285b12c587197c1 -SHA256 (squid3.0/11108.patch) = bbc6beec6674f793b9a47423860fb94eaa438cbcc49376c72ece2e1e1c1fc3c3 -SIZE (squid3.0/11108.patch) = 1381 -MD5 (squid3.0/11109.patch) = f99c38049ce3609bd05a249edea6cbb6 -SHA256 (squid3.0/11109.patch) = f05874c6ff6a3a34e4dd7fc6ed3d31a09d632ea7959ddb1f18f5022d6678c544 -SIZE (squid3.0/11109.patch) = 5403 -MD5 (squid3.0/11111.patch) = 62255b7fff26e08f0163e251ee3af283 -SHA256 (squid3.0/11111.patch) = c210464fff2a349d11e90a317db4a6fd6f75f5ea368f76d87974b329bf7a2e4e -SIZE (squid3.0/11111.patch) = 994 -MD5 (squid3.0/11112.patch) = f1fd72bad3761cf0eba5c289862f03bf -SHA256 (squid3.0/11112.patch) = d45456f4eaefc39055302e820a4074f88d7bbc09ec32bb7773f8665f23955c42 -SIZE (squid3.0/11112.patch) = 1911 -MD5 (squid3.0/11113.patch) = b30d429d3477cad481e1becdc68237a9 -SHA256 (squid3.0/11113.patch) = d60e818f6a2849081bdfa5bf50b69d576d1dca845ea528e86bc8ccd512e74e62 -SIZE (squid3.0/11113.patch) = 2171 -MD5 (squid3.0/11115.patch) = c4255a5a0c63f8fb078e426ddaffd157 -SHA256 (squid3.0/11115.patch) = 999f7a5ceef96f0ab0206cb991b3bcd0c2422c051a24596e7ee2a8792859e1c1 -SIZE (squid3.0/11115.patch) = 916 -MD5 (squid3.0/11116.patch) = a4803b64951047ffe7b4212d458d6803 -SHA256 (squid3.0/11116.patch) = 7ca2db30b64e7c236967d6f55b5461e34f99cb627188307441ed8d47776f4554 -SIZE (squid3.0/11116.patch) = 8214 -MD5 (squid3.0/11117.patch) = 80de32e73c559175dccc85bb12a95fa2 -SHA256 (squid3.0/11117.patch) = fba30bbc0f9ae77d592ebaa0cd0598e8b9c347ae6a806d6a0a88cd9369678119 -SIZE (squid3.0/11117.patch) = 1581 -MD5 (squid3.0/11118.patch) = 4fa9a82de7f11833faea594a8d5664eb -SHA256 (squid3.0/11118.patch) = 2ef3a35375ab3ed8baee56bf08e4f226e057b052ba2b01487cec17cc82df5ded -SIZE (squid3.0/11118.patch) = 901 -MD5 (squid3.0/11119.patch) = b7988ec78046e6710af795ea1cae60fe -SHA256 (squid3.0/11119.patch) = 47b2d315439b2a185fdde690a84b7eb3b197c366cef0cfffad3f03b5fead6150 -SIZE (squid3.0/11119.patch) = 1129 -MD5 (squid3.0/11120.patch) = 3bc71fe6b7bdbf2ffa1f8e66e9af2110 -SHA256 (squid3.0/11120.patch) = 07b5dafe58401999f65c4e285b208fb62ba5cd74393a9caf16a679e6d61d2192 -SIZE (squid3.0/11120.patch) = 99604 -MD5 (squid3.0/11121.patch) = c1a2bd5c050afab7f28922cb6cfaf63f -SHA256 (squid3.0/11121.patch) = 3c438d2e39851d6e4cfe8c481072b0766cfd915d407ac960a0457e5c5533fb3f -SIZE (squid3.0/11121.patch) = 13181 -MD5 (squid3.0/11122.patch) = 83c575764752364c6ef9b7d4acc16f27 -SHA256 (squid3.0/11122.patch) = 8c77985192e5211d41f6f3996f4809afc83b4a2c019e8efbf1c3e85e545177e6 -SIZE (squid3.0/11122.patch) = 1555 -MD5 (squid3.0/11123.patch) = 6e7044eed718316790f3fa6ee5f8fc7d -SHA256 (squid3.0/11123.patch) = 0f7d383349e7455a1a2f6870ee122934a3b05348f3d0f149a38f5a6815670dd5 -SIZE (squid3.0/11123.patch) = 4274 -MD5 (squid3.0/11124.patch) = 427e868b28ea6a7b7e407f5e1eb8e90e -SHA256 (squid3.0/11124.patch) = d0efa7429f68f911bd3dd358eabdc6387d13ebe5e7a58a602dd0ee4272c44742 -SIZE (squid3.0/11124.patch) = 1319 -MD5 (squid3.0/11125.patch) = 221d8fe35654dc03113b1507842d95e3 -SHA256 (squid3.0/11125.patch) = 69aee1addecc3a5998135156401b73f92749f1cea4e31a5fa1e06fed53ac253a -SIZE (squid3.0/11125.patch) = 1085 -MD5 (squid3.0/11126.patch) = 9a3697c3fdf582972031c6e1551fc4dd -SHA256 (squid3.0/11126.patch) = 7e60baa56f3202735075d6a96ad214db7113d224e4da93f01fc2e197563056eb -SIZE (squid3.0/11126.patch) = 8646 +MD5 (squid3.0/squid-3.0.RC1.tar.bz2) = d4c53f92514db85322dc8a799a3b2e83 +SHA256 (squid3.0/squid-3.0.RC1.tar.bz2) = cf261e445b5037f049e1b0e7cf41fd4dcc02b438ee7af764290adb5e188bcda3 +SIZE (squid3.0/squid-3.0.RC1.tar.bz2) = 1813556 +MD5 (squid3.0/11149.patch) = a4226636df193cb5419ec6fb63afd2d4 +SHA256 (squid3.0/11149.patch) = 30c8d21b96cc51d2c701ddd53e560bc4a0d5feae0b90bd8ff1d7c9f28a728a89 +SIZE (squid3.0/11149.patch) = 1954 diff --git a/www/squid31/files/patch-errors__Armenian b/www/squid31/files/patch-errors__Armenian new file mode 100644 index 000000000000..a420206f669e --- /dev/null +++ b/www/squid31/files/patch-errors__Armenian @@ -0,0 +1,71 @@ +Add copies of the respective English language documents to the errors/Armenian +directory. This allows the port to install the complete set of Armenian +language documents. This patch has been submitted as Squid bug #2094 and will +hopefully be added to mainline Squid in the next release. +--- errors/Armenian/ERR_ESI Thu Jan 1 01:00:00 1970 ++++ errors/Armenian/ERR_ESI Wed Oct 3 17:07:05 2007 +@@ -0,0 +1,28 @@ ++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> ++<HTML><HEAD> ++<TITLE>ERROR: The requested URL could not be retrieved</TITLE> ++<STYLE type="text/css"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}PRE{font-family:sans-serif}--></STYLE> ++</HEAD><BODY> ++<H2>The requested URL could not be retrieved</H2> ++<HR noshade size="1px"> ++<P> ++While trying to retrieve the URL: ++<A HREF="%U">%U</A> ++<P> ++The following error was encountered: ++<BLOCKQUOTE> ++ESI Processing failed. ++</BLOCKQUOTE> ++ ++<P> ++The ESI processor returned: ++<BLOCKQUOTE> ++%Z ++</BLOCKQUOTE> ++ ++<P> ++This means that: ++<PRE> ++ The surrogate was not able to process the ESI template. Please report this error to the webmaster. ++</PRE> ++<P>Your webmaster is <A HREF="mailto:%w">%w</A>. +--- errors/Armenian/ERR_ICAP_FAILURE Thu Jan 1 01:00:00 1970 ++++ errors/Armenian/ERR_ICAP_FAILURE Wed Oct 3 17:07:05 2007 +@@ -0,0 +1,33 @@ ++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> ++<HTML><HEAD> ++<TITLE>ERROR: The requested URL could not be retrieved</TITLE> ++<STYLE type="text/css"><!--BODY{background-color:#ffffff; font-family:verdana,sans-serif}--></STYLE> ++</HEAD><BODY> ++<H1>ERROR</H1> ++<H2>The requested URL could not be retrieved</H2> ++<HR noshade size="1px"> ++<P> ++While trying to retrieve the URL: ++<A HREF="%U">%U</A> ++<P> ++The following error was encountered: ++<UL> ++<LI> ++<STRONG> ++ICAP protocol error. ++</STRONG> ++</UL> ++ ++<P> ++The system returned: ++<PRE><I> %E</I></PRE> ++ ++<P> ++This means that: ++Some aspect of the ICAP communication failed. Possible problems: ++<UL> ++<LI>ICAP server is not reachable. ++<LI>Illegal response from ICAP server. ++</UL> ++</P> ++ diff --git a/www/squid31/pkg-descr b/www/squid31/pkg-descr index 1338a8bd547b..7e1a96e85534 100644 --- a/www/squid31/pkg-descr +++ b/www/squid31/pkg-descr @@ -8,7 +8,7 @@ By using the lightweight Internet Cache Protocol, Squid caches can be arranged in a hierarchy or mesh for additional bandwidth savings. This version of Squid is a pre-release snapshot of the upcoming Squid 3. -It is primarily meant for testing new features and not meant to be put +It is primarily meant for pre-release testing and should not yet be put into production use. WWW: http://www.squid-cache.org/ |