* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-milter/, mail-filter/amavisd-milter/files/
@ 2018-04-03 14:33 Marc Schiffbauer
0 siblings, 0 replies; 2+ messages in thread
From: Marc Schiffbauer @ 2018-04-03 14:33 UTC (permalink / raw
To: gentoo-commits
commit: 098b15f499ccd6a622802005c8d37a7a600f2f23
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 3 14:31:15 2018 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Apr 3 14:31:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=098b15f4
mail-filter/amavisd-milter: fix amavisd dep in init script
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../amavisd-milter/amavisd-milter-1.6.0-r1.ebuild | 4 +--
.../amavisd-milter/amavisd-milter-1.6.0.ebuild | 4 +--
.../amavisd-milter/files/amavisd-milter.initd-r1 | 29 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
index 157ccb62930..74a12efd464 100644
--- a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -28,6 +28,6 @@ src_install() {
dodoc AUTHORS CHANGES INSTALL README TODO
- newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
+ newinitd "${FILESDIR}/amavisd-milter.initd-r1" amavisd-milter
newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
}
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
index d0ad1d5fa9f..2ea91b4704b 100644
--- a/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -27,6 +27,6 @@ src_install() {
dodoc AUTHORS CHANGES INSTALL README TODO
- newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
+ newinitd "${FILESDIR}/amavisd-milter.initd-r1" amavisd-milter
newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
}
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1 b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
new file mode 100644
index 00000000000..61ae169e9bb
--- /dev/null
+++ b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+NAME="amavisd-milter"
+DAEMON="/usr/sbin/${NAME}"
+
+depend() {
+ use logger dns amavisd sendmail
+}
+
+start() {
+ ebegin "Starting ${NAME}"
+ start-stop-daemon --start --quiet --exec "${DAEMON}" -p "${PIDFILE}" --user amavis -- ${DOPTIONS}
+ eend $? "Failed to start ${NAME}"
+}
+
+stop() {
+ ebegin "Stopping ${NAME}"
+ start-stop-daemon --stop --name "${NAME}"
+ eend $? "Failed to stop ${NAME}"
+}
+
+restart() {
+ svc_stop
+ # needed to avoid potential mi_stop errors
+ sleep 4
+ svc_start
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-milter/, mail-filter/amavisd-milter/files/
@ 2021-04-26 12:45 Brian Evans
0 siblings, 0 replies; 2+ messages in thread
From: Brian Evans @ 2021-04-26 12:45 UTC (permalink / raw
To: gentoo-commits
commit: 68bfb7abf99f718fde02c10aedab23531c667c6f
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 26 12:44:48 2021 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Apr 26 12:44:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68bfb7ab
mail-filter/amavisd-milter: Drop old
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
mail-filter/amavisd-milter/Manifest | 2 --
.../amavisd-milter/amavisd-milter-1.5.0-r1.ebuild | 32 ---------------------
.../amavisd-milter/amavisd-milter-1.6.0-r1.ebuild | 33 ----------------------
.../files/amavisd-milter-1.6.0-policybank.patch | 20 -------------
.../amavisd-milter/files/amavisd-milter.initd | 29 -------------------
.../amavisd-milter/files/amavisd-milter.initd-r1 | 29 -------------------
6 files changed, 145 deletions(-)
diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index c97eaf307ef..b6d40e98e2c 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -1,4 +1,2 @@
-DIST amavisd-milter-1.5.0.tar.gz 175759 BLAKE2B c9de40eadbfca71a3a35c340372163ed7b685ff7150cdb85ab073cc78abcbc5dfb5fcaccc0b1518fa3a354d6ddcf19b6690d5a125e0f2ccb3ea190be57348b88 SHA512 ef206cd2c64cf48edb8a679b92a960451e0edbec11e0c207942bf6f435f7d14538a409d8197774ea4bbf63f27ed73d52a7c51531155be6d8724981b5dd9e0037
-DIST amavisd-milter-1.6.0.tar.gz 187994 BLAKE2B 87d3d870236b50e9c8c7bf3876fc476fb28ff6ee208c8da77c2f9ab2f1ccc0b883cc551718f4f9639125484965180100088d94557f065c7bf904fc912dd2794a SHA512 2e0b39b733f88742fcb2f4e884e528b70731ad5950bd56d3af1391d666dc018d2f6c1ad4212e787872a503bccbc65c52d55ae195c384e9333e4f39d25b1d1a34
DIST amavisd-milter-1.7.0.tar.gz 192688 BLAKE2B 882ecdc1f4b1b3fba2f7f82ffb3e7f4ecf27ce42fc14df926a508b852dd142161af9ce65bc367a5968f64a29a40cb362a0783bdbaf4dff2559715bfd53170f73 SHA512 52fdfe4acdd94e387de63d93aa3347dce46e7e16b8ab51679c7bbfc4f6faba160de5ca55aae141cbd06f3d9d1122dea67fdd67562dd5b8314055f7f6071545af
DIST amavisd-milter-1.7.1.tar.gz 193425 BLAKE2B e93f7f8f4c3b5e59fbfc160e60c8620231f8ab2a5fa06c39cf42b71c0c0abca4e27a1334d01e89337628ccdd685e059be469eeafc385521a780de1bf82bf3070 SHA512 db2fd53a3047a21fb20743fce7d01899eb92efffc62159d3022e0b5014dbfb3667e1664868734d84b58f5daadd8270d3e05a68c60a01a1ac35d104105cc86586
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.5.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.5.0-r1.ebuild
deleted file mode 100644
index c52a788999f..00000000000
--- a/mail-filter/amavisd-milter/amavisd-milter-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch
-
-DESCRIPTION="sendmail milter for amavisd-new"
-HOMEPAGE="http://amavisd-milter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
- mail-filter/amavisd-new"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch_user
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc AUTHORS CHANGES INSTALL README TODO
-
- newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
- newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
-}
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
deleted file mode 100644
index 4f26ffe3f47..00000000000
--- a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch
-
-DESCRIPTION="sendmail milter for amavisd-new"
-HOMEPAGE="http://amavisd-milter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
- mail-filter/amavisd-new"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-policybank.patch"
- epatch_user
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc AUTHORS CHANGES INSTALL README TODO
-
- newinitd "${FILESDIR}/amavisd-milter.initd-r1" amavisd-milter
- newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
-}
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter-1.6.0-policybank.patch b/mail-filter/amavisd-milter/files/amavisd-milter-1.6.0-policybank.patch
deleted file mode 100644
index afbdefc55c8..00000000000
--- a/mail-filter/amavisd-milter/files/amavisd-milter-1.6.0-policybank.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- amavisd-milter/mlfi.c 22 Apr 2013 00:36:12 -0000 1.60
-+++ amavisd-milter/mlfi.c 13 Jan 2015 17:00:47 -0000
-@@ -695,14 +695,14 @@
- l = 0;
- *mlfi->mlfi_amabuf = '\0';
- if ((policybank_from_daemon_name == 1) && (mlfi->mlfi_daemon_name != NULL)) {
-- l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
-+ l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
- "%s", mlfi->mlfi_daemon_name);
- }
- if (auth_type != NULL) {
- if (l > 0) {
-- l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length, ",");
-+ l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length, ",");
- }
-- l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
-+ l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
- "SMTP_AUTH,SMTP_AUTH_%s", auth_type);
- if (auth_ssf != NULL && *auth_ssf != '\0') {
- l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter.initd b/mail-filter/amavisd-milter/files/amavisd-milter.initd
deleted file mode 100644
index 68652d6be3e..00000000000
--- a/mail-filter/amavisd-milter/files/amavisd-milter.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-NAME="amavisd-milter"
-DAEMON="/usr/sbin/${NAME}"
-
-depend() {
- use logger dns amavis sendmail
-}
-
-start() {
- ebegin "Starting ${NAME}"
- start-stop-daemon --start --quiet --exec "${DAEMON}" -p "${PIDFILE}" --user amavis -- ${DOPTIONS}
- eend $? "Failed to start ${NAME}"
-}
-
-stop() {
- ebegin "Stopping ${NAME}"
- start-stop-daemon --stop --name "${NAME}"
- eend $? "Failed to stop ${NAME}"
-}
-
-restart() {
- svc_stop
- # needed to avoid potential mi_stop errors
- sleep 4
- svc_start
-}
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1 b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
deleted file mode 100644
index 61ae169e9bb..00000000000
--- a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-NAME="amavisd-milter"
-DAEMON="/usr/sbin/${NAME}"
-
-depend() {
- use logger dns amavisd sendmail
-}
-
-start() {
- ebegin "Starting ${NAME}"
- start-stop-daemon --start --quiet --exec "${DAEMON}" -p "${PIDFILE}" --user amavis -- ${DOPTIONS}
- eend $? "Failed to start ${NAME}"
-}
-
-stop() {
- ebegin "Stopping ${NAME}"
- start-stop-daemon --stop --name "${NAME}"
- eend $? "Failed to stop ${NAME}"
-}
-
-restart() {
- svc_stop
- # needed to avoid potential mi_stop errors
- sleep 4
- svc_start
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-26 12:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-26 12:45 [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-milter/, mail-filter/amavisd-milter/files/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2018-04-03 14:33 Marc Schiffbauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox