diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-03 22:39:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-03 22:39:47 +0100 |
| commit | 7f0ccc917c7abe6223784c703d86cd14755691fb (patch) | |
| tree | 8c6793f68896b341e22f33d7e6cef88e481f4a8b /net-proxy/squid | |
| parent | 9aa80713372911cec499b3adb2cd746790920916 (diff) | |
gentoo resync : 03.07.2021
Diffstat (limited to 'net-proxy/squid')
| -rw-r--r-- | net-proxy/squid/Manifest | 2 | ||||
| -rw-r--r-- | net-proxy/squid/squid-4.15-r2.ebuild (renamed from net-proxy/squid/squid-4.15-r1.ebuild) | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index f4022e8ba53d..5e193c944436 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -5,5 +5,5 @@ AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19 AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594 DIST squid-4.15.tar.xz 2454176 BLAKE2B 3cb08c806f03fcddd7233b05986434d2be3e62a50d006eb3f84bbc5b894ee3641929551d00a1800d6676add62f967067ec62b5b7c41d767766eeab5dfc17980e SHA512 8f0ce6e30dd9173927e8133618211ffb865fb5dde4c63c2fb465e2efccda4a6efb33f2c0846870c9b915340aff5f59461a60171882bcc0c890336b846fe60bd1 -EBUILD squid-4.15-r1.ebuild 8342 BLAKE2B 0c20240385d0618ca154d9716776f091a0ec15397d0ad01a24623cf1d1a67752440ebe16ff9f5a89d86d6ef5a38c153eca6a3293bf1ed74763c4608addf07827 SHA512 fd36d790300a69048fd8c3f9b33d53bacc8ddecd00a4d3ef41b8a734d6e8e1d111545a94990c99ba801780695a44cba39e0401c76f2212763d63fc2f7777a60e +EBUILD squid-4.15-r2.ebuild 8370 BLAKE2B c98374f6f37df8f16fab476306d9ff40ffe0e340968ff601c6334aed0fae5cb573fad9ce6791228516d534192d5af0494ad10fc2227772b3842cc3c15de0da2b SHA512 36667f7c03d18c6ae7088c0be53ea3733abba540764a18130fe7498cde9533715eef39d88155c2a6fa625d4515c08eb0613ee988e8cbd046df84ec6a07bfc2ab MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056 diff --git a/net-proxy/squid/squid-4.15-r1.ebuild b/net-proxy/squid/squid-4.15-r2.ebuild index 2b53ff4c50dc..06934d604038 100644 --- a/net-proxy/squid/squid-4.15-r1.ebuild +++ b/net-proxy/squid/squid-4.15-r2.ebuild @@ -35,19 +35,23 @@ BDEPEND="dev-lang/perl" COMMON_DEPEND="acct-group/squid acct-user/squid + virtual/libcrypt:= caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( - !gnutls? ( dev-libs/openssl:0= ) - dev-libs/nettle:= ) + !gnutls? ( + dev-libs/openssl:0= + ) + dev-libs/nettle:= + ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) - gnutls? ( >=net-libs/gnutls-3.1.5 ) + gnutls? ( >=net-libs/gnutls-3.1.5:= ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0" @@ -77,6 +81,7 @@ pkg_pretend() { src_prepare() { eapply "${FILESDIR}/${PN}-4.3-gentoo.patch" + sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ INSTALL QUICKSTART \ scripts/fileno-to-pathname.pl \ @@ -104,7 +109,7 @@ src_prepare() { sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \ libltdl/configure.ac || die - sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die + sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die eapply_user eautoreconf |