Hmmm. Somehow my submissions are getting messed up - it
must be my mail client. Okay, I'm going to another patch
against lsh-0.1.20/contrib/lsh.spec and we'll see how it
goes. I guess I really need to be sending these patches
against lsh.spec.in - I'll do so in the future. Niels,
hopefully you can make sense of this patch and get it
applied to lsh.spec.in - sorry.
This patch removes the no longer needed Source1: line,
fixes a line that was accidentally broken into two lines,
and fixes a test case in the %preun script.
--- lsh.spec.orig Sat Dec 25 14:21:28 1999
+++ lsh.spec Fri Dec 31 11:04:02 1999
@@ -5,7 +5,6 @@
Copyright: GPL
Group: Application/Internet
Source0: ftp://ftp.lysator.liu.se/pub/security/lsh/%{name}-%{version}.tar.gz
-Source1: lshd.rhlinux.init
BuildRoot: /var/tmp/%{name}-%{version}-root
Prefix: /usr
Packager: Thayne Harbaugh <[EMAIL PROTECTED]>
@@ -46,8 +45,7 @@
install -d -m 0755 $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 0755 contrib/lshd.rhlinux.init \
- $RPM_BUILD_ROOT/etc/rc.d/init.d/lshd
+install -m 0755 contrib/lshd.rhlinux.init $RPM_BUILD_ROOT/etc/rc.d/init.d/lshd
strip $RPM_BUILD_ROOT%{prefix}/bin/lsh
strip $RPM_BUILD_ROOT%{prefix}/bin/lsh_keygen
@@ -67,15 +65,14 @@
if [ ! -e /etc/lsh_host_key -o ! -e /etc/lsh_host_key.pub ]
then
rm -f /etc/lsh_host_key*
- /usr/bin/lsh_keygen -l 8 | /usr/bin/lsh_writekey
-/etc/lsh_host_key
+ /usr/bin/lsh_keygen -l 8 | /usr/bin/lsh_writekey /etc/lsh_host_key
fi
%preun
-if [ "$1" -eq 1 ]
+if [ "$1" -eq 0 ]
then
- chkconfig --del lshd || exit 0
+ chkconfig --del lshd
fi
@@ -92,6 +89,11 @@
%changelog
+
+* Fri Dec 31 1999 Thayne Harbaugh <[EMAIL PROTECTED]>
+- preun used to incorrectly check $1 -eq 1
+- some lines were accidentally broken into two lines
+- removed Source1: line for lshd.rhlinux.init - now contained in contrib dir
* Thu Sep 28 1999 Thayne Harbaugh <[EMAIL PROTECTED]>
- first rpm
On Fri, 31 Dec 1999 07:39:15 Niels M�ller wrote:
> Thayne Harbaugh <[EMAIL PROTECTED]> writes:
>
> > Somehow this line in contrib/lsh.spec was incorrectly broken into two
> > lines.
> >
> > - /usr/bin/lsh_keygen -l 8 | /usr/bin/lsh_writekey
> > -/etc/lsh_host_key
> > + /usr/bin/lsh_keygen -l 8 | /usr/bin/lsh_writekey
>
> I somehow overlooked this mail earlier. I'll check in the fix now.
>
> /Niels
