- up to 5.3p1

Changed files:
    openssh-chroot.patch -> 1.11
    openssh-lpk.patch -> 1.2
    openssh.spec -> 1.323

diff --git a/openssh-chroot.patch b/openssh-chroot.patch
index 92af31d037f6ef9b9a17ea55ec2f53e3a6ad20ee..e8f21f74e22983329d6bacd061c5e441fcfc5853 100644 (file)
--- a/openssh-chroot.patch
+++ b/openssh-chroot.patch
@@ -101,9 +101,9 @@
                }
  
 +
- #ifdef HAVE_LOGIN_CAP
-               if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETUSER) < 0) {
-                       perror("unable to set user context (setuser)");
+ #ifdef HAVE_SETPCRED
+               if (setpcred(pw->pw_name, (char **)NULL) == -1)
+                       fatal("Failed to set process credentials");
 --- openssh-3.7.1p2/sshd_config        2003-09-02 14:51:18.000000000 +0200
 +++ openssh-3.7.1p2.pius/sshd_config   2003-10-07 20:49:08.000000000 +0200
 @@ -91,6 +91,10 @@

diff --git a/openssh-lpk.patch b/openssh-lpk.patch
index 2b0f62f9627f1c643b7518e21765e7ac0c0fce9e..62997f8799b0adaa561912fc8616112795c06e7f 100644 (file)
--- a/openssh-lpk.patch
+++ b/openssh-lpk.patch
@@ -1205,12 +1205,12 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/lpk-user-exam
 diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/Makefile.in openssh-5.1p1+lpk/Makefile.in
 --- openssh-5.1p1.orig/Makefile.in     2008-07-08 07:21:12.000000000 -0700
 +++ openssh-5.1p1+lpk/Makefile.in      2008-08-23 15:02:47.000000000 -0700
-@@ -86,7 +86,7 @@
-       auth-krb5.o \
+@@ -88,7 +88,7 @@
        auth2-gss.o gss-serv.o gss-serv-krb5.o \
        loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
--      audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o
-+      audit.o audit-bsm.o platform.o ldapauth.o sftp-server.o sftp-common.o
+       audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
+-      roaming_common.o
++      roaming_common.o ldapauth.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-rand-helper.8.out ssh-keysign.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-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
@@ -1637,7 +1637,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c op
 +      { _DEFAULT_STI_TOKEN, sSearchTimeout, SSHCFG_GLOBAL },
 +      { _DEFAULT_LDP_TOKEN, sLdapConf, SSHCFG_GLOBAL },
 +#endif
-       { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL },
+       { "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
        { "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
        { "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
 @@ -1294,6 +1363,107 @@

diff --git a/openssh.spec b/openssh.spec
index 90d206091bf5c6abf677f7704bcec663786e3518..cf5bd8e8577ac763f220047977e609d4dc333805 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -21,13 +21,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:       5.2p1
-Release:       6
+Version:       5.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: ada79c7328a8551bdf55c95e631e7dad
+# Source0-md5: 13563dbf61f36ca9a1e4254260131041
 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