summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-09-01 14:14:37 +1100
committerDamien Miller <djm@mindrot.org>2000-09-01 14:14:37 +1100
commit50f14f87478f3b9a22e9c91a29b9be6df8e5be3b (patch)
tree56c629be2a258828bf9e824657ea4af4be27522d
parentefcd54a51d59aa7f5a0a1688dbfc421372257c69 (diff)
- (djm) Pick up Jim's new X11-askpass
- (djm) Release 2.2.0p1
-rw-r--r--ChangeLog4
-rw-r--r--contrib/redhat/openssh.spec4
-rw-r--r--next-posix.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 902e9ee5..15b1b948 100644
--- 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 89bdcbcd..3df33d1a 100644
--- 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 7bb34ef0..de7723e9 100644
--- a/next-posix.c
+++ b/next-posix.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "includes.h"
#ifdef HAVE_NEXT
#include <errno.h>