summaryrefslogtreecommitdiff
path: root/net-proxy/squid
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-07-19 22:05:27 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-07-19 22:05:27 +0100
commit121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch)
treece9341d77d1507f67d4a3a1472da9011b5baa0a8 /net-proxy/squid
parentdd762ff83c330186ee2ede002e08b2f780cddd51 (diff)
gentoo resync : 19.07.2019
Diffstat (limited to 'net-proxy/squid')
-rw-r--r--net-proxy/squid/Manifest4
-rw-r--r--net-proxy/squid/squid-4.8.ebuild (renamed from net-proxy/squid/squid-4.6.ebuild)12
2 files changed, 9 insertions, 7 deletions
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index ec3a3c1d0296..d77fdee0fb78 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -4,6 +4,6 @@ AUX squid.cron 143 BLAKE2B 17b1bccea20771a481a5b4745c9832a4b762132a500eaeb091349
AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19b59c7c3566550b298c71a20a9b62c2c89fd621f4ca67698d03af43586ac75cf16eee3b342c6a5a2c SHA512 e761500fb208954c92e0e83a6314688b29f1379855bf78195a72b12984c8fc7fdd09f5823729e90515bb7a382903fdcb42b79488d7f73474f8244311137b3e18
AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55
AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
-DIST squid-4.6.tar.xz 2439792 BLAKE2B 1344acfd4ba135d5ec6881612614f735c6e4791f9b15dcc2f572b93e7f7c9e39585aa0b30aef5b09e40a9599e7fe7d3a118f878adac8f272b014ac3d65a83fae SHA512 dbe2b02b83d53d67459e22a19e71cbf99b66d74a2ddc4bc69310f03a0a6092e5840766ad699fc43893516e97ef89799ef2147dd40f76b0bd688c1e271fd20d06
-EBUILD squid-4.6.ebuild 8158 BLAKE2B 60aab2b0202c2e2b2dcdaf4dc85cc99d1abc1347afee0972433566ec151e030762e31bf563cd7e31c7619d401e30eed3085353ed032c3cb47d60b87a469976ad SHA512 8c3164f4fed13cfeec103c02cce44d8624783107d8d86bfe84ae7bdf9ed174f5af1b8a9f5f4749b915a8d22389e3ac86a0e19f3cf726f97724eaf91566afd29a
+DIST squid-4.8.tar.xz 2440888 BLAKE2B c84b278183d49981f20aa08a745a096d017ae38f3b3c6fce8f334f6c1e4df1088860827f21a1ef8190061a6d121f99a56fb0e2ea727df1954f34b6eb2cbcb93f SHA512 2223f299950ded074faca6e3d09c15bc26e8644c3019b36a612f5d424e25b02a528c4b3c8a9463864f71edc29f17c5662f16ffda18c76317405cb97657e5e823
+EBUILD squid-4.8.ebuild 8193 BLAKE2B b8294cabe7004130a38a337b01467e478c2edc304620e0fb1d634d0c0e033723c309a5b2bedf7d4dd1fc19dde8f7587e339592d3ea2ba26a9d85e937e22b2e07 SHA512 235437268708f1d726a6dae0a9dae5e0858bd0a1a9f835c3fd9829ee98d50e0241d26367ffb33370d5c8e4b5596f7a8be0d26694946d2be32df1e5ad88b6103c
MISC metadata.xml 1541 BLAKE2B c04b0900be1711860ab53658c9ed7f3200da64fcd8f866a54d3a02c4576b5942afad4d8666eb950e19426beead7a40f5f03e04bca734cf9b5fedf4633f16087e SHA512 fb81b62b425f571f8f01f505f3b9d69186358180c1fcca80c61ad8e7b3d0397250292e9ea3bfa8bb1a93a9ade3293abdd7bb19ef6485df6244e016e21a3b56d5
diff --git a/net-proxy/squid/squid-4.6.ebuild b/net-proxy/squid/squid-4.8.ebuild
index ae8dca64ad4f..e6c323cbaecd 100644
--- a/net-proxy/squid/squid-4.6.ebuild
+++ b/net-proxy/squid/squid-4.8.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+IUSE="caps gnutls ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
ecap esi ssl-crtd \
mysql postgres sqlite \
perl qos tproxy \
@@ -39,12 +39,14 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
kerberos? ( virtual/krb5 )
qos? ( net-libs/libnetfilter_conntrack )
ssl? (
- libressl? ( dev-libs/libressl:0 )
- !libressl? ( dev-libs/openssl:0 )
- dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+ !gnutls? (
+ libressl? ( dev-libs/libressl:0 )
+ !libressl? ( dev-libs/openssl:0 ) )
+ dev-libs/nettle:= )
sasl? ( dev-libs/cyrus-sasl )
ecap? ( net-libs/libecap:1 )
esi? ( dev-libs/expat dev-libs/libxml2 )
+ gnutls? ( >=net-libs/gnutls-3.1.5 )
!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
>=sys-libs/db-4:*
dev-libs/libltdl:0"
@@ -206,7 +208,7 @@ src_configure() {
$(use_enable snmp) \
$(use_with ssl openssl) \
$(use_with ssl nettle) \
- $(use_with ssl gnutls) \
+ $(use_with gnutls) \
$(use_enable ssl-crtd) \
$(use_enable ecap) \
$(use_enable esi) \