- (djm) Pick up Jim's new X11-askpass

 - (djm) Release 2.2.0p1

diff --git a/ChangeLog b/ChangeLog
index 902e9ee5f8cf0f3c3b216b1274a3d7d3f0d049d0..15b1b9486e7a6fa350658dd6a32c566a4379af54 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20000901
+ - (djm) Pick up Jim's new X11-askpass
+ - (djm) Release 2.2.0p1
+
 20000831
  - (djm) Workaround SIGPIPE problems on SCO. Fix from Aran Cox 
    <acox@cv.telegroup.com>

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 89bdcbcd22c45ad590e3c6d8291f6651c14f000e..3df33d1a8a569231b1df63fdbce255634f60a6df 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -2,7 +2,7 @@
 %define oversion 2.2.0p1
 
 # Version of ssh-askpass
-%define aversion 1.0
+%define aversion 1.0.1
 
 # Do we want to disable building of x11-askpass? (1=yes 0=no)
 %define no_x11_askpass 0
@@ -17,7 +17,7 @@ Release: 1
 Packager: Damien Miller <djm@mindrot.org>
 URL: http://www.openssh.com/
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{oversion}.tar.gz
-Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
+Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz 
 Copyright: BSD
 Group: Applications/Internet
 BuildRoot: /tmp/openssh-%{version}-buildroot

diff --git a/next-posix.c b/next-posix.c
index 7bb34ef0090d48ca3c6b6a99adce39061d54a3dc..de7723e977cf7d824af0618f7f41cdf042293f19 100644 (file)
--- a/next-posix.c
+++ b/next-posix.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "includes.h"
 
 #ifdef HAVE_NEXT
 #include <errno.h>