main/opensmtpd: update to 6.0.2p1

Removes old LibreSSL patch that seems to be checked properly now,
and fix some incorrect config.h checking. Also refactors the initd
script to be more natural/declarative.

4 files changed, 56 insertions, 71 deletions

diff --git a/main/opensmtpd/APKBUILD b/main/opensmtpd/APKBUILD
index ea39e337ec..f50be56199 100644
--- a/main/opensmtpd/APKBUILD
+++ b/main/opensmtpd/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Jonathan Curran <jonathan@curran.in>
+# Contributor: Shiz <hi@shiz.me>
 # Maintainer: Jonathan Curran <jonathan@curran.in>
 pkgname=opensmtpd
-pkgver=5.9.2p1
-pkgrel=3
+pkgver=6.0.2p1
+pkgrel=0
 pkgdesc="secure, reliable, lean, and easy-to configure SMTP server"
 url="http://www.opensmtpd.org"
 arch="all"
 license="ISC"
 depends=""
-depends_dev=""
 makedepends="automake autoconf libtool mdocml db-dev libasr-dev libevent-dev
 	fts-dev zlib-dev libressl-dev bison flex-dev"
 install="$pkgname.pre-install $pkgname.post-install"
@@ -17,19 +17,11 @@ subpackages="$pkgname-doc"
 source="https://www.opensmtpd.org/archives/${pkgname}-${pkgver}.tar.gz
 	smtpd.initd
 	aliases
-	opensmtpd-5.7.3p2-libressl-arc4random-circularity.patch"
+	autoconf-decl-checks.patch"
 options="suid"
 
 builddir="$srcdir"/$pkgname-$pkgver
 
-prepare() {
-	default_prepare || return 1
-
-	cd "$builddir"
-	chmod 644 config.guess
-	update_config_guess || return 1
-}
-
 build() {
 	cd "$builddir"
 	./configure \
@@ -63,15 +55,15 @@ package() {
 	done
 }
 
-md5sums="d109374dcc4bc8be14f790b859f1dd31  opensmtpd-5.9.2p1.tar.gz
-a2f311a82c9a85f5c52975c4dbbdbd53  smtpd.initd
+md5sums="1ebc232624f2e2e31010c810ea0a3b88  opensmtpd-6.0.2p1.tar.gz
+0327ef7a8479130fea26051f334ef51f  smtpd.initd
 561d2aead043a64a4ce5d66b4f78223e  aliases
-a4c72a6a5fe18b514571e4baac19756f  opensmtpd-5.7.3p2-libressl-arc4random-circularity.patch"
-sha256sums="3522f273c1630c781facdb2b921228e338ed4e651909316735df775d6a70a71d  opensmtpd-5.9.2p1.tar.gz
-ab4b7f066a38dadd7a2dc6d7c3a06c3a8ac2367340d97e2a8b54f571ea0f8cf8  smtpd.initd
+7159c1af3a1ff8a676e6d865940bc173  autoconf-decl-checks.patch"
+sha256sums="2af9b6d08784c7e546bf124bb61e311a6aa0c9835507710a76f5c242383190ac  opensmtpd-6.0.2p1.tar.gz
+8bddc52a03cad563e229064bd41d64919ce7538e0149f9b7396a43798f54cba9  smtpd.initd
 7bef80f8d86aa5463c864681482a4908d22ff8b6f3e47d2a410ef2d59b316b53  aliases
-0dee9bb91e191bfe51e8609c9469cc141af1b1c049869db4eebbf0bbb55971f6  opensmtpd-5.7.3p2-libressl-arc4random-circularity.patch"
-sha512sums="99ca15101557848aa6d642f0c0171b152d805192e6839a97410b19431c981a21a5c0dc011e2c8cd91f3e6f6acb37a77f0f4c8e68114bf9808240392fe2b5d375  opensmtpd-5.9.2p1.tar.gz
-8152fecadeb1d818b7865eae040123f855e81fafbb4b40d12a64336e09dc486c10e6828809182c8172bfd9f54dc7d050a154b61d5e6049df6ffd8a7b6e5e1277  smtpd.initd
+5efee2a6d5ddd99662ef314ac5928f722ffa2fd615024171ddbda869933bf3b2  autoconf-decl-checks.patch"
+sha512sums="1e4275795dd2c43174ffa268398a0d9864ce4cb7d370330f7b8c55a9b40e757616bbd280919a409ebde403769e3dea62047857dc2ff98d7ecce660b459c7ff1c  opensmtpd-6.0.2p1.tar.gz
+3653c8bdb0666c99c54fa7c7cd799080407f96ccaf54af1d4fa316d7a2b7c0576c4c1513428335e40dc0dc763081c69711dd22171096cd5a7e8f96041b2e201d  smtpd.initd
 929ba0b8befca6cad558602f9793a9c653923924ee524902916b8ef4952d1ea8a391895e7450ed9768eb82a07bd307b49561f5d49ea4711bd87a1a73eb8d7dad  aliases
-f1958f86edbf558bac88f944196670b4d34b7367f8479ef13433981bcb174afd7aa0e42aa447eac4bd46b0be849e2cf97313cc1073782c86c4c0a4aa7326b456  opensmtpd-5.7.3p2-libressl-arc4random-circularity.patch"
+e61b7b0ab98acca9c092469d3ed756161225af5126e2fc0611b2676b8e1df05db7037549febe85b860fa48e47536a01fa3bfa37976f42e47666065ba4198e903  autoconf-decl-checks.patch"
diff --git a/main/opensmtpd/autoconf-decl-checks.patch b/main/opensmtpd/autoconf-decl-checks.patch
new file mode 100644
index 0000000000..83b2509d25
--- /dev/null
+++ b/main/opensmtpd/autoconf-decl-checks.patch
@@ -0,0 +1,38 @@
+--- opensmtpd-6.0.2p1/openbsd-compat/defines.h
++++ opensmtpd-6.0.2p1-patched/openbsd-compat/defines.h
+@@ -85,7 +85,7 @@
+ # define STDERR_FILENO   2
+ #endif
+ 
+-#if defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK == 0
++#if !HAVE_DECL_O_NONBLOCK
+ # define O_NONBLOCK      00004	/* Non Blocking Open */
+ #endif
+ 
+--- opensmtpd-6.0.2p1/openbsd-compat/openbsd-compat.h
++++ opensmtpd-6.0.2p1-patched/openbsd-compat/openbsd-compat.h
+@@ -212,11 +212,11 @@
+ #define pledge(promises, paths) 0
+ #endif
+ 
+-#ifndef HAVE_DECL_AF_LOCAL
++#if !HAVE_DECL_AF_LOCAL
+ #define AF_LOCAL AF_UNIX
+ #endif
+ 
+-#ifndef HAVE_DECL_WAIT_MYPGRP
++#if !HAVE_DECL_WAIT_MYPGRP
+ #define WAIT_MYPGRP 0
+ #endif
+ 
+--- opensmtpd-6.0.2p1/smtpd/to.c
++++ opensmtpd-6.0.2p1-patched/smtpd/to.c
+@@ -210,7 +210,7 @@
+ #if HAVE_STRUCT_TM_TM_GMTOFF
+ 	offset = lt->tm_gmtoff;
+ 	tz = lt->tm_zone;
+-#elif defined HAVE_DECL_ALTZONE && defined HAVE_DECL_TIMEZONE
++#elif HAVE_DECL_ALTZONE && HAVE_DECL_TIMEZONE
+ 	offset = lt->tm_isdst > 0 ? altzone : timezone;
+ 	tz = lt->tm_isdst > 0 ? tzname[1] : tzname[0];
+ #endif
diff --git a/main/opensmtpd/opensmtpd-5.7.3p2-libressl-arc4random-circularity.patch b/main/opensmtpd/opensmtpd-5.7.3p2-libressl-arc4random-circularity.patch
deleted file mode 100644
index 7c35862914..0000000000
--- a/main/opensmtpd/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)
- {
diff --git a/main/opensmtpd/smtpd.initd b/main/opensmtpd/smtpd.initd
index 52ffd99397..ad6f05dd45 100644
--- a/main/opensmtpd/smtpd.initd
+++ b/main/opensmtpd/smtpd.initd
@@ -1,8 +1,10 @@
 #!/sbin/openrc-run
 
-name="$SVCNAME"
-command="/usr/sbin/$SVCNAME"
-command_args="$SMTPD_OPTS"
+name="$RC_SVCNAME"
+command="/usr/sbin/$RC_SVCNAME"
+command_args="-F $SMTPD_OPTS"
+command_background=yes
+pidfile="/run/$RC_SVCNAME.pid"
 
 depend() {
 	need net localmount
@@ -10,15 +12,3 @@ depend() {
 	use logger dns
 	provide mta
 }
-
-start() {
-	ebegin "Starting smtpd ${CONF_MESSAGE}"
-	/usr/sbin/smtpd
-	eend $?
-}
-
-stop() {
-       ebegin "Stopping smtpd ${CONF_MESSAGE}"
-       /usr/sbin/smtpctl stop &> /dev/null
-       eend $?
-}
\ No newline at end of file