diff --git a/srcpkgs/openssh/patches/libressl.patch b/srcpkgs/openssh/patches/libressl.patch new file mode 100644 index 00000000000..564550ead3c --- /dev/null +++ b/srcpkgs/openssh/patches/libressl.patch @@ -0,0 +1,32 @@ +Index: configure.ac +=================================================================== +RCS file: /var/cvs/openssh/configure.ac,v +retrieving revision 1.577 +diff -u -p -r1.577 configure.ac +--- configure.ac 3 Jul 2014 01:54:19 -0000 1.577 ++++ configure.ac 13 Jul 2014 23:34:33 -0000 +@@ -1575,10 +1575,6 @@ AC_CHECK_FUNCS([ \ + Blowfish_expandstate \ + Blowfish_expand0state \ + Blowfish_stream2word \ +- arc4random \ +- arc4random_buf \ +- arc4random_stir \ +- arc4random_uniform \ + asprintf \ + b64_ntop \ + __b64_ntop \ +@@ -2639,6 +2635,13 @@ fi + + AC_SUBST([TEST_SSH_ECC]) + AC_SUBST([COMMENT_OUT_ECC]) ++ ++AC_CHECK_FUNCS([ \ ++ arc4random \ ++ arc4random_buf \ ++ arc4random_stir \ ++ arc4random_uniform \ ++]) + + saved_LIBS="$LIBS" + AC_CHECK_LIB([iaf], [ia_openinfo], [ diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 8afd8a2c038..249d0f8958d 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -3,15 +3,15 @@ _desc="The OpenSSH implementation of SSH protocol" pkgname=openssh version=6.6p1 -revision=7 +revision=8 build_style=gnu-configure configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --with-mantype=man --without-rpath --with-xauth=/usr/bin/xauth --with-ssl-engine --disable-strip --with-privsep-path=/var/chroot/ssh --with-pid-dir=/run --with-pam --with-pie --without-kerberos5 LD=$CC" -hostmakedepends="libtool perl" -makedepends="zlib-devel openssl-devel pam-devel" +hostmakedepends="automake libtool perl" +makedepends="zlib-devel libressl-devel pam-devel" short_desc="${_desc} - client" replaces="openssh-client<6.1p1" conf_files="/etc/ssh/moduli /etc/ssh/ssh_config" @@ -31,7 +31,7 @@ pre_configure() { patch -sNp1 -i identpersist.patch msg_normal "$pkgver: applied identitypersist patch.\n" fi - libtoolize -f + autoreconf -fi } post_install() {