summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--contrib/redhat/openssh.spec2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c3c93b63..53d89c905 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120091207 120091207
2 - (dtucker) Bug #1160: use pkg-config for opensc config if it's available. 2 - (dtucker) Bug #1160: use pkg-config for opensc config if it's available.
3 Tested by Martin Paljak. 3 Tested by Martin Paljak.
4 - (dtucker) Bug #1677: add conditionals around the source for ssh-askpass.
4 5
520091121 620091121
6 - (tim) [opensshd.init.in] If PidFile is set in sshd_config, use it. 7 - (tim) [opensshd.init.in] If PidFile is set in sshd_config, use it.
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 680906cf3..1bdaf2d93 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -74,7 +74,9 @@ 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}
77Source1: 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
78License: BSD 80License: BSD
79Group: Applications/Internet 81Group: Applications/Internet
80BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot 82BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot