From 562a06f45026f38ef1a2e260b091173ef08be7bb Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 25 Dec 2014 19:00:51 +0100
Subject: [PATCH] opensmtpd: update to 5.4.4p1.

---
 srcpkgs/opensmtpd/patches/libressl.patch | 26 ----------------------
 srcpkgs/opensmtpd/template               | 28 ++++++++++++------------
 2 files changed, 14 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/opensmtpd/patches/libressl.patch

diff --git a/srcpkgs/opensmtpd/patches/libressl.patch b/srcpkgs/opensmtpd/patches/libressl.patch
deleted file mode 100644
index e05df8a5df6..00000000000
--- a/srcpkgs/opensmtpd/patches/libressl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Defer checking for arc4random and friends until libcrypto is found,
-fixes segv due to portable libressl/opensmtpd and arc4random<->RAND_bytes.
-
-See http://marc.info/?l=openssh-unix-dev&m=140515171616098&w=2
-for more information.
---- configure.ac.orig	2014-08-03 18:23:43.352548006 +0200
-+++ configure.ac	2014-08-03 18:24:00.440690901 +0200
-@@ -620,9 +620,6 @@ fi
- #l1527 (customized)
- dnl    Checks for library functions. Please keep in alphabetical order
- AC_CHECK_FUNCS([ \
--	arc4random \
--        arc4random_buf \
--        arc4random_uniform \
- 	asprintf \
- 	b64_ntop \
- 	__b64_ntop \
-@@ -1369,6 +1366,8 @@ AC_RUN_IFELSE(
- 	]
- )
- 
-+AC_CHECK_FUNCS([arc4random arc4random_buf arc4random_uniform])
-+
- # PRNGD TCP socket
- AC_ARG_WITH([prngd-port],
- 	[  --with-prngd-port=PORT  read entropy from PRNGD/EGD TCP localhost:PORT],
diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 85269cc6a42..355c623b7c9 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,34 +1,34 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
-version=5.4.2p1
-revision=6
+version=5.4.4p1
+revision=1
 build_style=gnu-configure
-configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
+configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/sbin
  --with-maildir=/var/spool/mail --with-privsep-path=/var/db
- --with-sock-dir=/run --with-mantype=doc
+ --with-sock-dir=/run --with-mantype=doc --with-pie
  --with-privsep-user=smtpd --with-queue-user=smtpq
  --with-ca-file=/etc/ssl/certs/ca-certificates.crt"
-hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel"
+hostmakedepends="pkg-config bison"
+makedepends="zlib-devel libressl-devel libevent-devel db-devel libasr-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
-system_accounts="smtpd smtpq"
-smtpd_homedir="/var/spool/mail"
-smtpq_homedir="/var/spool/mail"
 build_options="systemd"
 provides="smtp-forwarder-0_1 smtp-server-0_1"
-replaces="runit-void<20141013_2 smtp-forwarder>=0 smtp-server>=0"
+replaces="smtp-forwarder>=0 smtp-server>=0"
 short_desc="Free implementation of the server-side SMTP protocol"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD, ISC, MIT"
 homepage="http://www.opensmtpd.org"
 distfiles="http://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
-checksum=4ffaf48d3d044ef8be1bd80c8972c87ba830a21bb330b85a59f6a70da5fbd9a2
+checksum=1118330aa54e9a8a30914a1f2e129a83f2954a5956300eade522a1396f6d8ebd
+
+system_accounts="smtpd smtpq"
+smtpd_descr="SMTPD daemon"
+smtpd_homedir="/var/empty"
+smtpq_descr="SMTPD queue"
+smtpq_homedir="/var/empty"
 
 pre_configure() {
-	touch README AUTHORS NEWS ChangeLog
-	autoreconf -fi
-
 	# XXX hardcode the libevent major version for now.
 	# XXX the configure test needs to execute a binary to
 	# XXX get this result.