diff --git a/srcpkgs/openssh/patches/werror.patch b/srcpkgs/openssh/patches/Werror.patch similarity index 52% rename from srcpkgs/openssh/patches/werror.patch rename to srcpkgs/openssh/patches/Werror.patch index 1b59cd06588..0c3fb2b221c 100644 --- a/srcpkgs/openssh/patches/werror.patch +++ b/srcpkgs/openssh/patches/Werror.patch @@ -1,9 +1,10 @@ ---- configure.ac.orig +--- configure.ac +++ configure.ac -@@ -399,7 +399,6 @@ +@@ -404,7 +404,6 @@ AC_CHECK_HEADERS([ \ + strings.h \ sys/bitypes.h \ sys/bsdtty.h \ - sys/cdefs.h \ sys/dir.h \ + sys/file.h \ sys/mman.h \ - sys/ndir.h \ diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 99486da648e..e953c7a323a 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,7 +1,7 @@ # Template file for 'openssh' pkgname=openssh -version=7.6p1 -revision=3 +version=7.7p1 +revision=1 build_style=gnu-configure configure_args="--datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody @@ -13,17 +13,18 @@ configure_args="--datadir=/usr/share/openssh $(vopt_if ssl --with-ssl-engine --without-openssl) $(vopt_if gssapi --with-kerberos5=$XBPS_CROSS_BASE/usr --without-kerberos5) LD=$CC" -hostmakedepends="autoconf perl" -makedepends="zlib-devel pam-devel libedit-devel - $(vopt_if ssl libressl-devel) $(vopt_if ldns libldns-devel) $(vopt_if gssapi mit-krb5-devel)" +hostmakedepends="autoconf" +makedepends="libedit-devel pam-devel zlib-devel + $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel') + $(vopt_if ssl 'libressl-devel')" short_desc="The OpenSSH implementation of SSH protocol" -conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd" -make_dirs="/var/chroot/ssh 0755 root root" maintainer="Juan RP " homepage="http://www.openssh.org" license="BSD" distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz" -checksum=a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723 +checksum=d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f +conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd" +make_dirs="/var/chroot/ssh 0755 root root" # Package build options build_options="ldns ssl gssapi" @@ -46,6 +47,7 @@ fi pre_configure() { autoreconf -fi } + post_install() { vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd vbin contrib/ssh-copy-id