summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-09-28 20:03:25 +1000
committerDamien Miller <djm@mindrot.org>2001-09-28 20:03:25 +1000
commitbccb5a933800d9c37ff7ce2865b14950da5cb5e9 (patch)
tree5d2beef6005bd4ce8f2567bf301d839d5816174d
parent3ff36d6ce250f74e7bf73b3fb6ef65fdb6f65b86 (diff)
- (djm) Update spec files for new x11-askpass
-rw-r--r--ChangeLog3
-rw-r--r--contrib/caldera/openssh.spec4
-rw-r--r--contrib/redhat/openssh.spec2
3 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0cf72829b..52cd397df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
4 [scard.c] 4 [scard.c]
5 Fix segv when smartcard communication error occurs during key load. 5 Fix segv when smartcard communication error occurs during key load.
6 ok markus@ 6 ok markus@
7 - (djm) Update spec files for new x11-askpass
7 8
820010927 920010927
9 - (stevesk) session.c: declare do_pre_login() before use 10 - (stevesk) session.c: declare do_pre_login() before use
@@ -6580,4 +6581,4 @@
6580 - Wrote replacements for strlcpy and mkdtemp 6581 - Wrote replacements for strlcpy and mkdtemp
6581 - Released 1.0pre1 6582 - Released 1.0pre1
6582 6583
6583$Id: ChangeLog,v 1.1565 2001/09/28 09:51:54 djm Exp $ 6584$Id: ChangeLog,v 1.1566 2001/09/28 10:03:25 djm Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 0ae1eb922..ec48759f0 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -1,4 +1,4 @@
1%define askpass 1.2.2 1%define askpass 1.2.4.1
2 2
3Name : openssh 3Name : openssh
4Version : 2.9.9p1 4Version : 2.9.9p1
@@ -310,4 +310,4 @@ fi
310* Mon Jan 01 1998 ... 310* Mon Jan 01 1998 ...
311Template Version: 1.31 311Template Version: 1.31
312 312
313$Id: openssh.spec,v 1.19 2001/09/24 23:15:15 mouring Exp $ 313$Id: openssh.spec,v 1.20 2001/09/28 10:03:26 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index c5c377fb8..781da5e45 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -2,7 +2,7 @@
2%define oversion 2.9.9p1 2%define oversion 2.9.9p1
3 3
4# Version of ssh-askpass 4# Version of ssh-askpass
5%define aversion 1.2.4 5%define aversion 1.2.4.1
6 6
7# Do we want to disable building of x11-askpass? (1=yes 0=no) 7# Do we want to disable building of x11-askpass? (1=yes 0=no)
8%define no_x11_askpass 0 8%define no_x11_askpass 0