[gentoo-commits] repo/gentoo:master commit in: mail-mta/opensmtpd/files/

[gentoo-commits] repo/gentoo:master commit in: mail-mta/opensmtpd/files/

[Jason Donenfeld]

commit:     329b8d12e35936429586c2f34ee1cd0e056258d5
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 09:08:14 2016 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 09:08:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329b8d12

mail-mta/opensmtpd: more robust openrc script

 mail-mta/opensmtpd/files/smtpd.initd | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mail-mta/opensmtpd/files/smtpd.initd b/mail-mta/opensmtpd/files/smtpd.initd
index 6d254f1..9dd01a7 100644
--- a/mail-mta/opensmtpd/files/smtpd.initd
+++ b/mail-mta/opensmtpd/files/smtpd.initd
@@ -1,17 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 command="smtpd"
-start_stop_daemon_args="--pidfile=/run/smtpd.pid"
+pidfile="/run/smtpd.pid"
 description="SMTP daemon from OpenBSD"
 
 depend() {
 	need net
 }
-stop() {
-	ebegin "Stopping smtpd"
-	smtpctl stop
-	eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: mail-mta/opensmtpd/files/

[Jason Donenfeld]

commit:     75cc291bf7ab80a7aae9911f818ed111c3f85b3c
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 08:10:46 2016 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 08:10:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cc291b

mail-mta/opensmtpd: remove old patches

 ...d-5.7.3p2-libressl-arc4random-circularity.patch | 35 ----------------------
 1 file changed, 35 deletions(-)

diff --git a/mail-mta/opensmtpd/files/opensmtpd-5.7.3p2-libressl-arc4random-circularity.patch b/mail-mta/opensmtpd/files/opensmtpd-5.7.3p2-libressl-arc4random-circularity.patch
deleted file mode 100644
index 7c35862..0000000
--- a/mail-mta/opensmtpd/files/opensmtpd-5.7.3p2-libressl-arc4random-circularity.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru opensmtpd-5.7.3p2/openbsd-compat/arc4random.c opensmtpd-5.7.3p2-fixed/openbsd-compat/arc4random.c
---- opensmtpd-5.7.3p2/openbsd-compat/arc4random.c	2016-02-02 08:40:06.000000000 +0100
-+++ opensmtpd-5.7.3p2-fixed/openbsd-compat/arc4random.c	2016-03-02 17:34:24.535030362 +0100
-@@ -188,6 +188,7 @@
- 	_ARC4_UNLOCK();
- }
- 
-+#if 0
- u_int32_t
- arc4random(void)
- {
-@@ -198,12 +199,13 @@
- 	_ARC4_UNLOCK();
- 	return val;
- }
-+#endif
- 
- /*
-  * If we are providing arc4random, then we can provide a more efficient 
-  * arc4random_buf().
-  */
--# ifndef HAVE_ARC4RANDOM_BUF
-+#if 0
- void
- arc4random_buf(void *buf, size_t n)
- {
-@@ -215,7 +217,7 @@
- #endif /* !HAVE_ARC4RANDOM */
- 
- /* arc4random_buf() that uses platform arc4random() */
--#if !defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_ARC4RANDOM)
-+#if 0
- void
- arc4random_buf(void *_buf, size_t n)
- {