diff options
| author |   Mikle Kolyada <zlogene@gentoo.org> | 2020-01-27 21:56:18 +0300 |
|---|---|---|
| committer | Mikle Kolyada <zlogene@gentoo.org> | 2020-01-27 21:56:18 +0300 |
| commit | 3e7fd31ae2bc7d57e339805abdce6ac064f6ea7e (patch) | |
| tree | a7da92734df4ba7fa222cc352668b2fb89712b86 /net-proxy | |
| parent | acct-user/squid: Initial commit (diff) | |
| download | gentoo-3e7fd31ae2bc7d57e339805abdce6ac064f6ea7e.tar.gz gentoo-3e7fd31ae2bc7d57e339805abdce6ac064f6ea7e.tar.bz2 gentoo-3e7fd31ae2bc7d57e339805abdce6ac064f6ea7e.zip | |
net-proxy/squid: migrate to acct user/group
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/squid/squid-4.10.ebuild | 16 | ||||
| -rw-r--r-- | net-proxy/squid/squid-4.9.ebuild | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/net-proxy/squid/squid-4.10.ebuild b/net-proxy/squid/squid-4.10.ebuild index 90f46fc0095b..a738f7035bc7 100644 --- a/net-proxy/squid/squid-4.10.ebuild +++ b/net-proxy/squid/squid-4.10.ebuild @@ -5,7 +5,7 @@ EAPI=7 WANT_AUTOMAKE="1.15" -inherit autotools linux-info pam toolchain-funcs user +inherit autotools linux-info pam toolchain-funcs DESCRIPTION="A full-featured web proxy cache" HOMEPAGE="http://www.squid-cache.org/" @@ -30,17 +30,20 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux +htcp +wccp +wccpv2 \ pf-transparent ipf-transparent kqueue \ elibc_uclibc kernel_linux" + RESTRICT="!test? ( test )" BDEPEND="dev-lang/perl" -COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) +COMMON_DEPEND="acct-group/squid + acct-user/squid + 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 ) + !gnutls? ( dev-libs/openssl:0 ) dev-libs/nettle:= ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) @@ -49,10 +52,12 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0" + DEPEND="${COMMON_DEPEND} ${BDEPEND} ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit )" + RDEPEND="${COMMON_DEPEND} samba? ( net-fs/samba ) perl? ( dev-lang/perl ) @@ -71,11 +76,6 @@ pkg_pretend() { fi } -pkg_setup() { - enewgroup squid - enewuser squid -1 -1 /var/cache/squid squid -} - src_prepare() { eapply "${FILESDIR}/${PN}-4.3-gentoo.patch" sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ diff --git a/net-proxy/squid/squid-4.9.ebuild b/net-proxy/squid/squid-4.9.ebuild index adfc6b39a0fa..76687eb647d2 100644 --- a/net-proxy/squid/squid-4.9.ebuild +++ b/net-proxy/squid/squid-4.9.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 WANT_AUTOMAKE="1.15" -inherit autotools linux-info pam toolchain-funcs user +inherit autotools linux-info pam toolchain-funcs DESCRIPTION="A full-featured web proxy cache" HOMEPAGE="http://www.squid-cache.org/" @@ -30,11 +30,14 @@ IUSE="caps gnutls ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp +htcp +wccp +wccpv2 \ pf-transparent ipf-transparent kqueue \ elibc_uclibc kernel_linux" + RESTRICT="!test? ( test )" BDEPEND="dev-lang/perl" -COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) +COMMON_DEPEND="acct-group/squid + acct-user/squid + caps? ( >=sys-libs/libcap-2.16 ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) @@ -51,10 +54,12 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) logrotate? ( app-admin/logrotate ) >=sys-libs/db-4:* dev-libs/libltdl:0" + DEPEND="${COMMON_DEPEND} ${BDEPEND} ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit )" + RDEPEND="${COMMON_DEPEND} samba? ( net-fs/samba ) perl? ( dev-lang/perl ) @@ -73,11 +78,6 @@ pkg_pretend() { fi } -pkg_setup() { - enewgroup squid - enewuser squid -1 -1 /var/cache/squid squid -} - src_prepare() { eapply "${FILESDIR}/${PN}-4.3-gentoo.patch" sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ |