From e171e5a0da58c35dcfdcf3046e5a92b8d33d9ae8 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 25 Dec 2014 19:13:36 +0100
Subject: [PATCH] opensmtpd: re-add arc4random patch for configure.ac, it's
 still needed.

---
 srcpkgs/opensmtpd/patches/libressl.patch | 27 ++++++++++++++++++++++++
 srcpkgs/opensmtpd/template               |  6 ++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/opensmtpd/patches/libressl.patch

diff --git a/srcpkgs/opensmtpd/patches/libressl.patch b/srcpkgs/opensmtpd/patches/libressl.patch
new file mode 100644
index 0000000000..e3a192c6dc
--- /dev/null
+++ b/srcpkgs/opensmtpd/patches/libressl.patch
@@ -0,0 +1,27 @@
+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-12-25 19:09:20.345153528 +0100
++++ configure.ac	2014-12-25 19:10:37.769896808 +0100
+@@ -640,10 +640,6 @@ fi
+ #l1572 (customized)
+ dnl    Checks for library functions. Please keep in alphabetical order
+ AC_CHECK_FUNCS([ \
+-	arc4random \
+-	arc4random_buf \
+-	arc4random_stir \
+-	arc4random_uniform \
+ 	asprintf \
+ 	b64_ntop \
+ 	__b64_ntop \
+@@ -1418,6 +1414,8 @@ AC_ARG_WITH([pam],
+ 	]
+ )
+ 
++AC_CHECK_FUNCS([arc4random arc4random_buf arc4random_stir arc4random_uniform])
++
+ # Check for older PAM
+ if test "x$PAM_MSG" = "xyes" ; then
+ 	# Check PAM strerror arguments (old PAM)
diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 355c623b7c..089debab18 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,14 +1,14 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=5.4.4p1
-revision=1
+revision=2
 build_style=gnu-configure
 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-pie
  --with-privsep-user=smtpd --with-queue-user=smtpq
  --with-ca-file=/etc/ssl/certs/ca-certificates.crt"
-hostmakedepends="pkg-config bison"
+hostmakedepends="automake libtool 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"
@@ -29,6 +29,8 @@ 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.