summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-09-16 17:13:45 +1000
committerDamien Miller <djm@mindrot.org>2001-09-16 17:13:45 +1000
commit0b9278e92315f35f1187d66e3267888bdc3c5bff (patch)
tree6bcdbdc0dd9b348a6b45a5493a8f187e3185774a
parent426d6bdc00c297b6e014a86648bffb922daa8b97 (diff)
- (djm) Workaround XFree breakage in RPM spec file
-rw-r--r--ChangeLog5
-rw-r--r--contrib/redhat/openssh.spec6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9cb4f838..4f815ae4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20010916
+ - (djm) Workaround XFree breakage in RPM spec file
+
20010915
- (djm) Make do_pre_login static to avoid prototype #ifdef hell
- (djm) Sync scard/ stuff
@@ -6441,4 +6444,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1520 2001/09/16 07:13:11 djm Exp $
+$Id: ChangeLog,v 1.1521 2001/09/16 07:13:45 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 20e9bf4d..f67174fc 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -153,7 +153,11 @@ make
%if ! %{no_x11_askpass}
pushd x11-ssh-askpass-%{aversion}
-xmkmf -a
+xmkmf
+### Hacks to workaround XFree breakage
+perl -pi -e "s|distclean: |distclean:: |g" Makefile
+make SshAskpass_ad.h
+###
make
popd
%endif