From 42d59c00ca68d0edc76361dba6738ce6c32cccaf Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 18 Mar 2015 08:19:06 +0100 Subject: [PATCH] openssh: update to 6.8p1. --- .../openssh/patches/openssh-fix-includes.diff | 12 ----------- srcpkgs/openssh/patches/openssh-fix-utmp.diff | 21 ------------------- srcpkgs/openssh/template | 8 +++---- 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/openssh/patches/openssh-fix-includes.diff delete mode 100644 srcpkgs/openssh/patches/openssh-fix-utmp.diff diff --git a/srcpkgs/openssh/patches/openssh-fix-includes.diff b/srcpkgs/openssh/patches/openssh-fix-includes.diff deleted file mode 100644 index 25d0211380..0000000000 --- a/srcpkgs/openssh/patches/openssh-fix-includes.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- includes.h.orig -+++ includes.h -@@ -21,6 +21,8 @@ - #define _GNU_SOURCE /* activate extra prototypes for glibc */ - - #include -+#include -+#include - #include /* For CMSG_* */ - - #ifdef HAVE_LIMITS_H - diff --git a/srcpkgs/openssh/patches/openssh-fix-utmp.diff b/srcpkgs/openssh/patches/openssh-fix-utmp.diff deleted file mode 100644 index 029d2fec28..0000000000 --- a/srcpkgs/openssh/patches/openssh-fix-utmp.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- loginrec.c.orig -+++ loginrec.c -@@ -784,12 +784,12 @@ - /* this is just a 128-bit IPv6 address */ - if (li->hostaddr.sa.sa_family == AF_INET6) { - sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa); -- memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16); -+ memcpy(utx->ut_addr_v6, sa6->sin6_addr.s6_addr, 16); - if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) { -- ut->ut_addr_v6[0] = ut->ut_addr_v6[3]; -- ut->ut_addr_v6[1] = 0; -- ut->ut_addr_v6[2] = 0; -- ut->ut_addr_v6[3] = 0; -+ utx->ut_addr_v6[0] = utx->ut_addr_v6[3]; -+ utx->ut_addr_v6[1] = 0; -+ utx->ut_addr_v6[2] = 0; -+ utx->ut_addr_v6[3] = 0; - } - } - # endif - diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index d21dba08a9..da41595cb1 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,14 +1,14 @@ # Template file for 'openssh' pkgname=openssh -version=6.7p1 -revision=11 +version=6.8p1 +revision=1 build_style=gnu-configure configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --with-mantype=doc --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 - --with-ldns --with-libedit LD=$CC" + --with-ldns --without-ssh1 --with-libedit LD=$CC" hostmakedepends="automake libtool perl" makedepends="zlib-devel libressl-devel>=2.1.4 pam-devel libldns-devel libedit-devel" short_desc="The OpenSSH implementation of SSH protocol" @@ -19,7 +19,7 @@ maintainer="Juan RP " homepage="http://www.openssh.org" license="BSD" distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz" -checksum=b2f8394eae858dabbdef7dac10b99aec00c95462753e80342e530bbb6f725507 +checksum=3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e # Package build options build_options="systemd openssh_identitypersist"