packages: openssh/openssh-blacklist.diff, openssh/openssh-lpk.patch, openss...

glen glen at pld-linux.org
Tue Aug 24 13:15:07 CEST 2010 

Author: glen                         Date: Tue Aug 24 11:15:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.6p1

---- Files affected:
packages/openssh:
   openssh-blacklist.diff (1.7 -> 1.8) , openssh-lpk.patch (1.4 -> 1.5) , openssh-sigpipe.patch (1.12 -> 1.13) , openssh.spec (1.340 -> 1.341) 

---- Diffs:

================================================================
Index: packages/openssh/openssh-blacklist.diff
diff -u packages/openssh/openssh-blacklist.diff:1.7 packages/openssh/openssh-blacklist.diff:1.8
--- packages/openssh/openssh-blacklist.diff:1.7	Fri Apr 16 08:16:11 2010
+++ packages/openssh/openssh-blacklist.diff	Tue Aug 24 13:15:01 2010
@@ -419,8 +419,8 @@
 +of processing
 +.Xr ssh-keyscan 1
 +output.
---- openssh-4.7p1.orig/auth2-hostbased.c
-+++ openssh-4.7p1/auth2-hostbased.c
+--- openssh-5.6p1/auth2-hostbased.c~	2010-08-24 14:10:03.000000000 +0300
++++ openssh-5.6p1/auth2-hostbased.c	2010-08-24 14:12:10.632553591 +0300
 @@ -40,6 +40,7 @@
  #include "compat.h"
  #include "key.h"
@@ -429,14 +429,9 @@
  #include "auth.h"
  #include "canohost.h"
  #ifdef GSSAPI
-@@ -141,10 +142,24 @@
- hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
-     Key *key)
- {
-+	char *fp;
- 	const char *resolvedname, *ipaddr, *lookup;
- 	HostStatus host_status;
+@@ -147,6 +147,19 @@
  	int len;
+ 	char *fp;
  
 +	if (blacklisted_key(key)) {
 +		fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);

================================================================
Index: packages/openssh/openssh-lpk.patch
diff -u packages/openssh/openssh-lpk.patch:1.4 packages/openssh/openssh-lpk.patch:1.5
--- packages/openssh/openssh-lpk.patch:1.4	Sun Mar 28 21:46:07 2010
+++ packages/openssh/openssh-lpk.patch	Tue Aug 24 13:15:01 2010
@@ -1533,9 +1533,8 @@
 +- CONTACT :
 +  - Eric AUGE <eau at phear.org>
 +  - Andrea Barisani <andrea at inversepath.com>
-diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1.orig/servconf.c openssh-5.1p1+lpk/servconf.c
---- openssh-5.1p1.orig/servconf.c	2008-07-03 20:51:12.000000000 -0700
-+++ openssh-5.1p1+lpk/servconf.c	2008-08-23 15:02:47.000000000 -0700
+--- openssh-5.6p1/servconf.c~	2010-08-24 14:07:30.000000000 +0300
++++ openssh-5.6p1/servconf.c	2010-08-24 14:09:08.999656164 +0300
 @@ -42,6 +42,10 @@
  #include "channels.h"
  #include "groupaccess.h"
@@ -1547,10 +1546,10 @@
  static void add_listen_addr(ServerOptions *, char *, int);
  static void add_one_listen_addr(ServerOptions *, char *, int);
  
-@@ -127,6 +131,25 @@
- 	options->zero_knowledge_password_authentication = -1;
+@@ -136,6 +136,24 @@
  	options->revoked_keys_file = NULL;
  	options->trusted_user_ca_keys = NULL;
+ 	options->authorized_principals_file = NULL;
 +#ifdef WITH_LDAP_PUBKEY
 + 	/* XXX dirty */
 + 	options->lpk.ld = NULL;
@@ -1569,7 +1568,6 @@
 + 	options->lpk.s_timeout.tv_sec = -1;
 + 	options->lpk.flags = FLAG_EMPTY;
 +#endif
-+
  }
  
  void
@@ -1619,10 +1617,10 @@
  } ServerOpCodes;
  
  #define SSHCFG_GLOBAL	0x01	/* allowed in main section of sshd_config */
-@@ -408,6 +463,20 @@
+@@ -459,6 +477,20 @@
  	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
- 	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },
- 	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },
+ 	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
+ 	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_ALL },
 +#ifdef WITH_LDAP_PUBKEY
 +	{ _DEFAULT_LPK_TOKEN, sLdapPublickey, SSHCFG_GLOBAL },
 +	{ _DEFAULT_SRV_TOKEN, sLdapServers, SSHCFG_GLOBAL },
@@ -1639,7 +1637,7 @@
 +#endif
  	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
  	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
- 	{ "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
+ 	{ "permittunnel", sPermitTunnel, SSHCFG_ALL },
 @@ -1294,6 +1363,107 @@
  		while (arg)
  		    arg = strdelim(&cp);

================================================================
Index: packages/openssh/openssh-sigpipe.patch
diff -u packages/openssh/openssh-sigpipe.patch:1.12 packages/openssh/openssh-sigpipe.patch:1.13
--- packages/openssh/openssh-sigpipe.patch:1.12	Mon Mar  8 14:51:46 2010
+++ packages/openssh/openssh-sigpipe.patch	Tue Aug 24 13:15:01 2010
@@ -31,17 +31,17 @@
       -a      Disables forwarding of the authentication agent connection.
  
       -b bind_address
---- openssh-4.0p1/ssh.1.orig	2005-03-09 01:00:06.000000000 +0100
-+++ openssh-4.0p1/ssh.1	2005-03-10 15:10:40.000000000 +0100
-@@ -43,7 +43,7 @@
- .Nd OpenSSH SSH client (remote login program)
+--- openssh-5.6p1/ssh.1~	2010-08-24 14:05:48.000000000 +0300
++++ openssh-5.6p1/ssh.1	2010-08-24 14:06:57.879253682 +0300
+@@ -44,7 +44,7 @@
  .Sh SYNOPSIS
  .Nm ssh
+ .Bk -words
 -.Op Fl 1246AaCfgKkMNnqsTtVvXxYy
 +.Op Fl 1246AaBCfgKkMNnqsTtVvXxYy
  .Op Fl b Ar bind_address
  .Op Fl c Ar cipher_spec
- .Oo Fl D\ \&
+ .Op Fl D Oo Ar bind_address : Oc Ns Ar port
 @@ -425,6 +425,10 @@
  on the local machine as the source address
  of the connection.

================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.340 packages/openssh/openssh.spec:1.341
--- packages/openssh/openssh.spec:1.340	Mon Aug 16 20:55:30 2010
+++ packages/openssh/openssh.spec	Tue Aug 24 13:15:01 2010
@@ -31,13 +31,13 @@
 Summary(ru.UTF-8):	OpenSSH - свободная реализация протокола Secure Shell (SSH)
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
-Version:	5.5p1
-Release:	6
+Version:	5.6p1
+Release:	1
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
 Source0:	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5:	88633408f4cb1eb11ec7e2ec58b519eb
+# Source0-md5:	e6ee52e47c768bf0ec42a232b5d18fb0
 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
@@ -768,6 +768,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.341  2010/08/24 11:15:01  glen
+- up to 5.6p1
+
 Revision 1.340  2010/08/16 18:55:30  baggins
 - rel 6
 - don't sync! just think how long it takes on a fileserver with 3TB storage,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh-blacklist.diff?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh-lpk.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh-sigpipe.patch?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.340&r2=1.341&f=u

More information about the pld-cvs-commit mailing list