From 463397cf1e064185110fe57c568d73f99a06f5d1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Feb 2021 10:35:54 +0000 Subject: gentoo resync : 17.02.2021 --- mail-filter/Manifest.gz | Bin 8700 -> 8698 bytes mail-filter/imapfilter/Manifest | 1 - .../files/imapfilter-2.6.16-libressl.patch | 29 -------- mail-filter/policyd/Manifest | 4 +- mail-filter/policyd/metadata.xml | 8 +- mail-filter/policyd/policyd-1.82-r3.ebuild | 79 -------------------- mail-filter/policyd/policyd-1.82-r4.ebuild | 82 +++++++++++++++++++++ 7 files changed, 88 insertions(+), 115 deletions(-) delete mode 100644 mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch delete mode 100644 mail-filter/policyd/policyd-1.82-r3.ebuild create mode 100644 mail-filter/policyd/policyd-1.82-r4.ebuild (limited to 'mail-filter') diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz index b01fc4560f91..18cce35cf7ed 100644 Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest index 5de3d3392578..3f3ad613ad87 100644 --- a/mail-filter/imapfilter/Manifest +++ b/mail-filter/imapfilter/Manifest @@ -1,4 +1,3 @@ -AUX imapfilter-2.6.16-libressl.patch 920 BLAKE2B 6c0bc84885354f2f95430f9e827c391063acc8bc12113a775a24b6af58679c43eea500bb57405ddf89cf09a0a97c5255e49257cb76b87f3481a3b65b62f8e884 SHA512 81ff9036b77d763c57287b4852ae6e3c746478c1b1a98ee62d5021a8580c0245231078b806eed5e6857e71ed2935788552f6fc2565506c21ae336dd89b8b70a2 AUX imapfilter-2.7.5-libressl.patch 806 BLAKE2B 4b0b40913d047f39b2faf23ebde782d5b34bf11f7e25243ea021c792d6a6854565e2df9924cd73b705d65a98dbe411677321dd848a11e929d8e32ada69937033 SHA512 ace3a8631dd23350a6a918bb2cd54d8eb3b9204c2f07d9fc64668216d0071a1acad76d2628936e0ac4a0b6e3ccc16299f17a8c833e866c3f346c27365a368051 DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442 EBUILD imapfilter-2.7.5.ebuild 1079 BLAKE2B 24f9fe64701889bb8484d1fcc62f849e419fa2cf33704380d3688c28ff78d656a88f4da61380ec2c1f2460f1f593abe87cbc9883c5c6cdc83a50e875954e13c1 SHA512 8d7c7e2b891b94b42869ef173313a384a41136db3d099a8c663ef44f19c5423fa944afd4a87553231128886d71e615668b3f6f0fb3e3e08b08b9d785f8e33d14 diff --git a/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch b/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch deleted file mode 100644 index 2454fc3ffb98..000000000000 --- a/mail-filter/imapfilter/files/imapfilter-2.6.16-libressl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bf69bdbf674269e84b22461c50ce1016182b56d3 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Sat, 28 Mar 2020 06:56:07 +0200 -Subject: [PATCH] Fix build with LibreSSL - -Bug: https://bugs.gentoo.org/714882 -Upstream-Status: Submitted -[https://github.com/lefcha/imapfilter/pull/204] -Signed-off-by: Stefan Strogin ---- - src/socket.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/socket.c b/src/socket.c -index 0a1874f..03e0d21 100644 ---- a/src/socket.c -+++ b/src/socket.c -@@ -143,7 +143,7 @@ open_secure_connection(session *ssn) - goto fail; - - if (get_option_boolean("certificates")) { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_set_hostflags(ssn->sslconn, - X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); - if (!SSL_set1_host(ssn->sslconn, ssn->server)) { --- -2.26.0 - diff --git a/mail-filter/policyd/Manifest b/mail-filter/policyd/Manifest index 4fd146456214..19dee0d91329 100644 --- a/mail-filter/policyd/Manifest +++ b/mail-filter/policyd/Manifest @@ -4,5 +4,5 @@ AUX policyd-post182.patch 1567 BLAKE2B 7019004993501396bada4754b40dbbf09e507220d AUX policyd.confd 61 BLAKE2B d39d4e5894dbc1164d29bf7e3fccc19c4247fd6a0f09c09f07e6f57ed531fc8aa5c22ea05ce63767e011754d1fc4aeed03b1d0cb1ef07705bf734c4e1f3b5f53 SHA512 6fbac91a71bd556e864b70534a57fcc60bf4a838ff780ee878b257313e12205ae95402c591cc62604dad8d1ee349ecea74c1646429c39587dc0ba13a697ca68f AUX policyd.rc 443 BLAKE2B 1135a6ab78cda5cb03cbed9d18773ab91237db217feaa0867dc0a9793f44f72d97033f77c78f94eb58b11a7f42071f59705088bf0b8e21cb8c8020a1bf6cf05b SHA512 32f2dec8b9067bcf219ee4edec2b36d010cadc34a018e6597339b238b21db7782975d12098d1232854b70e19bbdbe355bc8c4f23a5675ecc6171eeca81bfa69c DIST policyd-1.82.tar.gz 68372 BLAKE2B 39603b025235d3a68401e8cf9b357d224515f5308f1b86bf84d1231157ac2d5c2ca4dc00cc9deefdd03cdb4ffc214a8ebe5582e299f05b79a471e93238e36cff SHA512 08de114736620d5f1c11f7183135ecf4589c2d6258dee486b5f4f5a9156e4feabd7eaf19fa09428e79d5d5c72ac4757c83af86f43a7547030b1a59cb368e82a8 -EBUILD policyd-1.82-r3.ebuild 2030 BLAKE2B 30bf9e509d433fa619d5f603bb3a5cafbcc916ff6e133be6af8b8f20b780c8f9d9337f27065592a23b9b92d164ee8c7d64860be19b29d67183beb5259e9bc81f SHA512 346e21f8ca413c058e2a22a6a3efd17869379145c640a54fc4f5b00d64e9379aea8e765484884f528b6c834321b1ae13d792fffb3266a1b3c385f2822222c82f -MISC metadata.xml 249 BLAKE2B cea7fd2e21aaa481df4b19103927fcdd71b9e296720387e01aed419f8f27ef74ed751add3132fd2f811f55265315453ca1b6de218a4b4b78c06b6ec3bcb6d312 SHA512 d9f2d22053f3ff8e8dd64e0a1695fa371612f1f57d62bf1a914ce28443cc910dfb5b4f53b61742668da15ae3f8b9dfd3004c7fe980a71922d0fcf7bc8952ca9b +EBUILD policyd-1.82-r4.ebuild 1957 BLAKE2B 5f4df5f8e82f079228084059e1fdb5dd53b1aa744d87bb9037bbb25fb4b7c8cefa636b64e05c89c42a785e324f342cf8942b9ff8b0e65929d1f36b18512ec12b SHA512 ba1c08a244219fb7c5e9a9cc369c4c5c010b8daca45a3cb649068c5aea9344fb1c321423c34be8b66e3ffdfac58afa406c1acf2d8f8d4183b2d3bc88e0304a80 +MISC metadata.xml 244 BLAKE2B 878a0d6a1b7aeca0b9cbc7903c25fb9494ba6e3e9ba68f6eb6f19b7f48b2bf8a34c17b3784fcd981f44569b10bebd83ae3f7875cd94900599b66f6dcf7e0d131 SHA512 0c207065dfdfebb4d126b9ac830a78c9a91b91ba29cc0d48f3668d17bf503a2b0b337cbe415a37560a571091d215660b4ba9ba6b495a0740a580f16c22d7fff3 diff --git a/mail-filter/policyd/metadata.xml b/mail-filter/policyd/metadata.xml index e38074e80020..99c804e9dc66 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-r3.ebuild deleted file mode 100644 index 1fc4a90aaeda..000000000000 --- a/mail-filter/policyd/policyd-1.82-r3.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit 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:= )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${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" - 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 -} - -src_compile() { - emake CC=$(tc-getCC) build -} - -src_install() { - insopts -o root -g nobody -m 0750 - mv cleanup policyd_cleanup - mv stats policyd_stats - - dosbin policyd policyd_cleanup policyd_stats - - insopts -o root -g nobody -m 0640 - insinto /etc - doins policyd.conf - - insopts -o root -g nobody -m 0700 - exeinto /etc/cron.hourly - 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} -} - -pkg_postinst() { - elog "You will need to create the database using the script DATABASE.mysql" - elog "in /usr/share/doc/${PF}/" - elog "Read the mysql section of the README.txt for details." - elog - elog "To use policyd with postfix, update your /etc/postfix/main.cf file by adding" - elog " check_policy_service inet:127.0.0.1:10031" - elog "to your smtpd_recipient_restrictions line, or similar." - elog - elog "Also remember to start the daemon at boot:" - elog " rc-update add policyd default" - elog - elog "Read the documentation for more info." -} diff --git a/mail-filter/policyd/policyd-1.82-r4.ebuild b/mail-filter/policyd/policyd-1.82-r4.ebuild new file mode 100644 index 000000000000..ff0daf33992c --- /dev/null +++ b/mail-filter/policyd/policyd-1.82-r4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Policy daemon for postfix and other MTAs" +HOMEPAGE="http://policyd.sf.net/" +SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~hppa x86" + +DEPEND=" + dev-db/mysql-connector-c:0= + dev-libs/openssl:0=" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-post182.patch + "${FILESDIR}"/${PN}-makefile.patch +) + +src_prepare() { + default + sed -i -e 's/@${CC}/${CC}/' -e 's/@$(CC)/$(CC)/' Makefile + + # 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 +} + +src_configure() { + append-cflags -fcommon + default +} + +src_compile() { + emake CC=$(tc-getCC) build +} + +src_install() { + insopts -o root -g nobody -m 0750 + mv cleanup policyd_cleanup || die + mv stats policyd_stats || die + + dosbin policyd policyd_cleanup policyd_stats + + insopts -o root -g nobody -m 0640 + insinto /etc + doins policyd.conf + + insopts -o root -g nobody -m 0700 + exeinto /etc/cron.hourly + newexe "${FILESDIR}"/${PN}-cleanup.cron ${PN}-cleanup.cron + + dodoc ChangeLog DATABASE.mysql README doc/support.txt + + newinitd "${FILESDIR}"/${PN}.rc policyd + newconfd "${FILESDIR}"/${PN}.confd policyd +} + +pkg_postinst() { + elog "You will need to create the database using the script DATABASE.mysql" + elog "in /usr/share/doc/${PF}/" + elog "Read the mysql section of the README.txt for details." + elog + elog "To use policyd with postfix, update your /etc/postfix/main.cf file by adding" + elog " check_policy_service inet:127.0.0.1:10031" + elog "to your smtpd_recipient_restrictions line, or similar." + elog + elog "Also remember to start the daemon at boot:" + elog " rc-update add policyd default" + elog + elog "Read the documentation for more info." +} -- cgit v1.2.3