From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 60DCE138350 for ; Mon, 27 Jan 2020 18:57:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F3CDE0829; Mon, 27 Jan 2020 18:57:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E6E3E0829 for ; Mon, 27 Jan 2020 18:57:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2BFC734E494 for ; Mon, 27 Jan 2020 18:57:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5ADC98F for ; Mon, 27 Jan 2020 18:57:10 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1580151378.3e7fd31ae2bc7d57e339805abdce6ac064f6ea7e.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/squid/squid-4.10.ebuild net-proxy/squid/squid-4.9.ebuild X-VCS-Directories: net-proxy/squid/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 3e7fd31ae2bc7d57e339805abdce6ac064f6ea7e X-VCS-Branch: master Date: Mon, 27 Jan 2020 18:57:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0e4f453a-6523-4410-9b0c-56ba69e4e6e8 X-Archives-Hash: 8d431781983f6ab624a8a53241989f13 commit: 3e7fd31ae2bc7d57e339805abdce6ac064f6ea7e Author: Mikle Kolyada gentoo org> AuthorDate: Mon Jan 27 18:56:18 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Mon Jan 27 18:56:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7fd31a net-proxy/squid: migrate to acct user/group Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> net-proxy/squid/squid-4.10.ebuild | 16 ++++++++-------- 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 90f46fc0095..a738f7035bc 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 adfc6b39a0f..76687eb647d 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:' \