diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | contrib/caldera/openssh.spec | 10 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20110119 | ||
2 | - (tim) [contrib/caldera/openssh.spec] Use CFLAGS from Makefile instead | ||
3 | of RPM so build completes. Signatures were changed to .asc since 4.1p1. | ||
4 | |||
1 | 20110117 | 5 | 20110117 |
2 | - (djm) [regress/Makefile] use $TEST_SSH_KEYGEN instead of the one in | 6 | - (djm) [regress/Makefile] use $TEST_SSH_KEYGEN instead of the one in |
3 | $PATH, fix cleanup of droppings; reported by openssh AT | 7 | $PATH, fix cleanup of droppings; reported by openssh AT |
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 515fe334d..b76e6fd73 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -57,7 +57,7 @@ BuildRequires : XFree86-imake | |||
57 | # %{use_stable}==0: :pserver:cvs@bass.directhit.com:/cvs/openssh_cvs | 57 | # %{use_stable}==0: :pserver:cvs@bass.directhit.com:/cvs/openssh_cvs |
58 | Source0: see-above:/.../openssh-%{version}.tar.gz | 58 | Source0: see-above:/.../openssh-%{version}.tar.gz |
59 | %if %{use_stable} | 59 | %if %{use_stable} |
60 | Source1: see-above:/.../openssh-%{version}.tar.gz.sig | 60 | Source1: see-above:/.../openssh-%{version}.tar.gz.asc |
61 | %endif | 61 | %endif |
62 | Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz | 62 | Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz |
63 | Source3: http://www.openssh.com/faq.html | 63 | Source3: http://www.openssh.com/faq.html |
@@ -182,7 +182,7 @@ CFLAGS="$RPM_OPT_FLAGS" \ | |||
182 | --with-privsep-path=%{_var}/empty/sshd \ | 182 | --with-privsep-path=%{_var}/empty/sshd \ |
183 | #leave this line for easy edits. | 183 | #leave this line for easy edits. |
184 | 184 | ||
185 | %__make CFLAGS="$RPM_OPT_FLAGS" | 185 | %__make |
186 | 186 | ||
187 | cd %{askpass} | 187 | cd %{askpass} |
188 | %configure \ | 188 | %configure \ |
@@ -356,7 +356,11 @@ fi | |||
356 | 356 | ||
357 | 357 | ||
358 | %ChangeLog | 358 | %ChangeLog |
359 | * Tue Jan 18 2011 Tim Rice <tim@multitalents.net> | ||
360 | - Use CFLAGS from Makefile instead of RPM so build completes. | ||
361 | - Signatures were changed to .asc since 4.1p1. | ||
362 | |||
359 | * Mon Jan 01 1998 ... | 363 | * Mon Jan 01 1998 ... |
360 | Template Version: 1.31 | 364 | Template Version: 1.31 |
361 | 365 | ||
362 | $Id: openssh.spec,v 1.71 2010/08/08 16:32:09 djm Exp $ | 366 | $Id: openssh.spec,v 1.72 2011/01/19 04:47:07 tim Exp $ |