summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--contrib/redhat/openssh.spec5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b67dfe78f..dc602211d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120100714
2 - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass
3 (line 77) should have been for no_x11_askpass.
4
120100702 520100702
2 - (djm) OpenBSD CVS Sync 6 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2010/06/26 00:57:07 7 - jmc@cvs.openbsd.org 2010/06/26 00:57:07
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index c13cfe60d..a8637d954 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -74,7 +74,7 @@ Release: %{rel}
74%endif 74%endif
75URL: http://www.openssh.com/portable.html 75URL: http://www.openssh.com/portable.html
76Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz 76Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
77%if ! %{skip_x11_askpass} 77%if ! %{no_x11_askpass}
78Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz 78Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
79%endif 79%endif
80License: BSD 80License: BSD
@@ -407,6 +407,9 @@ fi
407%endif 407%endif
408 408
409%changelog 409%changelog
410* Wed Jul 14 2010 Tim Rice <tim@multitalents.net>
411- test for skip_x11_askpass (line 77) should have been for no_x11_askpass
412
410* Mon Jun 2 2003 Damien Miller <djm@mindrot.org> 413* Mon Jun 2 2003 Damien Miller <djm@mindrot.org>
411- Remove noip6 option. This may be controlled at run-time in client config 414- Remove noip6 option. This may be controlled at run-time in client config
412 file using new AddressFamily directive 415 file using new AddressFamily directive