[packages/openssh] - rel 2; x32 build fix

[arekm]

commit 9fdc70ea2d4d1a4454cc5eded013ff76235e8ea9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Mar 5 19:23:22 2016 +0100

    - rel 2; x32 build fix

 libseccomp-sandbox.patch | 16 ++++++++--------
 openssh.spec             |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/openssh.spec b/openssh.spec
index 1fcfb0d..3606fde 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -46,7 +46,7 @@ Summary(ru.UTF-8):	OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	7.2p1
-Release:	1
+Release:	2
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
diff --git a/libseccomp-sandbox.patch b/libseccomp-sandbox.patch
index abed09f..e701b2c 100644
--- a/libseccomp-sandbox.patch
+++ b/libseccomp-sandbox.patch
@@ -2,15 +2,15 @@ https://bugzilla.mindrot.org/show_bug.cgi?id=2142
 
 --- a/Makefile.in	
 +++ a/Makefile.in	
-@@ -106,7 +106,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
+@@ -112,7 +112,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passw
+ 	loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
  	sftp-server.o sftp-common.o \
- 	roaming_common.o roaming_serv.o \
  	sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
--	sandbox-seccomp-filter.o sandbox-capsicum.o
-+	sandbox-seccomp-filter.o sandbox-libseccomp-filter.o sandbox-capsicum.o
+-	sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \
++	sandbox-seccomp-filter.o sandbox-libseccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \
+ 	sandbox-solaris.o
  
- MANPAGES	= moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
- MANPAGES_IN	= moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
+ MANPAGES	= moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out ssh-ldap-helper.8.out sshd_config.5.out ssh_config.5.out ssh-ldap.conf.5.out
 --- a/configure.ac	
 +++ a/configure.ac	
 @@ -2867,11 +2867,22 @@ else
@@ -40,8 +40,8 @@ https://bugzilla.mindrot.org/show_bug.cgi?id=2142
  # Decide which sandbox style to use
  sandbox_arg=""
  AC_ARG_WITH([sandbox],
--	[  --with-sandbox=style    Specify privilege separation sandbox (no, darwin, rlimit, systrace, seccomp_filter, capsicum)],
-+	[  --with-sandbox=style    Specify privilege separation sandbox (no, darwin, rlimit, systrace, seccomp_filter, libseccomp_filter, capsicum)],
+-	[  --with-sandbox=style    Specify privilege separation sandbox (no, capsicum, darwin, rlimit, seccomp_filter, systrace, pledge)],
++	[  --with-sandbox=style    Specify privilege separation sandbox (no, capsicum, darwin, rlimit, seccomp_filter, libseccomp_filter, systrace, pledge)],
  	[
  		if test "x$withval" = "xyes" ; then
  			sandbox_arg=""
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/9fdc70ea2d4d1a4454cc5eded013ff76235e8ea9