OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Aug-2007 19:49:39
Branch: HEAD Handle: 2007083018493900
Modified files:
openpkg-src/openssh openssh.patch openssh.spec
Log:
apply a backported upstream patch (via FreeBSD ports)
Summary:
Revision Changes Path
1.20 +34 -0 openpkg-src/openssh/openssh.patch
1.197 +1 -1 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.patch
============================================================================
$ cvs diff -u -r1.19 -r1.20 openssh.patch
--- openpkg-src/openssh/openssh.patch 10 Mar 2007 08:35:34 -0000 1.19
+++ openpkg-src/openssh/openssh.patch 30 Aug 2007 17:49:39 -0000 1.20
@@ -31,3 +31,37 @@
#define SSH_PORTABLE "p1"
-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE " @l_openpkg_release@"
+
+-----------------------------------------------------------------------------
+
+Bugfix (backported from OpenBSD):
+Move C/R -> kbdint special case to after the defaults have been loaded,
+which makes "ChallengeResponse" default to yes again. This was broken by
+the "Match" changes and not fixed properly subsequently.
+
+Index: servconf.c
+--- servconf.c.orig 2007-08-30 11:50:17 -0300
++++ servconf.c 2007-08-30 11:50:38 -0300
+@@ -1387,8 +1387,4 @@
+ if (bad_options > 0)
+ fatal("%s: terminating, %d bad configuration options",
+ filename, bad_options);
+-
+- /* challenge-response is implemented via keyboard interactive */
+- if (options->challenge_response_authentication == 1)
+- options->kbd_interactive_authentication = 1;
+ }
+Index: sshd.c
+--- sshd.c.orig 2007-08-30 11:50:30 -0300
++++ sshd.c 2007-08-30 11:51:42 -0300
+@@ -1421,6 +1421,10 @@
+ /* Fill in default values for those options not explicitly set. */
+ fill_default_server_options(&options);
+
++ /* challenge-response is implemented via keyboard interactive */
++ if (options.challenge_response_authentication)
++ options.kbd_interactive_authentication = 1;
++
+ /* set default channel AF */
+ channel_set_af(options.address_family);
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.196 -r1.197 openssh.spec
--- openpkg-src/openssh/openssh.spec 3 Aug 2007 08:22:45 -0000 1.196
+++ openpkg-src/openssh/openssh.spec 30 Aug 2007 17:49:39 -0000 1.197
@@ -42,7 +42,7 @@
Group: SSH
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20070803
+Release: 20070830
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
