summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2014-05-15 10:47:06 +0000
committerEray Aslan <eras@gentoo.org>2014-05-15 10:47:06 +0000
commitced8da2a5bfbfcf4eba0b8b83ea348f4ec9a4e47 (patch)
tree11ed03a8a0f857695e4d35a4e5ad776c29ce1359 /net-proxy
parentRemove old development versions (diff)
downloadhistorical-ced8da2a5bfbfcf4eba0b8b83ea348f4ec9a4e47.tar.gz
historical-ced8da2a5bfbfcf4eba0b8b83ea348f4ec9a4e47.tar.bz2
historical-ced8da2a5bfbfcf4eba0b8b83ea348f4ec9a4e47.zip
Remove vulnerable versions
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x77F1F175586A3B1F
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/squid/ChangeLog10
-rw-r--r--net-proxy/squid/Manifest49
-rw-r--r--net-proxy/squid/files/squid-3.1.15-gentoo.patch289
-rw-r--r--net-proxy/squid/files/squid-3.2.1-gentoo.patch133
-rw-r--r--net-proxy/squid/files/squid.confd14
-rw-r--r--net-proxy/squid/files/squid.initd-logrotate-r1121
-rw-r--r--net-proxy/squid/files/squid.initd-logrotate-r3109
-rw-r--r--net-proxy/squid/files/squid.initd-r1128
-rw-r--r--net-proxy/squid/files/squid.initd-r3116
-rw-r--r--net-proxy/squid/squid-3.1.23.ebuild210
-rw-r--r--net-proxy/squid/squid-3.2.13.ebuild243
-rw-r--r--net-proxy/squid/squid-3.3.10.ebuild243
-rw-r--r--net-proxy/squid/squid-3.3.11.ebuild243
-rw-r--r--net-proxy/squid/squid-3.3.8.ebuild246
-rw-r--r--net-proxy/squid/squid-3.3.9.ebuild243
-rw-r--r--net-proxy/squid/squid-3.4.2.ebuild242
16 files changed, 23 insertions, 2616 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 3de4f6136d79..59d524952d23 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-proxy/squid
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.463 2014/05/14 16:14:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.464 2014/05/15 10:46:55 eras Exp $
+
+ 15 May 2014; Eray Aslan <eras@gentoo.org> -files/squid-3.1.15-gentoo.patch,
+ -files/squid-3.2.1-gentoo.patch, -files/squid.confd,
+ -files/squid.initd-logrotate-r1, -files/squid.initd-logrotate-r3,
+ -files/squid.initd-r1, -files/squid.initd-r3, -squid-3.1.23.ebuild,
+ -squid-3.2.13.ebuild, -squid-3.3.10.ebuild, -squid-3.3.11.ebuild,
+ -squid-3.3.8.ebuild, -squid-3.3.9.ebuild, -squid-3.4.2.ebuild:
+ Remove vulnerable versions
14 May 2014; Agostino Sarubbo <ago@gentoo.org> squid-3.3.12.ebuild:
Stable for sparc, wrt bug #504176
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 468d925f5842..93b332738721 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,57 +1,36 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX squid-3.1.15-gentoo.patch 10538 SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3 SHA512 6e2a26e7cb99664046619f3d4cb9e87998b462f7de09d6fbf4a269ccf2da758d5caad35c0ec43c5c9c5a9eb8943ecf14a0cdb67fa2a117bc3be4d9a41a920451 WHIRLPOOL 5dfce88287693fd75902b58c7d7759bd083173e8e69bf4f7c725a196a8d4d1f92e5e3e98dc7c727f01d62f5e049fe2599f6f9e02eb92c13a8bf09f8c4387dbd7
-AUX squid-3.2.1-gentoo.patch 4418 SHA256 41da185c1af04590525fc9144c14edd160522b878efc2e62e8a992a001ad38e0 SHA512 08ba6aac7de61aaae9a96c42801dbb8e414a2b8ec7bccd80afb1973f7c9949dacee4011e54d050c7ae46a06d2914ca8a42629af5707c6810b1547e3b66ccd5c0 WHIRLPOOL 2f8ba78840e46a3b8e780b653d8084f9c0e8b4d0793f4b06cb7faf9c6ae32b193de923b411c394278747ad9574cbf317f72f97467fbca386db4c4f1bd0f1ba50
AUX squid-3.3.4-gentoo.patch 4358 SHA256 d52c1c89c81540dfd6c464f7c4245857fdd6cc9e45568a03d4f028fe5feb8bb0 SHA512 b1bfb0a1298e30ce30681b8bcaed292a883f8153e3df61861d1dfd691c5f4d5bc4651531ac69932fcbdc74c5896ed4495d54810203d4c0674ceb49b33454f297 WHIRLPOOL 3b98a43c1cc98d20f28dd5eb096344ff80ec5de1e4e17c4a3b8fb5d89044b6090466bfd3a7e24dfb975d9e02009af900372ee8c791991921def12820a191da97
-AUX squid.confd 540 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec SHA512 db9a9f2d476df279e1f2c9ec6bdec42d0c4cd9117c78e2ce5876855bd91add5c01bf06d34456e9146fe70374b118ae20a8e75bf07254aa335dd3190e11c72d23 WHIRLPOOL 55863f771bb4ffc39dd809e5233bbfce994a8e4345f84d264c427b7d5d571c998b0011b71f878df2ff4d7037da250e62296f9c962a8118532e25af9297471995
AUX squid.confd-r1 493 SHA256 214a184495a3384eb452caef435256043bc51e35140a61b1f5fdff32603c8f7e SHA512 3f92645275e077bcf36e4cd2ccb56812540276d9456bc6f68268010aac57214f0d96b0aff74dc57cbc3446705a9fae8a5bb7a07304afeea45615ebf2cf2b7ab0 WHIRLPOOL 080cfb797ddb49f7c59463eaef0db8c3a6ec5e5da949884e9ccdf54d608b22fb81971aec21fab704c832c86a8c8e3d4795a7b09456c273d7c4bbb65692a68870
AUX squid.cron 143 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749 WHIRLPOOL 029c94d4e4826ee612c7dc12acc088e3100c9d1737baebb74b25b6e7ac2ba78d0bab9f744c12b5de4113c9727892c9a30dd17067409ac8da62afeee552de391e
-AUX squid.initd-logrotate-r1 3167 SHA256 cd245c5561a9ded59d71f1e73b3c97a56e4253325dec7054435b4d07d222e9a0 SHA512 818d875560f0b85920353af9ee2337c1109d14c34d623583708a44a53169889b864a281d03aa64ef1809b11852a619eca086b632aec8360750fa8ae8d7f22e99 WHIRLPOOL c15bf7f705f1c0f9d6a714ab97c73a2793d8a0e9a15cb2cc17e717f4729ea3cd892fd8969c5ba3afeff41586f424ded077aaef3958a64a2c14584a905061f4b7
-AUX squid.initd-logrotate-r3 3133 SHA256 02a7f23a30acce6a3090b324e8c70c0f966380364f839bb0e58935a9a6820b35 SHA512 7e96f4d523d10531b546fece23cb62f073de08181ff796e744190964d1d584400855fa4fb2ad43ed966d92de0c6826efdb19f24ab453ffd3b60e600543de34fa WHIRLPOOL a82b693268afec6149c2f61c4c2c28472f6190e0e6070805f23c380c20df1729e57e0a581fdbd657332f9bf772e27a2269f855d2240952b586cfcfe1476d1089
-AUX squid.initd-r1 3319 SHA256 f38e04ba1e295e9bbb537e353823c4bd738d206f4790d024e65aacfefbfe7abb SHA512 fc60c330dfebc2ff9f964b6475d8d00fcf69211384b605b68fef95daf5adc23c0d9fe1b72d858923449f7f024e8520bb7aa17d1ffa55e40f8de2726aa234125a WHIRLPOOL 27a43a425b67fb00a654b9bb71062aac63c7c4885bbd9493341043bb7147f8f7ac89ab79e015008f9da10b0a68f00b038d1ef932f7e0c350dfc9b3fc0fd9033e
-AUX squid.initd-r3 3285 SHA256 9b16b1ab2d3d3411dfcd8ac76b13a0889503ca78e3c6123814801af7577537f3 SHA512 3ec1a924922dcaf6634eda6f18e7010c722294e446aeb997fe77f539bdd1a45c7aa0551a356d9e4b90419e815cc0a2d1fa119575cdff4d0477f9bc3f8c6b8aff WHIRLPOOL 3f8c1070ffe5114de7a50f0eda2ff6d5c814eafb63942b8a80e6fab27be6ee2364676227aed18995a4151e38d7a1f51398ca31a771682ba811bc4a73831f38ed
AUX squid.initd-r4 3370 SHA256 3830cb94600ac658a6ff1f9f31bdbece64caf3ad23c62ae0a887d152970125f5 SHA512 f4edec6d001292ae62bcc6a70f864c334ce3efd8ac7c1b7286e65f330453cbde4d3ec8ef9ca86df7cc2b58795808fe50349a48474165d12e2ffb158d8701e2ba WHIRLPOOL 697be7cd90ef06e8b29d86af26143b6d67e5bae84e89ab717d9f9b495ada6df2c446008c3f881914513127a8f893b9e1732bbd7b1b7c7eef6578e377c4c23baf
AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 WHIRLPOOL 1cbce1fb05d4661d26f80baeafad0d3a5de1108a21eb6519775b9be2c549d1ca1b85575b72941fd246e4e9fbdf466b302b767aa7ce002f990f6ca4a9844e1e41
AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1
-DIST squid-3.1.23.tar.gz 3489539 SHA256 4633e59925480cc2ea8078e4d78b17dea59a67a71c054b8faa47ba2c1e204401 SHA512 620554273a54be76331dd559446f750dfe838c80e2427cdcfce89ebdb0b70124acc6015fb6f4f1c78d0ecd0e0aaf46ca2cec29e1415525ef72e14d18343a5e72 WHIRLPOOL cb678a25abf69d73f7f5b5774c00374d14c831b09af86678f065dd8001aedc9f4ba5fa8a8d8d8c301ab449e10d25a54d476810e2d5c77583ed604b6173f41bcd
-DIST squid-3.2.13.tar.gz 4115069 SHA256 b6686c12104b6874750d5341fd5b481ab8782111a6776c38460a2aa17247d1a9 SHA512 85adfc6fe73b59b11d86abeeb60dd45995c93fe2457d9f0b827364f519a381b2b843d6fd801bb3f8e2fce216d9e6dcf3c45ce7bcac87a4c1b78ad17fc3856eb8 WHIRLPOOL 33347b075a9a6ba783d5caad2f5b77e395b98bcd751b626c3d2a4ac16909d8637226821e1ee8c6ea336451274bde3d5fc4c8c8f14ec085d79e497a9378e2cbf8
-DIST squid-3.3.10.tar.gz 4229574 SHA256 3b53319e127cbe59b4e3e0c4fdb450bc147f68b832500a4044e59726dbcfa2e3 SHA512 20dfc3a1c16180f203185f868f77029388452b6708f606b74c7f120c7cc17cca1d6bf86a6229dcb50afe3a520978f8550ca270513d9a7180e96e5389e0f23fc6 WHIRLPOOL dda9f772a6c785931bce6dac5193d958c08b1b22dda95205d391feb239688cfbd575aaecf1117fa39db52b968e33df6f2742c39f8a3dca397e84b132fe12d383
-DIST squid-3.3.11.tar.xz 2186712 SHA256 3b7849cc1336642c671e4eae457ed722533776346f6ffd26dd67ab39a0d0374e SHA512 0ae9a79251024e513ec7ab9d8feb4f216766db0db49b989c5c9ae974a4280bb90ffaf8b37938da8769f71ef4113febfe722015f556d09e8f4844802c050866dd WHIRLPOOL 94ea664cae703751676ca394f5a590430618a20dcfe4db286a31496beb789ce40ea9fdf3ce20a829326dbea715d1672de14d34b02a1e85f60f1ab834f9818aff
DIST squid-3.3.12.tar.xz 2187760 SHA256 68c0e39bf7ab8e789f3ddbbe7a8cd341e4478b7f2264697217ff05802984ec82 SHA512 1d7cfa459bb5551933d2b7e8367e3dfbda63666f890b03088594c18d8708f7b1158530482c6a02a2c26f74d555f49b782cb2e8838ee1ab7db54ed5091508781d WHIRLPOOL 7d8f681efad2b0c6fed69ce8eab7d495dad1e1f147e1068faebdcd1febcd865e8d035eb0255226b8b891d1228da1ff07175eea1a1fecbc5869b6c3345d5f0f72
-DIST squid-3.3.8.tar.gz 4201652 SHA256 70d12505f2d91a64c05792406e12f2e6bd3082976bb7b6b49c4d982479d8c7d0 SHA512 6a4c95cffc23af44c985d0e897f3f1c66dbe3c282836e7e3724065b132dc59c6c512fd3914893be6a934f2b1fb72ba9a12bc3a1f953624760153616d5818f55f WHIRLPOOL 61c6b5e52138104634dd2ea602f251f10f7925c0ccba1823037d7a064141372d7a064f73d77747e1789b8e875819ca5939384d6a1c266889d07b7e0ee47170df
-DIST squid-3.3.9.tar.gz 4226863 SHA256 0bbb10739bcd8d3ede982246990445ff9b84348b9c5a38021c5afbfd28d9b413 SHA512 26c91d20804bf35fe36f4efdb790ef7b589383e75e6e4656d5fee6b05dc1a48b7491b4ce4d3bc8acf7f4caab8c395a43eaa84f88cd41a1d2efad529504f2ddd4 WHIRLPOOL 2f4eeee0c8376fe0bb422deda81a33470b84e871385d34129b9801fb4a5111687694c7947a4b36cdbb0dd831d69f9be966cc36bc7d60a1f52b2025c3ccd8bbeb
-DIST squid-3.4.2.tar.xz 2224616 SHA256 4c381334ab4d3ae25bf517fae91bbd739151bae1c727c935d464b546ff461d41 SHA512 c31a4cfda9a3a8f3bacb49a9b3cc15f00993099ca78aad3a37f56a1e0b2777d40af6b9848ffde98cf764a9dc7172b9b2f6291ca8717085879f1d4aebb5223d00 WHIRLPOOL c754e0fd2b2ebf14d6ae9b481008be38a14ab75a27a50d130afff1dcefb0192f94d412ca2c3b12122c569fc64d07fb5c7c5ba7a601082f3cdc027962eb8509eb
DIST squid-3.4.3.tar.xz 2225044 SHA256 c3ef45e7f1ae1bac0ec3ab2f4ed9af9b1f33f9a30304be0f2ad5d352a3eaf114 SHA512 478113511a56f0347e1f71afd680c7147686e606980c9062b6b1b7131faaae43f2206de2658f30d8c3f0219b72744563e72ad9b2c1039fc64190d047bd832b4e WHIRLPOOL 0eb3ebcd68674ebf76f6363c064553a2c83f6aabb52d46daee2ca5e91f003255d0791eefc30e0695a3d355d4f2f1641363cc169e78970314edf9044f483f20d2
DIST squid-3.4.4.tar.xz 2226656 SHA256 807f12cc7bd2fe113f866a9ad16db2e89b8d2e53dd2c7e61b8d42793e68f0414 SHA512 daf91c278a2a3455e3259f6ba78f7725bb22a5fddaa5edf4f515e113b8b09332c8cc5648570215ec1a290242696b9487d533567f03bd178bda8f795e10cc1426 WHIRLPOOL 3f3740e18a618cb830ef6e21fbea25094773d41cdc0bb96ac17ac814ae689457a39de8e0efcaf94c84fbb37d805bbc9906a99de28ad970771eb1297faf3a3435
DIST squid-3.4.5.tar.xz 2243152 SHA256 d82b9bd2dbcf61d8feaa85dc5af499e8bfc033da78968c4d5cea4c89cde6e007 SHA512 76cd378deec29904727d47c0c436565d1fb6dc965a5bd163ba86b96b8411ef2e3a6e28a3b75dcbb18f345bc4641c8e60f0df6c1cbc12e2195d1dc1f7105eaedf WHIRLPOOL 3c88a338e0c4ecbe7c5100e23514aa9e6bfa8a89c351cc092b06c13b3df5d52643a3b78413015d7002ea7f583d32adef6ac5ae1d75128a99fabd1a03dedb49d3
-EBUILD squid-3.1.23.ebuild 6687 SHA256 a12452feaeadfe2501e168dce2552b244c31e96436a0278bd8b3b5fdde89f34a SHA512 754809af799a7ce243cacee7a7b38dc3e8b51920f1f90f54953529d7e51ef4ab046961bde57c82418bae09034c3f8d98d1405f18659b434338071844e245730e WHIRLPOOL a6f8f792332b0d1e1e366d93e7a87cd2371e5c97ac8b8bab3783a6b830c83e0aa19c6aa8db7da5300c02c6a64e3d07f53cd551fb849daa50f2e5cb5c5bbe5392
-EBUILD squid-3.2.13.ebuild 7764 SHA256 4ce9ebe60eabc55946bf888a379b6c557514085f81ede1d3c7384fd63543a43f SHA512 d3e26f09d0044fca92e4ce54bba4066b21b95bf83148b9670799cb6844ddf29130677ab50c225217ea3070d6e1c2f38756030ac5bc2e593da1bb5d9d2f14da40 WHIRLPOOL 5ea4a7657a5d46dfbf8c369c5a61cac83dca4d907e7f8d31a7e91ed9026c20a4abe8ecbe8b6e14bc8861ebe784e4aff00e4a84be288a71a7231acfc3313c346e
-EBUILD squid-3.3.10.ebuild 7842 SHA256 47f5fc2966042271b817fbc288f7477b98d13464d390c3cd0f5239e33ac6f848 SHA512 8b390afdbd16ca8f967c1fd1ada2d135ef23f26a62069a07667b95d6c0f73b47434dd4206a4de7dc9936e9b59c346f9342ef5c2f8ddf0dc7ae1fd7964e25022e WHIRLPOOL 03bbebaf11bba3a4642b679f5d6cc8845a5ad9630e5f73812aed65a8137a0d2506635a59161fc2c48144c5a28e907facbfce24eb5377acb30eba59c345684f10
-EBUILD squid-3.3.11.ebuild 7841 SHA256 812bcb88b2be8f8d7aa02e1c94713897c231bd40351b965d754b976099b82158 SHA512 76164ecdcf5dc2b19ac2d476c7c035283e84cb67a4d134923f683b1e487c6d51f0ed7344fd04e42fd38d8cf9e23319e02bb661a7b4de2018963e51576e8d1481 WHIRLPOOL b3446ce8660d856c1d23a5f99165d48fde9568f4cc1a23c18db54185f3671ee37f7056553d50edec38f90f5efba5301b1c945f9a74c73b35a5df6cc645b4420d
EBUILD squid-3.3.12.ebuild 7806 SHA256 0cd4be617a12431536eace0e53bf6440d48d38030009c628b5f49743356d9f50 SHA512 51dce84bf8f72eae6359bb532d9ff69dcf621856af8377e894abace43b4ff621cdde6e4db440bdcda5d22789156e4269b634b3743d224e5058e78240c6f53b58 WHIRLPOOL a73c6f9d31a88d8e2b83189fb6de6bcca18b260411bcf44ee752e4bcad720538221d661126f0606eb7038c71cddc1473285a467463337a168006870364b337c3
-EBUILD squid-3.3.8.ebuild 7922 SHA256 b6038f2c7591fe21d0a3c31f5630e1233f3de8a23445249fc29cb61579b0d90f SHA512 137b0ace09b17d9e9e779b58b50d7c90ac0bba75a551a4469c852be6d8cc7526a20c872c53301cb36e659b80ba6bd2ea4b6779b59a675b19b2d0a634984e2836 WHIRLPOOL fb75b24773892008e436b1a0261539c8b0fe9955b22f7502aa8446caf146afc9404b479fcf094e94aa8386ff2c1ac53c41ab8e5ff1806b5ebb3afe1baeb16e21
-EBUILD squid-3.3.9.ebuild 7841 SHA256 35049459d13d4af470b492718061460c73ad7707cae10e7823558d7000fcf91b SHA512 fdd03568c223b4c9eec4aabc9369b941aecbbe976e463cfd993c3867cd7f9b6bafae99dd1a5294940aa975956ce47b3a95b90c1065f067504c4e8124f9658a04 WHIRLPOOL 4cc164363a11bac592ed95dab2f6f25515575ffea5c7f0cf126926c5389390bea6c0072c94d508ed2df8bd8e0e9e283c5bda0ae2adc5b22e5ff012c02806c464
-EBUILD squid-3.4.2.ebuild 7785 SHA256 7b93d1d9e75cb82d44502e250e80cc55a10ca320e618473ad80a24f55aa52423 SHA512 4e0edf8a6e60efafb2861e87f36fabf5195ed8cea581a468ed212814dacc62690805f6bac0ac11acdff95472a04f4ee3ff7632ff8a2a4be176624bb7c1acb304 WHIRLPOOL d98c4b71c4eca09f1f9e97a86bbfa300793fabb135505ce0b4acb3748aeb08f595d3b2edd2fd2e38282acdefa46f42d772e656bcd8b9ea5d4c14d456e01de100
EBUILD squid-3.4.3.ebuild 7910 SHA256 8862f83c6036c60dd2918e2b06f9bd324c8d331bec4de36e719f048224b38a80 SHA512 ab50e2438c0b42853d5555c7e75de00545e805a5cebb22bd03d7b3b87a5ebc693357a05ca53043c39e2242a7ab2d842cedfeefceb8558d8f7679ec62f1bab058 WHIRLPOOL b78a5bfa5c43431722fa4d63e471ee1f9685b1474de48048c41f65b9d2f83faed972dfbfd3181fcffe93e073d12008bbd9845454a5db2ae80ea5552c788f926d
EBUILD squid-3.4.4.ebuild 8030 SHA256 4e2a0c9cd0ea44c89665cc6a921504b4cb452700911eb00b21340cab317b663f SHA512 3dc14f35c2a6930f55791d3642424b402d252ccf6e58af24211d68c44ce5c252135b522bf4c3789be773311ed7c1ccb349f83d82ecd48e8399dc39f0a4599481 WHIRLPOOL de43d67ace234452e36a50f0af62b6268da79268a72a5d7388f24592d8caa1c59f976d63ed4c770a7b8d9528a778955e7d64270a5032b085afad975f69ce153c
EBUILD squid-3.4.5.ebuild 7861 SHA256 014659983864e78b0e6fde00a21394372488c17e9fe0abcacc3a260864143922 SHA512 c8de367cdce207693aa6b1c191713f0e9eadd0d6d152795bce60b17c5cf51d6d850ff3588cc06fe6543078c551b345119f66d8ab2e607165330590ba70d12bdc WHIRLPOOL f8f841b4909d705b83aa857db1ae3af24732ed6cef66142ca199dccc4a5cf9da50d10fe40ce55cbb7b2d2d2c9081fb996541e21179aa4b83418d49ea6938c73b
-MISC ChangeLog 87078 SHA256 a1053c4667acc72831bfb231c691aea2deb9a843a4571f793b20af956fa28b5f SHA512 c4742920fc00423bc8289f53ce0f52f2c439c1b68c43ccf60eb9463f8ab26a63b8bde77614087e7588730cda7750e1b604a9af3cb0fa632fdb4bb59d7717102c WHIRLPOOL d9b4e3cad43c2e959eb27b0beca547b376938205c74123117d65da015f141fb6cb0ffaa2fecf658af55796912e87ece418588b397a609e0062f8e5d10db43326
+MISC ChangeLog 87513 SHA256 84d8d3cb4a71a6ed35073595faca35344fcd32902dfd99dc966c05d77790907e SHA512 63a7625830380eb091f397167bdd53209a1383955b7d6f78205fc4a2a5f11955dab2774a4b476ffb99924710a21cb0ce01ddcb632888fefb61d4e8fe6bbd0370 WHIRLPOOL efcaee30fb5487a3c7db13c46c941ccee264f84d0c9b70a149cd6d824b0ca43b39856dbeb714e1f81d061e8e3cdf4b9cfeff2ae4d8b9945bbc14c45e80453213
MISC metadata.xml 1727 SHA256 ed46e4a4e0a120954c3d925ca17863ebbb8bef9c84287c9255a59fa69d058349 SHA512 36a201a15736be3638747489033e381593ccd9595f0c94e466a4c1c7c20bfe3d30716f657fcc0c4f884edb7f1a2b06f4f7c7bcca71c99f3b5ed69e5e9bbb73d9 WHIRLPOOL 87e107547231c7e437c1356a43da701979ea0eccc166e367032b5bae5d6c43cb3a3eb091e173d5df674185c6b88a6cdfe3e6e436ab8a2f97c7073a9f6837768e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJTc5ZeAAoJELp701BxlEWf9ecP/i2ZbbvPBEptfUgjaWQbL1ol
-iEGeGEVOquh0iFoq+KYF77dkfBh5FiCsAj/bqTXr7x9Jvuato2Q3SjQB888Fxbno
-QAvjhb54EBAlZjPmFTQW1KaeVl44o7d7J7BzbV7G7QvWfobpn9ayLJTgrS846tko
-obON8iyp3N5JpjQ407cBoW5uewIqDnndoVBZPdtE16awTn2bDmI61p/9vMI4nSsz
-TPBRCy5Ai185sXMqvo4ObgsvYLEBcDWMN9zNntB3RMELfENUY862pCw4KunrJad+
-KQceJ4UjCmDOycy6S3dZjH+8bMEApG5XQoA6ga26gAkJ80Cxvoe4Be8PZBSggBbJ
-Oglfr0ZQaJ5OHQKITPjRjXF6XY7QrJsbUjm0SIWdLCI4wQ/le8IhEM8oZnB7gRuF
-PSeyy7VhXRj29BmBKDWqWrbrBITO2z9lXLzfuCtA0WSugAZ3PAlmWoMozX7WWEXI
-PFRZ8324qrQ8g39ho07W3bR4KT0NW5yNIzCUjoOpSRJUTkGAxbrAjK6Xh1tngWwL
-Wr520qJqZcW1Rpu0XVrcHykVa/5DufA0uSz3XwBkvu7rvtQlLNj9ZJt51m6IHYwE
-3NOrXiU8nRnVonqVFEMcw6SxwSsQNJlYKeoJkyNw1mhJJV8n2v0BpBVnIUetvMxp
-ZAHfcK+UZLFpTL6EwIa8
-=IcV+
+iQIcBAEBCAAGBQJTdJspAAoJEHfx8XVYajsfBvsQAIskEV8BxlG+MPsgn2zcXcss
+B1rX0yKhHPPlUQVFQ/+Q5cxq6Y2TaC9QH1+AS9nKWRiCE50jQ/PD3znrb7fbGODi
+JNi7f2EqXD0v5vALxAnheibG4FDLGftc+mlqkBpcbtXmzyQziUFrE6auMgSgaqyS
+mIMyOyrW09RfH1pRVICsi/kpsMOYlVXDte+j1VL5ox7fSuNS93el8QupBxaNcpf0
+SUuzwrkb90Y1onTA/vl3A/68PZXjUifewCPbdBs9vnR7V4BF84Ln2pgQQ5Z/rvuu
+sdBStrGEpDoQGMiOgX/iu/WSVOoyCxRjRf9BELlajevkSD3yxZWSIMSWoJf4bX5w
+QFP2cHFSGvlgrqaDKUiCMXRNKR9dXQM6bU2FUwWkgUCHtgUlgsUS8OsbwVxt7fAo
+DiuEGnZLFrPqzRQojOYxmhV24AK+Q0MM3C4FzKwtIqrKHqtolPIuBeOaah9pBTyr
+eAngn//vx3UvaeD4j4xaYkKbn38AnVremcMeva2QbtevyB7kuzbond3Q4LcLCCFT
+tX1gyXreu5ucAF5E9ZVdg7FJUCsY4DSDYFN1+evbW3eamxXM6e+vKeUtY+OOrxCB
+Z8555OIRJUeF0nX3MPPeLs54hIgk77z+odMeiJSCH4SlCNMPGGHx9qOHbTeCZk+s
+s6tYCBI3gkf31y/TLtrW
+=vLYj
-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-3.1.15-gentoo.patch b/net-proxy/squid/files/squid-3.1.15-gentoo.patch
deleted file mode 100644
index 09c9600b6c8e..000000000000
--- a/net-proxy/squid/files/squid-3.1.15-gentoo.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 23922c0..f359a00 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,9 +16,9 @@ PRESET_CFLAGS="$CFLAGS"
- PRESET_LDFLAGS="$LDFLAGS"
-
- dnl Set default LDFLAGS
--if test -z "$LDFLAGS"; then
-- LDFLAGS="-g"
--fi
-+dnl if test -z "$LDFLAGS"; then
-+dnl LDFLAGS="-g"
-+dnl fi
-
- dnl Check for GNU cc
- AC_PROG_CC
-diff --git a/helpers/basic_auth/MSNT/confload.c b/helpers/basic_auth/MSNT/confload.c
-index e04365e..7241b3f 100644
---- a/helpers/basic_auth/MSNT/confload.c
-+++ b/helpers/basic_auth/MSNT/confload.c
-@@ -27,7 +27,7 @@
-
- /* Path to configuration file */
- #ifndef SYSCONFDIR
--#define SYSCONFDIR "/usr/local/squid/etc"
-+#define SYSCONFDIR "/etc/squid"
- #endif
- #define CONFIGFILE SYSCONFDIR "/msntauth.conf"
-
-diff --git a/helpers/basic_auth/MSNT/msntauth.conf.default b/helpers/basic_auth/MSNT/msntauth.conf.default
-index 323bc1c..c3d7d21 100644
---- a/helpers/basic_auth/MSNT/msntauth.conf.default
-+++ b/helpers/basic_auth/MSNT/msntauth.conf.default
-@@ -8,6 +8,6 @@ server my_PDC my_BDC my_NTdomain
- server other_PDC other_BDC otherdomain
-
- # Denied and allowed users. Comment these if not needed.
--#denyusers /usr/local/squid/etc/msntauth.denyusers
--#allowusers /usr/local/squid/etc/msntauth.allowusers
-+#denyusers /etc/squid/msntauth.denyusers
-+#allowusers /etc/squid/msntauth.allowusers
-
-diff --git a/helpers/basic_auth/SMB/smb_auth.sh b/helpers/basic_auth/SMB/smb_auth.sh
-index 2a1abb3..b3ebb7a 100755
---- a/helpers/basic_auth/SMB/smb_auth.sh
-+++ b/helpers/basic_auth/SMB/smb_auth.sh
-@@ -24,7 +24,7 @@ read NMBCAST
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
-
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@ else
- addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
-+dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
-
-diff --git a/helpers/external_acl/session/squid_session.8 b/helpers/external_acl/session/squid_session.8
-index 7808f41..d86e320 100644
---- a/helpers/external_acl/session/squid_session.8
-+++ b/helpers/external_acl/session/squid_session.8
-@@ -35,7 +35,7 @@ the first request.
- .P
- Configuration example using the default automatic mode
- .IP
--external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session
-+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session
- .IP
- acl session external session
- .IP
-diff --git a/helpers/external_acl/unix_group/squid_unix_group.8 b/helpers/external_acl/unix_group/squid_unix_group.8
-index 72aa1a3..cde5f20 100644
---- a/helpers/external_acl/unix_group/squid_unix_group.8
-+++ b/helpers/external_acl/unix_group/squid_unix_group.8
-@@ -27,7 +27,7 @@ Strip NT domain name component from user names (/ or \\ separated)
- This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
- matches users in group2 or group3
- .IP
--external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
-+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p
- .IP
- acl usergroup1 external unix_group group1
- .IP
-diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-index e78f61e..ca6c0c2 100644
---- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-@@ -17,6 +17,7 @@ dnl Process this file with autoconf to produce a configure script.
-
- AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com])
- AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5)
-+AM_MAINTAINER_MODE
- AC_CONFIG_SRCDIR([squid_kerb_auth.c])
-
- AC_PROG_CC
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e1c0be4..423553e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -639,7 +639,6 @@ BUILT_SOURCES = \
-
- sysconf_DATA = \
- squid.conf.default \
-- squid.conf.documented \
- mime.conf.default
-
- data_DATA = \
-@@ -724,9 +724,9 @@
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
- DEFAULT_PID_FILE = $(DEFAULT_PIDFILE)
--DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR = $(localstatedir)/cache
--DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db
-+DEFAULT_NETDB_FILE = $(localstatedir)/run//netdb.state
-+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid
-+DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/squid/ssl_db
- DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-@@ -802,13 +801,11 @@ install-data-local: install-sysconfDATA install-dataDATA
- @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
- else \
-- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
-+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
- fi
-- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
-- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
-- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
-- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
-+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
-+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \
- $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PID_FILE)`
-diff --git a/src/cf.data.pre b/src/cf.data.pre
-index b504918..56928c4 100644
---- a/src/cf.data.pre
-+++ b/src/cf.data.pre
-@@ -768,6 +768,7 @@ acl Safe_ports port 280 # http-mgmt
- acl Safe_ports port 488 # gss-http
- acl Safe_ports port 591 # filemaker
- acl Safe_ports port 777 # multiling http
-+acl Safe_ports port 901 # SWAT
- acl CONNECT method CONNECT
- NOCOMMENT_END
- DOC_END
-@@ -917,6 +918,9 @@ http_access deny CONNECT !SSL_ports
- http_access allow localnet
- http_access allow localhost
-
-+# Allow the localhost to have access by default
-+http_access allow localhost
-+
- # And finally deny all other access to this proxy
- http_access deny all
- NOCOMMENT_END
-@@ -4138,11 +4142,11 @@ COMMENT_END
-
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- Email-address of local cache manager who will receive
-- mail if the cache dies. The default is "webmaster."
-+ mail if the cache dies. The default is "root."
- DOC_END
-
- NAME: mail_from
-@@ -6456,7 +6460,7 @@ DOC_END
- NAME: forwarded_for
- COMMENT: on|off|transparent|truncate|delete
- TYPE: string
--DEFAULT: on
-+DEFAULT: delete
- LOC: opt_forwarded_for
- DOC_START
- If set to "on", Squid will append your client's IP address
-diff --git a/src/debug.cc b/src/debug.cc
-index 32813bf..6de334a 100644
---- a/src/debug.cc
-+++ b/src/debug.cc
-@@ -452,7 +452,7 @@ _db_init(const char *logfile, const char *options)
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
-
- if (Debug::log_syslog)
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
-
- #endif /* HAVE_SYSLOG */
-
-diff --git a/src/main.cc b/src/main.cc
-index 941126d..71f3c3b 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -1555,7 +1555,7 @@ watch_child(char *argv[])
- if (*(argv[0]) == '(')
- return;
-
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- if ((pid = fork()) < 0)
- syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1599,7 +1599,7 @@ watch_child(char *argv[])
-
- if ((pid = fork()) == 0) {
- /* child */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
- prog = xstrdup(argv[0]);
- argv[0] = xstrdup("(squid)");
- execvp(prog, argv);
-@@ -1607,7 +1607,7 @@ watch_child(char *argv[])
- }
-
- /* parent */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON);
-
- syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid);
-
-commit e3f6cc6438869766751556f2d9747669b4c51fe1
-Author: Eray Aslan <eras@gentoo.org>
-Date: Fri Apr 29 10:55:17 2011 +0000
-
- Do not auto detect kerberos.
-
- No need for automagic dependencies. We already give the necessary flags
- to the configure script.
-
-diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-index e78f61e..dc739b2 100644
---- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac
-@@ -279,40 +279,6 @@ AC_ARG_ENABLE(seam-64,
- check_seam_64
- fi ])
-
--dnl Define system default
--if test "$enable_arg" = "no"; then
-- dnl Autodetect system
-- dnl Check krb5-config first
-- AC_CHECK_PROG(ac_krb5_config,krb5-config,yes,no)
-- case $sys in
-- Linux) rpm -q heimdal-lib >/dev/null 2>&1
-- if test $? = 0 ; then
-- check_heimdal
-- else
-- check_mit
-- fi
-- ;;
-- AIX) lslpp -L krb5.client.rte >/dev/null 2>&1
-- if test $? = 0 ; then
-- check_nas
-- else
-- check_mit
-- fi
-- ;;
-- SunOS) pkginfo SUNWgss >/dev/null 2>&1
-- if test $? = 0 ; then
-- check_seam
-- else
-- check_mit
-- fi
-- ;;
-- FreeBSD) check_heimdal
-- ;;
-- *) check_mit
-- ;;
-- esac
--fi
--
- AC_C_BIGENDIAN
-
- AC_CHECK_HEADERS( \
diff --git a/net-proxy/squid/files/squid-3.2.1-gentoo.patch b/net-proxy/squid/files/squid-3.2.1-gentoo.patch
deleted file mode 100644
index c5db303f9129..000000000000
--- a/net-proxy/squid/files/squid-3.2.1-gentoo.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a863327..deb44ed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,9 +26,9 @@ PRESET_CFLAGS="$CFLAGS"
- PRESET_LDFLAGS="$LDFLAGS"
-
- dnl Set default LDFLAGS
--if test "x$LDFLAGS" = "x" ; then
-- LDFLAGS="-g"
--fi
-+dnl if test "x$LDFLAGS" = "x" ; then
-+dnl LDFLAGS="-g"
-+dnl fi
-
- # Check for GNU cc
- AC_PROG_CC
-diff --git a/helpers/basic_auth/SMB/basic_smb_auth.sh b/helpers/basic_auth/SMB/basic_smb_auth.sh
-index 2a1abb3..b3ebb7a 100755
---- a/helpers/basic_auth/SMB/basic_smb_auth.sh
-+++ b/helpers/basic_auth/SMB/basic_smb_auth.sh
-@@ -24,7 +24,7 @@ read NMBCAST
- read AUTHSHARE
- read AUTHFILE
- read SMBUSER
--read SMBPASS
-+read -r SMBPASS
-
- # Find domain controller
- echo "Domain name: $DOMAINNAME"
-@@ -47,7 +47,7 @@ else
- addropt=""
- fi
- echo "Query address options: $addropt"
--dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
-+dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
- echo "Domain controller IP address: $dcip"
- [ -n "$dcip" ] || exit 1
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6b69267..10f506a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -867,8 +867,8 @@ DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
- DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db
-+DEFAULT_NETDB_FILE = $(localstatedir)/lib/squid/netdb.state
-+DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/squid/ssl_db
- DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
-diff --git a/src/cf.data.pre b/src/cf.data.pre
-index 697233e..311c3ea 100644
---- a/src/cf.data.pre
-+++ b/src/cf.data.pre
-@@ -906,6 +906,7 @@ acl Safe_ports port 280 # http-mgmt
- acl Safe_ports port 488 # gss-http
- acl Safe_ports port 591 # filemaker
- acl Safe_ports port 777 # multiling http
-+acl Safe_ports port 901 # SWAT
- acl CONNECT method CONNECT
- NOCOMMENT_END
- DOC_END
-@@ -4778,11 +4782,11 @@ COMMENT_END
-
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- Email-address of local cache manager who will receive
-- mail if the cache dies. The default is "webmaster."
-+ mail if the cache dies. The default is "root".
- DOC_END
-
- NAME: mail_from
-@@ -7442,7 +7446,7 @@ DOC_END
- NAME: forwarded_for
- COMMENT: on|off|transparent|truncate|delete
- TYPE: string
--DEFAULT: on
-+DEFAULT: delete
- LOC: opt_forwarded_for
- DOC_START
- If set to "on", Squid will append your client's IP address
-diff --git a/src/debug.cc b/src/debug.cc
-index 64ab0ba..062119a 100644
---- a/src/debug.cc
-+++ b/src/debug.cc
-@@ -450,7 +450,7 @@ _db_init(const char *logfile, const char *options)
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
-
- if (Debug::log_syslog)
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
-
- #endif /* HAVE_SYSLOG */
-
-diff --git a/src/main.cc b/src/main.cc
-index d6eb01a..0b93f0e 100644
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -1657,7 +1657,7 @@ watch_child(char *argv[])
- if (!IamMasterProcess())
- return;
-
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
-
- if ((pid = fork()) < 0)
- syslog(LOG_ALERT, "fork failed: %s", xstrerror());
-@@ -1720,7 +1720,7 @@ watch_child(char *argv[])
-
- if ((pid = fork()) == 0) {
- /* child */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
- prog = argv[0];
- argv[0] = const_cast<char*>(kid.name().termedBuf());
- execvp(prog, argv);
-@@ -1733,7 +1733,7 @@ watch_child(char *argv[])
- }
-
- /* parent */
-- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
-
- squid_signal(SIGINT, SIG_IGN, SA_RESTART);
-
diff --git a/net-proxy/squid/files/squid.confd b/net-proxy/squid/files/squid.confd
deleted file mode 100644
index 67956bf64154..000000000000
--- a/net-proxy/squid/files/squid.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.3 2009/10/25 08:35:46 mrness Exp $
-
-# Config file for /etc/init.d/squid
-
-SQUID_OPTS="-YC"
-
-# Max. number of filedescriptors to use. You can increase this on a busy
-# cache to a maximum of (currently) 8192 filedescriptors. Default is 1024.
-SQUID_MAXFD=1024
-
-# Kerberos keytab file to use. This is required if you enable kerberos authentication.
-SQUID_KEYTAB=""
diff --git a/net-proxy/squid/files/squid.initd-logrotate-r1 b/net-proxy/squid/files/squid.initd-logrotate-r1
deleted file mode 100644
index 0285fae25c55..000000000000
--- a/net-proxy/squid/files/squid.initd-logrotate-r1
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate-r1,v 1.1 2012/10/23 07:01:47 eras Exp $
-
-extra_started_commands="reload"
-
-depend() {
- use dns net
-}
-
-upprocval() {
- [ -f $1 ] || return 0
- if [ `cat $1` -lt $2 ]; then
- echo $2 > $1
- fi
-}
-
-# Try to increase the # of filedescriptors we can open.
-maxfds() {
- [ -n "$SQUID_MAXFD" ] || return
- [ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
- local minimal_file_max=$(($SQUID_MAXFD + 4096))
- upprocval /proc/sys/fs/file-max $minimal_file_max
- if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
- upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
- fi
- ulimit -n $SQUID_MAXFD
-}
-
-checkconfig() {
- if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
- eerror "You need to create /etc/squid/${SVCNAME}.conf first."
- eerror "An example can be found in /etc/squid/squid.conf.default"
- return 1
- fi
-
- local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
- [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
- if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
- eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
- eerror " /var/run/${SVCNAME}.pid"
- eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
- eerror " in any other instance of squid."
- return 1
- fi
-
- maxfds
-
- local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
- [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-
- local x
- for x in $CACHE_SWAP ; do
- if [ ! -e $x ] ; then
- ebegin "Initializing cache directory ${x%/*}"
- local ORIG_UMASK=$(umask)
- umask 027
-
- if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
- eend 1
- return 1
- fi
-
- local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
- if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
- umask $ORIG_UMASK
- eend 1
- echo "$INIT_CACHE_RESPONSE"
- return 1
- fi
-
- umask $ORIG_UMASK
- eend 0
- break
- fi
- done
-
- return 0
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ${SVCNAME}"
- KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
- eend $? && sleep 1
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
- # Now we have to wait until squid has _really_ stopped.
- sleep 1
- if [ -f /var/run/${SVCNAME}.pid ] ; then
- einfon "Waiting for squid to shutdown ."
- cnt=0
- while [ -f /var/run/${SVCNAME}.pid ] ; do
- cnt=$(expr $cnt + 1)
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- eend 1 "Failed."
- break
- fi
- sleep 2
- echo -n "."
- done
- echo
- fi
- else
- eerror "Squid shutdown failed, probably service is already down."
- fi
- eend 0
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${SVCNAME}"
- /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
- eend $?
-}
diff --git a/net-proxy/squid/files/squid.initd-logrotate-r3 b/net-proxy/squid/files/squid.initd-logrotate-r3
deleted file mode 100644
index 8aaf7ad93f5d..000000000000
--- a/net-proxy/squid/files/squid.initd-logrotate-r3
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate-r3,v 1.1 2013/01/11 15:25:49 eras Exp $
-
-extra_started_commands="reload"
-
-depend() {
- use dns net
-}
-
-checkconfig() {
- if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
- eerror "You need to create /etc/squid/${SVCNAME}.conf first."
- eerror "An example can be found in /etc/squid/squid.conf.default"
- return 1
- fi
-
- local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
- [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
- if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
- eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
- eerror " /var/run/${SVCNAME}.pid"
- eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
- eerror " in any other instance of squid."
- return 1
- fi
-
- # Maximum file descriptors squid can open is determined by:
- # a basic default of N=1024
- # ... altered by ./configure --with-filedescriptors=N
- # ... overridden on production by squid.conf max_filedescriptors (if,
- # and only if, setrlimit() RLIMIT_NOFILE is able to be built+used).
- # Since we do not configure hard coded # of filedescriptors anymore,
- # there is no need for ulimit calls in the init script.
- # Use max_filedescriptors in squid.conf instead.
-
- local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
- [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-
- local x
- for x in $CACHE_SWAP ; do
- if [ ! -e $x ] ; then
- ebegin "Initializing cache directory ${x%/*}"
- local ORIG_UMASK=$(umask)
- umask 027
-
- if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
- eend 1
- return 1
- fi
-
- local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
- if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
- umask $ORIG_UMASK
- eend 1
- echo "$INIT_CACHE_RESPONSE"
- return 1
- fi
-
- umask $ORIG_UMASK
- eend 0
- break
- fi
- done
-
- return 0
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ${SVCNAME}"
- KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
- eend $? && sleep 1
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
- # Now we have to wait until squid has _really_ stopped.
- sleep 1
- if [ -f /var/run/${SVCNAME}.pid ] ; then
- einfon "Waiting for squid to shutdown ."
- cnt=0
- while [ -f /var/run/${SVCNAME}.pid ] ; do
- cnt=$(expr $cnt + 1)
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- eend 1 "Failed."
- break
- fi
- sleep 2
- echo -n "."
- done
- echo
- fi
- else
- eerror "Squid shutdown failed, probably service is already down."
- fi
- eend 0
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${SVCNAME}"
- /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
- eend $?
-}
diff --git a/net-proxy/squid/files/squid.initd-r1 b/net-proxy/squid/files/squid.initd-r1
deleted file mode 100644
index 86998494172a..000000000000
--- a/net-proxy/squid/files/squid.initd-r1
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-r1,v 1.1 2012/10/23 07:01:47 eras Exp $
-
-extra_started_commands="reload rotate"
-
-depend() {
- use dns net
-}
-
-upprocval() {
- [ -f $1 ] || return 0
- if [ `cat $1` -lt $2 ]; then
- echo $2 > $1
- fi
-}
-
-# Try to increase the # of filedescriptors we can open.
-maxfds() {
- [ -n "$SQUID_MAXFD" ] || return
- [ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192
- local minimal_file_max=$(($SQUID_MAXFD + 4096))
- upprocval /proc/sys/fs/file-max $minimal_file_max
- if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then
- upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max
- fi
- ulimit -n $SQUID_MAXFD
-}
-
-checkconfig() {
- if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
- eerror "You need to create /etc/squid/${SVCNAME}.conf first."
- eerror "An example can be found in /etc/squid/squid.conf.default"
- return 1
- fi
-
- local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
- [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
- if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
- eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
- eerror " /var/run/${SVCNAME}.pid"
- eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
- eerror " in any other instance of squid."
- return 1
- fi
-
- maxfds
-
- local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
- [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-
- local x
- for x in $CACHE_SWAP ; do
- if [ ! -e $x ] ; then
- ebegin "Initializing cache directory ${x%/*}"
- local ORIG_UMASK=$(umask)
- umask 027
-
- if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
- eend 1
- return 1
- fi
-
- local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
- if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
- umask $ORIG_UMASK
- eend 1
- echo "$INIT_CACHE_RESPONSE"
- return 1
- fi
-
- umask $ORIG_UMASK
- eend 0
- break
- fi
- done
-
- return 0
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ${SVCNAME}"
- KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
- eend $? && sleep 1
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
- # Now we have to wait until squid has _really_ stopped.
- sleep 1
- if [ -f /var/run/${SVCNAME}.pid ] ; then
- einfon "Waiting for squid to shutdown ."
- cnt=0
- while [ -f /var/run/${SVCNAME}.pid ] ; do
- cnt=$(expr $cnt + 1)
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- eend 1 "Failed."
- break
- fi
- sleep 2
- echo -n "."
- done
- echo
- fi
- else
- eerror "Squid shutdown failed, probably service is already down."
- fi
- eend 0
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${SVCNAME}"
- /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
- eend $?
-}
-
-rotate() {
- service_started ${SVCNAME} || return 1
- ebegin "Rotating ${SVCNAME} logs"
- /usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf
- eend $?
-}
diff --git a/net-proxy/squid/files/squid.initd-r3 b/net-proxy/squid/files/squid.initd-r3
deleted file mode 100644
index 59564321749b..000000000000
--- a/net-proxy/squid/files/squid.initd-r3
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-r3,v 1.1 2013/01/11 15:25:49 eras Exp $
-
-extra_started_commands="reload rotate"
-
-depend() {
- use dns net
-}
-
-checkconfig() {
- if [ ! -f /etc/squid/${SVCNAME}.conf ]; then
- eerror "You need to create /etc/squid/${SVCNAME}.conf first."
- eerror "An example can be found in /etc/squid/squid.conf.default"
- return 1
- fi
-
- local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf)
- [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid
- if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then
- eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to"
- eerror " /var/run/${SVCNAME}.pid"
- eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than"
- eerror " in any other instance of squid."
- return 1
- fi
-
- # Maximum file descriptors squid can open is determined by:
- # a basic default of N=1024
- # ... altered by ./configure --with-filedescriptors=N
- # ... overridden on production by squid.conf max_filedescriptors (if,
- # and only if, setrlimit() RLIMIT_NOFILE is able to be built+used).
- # Since we do not configure hard coded # of filedescriptors anymore,
- # there is no need for ulimit calls in the init script.
- # Use max_filedescriptors in squid.conf instead.
-
- local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf)
- [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
-
- local x
- for x in $CACHE_SWAP ; do
- if [ ! -e $x ] ; then
- ebegin "Initializing cache directory ${x%/*}"
- local ORIG_UMASK=$(umask)
- umask 027
-
- if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then
- eend 1
- return 1
- fi
-
- local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)"
- if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
- umask $ORIG_UMASK
- eend 1
- echo "$INIT_CACHE_RESPONSE"
- return 1
- fi
-
- umask $ORIG_UMASK
- eend 0
- break
- fi
- done
-
- return 0
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ${SVCNAME}"
- KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
- eend $? && sleep 1
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then
- # Now we have to wait until squid has _really_ stopped.
- sleep 1
- if [ -f /var/run/${SVCNAME}.pid ] ; then
- einfon "Waiting for squid to shutdown ."
- cnt=0
- while [ -f /var/run/${SVCNAME}.pid ] ; do
- cnt=$(expr $cnt + 1)
- if [ $cnt -gt 60 ] ; then
- # Waited 120 seconds now. Fail.
- echo
- eend 1 "Failed."
- break
- fi
- sleep 2
- echo -n "."
- done
- echo
- fi
- else
- eerror "Squid shutdown failed, probably service is already down."
- fi
- eend 0
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${SVCNAME}"
- /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf
- eend $?
-}
-
-rotate() {
- service_started ${SVCNAME} || return 1
- ebegin "Rotating ${SVCNAME} logs"
- /usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf
- eend $?
-}
diff --git a/net-proxy/squid/squid-3.1.23.ebuild b/net-proxy/squid/squid-3.1.23.ebuild
deleted file mode 100644
index f8a10834e109..000000000000
--- a/net-proxy/squid/squid-3.1.23.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild,v 1.11 2013/03/09 19:07:42 ago Exp $
-
-EAPI=4
-inherit eutils pam toolchain-funcs autotools linux-info user
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client \
- mysql postgres sqlite \
- zero-penalty-hit \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux +epoll tproxy"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap:0 )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- dev-lang/perl
- sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )
- !<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )"
-
-pkg_pretend() {
- if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then
- eerror "coss store IO has been disabled by upstream due to stability issues!"
- eerror "If you want to install this version, switch the store type to something else"
- eerror "before attempting to install this version again."
-
- die "/etc/squid/squid.conf: cache_dir uses a disabled store type"
- fi
-
- if use tproxy; then
- echo
- elog "Checking kernel configuration for full Tproxy4 support"
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
- linux-info_pkg_setup
- echo
- fi
-}
-
-pkg_setup() {
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.1.15-gentoo.patch"
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
-
- local basic_modules="getpwnam,NCSA,MSNT"
- use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
- use ldap && basic_modules="LDAP,${basic_modules}"
- use pam && basic_modules="PAM,${basic_modules}"
- use sasl && basic_modules="SASL,${basic_modules}"
- use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
- use radius && basic_modules="squid_radius_auth,${basic_modules}"
- if use mysql || use postgres || use sqlite ; then
- basic_modules="DB,${basic_modules}"
- fi
-
- local digest_modules="password"
- use ldap && digest_modules="ldap,${digest_modules}"
-
- local ext_helpers="ip_user,session,unix_group"
- use samba && ext_helpers="wbinfo_group,${ext_helpers}"
- use ldap && ext_helpers="ldap_group,${ext_helpers}"
-
- local ntlm_helpers="fakeauth"
- use samba && ntlm_helpers="smb_lm,${ntlm_helpers}"
-
- local negotiate_helpers=
- if use kerberos; then
- negotiate_helpers="squid_kerb_auth"
- if has_version app-crypt/mit-krb5; then
- myconf="--enable-mit=${EPREFIX}/usr --disable-heimdal"
- elif has_version app-crypt/heimdal; then
- myconf="--disable-mit --enable-heimdal=${EPREFIX}/usr"
- fi
- else
- myconf="--disable-mit --disable-heimdal"
- fi
-
- # coss support has been disabled
- # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175)
- myconf="${myconf} --enable-storeio=ufs,diskd,aufs"
-
- if use kernel_linux; then
- myconf="${myconf} --enable-linux-netfilter \
- $(use_enable tproxy linux-tproxy) \
- $(use_enable epoll)"
- elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- myconf="${myconf} $(use_enable kqueue)"
- if use pf-transparent; then
- myconf="${myconf} --enable-pf-transparent"
- elif use ipf-transparent; then
- myconf="${myconf} --enable-ipf-transparent"
- fi
- fi
-
- export CC=$(tc-getCC)
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/var/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-auth="basic,digest,negotiate,ntlm" \
- --enable-removal-policies="lru,heap" \
- --enable-digest-auth-helpers="${digest_modules}" \
- --enable-basic-auth-helpers="${basic_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-ntlm-auth-helpers="${ntlm_helpers}" \
- --enable-negotiate-auth-helpers="${negotiate_helpers}" \
- --enable-useragent-log \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-referer-log \
- --enable-arp-acl \
- --with-large-files \
- --with-filedescriptors=8192 \
- --disable-strict-error-checking \
- $(use_with caps libcap) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- $(use_enable zero-penalty-hit zph-qos) \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/ncsa_auth
- fperms 4750 /usr/libexec/squid/ncsa_auth
- if use pam; then
- fowners root:squid /usr/libexec/squid/pam_auth
- fperms 4750 /usr/libexec/squid/pam_auth
- fi
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \
- helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
- newdoc helpers/basic_auth/SMB/README README.auth_smb
- dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
- newdoc helpers/basic_auth/LDAP/README README.auth_ldap
- doman helpers/basic_auth/LDAP/*.8
- dodoc helpers/basic_auth/SASL/squid_sasl_auth*
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd" squid
- if use logrotate; then
- newinitd "${FILESDIR}/squid.initd-logrotate-r1" squid
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- newinitd "${FILESDIR}/squid.initd-r1" squid
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- rm -rf "${D}"/var
- diropts -m0755 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid
-}
-
-pkg_postinst() {
- echo
- elog "Squid authentication helpers have been installed suid root."
- elog "This allows shadow based authentication (see bug #52977 for more)."
- echo
- elog "Be careful what type of cache_dir you select!"
- elog " 'diskd' is optimized for high levels of traffic, but it might seem slow"
- elog "when there isn't sufficient traffic to keep squid reasonably busy."
- elog " If your traffic level is low to moderate, use 'aufs' or 'ufs'."
-}
diff --git a/net-proxy/squid/squid-3.2.13.ebuild b/net-proxy/squid/squid-3.2.13.ebuild
deleted file mode 100644
index f11d8416e4d4..000000000000
--- a/net-proxy/squid/squid-3.2.13.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.13.ebuild,v 1.11 2013/09/23 14:40:36 tomwij Exp $
-
-EAPI=5
-
-# Workaround to avoid failing make check until we have a proper fix
-WANT_AUTOMAKE="1.12"
-
-inherit eutils pam toolchain-funcs autotools linux-info user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client ssl-crtd \
- mysql postgres sqlite \
- qos tproxy \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap:0.2 )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- sys-devel/libtool
- dev-lang/perl
- sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )
- !<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
- qos? ( caps )"
-
-pkg_pretend() {
- if use tproxy; then
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
- linux-info_pkg_setup
- fi
-}
-
-pkg_setup() {
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch"
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- lib/libTrie/configure.ac || die
- sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
- INSTALL QUICKSTART \
- helpers/basic_auth/MSNT/README.html \
- helpers/basic_auth/MSNT/confload.cc \
- helpers/basic_auth/MSNT/msntauth.conf.default \
- scripts/fileno-to-pathname.pl \
- scripts/check_cache.pl \
- tools/cachemgr.cgi.8 \
- tools/purge/conffile.hh \
- tools/purge/README || die
- sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
- INSTALL QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
- QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
- QUICKSTART \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
- helpers/basic_auth/MSNT/README.html || die
- sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
- helpers/external_acl/unix_group/ext_unix_group_acl.8 \
- helpers/external_acl/session/ext_session_acl.8 \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
- scripts/check_cache.pl || die
- sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- # /var/run/squid to /run/squid
- sed -i -e 's:$(localstatedir)::' \
- src/ipc/Makefile.am
- eautoreconf
-}
-
-src_configure() {
- local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
- use samba && basic_modules+=",SMB"
- use ldap && basic_modules+=",LDAP"
- use pam && basic_modules+=",PAM"
- use sasl && basic_modules+=",SASL"
- use nis && ! use elibc_uclibc && basic_modules+=",NIS"
- use radius && basic_modules+=",RADIUS"
- if use mysql || use postgres || use sqlite ; then
- basic_modules+=",DB"
- fi
-
- local digest_modules="file"
- use ldap && digest_modules+=",LDAP,eDirectory"
-
- local negotiate_modules="none"
- use kerberos && negotiate_modules="kerberos,wrapper"
-
- local ntlm_modules="none"
- use samba && ntlm_modules="smb_lm"
-
- local ext_helpers="file_userip,session,unix_group"
- use samba && ext_helpers+=",wbinfo_group"
- use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
- use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
- # uclibc does not have aio support - needed for coss (#61175)
- local storeio_modules="aufs,diskd,rock,ufs"
- # not stable enough yet
- #! use elibc_uclibc && storeio_modules+=",coss"
-
- local transparent
- if use kernel_linux ; then
- transparent+=" --enable-linux-netfilter"
- use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
- fi
-
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- transparent+=" $(use_enable kqueue)"
- if use pf-transparent; then
- transparent+=" --enable-pf-transparent"
- elif use ipf-transparent; then
- transparent+=" --enable-ipf-transparent"
- fi
- fi
-
- export CC=$(tc-getCC)
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-removal-policies="lru,heap" \
- --enable-storeio="${storeio_modules}" \
- --enable-disk-io \
- --enable-auth \
- --enable-auth-basic="${basic_modules}" \
- --enable-auth-digest="${digest_modules}" \
- --enable-auth-ntlm="${ntlm_modules}" \
- --enable-auth-negotiate="${negotiate_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-log-daemon-helpers \
- --enable-url-rewrite-helpers \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-eui \
- --enable-icmp \
- --enable-follow-x-forwarded-for \
- --enable-esi \
- --with-large-files \
- --disable-strict-error-checking \
- $(use_with caps libcap) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable ssl-crtd) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- ${transparent}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/basic_ncsa_auth
- fperms 4750 /usr/libexec/squid/basic_ncsa_auth
- if use pam; then
- fowners root:squid /usr/libexec/squid/basic_pam_auth
- fperms 4750 /usr/libexec/squid/basic_pam_auth
- fi
- # pinger needs suid as well
- fowners root:squid /usr/libexec/squid/pinger
- fperms 4750 /usr/libexec/squid/pinger
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
- newdoc helpers/negotiate_auth/kerberos/README README.kerberos
- newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
- newdoc helpers/basic_auth/LDAP/README README.LDAP
- newdoc helpers/basic_auth/RADIUS/README README.RADIUS
- newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
- newdoc tools/purge/README README.purge
- newdoc tools/helper-mux.README README.helper-mux
- dohtml RELEASENOTES.html
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd-r1" squid
- if use logrotate; then
- newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- newinitd "${FILESDIR}/squid.initd-r3" squid
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- diropts -m0750 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
- if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
- [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 2 ]]; then
- elog "Please read the release notes at:"
- elog " http://www.squid-cache.org/Versions/v3/3.2/RELEASENOTES.html"
- echo
- fi
-}
diff --git a/net-proxy/squid/squid-3.3.10.ebuild b/net-proxy/squid/squid-3.3.10.ebuild
deleted file mode 100644
index 84ce7e8ac63d..000000000000
--- a/net-proxy/squid/squid-3.3.10.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.10.ebuild,v 1.1 2013/11/11 16:52:18 eras Exp $
-
-EAPI=5
-
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client ssl-crtd \
- mysql postgres sqlite \
- qos tproxy \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap:0.2 )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- sys-devel/libtool
- dev-lang/perl
- sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )
- !<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
- qos? ( caps )"
-
-pkg_pretend() {
- if use tproxy; then
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
- linux-info_pkg_setup
- fi
-}
-
-pkg_setup() {
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- lib/libTrie/configure.ac || die
- sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
- INSTALL QUICKSTART \
- helpers/basic_auth/MSNT/README.html \
- helpers/basic_auth/MSNT/confload.cc \
- helpers/basic_auth/MSNT/msntauth.conf.default \
- scripts/fileno-to-pathname.pl \
- scripts/check_cache.pl \
- tools/cachemgr.cgi.8 \
- tools/purge/conffile.hh \
- tools/purge/README || die
- sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
- INSTALL QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
- QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
- QUICKSTART \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
- helpers/basic_auth/MSNT/README.html || die
- sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
- helpers/external_acl/unix_group/ext_unix_group_acl.8 \
- helpers/external_acl/session/ext_session_acl.8 \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
- scripts/check_cache.pl || die
- sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- # /var/run/squid to /run/squid
- sed -i -e 's:$(localstatedir)::' \
- src/ipc/Makefile.am
-
- # Bug #419685 - eautoreconf in src_prepare() fails in libltdl/
- # aclocal-1.11: `configure.ac' or `configure.in' is required
- MAKEOPTS="${MAKEOPTS} -j1" eautoreconf
-}
-
-src_configure() {
- local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
- use samba && basic_modules+=",SMB"
- use ldap && basic_modules+=",LDAP"
- use pam && basic_modules+=",PAM"
- use sasl && basic_modules+=",SASL"
- use nis && ! use elibc_uclibc && basic_modules+=",NIS"
- use radius && basic_modules+=",RADIUS"
- if use mysql || use postgres || use sqlite ; then
- basic_modules+=",DB"
- fi
-
- local digest_modules="file"
- use ldap && digest_modules+=",LDAP,eDirectory"
-
- local negotiate_modules="none"
- use kerberos && negotiate_modules="kerberos,wrapper"
-
- local ntlm_modules="none"
- use samba && ntlm_modules="smb_lm"
-
- local ext_helpers="file_userip,session,unix_group"
- use samba && ext_helpers+=",wbinfo_group"
- use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
- use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
- # uclibc does not have aio support - needed for coss (#61175)
- local storeio_modules="aufs,diskd,rock,ufs"
- # not stable enough yet
- #! use elibc_uclibc && storeio_modules+=",coss"
-
- local transparent
- if use kernel_linux ; then
- transparent+=" --enable-linux-netfilter"
- use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
- fi
-
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- transparent+=" $(use_enable kqueue)"
- if use pf-transparent; then
- transparent+=" --enable-pf-transparent"
- elif use ipf-transparent; then
- transparent+=" --enable-ipf-transparent"
- fi
- fi
-
- tc-export CC AR
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-removal-policies="lru,heap" \
- --enable-storeio="${storeio_modules}" \
- --enable-disk-io \
- --enable-auth \
- --enable-auth-basic="${basic_modules}" \
- --enable-auth-digest="${digest_modules}" \
- --enable-auth-ntlm="${ntlm_modules}" \
- --enable-auth-negotiate="${negotiate_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-log-daemon-helpers \
- --enable-url-rewrite-helpers \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-eui \
- --enable-icmp \
- --enable-follow-x-forwarded-for \
- --enable-esi \
- --with-large-files \
- --disable-strict-error-checking \
- $(use_with caps libcap) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable ssl-crtd) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- ${transparent}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/basic_ncsa_auth
- fperms 4750 /usr/libexec/squid/basic_ncsa_auth
- if use pam; then
- fowners root:squid /usr/libexec/squid/basic_pam_auth
- fperms 4750 /usr/libexec/squid/basic_pam_auth
- fi
- # pinger needs suid as well
- fowners root:squid /usr/libexec/squid/pinger
- fperms 4750 /usr/libexec/squid/pinger
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
- newdoc helpers/negotiate_auth/kerberos/README README.kerberos
- newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
- newdoc helpers/basic_auth/LDAP/README README.LDAP
- newdoc helpers/basic_auth/RADIUS/README README.RADIUS
- newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
- newdoc tools/purge/README README.purge
- newdoc tools/helper-mux.README README.helper-mux
- dohtml RELEASENOTES.html
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd-r1" squid
- if use logrotate; then
- newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- newinitd "${FILESDIR}/squid.initd-r3" squid
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- diropts -m0750 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
- if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
- [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
- elog "Please read the release notes at:"
- elog " http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
- echo
- fi
-}
diff --git a/net-proxy/squid/squid-3.3.11.ebuild b/net-proxy/squid/squid-3.3.11.ebuild
deleted file mode 100644
index cfffa0e19bf9..000000000000
--- a/net-proxy/squid/squid-3.3.11.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.11.ebuild,v 1.1 2013/12/01 11:23:29 eras Exp $
-
-EAPI=5
-
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="ftp://ftp.squid-cache.org/pub/archive/3.3/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client ssl-crtd \
- mysql postgres sqlite \
- qos tproxy \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap:0.2 )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- sys-devel/libtool
- dev-lang/perl
- sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )
- !<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
- qos? ( caps )"
-
-pkg_pretend() {
- if use tproxy; then
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
- linux-info_pkg_setup
- fi
-}
-
-pkg_setup() {
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- lib/libTrie/configure.ac || die
- sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
- INSTALL QUICKSTART \
- helpers/basic_auth/MSNT/README.html \
- helpers/basic_auth/MSNT/confload.cc \
- helpers/basic_auth/MSNT/msntauth.conf.default \
- scripts/fileno-to-pathname.pl \
- scripts/check_cache.pl \
- tools/cachemgr.cgi.8 \
- tools/purge/conffile.hh \
- tools/purge/README || die
- sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
- INSTALL QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
- QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
- QUICKSTART \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
- helpers/basic_auth/MSNT/README.html || die
- sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
- helpers/external_acl/unix_group/ext_unix_group_acl.8 \
- helpers/external_acl/session/ext_session_acl.8 \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
- scripts/check_cache.pl || die
- sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- # /var/run/squid to /run/squid
- sed -i -e 's:$(localstatedir)::' \
- src/ipc/Makefile.am
-
- # Bug #419685 - eautoreconf in src_prepare() fails in libltdl/
- # aclocal-1.11: `configure.ac' or `configure.in' is required
- MAKEOPTS="${MAKEOPTS} -j1" eautoreconf
-}
-
-src_configure() {
- local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
- use samba && basic_modules+=",SMB"
- use ldap && basic_modules+=",LDAP"
- use pam && basic_modules+=",PAM"
- use sasl && basic_modules+=",SASL"
- use nis && ! use elibc_uclibc && basic_modules+=",NIS"
- use radius && basic_modules+=",RADIUS"
- if use mysql || use postgres || use sqlite ; then
- basic_modules+=",DB"
- fi
-
- local digest_modules="file"
- use ldap && digest_modules+=",LDAP,eDirectory"
-
- local negotiate_modules="none"
- use kerberos && negotiate_modules="kerberos,wrapper"
-
- local ntlm_modules="none"
- use samba && ntlm_modules="smb_lm"
-
- local ext_helpers="file_userip,session,unix_group"
- use samba && ext_helpers+=",wbinfo_group"
- use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
- use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
- # uclibc does not have aio support - needed for coss (#61175)
- local storeio_modules="aufs,diskd,rock,ufs"
- # not stable enough yet
- #! use elibc_uclibc && storeio_modules+=",coss"
-
- local transparent
- if use kernel_linux ; then
- transparent+=" --enable-linux-netfilter"
- use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
- fi
-
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- transparent+=" $(use_enable kqueue)"
- if use pf-transparent; then
- transparent+=" --enable-pf-transparent"
- elif use ipf-transparent; then
- transparent+=" --enable-ipf-transparent"
- fi
- fi
-
- tc-export CC AR
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-removal-policies="lru,heap" \
- --enable-storeio="${storeio_modules}" \
- --enable-disk-io \
- --enable-auth \
- --enable-auth-basic="${basic_modules}" \
- --enable-auth-digest="${digest_modules}" \
- --enable-auth-ntlm="${ntlm_modules}" \
- --enable-auth-negotiate="${negotiate_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-log-daemon-helpers \
- --enable-url-rewrite-helpers \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-eui \
- --enable-icmp \
- --enable-follow-x-forwarded-for \
- --enable-esi \
- --with-large-files \
- --disable-strict-error-checking \
- $(use_with caps libcap) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable ssl-crtd) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- ${transparent}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/basic_ncsa_auth
- fperms 4750 /usr/libexec/squid/basic_ncsa_auth
- if use pam; then
- fowners root:squid /usr/libexec/squid/basic_pam_auth
- fperms 4750 /usr/libexec/squid/basic_pam_auth
- fi
- # pinger needs suid as well
- fowners root:squid /usr/libexec/squid/pinger
- fperms 4750 /usr/libexec/squid/pinger
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
- newdoc helpers/negotiate_auth/kerberos/README README.kerberos
- newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
- newdoc helpers/basic_auth/LDAP/README README.LDAP
- newdoc helpers/basic_auth/RADIUS/README README.RADIUS
- newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
- newdoc tools/purge/README README.purge
- newdoc tools/helper-mux.README README.helper-mux
- dohtml RELEASENOTES.html
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd-r1" squid
- if use logrotate; then
- newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- newinitd "${FILESDIR}/squid.initd-r3" squid
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- diropts -m0750 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
- if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
- [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
- elog "Please read the release notes at:"
- elog " http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
- echo
- fi
-}
diff --git a/net-proxy/squid/squid-3.3.8.ebuild b/net-proxy/squid/squid-3.3.8.ebuild
deleted file mode 100644
index 0ff03ef47292..000000000000
--- a/net-proxy/squid/squid-3.3.8.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.8.ebuild,v 1.12 2014/01/18 19:52:37 ago Exp $
-
-EAPI=5
-
-# Workaround to avoid failing make check until we have a proper fix
-WANT_AUTOMAKE="1.12"
-
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client ssl-crtd \
- mysql postgres sqlite \
- qos tproxy \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap:0.2 )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- sys-devel/libtool
- dev-lang/perl
- sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )
- !<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
- qos? ( caps )"
-
-pkg_pretend() {
- if use tproxy; then
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
- linux-info_pkg_setup
- fi
-}
-
-pkg_setup() {
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- lib/libTrie/configure.ac || die
- sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
- INSTALL QUICKSTART \
- helpers/basic_auth/MSNT/README.html \
- helpers/basic_auth/MSNT/confload.cc \
- helpers/basic_auth/MSNT/msntauth.conf.default \
- scripts/fileno-to-pathname.pl \
- scripts/check_cache.pl \
- tools/cachemgr.cgi.8 \
- tools/purge/conffile.hh \
- tools/purge/README || die
- sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
- INSTALL QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
- QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
- QUICKSTART \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
- helpers/basic_auth/MSNT/README.html || die
- sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
- helpers/external_acl/unix_group/ext_unix_group_acl.8 \
- helpers/external_acl/session/ext_session_acl.8 \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
- scripts/check_cache.pl || die
- sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- # /var/run/squid to /run/squid
- sed -i -e 's:$(localstatedir)::' \
- src/ipc/Makefile.am
-
- # Bug #419685 - eautoreconf in src_prepare() fails in libltdl/
- # aclocal-1.11: `configure.ac' or `configure.in' is required
- MAKEOPTS="${MAKEOPTS} -j1" eautoreconf
-}
-
-src_configure() {
- local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
- use samba && basic_modules+=",SMB"
- use ldap && basic_modules+=",LDAP"
- use pam && basic_modules+=",PAM"
- use sasl && basic_modules+=",SASL"
- use nis && ! use elibc_uclibc && basic_modules+=",NIS"
- use radius && basic_modules+=",RADIUS"
- if use mysql || use postgres || use sqlite ; then
- basic_modules+=",DB"
- fi
-
- local digest_modules="file"
- use ldap && digest_modules+=",LDAP,eDirectory"
-
- local negotiate_modules="none"
- use kerberos && negotiate_modules="kerberos,wrapper"
-
- local ntlm_modules="none"
- use samba && ntlm_modules="smb_lm"
-
- local ext_helpers="file_userip,session,unix_group"
- use samba && ext_helpers+=",wbinfo_group"
- use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
- use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
- # uclibc does not have aio support - needed for coss (#61175)
- local storeio_modules="aufs,diskd,rock,ufs"
- # not stable enough yet
- #! use elibc_uclibc && storeio_modules+=",coss"
-
- local transparent
- if use kernel_linux ; then
- transparent+=" --enable-linux-netfilter"
- use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
- fi
-
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- transparent+=" $(use_enable kqueue)"
- if use pf-transparent; then
- transparent+=" --enable-pf-transparent"
- elif use ipf-transparent; then
- transparent+=" --enable-ipf-transparent"
- fi
- fi
-
- tc-export CC AR
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-removal-policies="lru,heap" \
- --enable-storeio="${storeio_modules}" \
- --enable-disk-io \
- --enable-auth \
- --enable-auth-basic="${basic_modules}" \
- --enable-auth-digest="${digest_modules}" \
- --enable-auth-ntlm="${ntlm_modules}" \
- --enable-auth-negotiate="${negotiate_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-log-daemon-helpers \
- --enable-url-rewrite-helpers \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-eui \
- --enable-icmp \
- --enable-follow-x-forwarded-for \
- --enable-esi \
- --with-large-files \
- --disable-strict-error-checking \
- $(use_with caps libcap) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable ssl-crtd) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- ${transparent}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/basic_ncsa_auth
- fperms 4750 /usr/libexec/squid/basic_ncsa_auth
- if use pam; then
- fowners root:squid /usr/libexec/squid/basic_pam_auth
- fperms 4750 /usr/libexec/squid/basic_pam_auth
- fi
- # pinger needs suid as well
- fowners root:squid /usr/libexec/squid/pinger
- fperms 4750 /usr/libexec/squid/pinger
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
- newdoc helpers/negotiate_auth/kerberos/README README.kerberos
- newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
- newdoc helpers/basic_auth/LDAP/README README.LDAP
- newdoc helpers/basic_auth/RADIUS/README README.RADIUS
- newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
- newdoc tools/purge/README README.purge
- newdoc tools/helper-mux.README README.helper-mux
- dohtml RELEASENOTES.html
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd-r1" squid
- if use logrotate; then
- newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- newinitd "${FILESDIR}/squid.initd-r3" squid
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- diropts -m0750 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
- if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
- [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
- elog "Please read the release notes at:"
- elog " http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
- echo
- fi
-}
diff --git a/net-proxy/squid/squid-3.3.9.ebuild b/net-proxy/squid/squid-3.3.9.ebuild
deleted file mode 100644
index f77aff07c8c5..000000000000
--- a/net-proxy/squid/squid-3.3.9.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.9.ebuild,v 1.1 2013/09/30 07:15:09 eras Exp $
-
-EAPI=5
-
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client ssl-crtd \
- mysql postgres sqlite \
- qos tproxy \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap:0.2 )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- sys-devel/libtool
- dev-lang/perl
- sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )
- !<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
- qos? ( caps )"
-
-pkg_pretend() {
- if use tproxy; then
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
- linux-info_pkg_setup
- fi
-}
-
-pkg_setup() {
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- lib/libTrie/configure.ac || die
- sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
- INSTALL QUICKSTART \
- helpers/basic_auth/MSNT/README.html \
- helpers/basic_auth/MSNT/confload.cc \
- helpers/basic_auth/MSNT/msntauth.conf.default \
- scripts/fileno-to-pathname.pl \
- scripts/check_cache.pl \
- tools/cachemgr.cgi.8 \
- tools/purge/conffile.hh \
- tools/purge/README || die
- sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
- INSTALL QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
- QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
- QUICKSTART \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
- helpers/basic_auth/MSNT/README.html || die
- sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
- helpers/external_acl/unix_group/ext_unix_group_acl.8 \
- helpers/external_acl/session/ext_session_acl.8 \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
- scripts/check_cache.pl || die
- sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- # /var/run/squid to /run/squid
- sed -i -e 's:$(localstatedir)::' \
- src/ipc/Makefile.am
-
- # Bug #419685 - eautoreconf in src_prepare() fails in libltdl/
- # aclocal-1.11: `configure.ac' or `configure.in' is required
- MAKEOPTS="${MAKEOPTS} -j1" eautoreconf
-}
-
-src_configure() {
- local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
- use samba && basic_modules+=",SMB"
- use ldap && basic_modules+=",LDAP"
- use pam && basic_modules+=",PAM"
- use sasl && basic_modules+=",SASL"
- use nis && ! use elibc_uclibc && basic_modules+=",NIS"
- use radius && basic_modules+=",RADIUS"
- if use mysql || use postgres || use sqlite ; then
- basic_modules+=",DB"
- fi
-
- local digest_modules="file"
- use ldap && digest_modules+=",LDAP,eDirectory"
-
- local negotiate_modules="none"
- use kerberos && negotiate_modules="kerberos,wrapper"
-
- local ntlm_modules="none"
- use samba && ntlm_modules="smb_lm"
-
- local ext_helpers="file_userip,session,unix_group"
- use samba && ext_helpers+=",wbinfo_group"
- use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
- use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
- # uclibc does not have aio support - needed for coss (#61175)
- local storeio_modules="aufs,diskd,rock,ufs"
- # not stable enough yet
- #! use elibc_uclibc && storeio_modules+=",coss"
-
- local transparent
- if use kernel_linux ; then
- transparent+=" --enable-linux-netfilter"
- use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
- fi
-
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- transparent+=" $(use_enable kqueue)"
- if use pf-transparent; then
- transparent+=" --enable-pf-transparent"
- elif use ipf-transparent; then
- transparent+=" --enable-ipf-transparent"
- fi
- fi
-
- tc-export CC AR
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-removal-policies="lru,heap" \
- --enable-storeio="${storeio_modules}" \
- --enable-disk-io \
- --enable-auth \
- --enable-auth-basic="${basic_modules}" \
- --enable-auth-digest="${digest_modules}" \
- --enable-auth-ntlm="${ntlm_modules}" \
- --enable-auth-negotiate="${negotiate_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-log-daemon-helpers \
- --enable-url-rewrite-helpers \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-eui \
- --enable-icmp \
- --enable-follow-x-forwarded-for \
- --enable-esi \
- --with-large-files \
- --disable-strict-error-checking \
- $(use_with caps libcap) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable ssl-crtd) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- ${transparent}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/basic_ncsa_auth
- fperms 4750 /usr/libexec/squid/basic_ncsa_auth
- if use pam; then
- fowners root:squid /usr/libexec/squid/basic_pam_auth
- fperms 4750 /usr/libexec/squid/basic_pam_auth
- fi
- # pinger needs suid as well
- fowners root:squid /usr/libexec/squid/pinger
- fperms 4750 /usr/libexec/squid/pinger
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
- newdoc helpers/negotiate_auth/kerberos/README README.kerberos
- newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
- newdoc helpers/basic_auth/LDAP/README README.LDAP
- newdoc helpers/basic_auth/RADIUS/README README.RADIUS
- newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
- newdoc tools/purge/README README.purge
- newdoc tools/helper-mux.README README.helper-mux
- dohtml RELEASENOTES.html
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd-r1" squid
- if use logrotate; then
- newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- newinitd "${FILESDIR}/squid.initd-r3" squid
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- diropts -m0750 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
- if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
- [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then
- elog "Please read the release notes at:"
- elog " http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html"
- echo
- fi
-}
diff --git a/net-proxy/squid/squid-3.4.2.ebuild b/net-proxy/squid/squid-3.4.2.ebuild
deleted file mode 100644
index d54be8ce797a..000000000000
--- a/net-proxy/squid/squid-3.4.2.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.2.ebuild,v 1.1 2014/01/18 22:16:27 eras Exp $
-
-EAPI=5
-
-inherit autotools eutils linux-info pam toolchain-funcs user versionator
-
-DESCRIPTION="A full-featured web proxy cache"
-HOMEPAGE="http://www.squid-cache.org/"
-SRC_URI="ftp://ftp.squid-cache.org/pub/archive/3.4/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
- ecap icap-client ssl-crtd \
- mysql postgres sqlite \
- qos tproxy \
- pf-transparent ipf-transparent kqueue \
- elibc_uclibc kernel_linux"
-
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
- pam? ( virtual/pam )
- ldap? ( net-nds/openldap )
- kerberos? ( virtual/krb5 )
- qos? ( net-libs/libnetfilter_conntrack )
- ssl? ( dev-libs/openssl )
- sasl? ( dev-libs/cyrus-sasl )
- ecap? ( net-libs/libecap:0.2 )
- selinux? ( sec-policy/selinux-squid )
- !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
- >=sys-libs/db-4
- sys-devel/libtool
- dev-lang/perl
- sys-devel/libtool"
-DEPEND="${COMMON_DEPEND}
- sys-apps/ed
- test? ( dev-util/cppunit )"
-RDEPEND="${COMMON_DEPEND}
- samba? ( net-fs/samba )
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- sqlite? ( dev-perl/DBD-SQLite )
- !<=sci-biology/meme-4.8.1-r1"
-
-REQUIRED_USE="tproxy? ( caps )
- qos? ( caps )"
-
-pkg_pretend() {
- if use tproxy; then
- local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
- linux-info_pkg_setup
- fi
-}
-
-pkg_setup() {
- enewgroup squid 31
- enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
- #sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- # lib/libTrie/configure.ac || die
- sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
- INSTALL QUICKSTART \
- helpers/basic_auth/MSNT/README.html \
- helpers/basic_auth/MSNT/confload.cc \
- helpers/basic_auth/MSNT/msntauth.conf.default \
- scripts/fileno-to-pathname.pl \
- scripts/check_cache.pl \
- tools/cachemgr.cgi.8 \
- tools/purge/conffile.hh \
- tools/purge/README || die
- sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
- INSTALL QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
- QUICKSTART || die
- sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
- QUICKSTART \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
- src/log/access_log.cc || die
- sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
- helpers/basic_auth/MSNT/README.html || die
- sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
- helpers/external_acl/unix_group/ext_unix_group_acl.8 \
- helpers/external_acl/session/ext_session_acl.8 \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
- scripts/check_cache.pl || die
- sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
- src/ssl/ssl_crtd.8 || die
- # /var/run/squid to /run/squid
- sed -i -e 's:$(localstatedir)::' \
- src/ipc/Makefile.am
-
- # Bug #419685 - eautoreconf in src_prepare() fails in libltdl/
- # aclocal-1.11: `configure.ac' or `configure.in' is required
- MAKEOPTS="${MAKEOPTS} -j1" eautoreconf
-}
-
-src_configure() {
- local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
- use samba && basic_modules+=",SMB"
- use ldap && basic_modules+=",LDAP"
- use pam && basic_modules+=",PAM"
- use sasl && basic_modules+=",SASL"
- use nis && ! use elibc_uclibc && basic_modules+=",NIS"
- use radius && basic_modules+=",RADIUS"
- if use mysql || use postgres || use sqlite ; then
- basic_modules+=",DB"
- fi
-
- local digest_modules="file"
- use ldap && digest_modules+=",LDAP,eDirectory"
-
- local negotiate_modules="none"
- use kerberos && negotiate_modules="kerberos,wrapper"
-
- local ntlm_modules="none"
- use samba && ntlm_modules="smb_lm"
-
- local ext_helpers="file_userip,session,unix_group"
- use samba && ext_helpers+=",wbinfo_group"
- use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
- use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
-
- # uclibc does not have aio support - needed for coss (#61175)
- local storeio_modules="aufs,diskd,rock,ufs"
- # not stable enough yet
- #! use elibc_uclibc && storeio_modules+=",coss"
-
- local transparent
- if use kernel_linux ; then
- transparent+=" --enable-linux-netfilter"
- use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
- fi
-
- if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
- transparent+=" $(use_enable kqueue)"
- if use pf-transparent; then
- transparent+=" --enable-pf-transparent"
- elif use ipf-transparent; then
- transparent+=" --enable-ipf-transparent"
- fi
- fi
-
- tc-export CC AR
-
- econf \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/libexec/squid \
- --localstatedir=/var \
- --with-pidfile=/run/squid.pid \
- --datadir=/usr/share/squid \
- --with-logdir=/var/log/squid \
- --with-default-user=squid \
- --enable-removal-policies="lru,heap" \
- --enable-storeio="${storeio_modules}" \
- --enable-disk-io \
- --enable-auth \
- --enable-auth-basic="${basic_modules}" \
- --enable-auth-digest="${digest_modules}" \
- --enable-auth-ntlm="${ntlm_modules}" \
- --enable-auth-negotiate="${negotiate_modules}" \
- --enable-external-acl-helpers="${ext_helpers}" \
- --enable-log-daemon-helpers \
- --enable-url-rewrite-helpers \
- --enable-cache-digests \
- --enable-delay-pools \
- --enable-eui \
- --enable-icmp \
- --enable-follow-x-forwarded-for \
- --enable-esi \
- --with-large-files \
- --disable-strict-error-checking \
- $(use_with caps libcap) \
- $(use_enable ipv6) \
- $(use_enable snmp) \
- $(use_enable ssl) \
- $(use_enable ssl-crtd) \
- $(use_enable icap-client) \
- $(use_enable ecap) \
- ${transparent}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # need suid root for looking into /etc/shadow
- fowners root:squid /usr/libexec/squid/basic_ncsa_auth
- fperms 4750 /usr/libexec/squid/basic_ncsa_auth
- if use pam; then
- fowners root:squid /usr/libexec/squid/basic_pam_auth
- fperms 4750 /usr/libexec/squid/basic_pam_auth
- fi
- # pinger needs suid as well
- fowners root:squid /usr/libexec/squid/pinger
- fperms 4750 /usr/libexec/squid/pinger
-
- # some cleanups
- rm -f "${D}"/usr/bin/Run*
-
- dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
- newdoc helpers/negotiate_auth/kerberos/README README.kerberos
- newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
- newdoc helpers/basic_auth/LDAP/README README.LDAP
- newdoc helpers/basic_auth/RADIUS/README README.RADIUS
- newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
- newdoc tools/purge/README README.purge
- newdoc tools/helper-mux.README README.helper-mux
- dohtml RELEASENOTES.html
-
- newpamd "${FILESDIR}/squid.pam" squid
- newconfd "${FILESDIR}/squid.confd-r1" squid
- newinitd "${FILESDIR}/squid.initd-r4" squid
- if use logrotate; then
- insinto /etc/logrotate.d
- newins "${FILESDIR}/squid.logrotate" squid
- else
- exeinto /etc/cron.weekly
- newexe "${FILESDIR}/squid.cron" squid.cron
- fi
-
- diropts -m0750 -o squid -g squid
- keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
-}
-
-pkg_postinst() {
- if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
- [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 4 ]]; then
- elog "Please read the release notes at:"
- elog " http://www.squid-cache.org/Versions/v3/3.4/RELEASENOTES.html"
- echo
- fi
-}