Author: arekm Date: Mon Mar 8 13:51:52 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 5.4 partial update
---- Files affected:
packages/openssh:
openssh-chroot.patch (1.11 -> 1.12) , openssh-config.patch (1.8 -> 1.9) ,
openssh-lpk.patch (1.2 -> 1.3) , openssh-sigpipe.patch (1.11 -> 1.12) ,
openssh.spec (1.326 -> 1.327)
---- Diffs:
================================================================
Index: packages/openssh/openssh-chroot.patch
diff -u packages/openssh/openssh-chroot.patch:1.11
packages/openssh/openssh-chroot.patch:1.12
--- packages/openssh/openssh-chroot.patch:1.11 Fri Oct 2 13:15:33 2009
+++ packages/openssh/openssh-chroot.patch Mon Mar 8 14:51:46 2010
@@ -101,9 +101,9 @@
}
+
- #ifdef HAVE_SETPCRED
- if (setpcred(pw->pw_name, (char **)NULL) == -1)
- fatal("Failed to set process credentials");
+ #ifdef HAVE_LOGIN_CAP
+ if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETUSER) < 0) {
+ perror("unable to set user context (setuser)");
--- 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 @@
================================================================
Index: packages/openssh/openssh-config.patch
diff -u packages/openssh/openssh-config.patch:1.8
packages/openssh/openssh-config.patch:1.9
--- packages/openssh/openssh-config.patch:1.8 Mon May 18 16:59:54 2009
+++ packages/openssh/openssh-config.patch Mon Mar 8 14:51:46 2010
@@ -75,9 +75,9 @@
# CheckHostIP yes
# AddressFamily any
@@ -42,3 +45,19 @@
- # TunnelDevice any:any
# PermitLocalCommand no
# VisualHostKey no
+ # ProxyCommand ssh -q -W %h:%p gateway.example.com
+
+Host *
+ GSSAPIAuthentication yes
================================================================
Index: packages/openssh/openssh-lpk.patch
diff -u packages/openssh/openssh-lpk.patch:1.2
packages/openssh/openssh-lpk.patch:1.3
--- packages/openssh/openssh-lpk.patch:1.2 Fri Oct 2 13:15:33 2009
+++ packages/openssh/openssh-lpk.patch Mon Mar 8 14:51:46 2010
@@ -1205,15 +1205,15 @@
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
-@@ -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 \
-- roaming_common.o
-+ roaming_common.o ldapauth.o
+@@ -78,7 +78,7 @@
- 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
+ SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
+ sshconnect.o sshconnect1.o sshconnect2.o mux.o \
+- roaming_common.o roaming_client.o
++ roaming_common.o roaming_client.o ldapauth.o
+
+ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
+ sshpty.o sshlogin.o servconf.o serverloop.o \
diff -Nuar --exclude '*.orig' --exclude '*.rej'
openssh-5.1p1.orig/openssh-lpk_openldap.schema
openssh-5.1p1+lpk/openssh-lpk_openldap.schema
--- openssh-5.1p1.orig/openssh-lpk_openldap.schema 1969-12-31
16:00:00.000000000 -0800
+++ openssh-5.1p1+lpk/openssh-lpk_openldap.schema 2008-08-23
15:02:47.000000000 -0700
@@ -1548,9 +1548,9 @@
static void add_one_listen_addr(ServerOptions *, char *, int);
@@ -127,6 +131,25 @@
- options->adm_forced_command = NULL;
- options->chroot_directory = NULL;
options->zero_knowledge_password_authentication = -1;
+ options->revoked_keys_file = NULL;
+ options->trusted_user_ca_keys = NULL;
+#ifdef WITH_LDAP_PUBKEY
+ /* XXX dirty */
+ options->lpk.ld = NULL;
================================================================
Index: packages/openssh/openssh-sigpipe.patch
diff -u packages/openssh/openssh-sigpipe.patch:1.11
packages/openssh/openssh-sigpipe.patch:1.12
--- packages/openssh/openssh-sigpipe.patch:1.11 Mon Feb 23 22:11:03 2009
+++ packages/openssh/openssh-sigpipe.patch Mon Mar 8 14:51:46 2010
@@ -78,8 +78,8 @@
again:
while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
-- "ACD:F:I:KL:MNO:PR:S:TVw:XYy")) != -1) {
-+ "ABCD:F:I:KL:MNO:PR:S:TVw:XYy")) != -1) {
+- "ACD:F:I:KL:MNO:PR:S:TVw:W:XYy")) != -1) {
++ "ABCD:F:I:KL:MNO:PR:S:TVw:W:XYy")) != -1) {
switch (opt) {
case '1':
options.protocol = SSH_PROTO_1;
================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.326 packages/openssh/openssh.spec:1.327
--- packages/openssh/openssh.spec:1.326 Sat Dec 26 04:15:31 2009
+++ packages/openssh/openssh.spec Mon Mar 8 14:51:46 2010
@@ -22,13 +22,13 @@
Summary(ru.UTF-8): OpenSSH - свободная реализация протокола Secure Shell
(SSH)
Summary(uk.UTF-8): OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
Name: openssh
-Version: 5.3p1
-Release: 2
+Version: 5.4p1
+Release: 1
Epoch: 2
License: BSD
Group: Applications/Networking
Source0:
ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 13563dbf61f36ca9a1e4254260131041
+# Source0-md5: da10af8a789fa2e83e3635f3a1b76f5e
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
@@ -689,6 +689,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.327 2010/03/08 13:51:46 arekm
+- 5.4 partial update
+
Revision 1.326 2009/12/26 03:15:31 glen
- "fix" v2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh-chroot.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh-config.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh-lpk.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh-sigpipe.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.326&r2=1.327&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
