From 4bd77fcccc09aa5b2d6c6aa6c71979b0e8b140b0 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Mon, 25 Jul 2016 15:02:45 +0200
Subject: [PATCH] seccomp for secondary architecures patch already upstream
 (#2590)

---
 openssh-6.9p1-seccomp-secondary.patch | 36 ---------------------------
 openssh.spec                          |  3 ---
 2 files changed, 39 deletions(-)
 delete mode 100644 openssh-6.9p1-seccomp-secondary.patch

diff --git a/openssh-6.9p1-seccomp-secondary.patch b/openssh-6.9p1-seccomp-secondary.patch
deleted file mode 100644
index dce205d..0000000
--- a/openssh-6.9p1-seccomp-secondary.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 24378a7..0bed910 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -811,6 +811,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
- 	aarch64*-*)
- 		seccomp_audit_arch=AUDIT_ARCH_AARCH64
- 		;;
-+	s390x-*)
-+		seccomp_audit_arch=AUDIT_ARCH_S390X
-+		;;
-+	s390-*)
-+		seccomp_audit_arch=AUDIT_ARCH_S390
-+		;;
-+	powerpc64-*)
-+		seccomp_audit_arch=AUDIT_ARCH_PPC64
-+		;;
-+	powerpc64le-*)
-+		seccomp_audit_arch=AUDIT_ARCH_PPC64LE
-+		;;
-+	mips-*)
-+		seccomp_audit_arch=AUDIT_ARCH_MIPS
-+		;;
-+	mipsel-*)
-+		seccomp_audit_arch=AUDIT_ARCH_MIPSEL
-+		;;
-+	mips64-*)
-+		seccomp_audit_arch=AUDIT_ARCH_MIPS64
-+		;;
-+	mips64el-*)
-+		seccomp_audit_arch=AUDIT_ARCH_MIPSEL64
-+		;;
- 	esac
- 	if test "x$seccomp_audit_arch" != "x" ; then
- 		AC_MSG_RESULT(["$seccomp_audit_arch"])
-
diff --git a/openssh.spec b/openssh.spec
index 4cc9391..2e0cf14 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -203,8 +203,6 @@ Patch920: openssh-6.6.1p1-ip-port-config-parser.patch
 Patch921: openssh-6.7p1-debian-restore-tcp-wrappers.patch
 # apply upstream patch and make sshd -T more consistent (#1187521)
 Patch922: openssh-6.8p1-sshdT-output.patch
-# Seccomp support for secondary architectures (#1195065)
-Patch924: openssh-6.9p1-seccomp-secondary.patch
 # Add sftp option to force mode of created files (#1191055)
 Patch926: openssh-6.7p1-sftp-force-permission.patch
 # Memory problems
@@ -461,7 +459,6 @@ popd
 %patch802 -p1 -b .GSSAPIEnablek5users
 %patch921 -p1 -b .tcp_wrappers
 %patch922 -p1 -b .sshdt
-%patch924 -p1 -b .seccomp
 %patch926 -p1 -b .sftp-force-mode
 %patch928 -p1 -b .memory
 %patch929 -p1 -b .root-login