summaryrefslogtreecommitdiff
path: root/net-proxy/squid
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-03-24 23:59:54 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-03-24 23:59:54 +0000
commit401101f9c8077911929d3f2b60a37098460a5d89 (patch)
treec2bef4719f6787550f0916aeaa8f4f403a9296af /net-proxy/squid
parent4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff)
gentoo resync : 25.03.2022
Diffstat (limited to 'net-proxy/squid')
-rw-r--r--net-proxy/squid/Manifest7
-rw-r--r--net-proxy/squid/files/squid-4.17-use-system-libltdl.patch16
-rw-r--r--net-proxy/squid/squid-4.15-r3.ebuild (renamed from net-proxy/squid/squid-4.15-r2.ebuild)2
-rw-r--r--net-proxy/squid/squid-4.17-r1.ebuild (renamed from net-proxy/squid/squid-4.17.ebuild)10
-rw-r--r--net-proxy/squid/squid-5.4.1-r2.ebuild (renamed from net-proxy/squid/squid-5.4.1-r1.ebuild)8
5 files changed, 32 insertions, 11 deletions
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 27e34a99ed9c..66a169b393aa 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,4 @@
+AUX squid-4.17-use-system-libltdl.patch 497 BLAKE2B 38dbd734d7a56c2d5acb508ac5ab348c81247ce20f2bb9b7a278c9b480c15b2d29f106647d58aa2abb290b864bb103f2d11deeb7a50f7574e3f619b9392353a7 SHA512 754c41b03e5627ead2b824fc9ed6e91463b51308833e4c7ad6f4e35b0cfb5e58af1a8db9a6a5f3157933f408f7d5127214efbf91db4f74a7176f2dcb8ae87ad9
AUX squid-4.3-gentoo.patch 2767 BLAKE2B fbf424bec42a8bd29f54431107e73db1d1acd7612c8acc4d38022419a72ccabc9d0287fb34cbd26e96df2b6e2aaceae929c1005ef2ad4f731cf28edf66ac569a SHA512 eaf076cef4b60c1f5e9985a69f5ae674082b04a6f70d5b484ad13e9e397a8c67cb1780960a11fd943dc2500ec9f0590192b276bf36451d3063537661200487bf
AUX squid-5.3-gentoo.patch 2765 BLAKE2B 0260544df7ed59b99e6fb030b277330ad6d9ffc3130b550a8b3aee7386ba635b9848cdf655bf264fe83614c00772921eaaa5e66ed3ccefddc23a8b8f1fedfc62 SHA512 d68c1fd82a2a65cfc7bf257b7305827cfead3e37361952171cb6f5e933c607ba82025434b1430e4210ff937d58200019d66b4869a4c0d0291d19192e76105770
AUX squid.confd-r2 707 BLAKE2B 9fce12f6c6d395448b1e70c95ef75418d1844e7409738df60bee7c1adab786ca7e504070eacdd2b6e30a35df8a7322cccdfb950e60bcde352d35d090d55c6be9 SHA512 37435f808b1dab1ca3ceecafd6cd9007c44e10d257f135ba6baf1a51b1e3408f2a76b71d85a08ce6dcb7f86b9841b7bfcd870b0d312a2365699290e28f72314a
@@ -8,7 +9,7 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
DIST squid-4.15.tar.xz 2454176 BLAKE2B 3cb08c806f03fcddd7233b05986434d2be3e62a50d006eb3f84bbc5b894ee3641929551d00a1800d6676add62f967067ec62b5b7c41d767766eeab5dfc17980e SHA512 8f0ce6e30dd9173927e8133618211ffb865fb5dde4c63c2fb465e2efccda4a6efb33f2c0846870c9b915340aff5f59461a60171882bcc0c890336b846fe60bd1
DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a
DIST squid-5.4.1.tar.xz 2561444 BLAKE2B 3281f592c342b59a1017f4c0829543c857d61c4d1e191461f6e69bda2dc61ff59d5b92a04744dcebb75bd1b5d85c214c1f0bea78a791033a50f29891b6995fb8 SHA512 d53e64e8c44cfc978307f3965c52889d238121735fd201a8286139f974d5db9af41fe886d64e57dfacc87b777f5940cd6123a6e178d12530117cace945a9f6c1
-EBUILD squid-4.15-r2.ebuild 8007 BLAKE2B 012bd4aebde0071cc13564f217e71974588a8aa93791e5ca230d5e616db46a30e7a87091437c169f00998af6d31ca15c3bbb4868bd780323a8a32cbfddd1ea67 SHA512 052868e7d81d06203d1431e7c777d3015bf9fd25e70c534776a68a2270b667c04d212792dc3298727d4d968aa24c92224eada42c5b83f5ef651a7faf22344213
-EBUILD squid-4.17.ebuild 8011 BLAKE2B 43148108a2ad811aa49ba3f9177b0be41c4f3bde47cec23d5c47dad40acf3ace70f48254b1b149a407ec33ecc9dbedea714155b16d48e437489e287676cb9710 SHA512 bc405b8abd4dbcf6cd36b690a3d4eaa1abbc312249fd79ef2b9c0dcfbd89f67f618ab154fff5e5a88d4bb93ad16612238ec8131116554e3eb05b11e954ed1acb
-EBUILD squid-5.4.1-r1.ebuild 8067 BLAKE2B 5d3511ad10971454d265a3e4ec8fd6b1fe0d9365deae802a501c2fd675bc3a6299eb99ee6e5dd01270bbefe4fb6fb8b1b5e1fa1714d994fdcdbb24de1e7d1466 SHA512 256b9821a123c71826e95c5f489f704c32b5be39ed7e235d6239b68a64cbb9046c9264c088c50f4e5dc9dc317fd8bb027f59ca7aac1cb90fa20c792102d6321f
+EBUILD squid-4.15-r3.ebuild 8009 BLAKE2B d2cb94cf8004ffcf82280d2963673d01271a84c67f299a82d6af20419b372288d7921d8645f69d299c987659a25d4627e41190843267d4bf431d036202b179b7 SHA512 6557306a21cb81cce89d1c079332a17e4cbf1bdd6465f5bd909804464183cb4d2946af44dda2f162c8438eabf580d9c4976017eeb41a15222e131fca7075a12e
+EBUILD squid-4.17-r1.ebuild 8118 BLAKE2B 2f961c7797ab9dee15fa3da14e4571282c786894a28d596c5520ccf123fd7326269975b7033492d8a30130be8424b16d672ef6ec4807314f06633f74a64e353f SHA512 f39938692e0d59afa5c3ff64024cd40d80eb33d4757b1031af122dc9cea895dc3dc58a2d397b9f6136f692507e63e1ca2b56040673de4f85214fd03d39d6c0fc
+EBUILD squid-5.4.1-r2.ebuild 8177 BLAKE2B baf3c001ac4e752b7ef1d1397f0b99429a7fe1b1523bf3614fbf91044e14d04f0f0b67a62539467a4f21f90e792c2fa3d70edb25898232ce08979438790c4a18 SHA512 fe4f682b8f9fbd0d6ed153dec63117adb9c9eae8bbfecda04a3dfeef1c47053bd959cee97669cb21f04f0316ffa4d3645465dd42ce589ad9a4467841b01bf469
MISC metadata.xml 1178 BLAKE2B ef1e50d591c080e753b2eded1cb9934d26f46358125188ae539489e7bcaa787862c177e3a72f48217ade968fa1bf7870fb0420ae8fc214cc142522a9bf2675f2 SHA512 72db9b79e1861ccd78df889cd5d95e17fdfdc55846b1f3a21171ff5b24ddada441dc807dc818086689b3c20b9e53e6cbc83abfc5afdaea6d744b486e519b6d64
diff --git a/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch b/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch
new file mode 100644
index 000000000000..219f2ab6cf70
--- /dev/null
+++ b/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/830099
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,11 +6,8 @@
+ ##
+
+ AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
+-DIST_SUBDIRS = compat lib libltdl scripts icons errors contrib doc src test-suite tools
++DIST_SUBDIRS = compat lib scripts icons errors contrib doc src test-suite tools
+ SUBDIRS = compat lib
+-if ENABLE_LOADABLE_MODULES
+-SUBDIRS += libltdl
+-endif
+ SUBDIRS += scripts icons errors doc src tools test-suite
+
+ DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
diff --git a/net-proxy/squid/squid-4.15-r2.ebuild b/net-proxy/squid/squid-4.15-r3.ebuild
index df77cce05a92..b41ec27dec43 100644
--- a/net-proxy/squid/squid-4.15-r2.ebuild
+++ b/net-proxy/squid/squid-4.15-r3.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="acct-group/squid
virtual/libcrypt:=
caps? ( >=sys-libs/libcap-2.16 )
pam? ( sys-libs/pam )
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
kerberos? ( virtual/krb5 )
qos? ( net-libs/libnetfilter_conntrack )
ssl? (
diff --git a/net-proxy/squid/squid-4.17.ebuild b/net-proxy/squid/squid-4.17-r1.ebuild
index 92eaac54a145..d9d2fafd0bff 100644
--- a/net-proxy/squid/squid-4.17.ebuild
+++ b/net-proxy/squid/squid-4.17-r1.ebuild
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
ecap esi ssl-crtd \
mysql postgres sqlite systemd \
@@ -36,7 +36,7 @@ COMMON_DEPEND="acct-group/squid
virtual/libcrypt:=
caps? ( >=sys-libs/libcap-2.16 )
pam? ( sys-libs/pam )
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
kerberos? ( virtual/krb5 )
qos? ( net-libs/libnetfilter_conntrack )
ssl? (
@@ -79,6 +79,7 @@ pkg_pretend() {
src_prepare() {
eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
+ eapply "${FILESDIR}/${PN}-4.17-use-system-libltdl.patch"
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
INSTALL QUICKSTART \
@@ -197,8 +198,9 @@ src_configure() {
--with-build-environment=default \
--disable-strict-error-checking \
--disable-arch-native \
- --with-included-ltdl=/usr/include \
- --with-ltdl-libdir=/usr/$(get_libdir) \
+ --without-included-ltdl \
+ --with-ltdl-include="${ESYSROOT}"/usr/include \
+ --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir) \
$(use_with caps libcap) \
$(use_enable ipv6) \
$(use_enable snmp) \
diff --git a/net-proxy/squid/squid-5.4.1-r1.ebuild b/net-proxy/squid/squid-5.4.1-r2.ebuild
index e5e9b869626f..35fe4421d520 100644
--- a/net-proxy/squid/squid-5.4.1-r1.ebuild
+++ b/net-proxy/squid/squid-5.4.1-r2.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="acct-group/squid
virtual/libcrypt:=
caps? ( >=sys-libs/libcap-2.16 )
pam? ( sys-libs/pam )
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
kerberos? ( virtual/krb5 )
qos? ( net-libs/libnetfilter_conntrack )
ssl? (
@@ -81,6 +81,7 @@ pkg_pretend() {
src_prepare() {
eapply "${FILESDIR}/${PN}-5.3-gentoo.patch"
+ eapply "${FILESDIR}/${PN}-4.17-use-system-libltdl.patch"
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
INSTALL QUICKSTART \
@@ -199,8 +200,9 @@ src_configure() {
--with-build-environment=default \
--disable-strict-error-checking \
--disable-arch-native \
- --with-included-ltdl=/usr/include \
- --with-ltdl-libdir=/usr/$(get_libdir) \
+ --without-included-ltdl \
+ --with-ltdl-include="${ESYSROOT}"/usr/include \
+ --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir) \
$(use_with caps libcap) \
$(use_enable ipv6) \
$(use_enable snmp) \
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 21:36:51 +0000