From 80cbd151010857bdfeb10e0e1d7f54df7a3373b9 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Fri, 31 Oct 2014 14:52:17 +0000
Subject: openssh-princ-fp: updpkg 6.6p1 → 6.7p1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .SRCINFO            | 13 ++++++-------
 PKGBUILD            |  9 ++++-----
 curve25519pad.patch |  6 +++---
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a53a6d4..61fa226 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 4.2.1
-# Mon Jun  1 14:54:08 UTC 2015
+# Mon Jun  1 14:54:09 UTC 2015
 pkgbase = openssh-princ-fp
 	pkgdesc = Free version of the SSH connectivity tools
-	pkgver = 6.6p1
+	pkgver = 6.7p1
 	pkgrel = 1
 	url = http://www.openssh.org/portable.html
 	install = install
@@ -16,25 +16,24 @@ pkgbase = openssh-princ-fp
 	depends = ldns
 	optdepends = xorg-xauth: X11 forwarding
 	optdepends = x11-ssh-askpass: input passphrase in X
+	provides = openssh
 	conflicts = openssh
 	backup = etc/ssh/ssh_config
 	backup = etc/ssh/sshd_config
 	backup = etc/pam.d/sshd
-	source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz
-	source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz.asc
+	source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.7p1.tar.gz
+	source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.7p1.tar.gz.asc
 	source = GSS_AUTH_KRB5_PRINC-env4openssh.diff
 	source = pubkey_fingerprint.patch
-	source = curve25519pad.patch
 	source = sshdgenkeys.service
 	source = sshd@.service
 	source = sshd.service
 	source = sshd.socket
 	source = sshd.pam
-	sha1sums = b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e
+	sha1sums = 14e5fbed710ade334d65925e080d1aaeb9c85bf6
 	sha1sums = SKIP
 	sha1sums = 34f85eeb736fab630926f1ac59e752556cae43ee
 	sha1sums = 83ba34572eb6c1ee250034a69a7eb9e9137d7068
-	sha1sums = 13b74b57b3d9b9a256eeb44b4fca29a8f27aa7ad
 	sha1sums = cc1ceec606c98c7407e7ac21ade23aed81e31405
 	sha1sums = 6a0ff3305692cf83aca96e10f3bb51e1c26fccda
 	sha1sums = ec49c6beba923e201505f5669cea48cad29014db
diff --git a/PKGBUILD b/PKGBUILD
index cc30db7..4c8117a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=openssh-princ-fp
-pkgver=6.6p1
+pkgver=6.7p1
 pkgrel=1
 
 pkgdesc='Free version of the SSH connectivity tools'
@@ -13,6 +13,7 @@ optdepends=('xorg-xauth: X11 forwarding'
 makedepends=('linux-headers')
 
 conflicts=('openssh')
+provides=('openssh')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
@@ -20,17 +21,16 @@ install=install
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${pkgver}.tar.gz"{,.asc}
         'GSS_AUTH_KRB5_PRINC-env4openssh.diff'
         'pubkey_fingerprint.patch'
-        'curve25519pad.patch'
         'sshdgenkeys.service'
         'sshd@.service'
         'sshd.service'
         'sshd.socket'
         'sshd.pam')
 
-sha1sums=('b850fd1af704942d9b3c2eff7ef6b3a59b6a6b6e' 'SKIP'
+sha1sums=('14e5fbed710ade334d65925e080d1aaeb9c85bf6'
+          'SKIP'
           '34f85eeb736fab630926f1ac59e752556cae43ee'
           '83ba34572eb6c1ee250034a69a7eb9e9137d7068'
-          '13b74b57b3d9b9a256eeb44b4fca29a8f27aa7ad'
           'cc1ceec606c98c7407e7ac21ade23aed81e31405'
           '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
           'ec49c6beba923e201505f5669cea48cad29014db'
@@ -41,7 +41,6 @@ prepare() {
 	cd openssh-$pkgver
 	patch -p0 -i ../GSS_AUTH_KRB5_PRINC-env4openssh.diff
 	patch -p0 -i ../pubkey_fingerprint.patch
-	patch -p0 -i ../curve25519pad.patch
 }
 
 build() {
diff --git a/curve25519pad.patch b/curve25519pad.patch
index 9774a93..05aeca7 100644
--- a/curve25519pad.patch
+++ b/curve25519pad.patch
@@ -32,8 +32,8 @@ diff -u -p -r1.82 version.h
 @@ -1,6 +1,6 @@
  /* $OpenBSD: version.h,v 1.70 2014/02/27 22:57:40 djm Exp $ */
  
--#define SSH_VERSION	"OpenSSH_6.6"
-+#define SSH_VERSION	"OpenSSH_6.6.1"
+-#define SSH_VERSION	"OpenSSH_6.7"
++#define SSH_VERSION	"OpenSSH_6.7.1"
  
  #define SSH_PORTABLE	"p1"
  #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
@@ -168,4 +168,4 @@ diff -u -p -r1.62 -r1.63
 _______________________________________________
 openssh-unix-dev mailing list
 openssh-unix-dev@mindrot.org
-https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
\ No newline at end of file
+https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
-- 
cgit v1.2.3-54-g00ecf