| 1 |
commit: 3e7fd31ae2bc7d57e339805abdce6ac064f6ea7e |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 27 18:56:18 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 27 18:56:18 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7fd31a |
| 7 |
|
| 8 |
net-proxy/squid: migrate to acct user/group |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
net-proxy/squid/squid-4.10.ebuild | 16 ++++++++-------- |
| 14 |
net-proxy/squid/squid-4.9.ebuild | 16 ++++++++-------- |
| 15 |
2 files changed, 16 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-proxy/squid/squid-4.10.ebuild b/net-proxy/squid/squid-4.10.ebuild |
| 18 |
index 90f46fc0095..a738f7035bc 100644 |
| 19 |
--- a/net-proxy/squid/squid-4.10.ebuild |
| 20 |
+++ b/net-proxy/squid/squid-4.10.ebuild |
| 21 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 22 |
|
| 23 |
WANT_AUTOMAKE="1.15" |
| 24 |
|
| 25 |
-inherit autotools linux-info pam toolchain-funcs user |
| 26 |
+inherit autotools linux-info pam toolchain-funcs |
| 27 |
|
| 28 |
DESCRIPTION="A full-featured web proxy cache" |
| 29 |
HOMEPAGE="http://www.squid-cache.org/" |
| 30 |
@@ -30,17 +30,20 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux |
| 31 |
+htcp +wccp +wccpv2 \ |
| 32 |
pf-transparent ipf-transparent kqueue \ |
| 33 |
elibc_uclibc kernel_linux" |
| 34 |
+ |
| 35 |
RESTRICT="!test? ( test )" |
| 36 |
|
| 37 |
BDEPEND="dev-lang/perl" |
| 38 |
|
| 39 |
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) |
| 40 |
+COMMON_DEPEND="acct-group/squid |
| 41 |
+ acct-user/squid |
| 42 |
+ caps? ( >=sys-libs/libcap-2.16 ) |
| 43 |
pam? ( sys-libs/pam ) |
| 44 |
ldap? ( net-nds/openldap ) |
| 45 |
kerberos? ( virtual/krb5 ) |
| 46 |
qos? ( net-libs/libnetfilter_conntrack ) |
| 47 |
ssl? ( |
| 48 |
- !gnutls? ( dev-libs/openssl:0 ) |
| 49 |
+ !gnutls? ( dev-libs/openssl:0 ) |
| 50 |
dev-libs/nettle:= ) |
| 51 |
sasl? ( dev-libs/cyrus-sasl ) |
| 52 |
ecap? ( net-libs/libecap:1 ) |
| 53 |
@@ -49,10 +52,12 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) |
| 54 |
logrotate? ( app-admin/logrotate ) |
| 55 |
>=sys-libs/db-4:* |
| 56 |
dev-libs/libltdl:0" |
| 57 |
+ |
| 58 |
DEPEND="${COMMON_DEPEND} |
| 59 |
${BDEPEND} |
| 60 |
ecap? ( virtual/pkgconfig ) |
| 61 |
test? ( dev-util/cppunit )" |
| 62 |
+ |
| 63 |
RDEPEND="${COMMON_DEPEND} |
| 64 |
samba? ( net-fs/samba ) |
| 65 |
perl? ( dev-lang/perl ) |
| 66 |
@@ -71,11 +76,6 @@ pkg_pretend() { |
| 67 |
fi |
| 68 |
} |
| 69 |
|
| 70 |
-pkg_setup() { |
| 71 |
- enewgroup squid |
| 72 |
- enewuser squid -1 -1 /var/cache/squid squid |
| 73 |
-} |
| 74 |
- |
| 75 |
src_prepare() { |
| 76 |
eapply "${FILESDIR}/${PN}-4.3-gentoo.patch" |
| 77 |
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ |
| 78 |
|
| 79 |
diff --git a/net-proxy/squid/squid-4.9.ebuild b/net-proxy/squid/squid-4.9.ebuild |
| 80 |
index adfc6b39a0f..76687eb647d 100644 |
| 81 |
--- a/net-proxy/squid/squid-4.9.ebuild |
| 82 |
+++ b/net-proxy/squid/squid-4.9.ebuild |
| 83 |
@@ -1,11 +1,11 @@ |
| 84 |
-# Copyright 1999-2019 Gentoo Authors |
| 85 |
+# Copyright 1999-2020 Gentoo Authors |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
|
| 88 |
EAPI=7 |
| 89 |
|
| 90 |
WANT_AUTOMAKE="1.15" |
| 91 |
|
| 92 |
-inherit autotools linux-info pam toolchain-funcs user |
| 93 |
+inherit autotools linux-info pam toolchain-funcs |
| 94 |
|
| 95 |
DESCRIPTION="A full-featured web proxy cache" |
| 96 |
HOMEPAGE="http://www.squid-cache.org/" |
| 97 |
@@ -30,11 +30,14 @@ IUSE="caps gnutls ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp |
| 98 |
+htcp +wccp +wccpv2 \ |
| 99 |
pf-transparent ipf-transparent kqueue \ |
| 100 |
elibc_uclibc kernel_linux" |
| 101 |
+ |
| 102 |
RESTRICT="!test? ( test )" |
| 103 |
|
| 104 |
BDEPEND="dev-lang/perl" |
| 105 |
|
| 106 |
-COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) |
| 107 |
+COMMON_DEPEND="acct-group/squid |
| 108 |
+ acct-user/squid |
| 109 |
+ caps? ( >=sys-libs/libcap-2.16 ) |
| 110 |
pam? ( sys-libs/pam ) |
| 111 |
ldap? ( net-nds/openldap ) |
| 112 |
kerberos? ( virtual/krb5 ) |
| 113 |
@@ -51,10 +54,12 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) |
| 114 |
logrotate? ( app-admin/logrotate ) |
| 115 |
>=sys-libs/db-4:* |
| 116 |
dev-libs/libltdl:0" |
| 117 |
+ |
| 118 |
DEPEND="${COMMON_DEPEND} |
| 119 |
${BDEPEND} |
| 120 |
ecap? ( virtual/pkgconfig ) |
| 121 |
test? ( dev-util/cppunit )" |
| 122 |
+ |
| 123 |
RDEPEND="${COMMON_DEPEND} |
| 124 |
samba? ( net-fs/samba ) |
| 125 |
perl? ( dev-lang/perl ) |
| 126 |
@@ -73,11 +78,6 @@ pkg_pretend() { |
| 127 |
fi |
| 128 |
} |
| 129 |
|
| 130 |
-pkg_setup() { |
| 131 |
- enewgroup squid |
| 132 |
- enewuser squid -1 -1 /var/cache/squid squid |
| 133 |
-} |
| 134 |
- |
| 135 |
src_prepare() { |
| 136 |
eapply "${FILESDIR}/${PN}-4.3-gentoo.patch" |
| 137 |
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ |
Archives