opensmtpd: re-add arc4random patch for configure.ac, it's still needed.

This commit is contained in:
Juan RP 2014-12-25 19:13:36 +01:00
parent 47cce7e478
commit e171e5a0da
2 changed files with 31 additions and 2 deletions

View File

@ -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)

View File

@ -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.