commit: 0410c0ed2b65ca36f40a630d7f84f01a5a7681af Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sun Feb 14 10:32:45 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> 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 <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> 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 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">policyd</remote-id> - </upstream> + <!-- maintainer-needed --> + <upstream> + <remote-id type="sourceforge">policyd</remote-id> + </upstream> </pkgmetadata> 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() {
