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 66C2413835B for ; Sun, 14 Feb 2021 10:36:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92721E0942; Sun, 14 Feb 2021 10:36:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 44567E0942 for ; Sun, 14 Feb 2021 10:36:58 +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 88CF9340EF5 for ; Sun, 14 Feb 2021 10:36:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1313A4CA for ; Sun, 14 Feb 2021 10:36:55 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1613298765.0410c0ed2b65ca36f40a630d7f84f01a5a7681af.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/policyd/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/policyd/metadata.xml mail-filter/policyd/policyd-1.82-r3.ebuild mail-filter/policyd/policyd-1.82-r4.ebuild X-VCS-Directories: mail-filter/policyd/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 0410c0ed2b65ca36f40a630d7f84f01a5a7681af X-VCS-Branch: master Date: Sun, 14 Feb 2021 10:36:55 +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: 9545bf08-f01e-4754-af0f-78f84ac56bac X-Archives-Hash: a562c6d9d9a47dc3f2c4d28955cad03d commit: 0410c0ed2b65ca36f40a630d7f84f01a5a7681af Author: Jakov Smolic sartura hr> AuthorDate: Sun Feb 14 10:32:45 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Feb 14 10:32:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0410c0ed mail-filter/policyd: Apply gcc-10 workaround, drop libressl support * Dead upstream, patching requires bigger code rewrite Closes: https://bugs.gentoo.org/708060 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> mail-filter/policyd/metadata.xml | 8 ++-- ...licyd-1.82-r3.ebuild => policyd-1.82-r4.ebuild} | 49 ++++++++++++---------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/mail-filter/policyd/metadata.xml b/mail-filter/policyd/metadata.xml index e38074e8002..99c804e9dc6 100644 --- a/mail-filter/policyd/metadata.xml +++ b/mail-filter/policyd/metadata.xml @@ -1,8 +1,8 @@ - - - policyd - + + + policyd + diff --git a/mail-filter/policyd/policyd-1.82-r3.ebuild b/mail-filter/policyd/policyd-1.82-r4.ebuild similarity index 64% rename from mail-filter/policyd/policyd-1.82-r3.ebuild rename to mail-filter/policyd/policyd-1.82-r4.ebuild index 1fc4a90aaed..ff0daf33992 100644 --- a/mail-filter/policyd/policyd-1.82-r3.ebuild +++ b/mail-filter/policyd/policyd-1.82-r4.ebuild @@ -1,41 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="Policy daemon for postfix and other MTAs" HOMEPAGE="http://policyd.sf.net/" - -# This is not available through SF mirrors SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~hppa x86" -IUSE="libressl" -DEPEND="dev-db/mysql-connector-c:0= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= )" + +DEPEND=" + dev-db/mysql-connector-c:0= + dev-libs/openssl:0=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-post182.patch" - "${FILESDIR}/${PN}-makefile.patch" + "${FILESDIR}"/${PN}-post182.patch + "${FILESDIR}"/${PN}-makefile.patch ) src_prepare() { default sed -i -e 's/@${CC}/${CC}/' -e 's/@$(CC)/$(CC)/' Makefile - ebegin "Applying config patches" + # config patches sed -i -e s:UID=0:UID=65534:g \ - -e s:GID=0:GID=65534:g \ - -e s:DAEMON=0:DAEMON=1:g \ - -e s:DEBUG=3:DEBUG=0:g \ - -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \ - policyd.conf || die "sed failed" - eend + -e s:GID=0:GID=65534:g \ + -e s:DAEMON=0:DAEMON=1:g \ + -e s:DEBUG=3:DEBUG=0:g \ + -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \ + policyd.conf || die +} + +src_configure() { + append-cflags -fcommon + default } src_compile() { @@ -44,8 +47,8 @@ src_compile() { src_install() { insopts -o root -g nobody -m 0750 - mv cleanup policyd_cleanup - mv stats policyd_stats + mv cleanup policyd_cleanup || die + mv stats policyd_stats || die dosbin policyd policyd_cleanup policyd_stats @@ -55,12 +58,12 @@ src_install() { insopts -o root -g nobody -m 0700 exeinto /etc/cron.hourly - newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron + newexe "${FILESDIR}"/${PN}-cleanup.cron ${PN}-cleanup.cron dodoc ChangeLog DATABASE.mysql README doc/support.txt - newinitd "${FILESDIR}/${PN}.rc" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} + newinitd "${FILESDIR}"/${PN}.rc policyd + newconfd "${FILESDIR}"/${PN}.confd policyd } pkg_postinst() {