- updated to 7.3p1, partial PLD merge (patch updates/fixes)

diff --git a/libseccomp-sandbox.patch b/libseccomp-sandbox.patch
index abed09f8d1b4261ba5cfb0529d0e8e424682cec2..e701b2c298cbd8966568405f12c1a24a4bbe9e12 100644 (file)
--- 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=""

diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
index 11969ddfee69599bd61c7bf02b65588926639a47..fccaf42de18a66bc53e12730b70c76f416c6139e 100644 (file)
--- a/openssh-sigpipe.patch
+++ b/openssh-sigpipe.patch
@@ -79,8 +79,8 @@ diff -urN openssh-3.9p1.org/ssh.0 openssh-3.9p1/ssh.0
  
   again:
        while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
--          "ACD:E:F:GI:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
-+          "ABCD:E:F:GI:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
+-          "ACD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
++          "ABCD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
                switch (opt) {
                case '1':
                        options.protocol = SSH_PROTO_1;

diff --git a/openssh.spec b/openssh.spec
index 03723c564ff8e0e31dfe61d2ac31914a5d129b57..3c84d32c2c87ff2cd2cc4e21be6c2dab6fda3975 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -41,13 +41,13 @@ Summary(pt_BR.UTF-8):       Implementação livre do SSH
 Summary(ru.UTF-8):     OpenSSH - свободная реализация протокола Secure Shell (SSH)
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
-Version:       7.2p2
+Version:       7.3p1
 Release:       1
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
-Source0:       ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 13009a9156510d8f27e752659075cced
+Source0:       http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
+# Source0-md5: dfadd9f035d38ce5d58a3bf130b86d08
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 66943d481cc422512b537bcc2c7400d1
 Source2:       %{name}d.init

diff --git a/sshd-keygen b/sshd-keygen
old mode 100644 (file)
new mode 100755 (executable)
index b31c06b..a090614
--- a/sshd-keygen
+++ b/sshd-keygen
@@ -11,7 +11,7 @@ ssh_gen_key() {
 
        /usr/bin/ssh-keygen -t $type -f $keyfile -N '' >&2
        chmod 600 $keyfile
-       [ -x /sbin/restorecon ] && /sbin/restorecon $keyfile
+       [ ! -x /sbin/restorecon ] || /sbin/restorecon $keyfile
 }
 
 # generate new keys with empty passwords if they do not exist