- updated to 2.1

- updated info patch
- removed obsolete shared-nettle patch

diff --git a/lsh-info.patch b/lsh-info.patch
index 6b8ea881d893f2a01e81704fca2da086a5c232ce..1eae305181c1b1ea16fb810528ff98ab662f2d71 100644 (file)
--- a/lsh-info.patch
+++ b/lsh-info.patch
@@ -12,17 +12,3 @@
  @end direntry
  
  @set UPDATED-FOR 1.3.4
---- lsh-1.3.7/src/nettle/nettle.texinfo~       Tue May 14 23:54:56 2002
-+++ lsh-1.3.7/src/nettle/nettle.texinfo        Tue May 14 23:54:56 2002
-@@ -8,9 +8,9 @@
- @footnotestyle end
- @syncodeindex fn cp
- 
--@dircategory GNU Libraries
-+@dircategory Libraries:
- @direntry
--* Nettle: (nettle).           A low-level cryptographics library.
-+* Nettle: (nettle).                   A low-level cryptographics library
- @end direntry
- 
- @set UPDATED-FOR 1.5

diff --git a/lsh-shared-nettle.patch b/lsh-shared-nettle.patch
deleted file mode 100644 (file)
index 50ef463..0000000
--- a/lsh-shared-nettle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- lsh-1.5.1/src/Makefile.am.orig     Wed Feb 19 08:59:27 2003
-+++ lsh-1.5.1/src/Makefile.am  Fri Apr  4 22:26:19 2003
-@@ -1,6 +1,6 @@
- # Process this file with automake to produce Makefile.in
- 
--SUBDIRS = argp rsync nettle scm sftp spki . testsuite
-+SUBDIRS = argp rsync scm sftp spki . testsuite
- 
- include .dist_classes
- include .dist_headers
-@@ -184,7 +184,7 @@
- #       $(PERL) $(top_srcdir)/misc/mk-reverse-table ssh.h >$@T
- #       if test -s $@T ; then mv -f $@T $@ ; else touch $@ ; fi
- 
--LDADD = liblsh.a spki/libspki.a nettle/libnettle.a @LIBARGP@
-+LDADD = liblsh.a spki/libspki.a -lnettle @LIBARGP@
- 
- # lshg needs ssh_format, which need bignum functions from nettle.
- # lshg_LDADD = liblsh.a @LIBARGP@
---- lsh-1.5.4/src/spki/tools/Makefile.am.orig  Mon Feb 17 08:59:43 2003
-+++ lsh-1.5.4/src/spki/tools/Makefile.am       Fri Apr  4 22:29:48 2003
-@@ -2,13 +2,13 @@
- 
- # FIXME: Create a link to nettle directory instead?
--AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/.. -I../../nettle
--AM_LDFLAGS = -L.. -L../../nettle/
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/..
-+AM_LDFLAGS = -L..
- 
- # libnettle.a and libspki.a are added at the end to make sure all
- # programs depend on it. It seems there's no DEPENDENCIES variable
- # that affects all programs.
- 
- LDADD = misc.o getopt.o getopt1.o \
--      -lspki -lnettle ../libspki.a ../../nettle/libnettle.a
-+      -lspki -lnettle ../libspki.a -lnettle
- 
- EXTRA_DIST = misc.c misc.h getopt.h getopt.c getopt1.c
---- lsh-1.5.1/src/testsuite/Makefile.am.orig   Tue Feb 25 22:40:42 2003
-+++ lsh-1.5.1/src/testsuite/Makefile.am        Fri Apr  4 22:42:16 2003
-@@ -23,7 +23,7 @@
- # Workaround to get automake to keep dependencies for testutils.o
- EXTRA_PROGRAMS = testutils
- 
--LDADD = testutils.o ../liblsh.a ../spki/libspki.a ../nettle/libnettle.a \
-+LDADD = testutils.o ../liblsh.a ../spki/libspki.a -lnettle \
-       $(DOTDOT_LIBARGP)
- 
- include .dist_rapid7
-@@ -48,6 +48,6 @@
- 
- # sexp-conv may be dynamically linked
- check: $(TS_ALL)
--      LD_LIBRARY_PATH="`pwd`/../nettle/.lib" srcdir=$(srcdir) \
-+      srcdir=$(srcdir) \
-               $(srcdir)/run-tests $(TS_ALL)
- 

diff --git a/lsh.spec b/lsh.spec
index ef228f997b3be9596a849dd3ed70b5b0c5025da0..57a1b2c3b5d502bc3e7ee344935110d094690a46 100644 (file)
--- a/lsh.spec
+++ b/lsh.spec
@@ -5,27 +5,32 @@
 Summary:       GNU implementation of the Secure Shell protocols
 Summary(pl.UTF-8):     Implementacja GNU bezpiecznego shella
 Name:          lsh
-Version:       2.0.4
+Version:       2.1
 Release:       1
-License:       GPL
+License:       GPL v2+
 Group:         Networking/Daemons
-Source0:       ftp://ftp.lysator.liu.se/pub/security/lsh/%{name}-%{version}.tar.gz
-# Source0-md5: 621f4442332bb772b92d397d17ccaf02
+Source0:       http://www.lysator.liu.se/~nisse/archive/%{name}-%{version}.tar.gz
+# Source0-md5: cde8e1306b1c544909e1e9ecb86e6402
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5: 164cdde8060577b54954c3f9f067927e
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-shared-nettle.patch
 URL:           http://www.lysator.liu.se/~nisse/lsh/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.52
 BuildRequires: automake
-BuildRequires: gmp-devel
+BuildRequires: gmp-devel >= 3.1
+BuildRequires: groff
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: liboop-devel
+BuildRequires: libwrap-devel
+BuildRequires: m4
 BuildRequires: nettle-devel >= 1.14
 BuildRequires: pam-devel
-BuildRequires: slib
 BuildRequires: texinfo
+BuildRequires: xorg-lib-libXau-devel
 BuildRequires: zlib-devel
+# only for maintainer mode
+#BuildRequires:        guile
+#BuildRequires:        slib
 Requires:      nettle >= 1.14
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -52,7 +57,6 @@ należy zainstalować odpowiedniego demona (openssh-server lub SSH.COM
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 cd src/spki
@@ -64,8 +68,10 @@ cd ../..
 %{__autoconf}
 %{__automake}
 %configure \
+       XAUTH_PROGRAM=/usr/bin/xauth \
        %{!?with_kerberos5:--disable-kerberos} \
        --with-sshd1=%{_sbindir}/sshd \
+       --with-tcpwrappers \
        --with-zlib
 
 %{__make}
@@ -79,25 +85,63 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,logrotate.d},/var/spool/l
 
 install -d $RPM_BUILD_ROOT%{_mandir}
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{README.lsh-man-pages,diff.*}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p      /sbin/postshell
+%post  -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun        -p      /sbin/postshell
+%postun        -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README
-%doc doc/{HACKING,NOTES,PORTS,TASKLIST,TODO,*.txt}
+%doc ANNOUNCE AUTHORS ChangeLog* FAQ NEWS README doc/{HACKING,NOTES,PORTS,TASKLIST,TODO,*.txt}
 #%attr(754,root,root) /etc/rc.d/init.d/*
 #%attr(640,root,root) /etc/sysconfig/*
 #%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/*
-%dir %attr(6750,root,root) /var/spool/lsh
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
+%attr(6750,root,root) %dir /var/spool/lsh
+%attr(755,root,root) %{_bindir}/lcp
+%attr(755,root,root) %{_bindir}/lsftp
+%attr(755,root,root) %{_bindir}/lsh
+%attr(755,root,root) %{_bindir}/lsh-authorize
+%attr(755,root,root) %{_bindir}/lsh-decode-key
+%attr(755,root,root) %{_bindir}/lsh-decrypt-key
+%attr(755,root,root) %{_bindir}/lsh-export-key
+%attr(755,root,root) %{_bindir}/lsh-keygen
+%attr(755,root,root) %{_bindir}/lsh-make-seed
+%attr(755,root,root) %{_bindir}/lsh-upgrade
+%attr(755,root,root) %{_bindir}/lsh-upgrade-key
+%attr(755,root,root) %{_bindir}/lsh-writekey
+%attr(755,root,root) %{_bindir}/lshg
+%attr(755,root,root) %{_bindir}/srp-gen
+%attr(755,root,root) %{_bindir}/ssh-conv
+%attr(755,root,root) %{_sbindir}/lsh-execuv
+%{?with_kerberos5:%attr(755,root,root) %{_sbindir}/lsh-krb-checkpw}
+%attr(755,root,root) %{_sbindir}/lsh-pam-checkpw
+%attr(755,root,root) %{_sbindir}/lshd
+%attr(755,root,root) %{_sbindir}/sftp-server
 %{_infodir}/lsh.info*
-%{_mandir}/man[158]/*
+%{_mandir}/man1/lsftp.1*
+%{_mandir}/man1/lsh.1*
+%{_mandir}/man1/lsh-authorize.1*
+%{_mandir}/man1/lsh-decode-key.1*
+%{_mandir}/man1/lsh-decrypt-key.1*
+%{_mandir}/man1/lsh-export-key.1*
+%{_mandir}/man1/lsh-keygen.1*
+%{_mandir}/man1/lsh-make-seed.1*
+%{_mandir}/man1/lsh-upgrade.1*
+%{_mandir}/man1/lsh-upgrade-key.1*
+%{_mandir}/man1/lsh-writekey.1*
+%{_mandir}/man1/lshg.1*
+%{_mandir}/man1/sexp-conv.1*
+%{_mandir}/man1/srp-gen.1*
+%{_mandir}/man1/ssh-conv.1*
+%{_mandir}/man5/DSA.5*
+%{_mandir}/man5/SHA.5*
+%{_mandir}/man5/SPKI.5*
+%{_mandir}/man5/secsh.5*
+%{_mandir}/man8/lshd.8*
+%{_mandir}/man8/sftp-server.8*