From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 18 May 2009 16:00:46 +0000 (+0000)
Subject: - update from source url (http://people.debian.org/~cjwatson/openssh-blacklist.diff)
X-Git-Tag: auto/th/openssh-5_2p1-2~4
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fopenssh.git;a=commitdiff_plain;h=a3aa7ff47bd06497b11ba0a73e4b19ab2de929a5

- update from source url (http://people.debian.org/~cjwatson/openssh-blacklist.diff)

Changed files:
    openssh-blacklist.diff -> 1.4
---

diff --git a/openssh-blacklist.diff b/openssh-blacklist.diff
index c162ebf..ba10d94 100644
--- a/openssh-blacklist.diff
+++ b/openssh-blacklist.diff
@@ -90,7 +90,7 @@ This patch is up to date with respect to Debian openssh 1:4.7p1-10.
  	{ "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
  	{ "strictmodes", sStrictModes, SSHCFG_GLOBAL },
 +	{ "permitblacklistedkeys", sPermitBlacklistedKeys, SSHCFG_GLOBAL },
- 	{ "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL },
+ 	{ "permitemptypasswords", sEmptyPasswd, SSHCFG_GLOBAL },
  	{ "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL },
  	{ "uselogin", sUseLogin, SSHCFG_GLOBAL },
 @@ -943,6 +947,10 @@
@@ -111,9 +111,9 @@ This patch is up to date with respect to Debian openssh 1:4.7p1-10.
  	int     kbd_interactive_authentication;	/* If true, permit */
  	int     challenge_response_authentication;
 +	int     permit_blacklisted_keys;	/* If true, permit */
- 	int     zero_knowledge_password_authentication;
- 					/* If true, permit jpake auth */
  	int     permit_empty_passwd;	/* If false, do not permit empty
+ 					 * passwords. */
+ 	int     permit_user_env;	/* If true, read ~/.ssh/environment */
 --- openssh-4.7p1.orig/Makefile.in
 +++ openssh-4.7p1/Makefile.in
 @@ -60,7 +60,7 @@
@@ -127,12 +127,12 @@ This patch is up to date with respect to Debian openssh 1:4.7p1-10.
  	canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
 @@ -88,8 +88,8 @@
  	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
  
--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
-+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 ssh-vulnkey.1.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 ssh-vulnkey.1
+-MANPAGES	= 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	= 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
++MANPAGES	= 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 ssh-vulnkey.1.out sshd_config.5.out ssh_config.5.out
++MANPAGES_IN	= 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 ssh-vulnkey.1 sshd_config.5 ssh_config.5
  MANTYPE		= @MANTYPE@
  
  CONFIGFILES=sshd_config.out ssh_config.out moduli.out