From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1258528-garchives=archives.gentoo.org@lists.gentoo.org>
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 4C15B1382C5
for <garchives@archives.gentoo.org>; Sun, 7 Mar 2021 10:36:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 87E03E0829;
Sun, 7 Mar 2021 10:36:03 +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 61AEDE0829
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Mar 2021 10:36:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 3E6C633BED9
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Mar 2021 10:36:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 12C11585
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Mar 2021 10:35:59 +0000 (UTC)
From: "Mikle Kolyada" <zlogene@gentoo.org>
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" <zlogene@gentoo.org>
Message-ID: <1615113355.5b7dc497f33a127dbf5706db72e9c5a077a8b82c.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.13-r1.ebuild net-proxy/squid/squid-4.13.ebuild
X-VCS-Directories: net-proxy/squid/
X-VCS-Committer: zlogene
X-VCS-Committer-Name: Mikle Kolyada
X-VCS-Revision: 5b7dc497f33a127dbf5706db72e9c5a077a8b82c
X-VCS-Branch: master
Date: Sun, 7 Mar 2021 10:35:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 05f976b9-9366-4bf1-a90e-b23d378a29a2
X-Archives-Hash: 6c4ccb634da2e0a02a44132f32be893a
commit: 5b7dc497f33a127dbf5706db72e9c5a077a8b82c
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 7 10:33:24 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 10:35:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b7dc497
net-proxy/squid: add systemd support
Closes: https://bugs.gentoo.org/454878
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-proxy/squid/{squid-4.13.ebuild => squid-4.13-r1.ebuild} | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/net-proxy/squid/squid-4.13.ebuild b/net-proxy/squid/squid-4.13-r1.ebuild
similarity index 96%
rename from net-proxy/squid/squid-4.13.ebuild
rename to net-proxy/squid/squid-4.13-r1.ebuild
index 6201b7c4543..3b6b5c6f58f 100644
--- a/net-proxy/squid/squid-4.13.ebuild
+++ b/net-proxy/squid/squid-4.13-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
WANT_AUTOMAKE="1.15"
-inherit autotools flag-o-matic linux-info pam toolchain-funcs
+inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
DESCRIPTION="A full-featured web proxy cache"
HOMEPAGE="http://www.squid-cache.org/"
@@ -25,7 +25,7 @@ SLOT="0"
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 \
+ mysql postgres sqlite systemd \
perl qos tproxy \
+htcp +wccp +wccpv2 \
pf-transparent ipf-transparent kqueue \
@@ -46,6 +46,7 @@ COMMON_DEPEND="acct-group/squid
!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 )
@@ -105,6 +106,8 @@ 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
+
eapply_user
eautoreconf
}
@@ -211,6 +214,7 @@ src_configure() {
$(use_with ssl nettle) \
$(use_with gnutls) \
$(use_enable ssl-crtd) \
+ $(use_with systemd) \
$(use_enable ecap) \
$(use_enable esi) \
$(use_enable htcp) \
@@ -223,6 +227,8 @@ src_configure() {
src_install() {
default
+ systemd_dounit "tools/systemd/squid.service"
+
# need suid root for looking into /etc/shadow
fowners root:squid /usr/libexec/squid/basic_ncsa_auth
fperms 4750 /usr/libexec/squid/basic_ncsa_auth