openssh-selinux 6.9p1-1 update

2 files changed, 10 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2075917dd907..b61d0375b946 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openssh-selinux
 	pkgdesc = Free version of the SSH connectivity tools with SELinux support
-	pkgver = 6.8p1
-	pkgrel = 2
+	pkgver = 6.9p1
+	pkgrel = 1
 	url = http://www.openssh.org/portable.html
 	install = install
 	arch = i686
@@ -16,27 +16,23 @@ pkgbase = openssh-selinux
 	depends = libselinux
 	optdepends = xorg-xauth: X11 forwarding
 	optdepends = x11-ssh-askpass: input passphrase in X
-	provides = openssh=6.8p1-2
-	provides = selinux-openssh=6.8p1-2
+	provides = openssh=6.9p1-1
+	provides = selinux-openssh=6.9p1-1
 	conflicts = openssh
 	conflicts = selinux-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.8p1.tar.gz
-	source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.8p1.tar.gz.asc
-	source = error.patch
-	source = dispatch.patch
+	source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.9p1.tar.gz
+	source = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.9p1.tar.gz.asc
 	source = sshdgenkeys.service
 	source = sshd@.service
 	source = sshd.service
 	source = sshd.socket
 	source = sshd.conf
 	source = sshd.pam
-	sha1sums = cdbc51e46a902b30d263b05fdc71340920e91c92
+	sha1sums = 86ab57f00d0fd9bf302760f2f6deac1b6e9df265
 	sha1sums = SKIP
-	sha1sums = 1b6b11efe9b20b9d1e51a59ac4b16eefb1dc84b8
-	sha1sums = e629d45e899bbb2b3e702080f37cb40f3dc2b9b4
 	sha1sums = cc1ceec606c98c7407e7ac21ade23aed81e31405
 	sha1sums = 6a0ff3305692cf83aca96e10f3bb51e1c26fccda
 	sha1sums = ec49c6beba923e201505f5669cea48cad29014db
diff --git a/PKGBUILD b/PKGBUILD
index a3e3a6ba5a43..0032543ce46e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 # SELinux Contributor: Nicky726 <Nicky726@gmail.com>
 
 pkgname=openssh-selinux
-pkgver=6.8p1
-pkgrel=2
+pkgver=6.9p1
+pkgrel=1
 pkgdesc='Free version of the SSH connectivity tools with SELinux support'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -23,17 +23,13 @@ provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}"
 groups=('selinux')
 validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname/-selinux}-${pkgver}.tar.gz"{,.asc}
-        'error.patch'
-        'dispatch.patch'
         'sshdgenkeys.service'
         'sshd@.service'
         'sshd.service'
         'sshd.socket'
         'sshd.conf'
         'sshd.pam')
-sha1sums=('cdbc51e46a902b30d263b05fdc71340920e91c92' 'SKIP'
-          '1b6b11efe9b20b9d1e51a59ac4b16eefb1dc84b8'
-          'e629d45e899bbb2b3e702080f37cb40f3dc2b9b4'
+sha1sums=('86ab57f00d0fd9bf302760f2f6deac1b6e9df265' 'SKIP'
           'cc1ceec606c98c7407e7ac21ade23aed81e31405'
           '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
           'ec49c6beba923e201505f5669cea48cad29014db'
@@ -45,12 +41,6 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
 
 install=install
 
-prepare() {
-	cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
-	patch -p1 -i ../error.patch
-	patch -p1 -i ../dispatch.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname/-selinux}-${pkgver}"