/trunk/debian/lsh-utils.postinst |
---|
File deleted |
/trunk/debian/lsh-server.dirs |
---|
File deleted |
/trunk/debian/lsh-utils.prerm |
---|
File deleted |
/trunk/debian/control |
---|
5,7 → 5,10 |
Uploaders: Stefan Pfetzing <dreamind@dreamind.de>, |
Magnus Holmgren <magnus@kibibyte.se> |
Standards-Version: 3.7.2 |
Build-Depends: cdbs, debhelper (>= 4.1.16), libgmp3-dev, zlib1g-dev | libz-dev, liboop-dev, libxau-dev, texinfo (>= 4.2), guile-1.6 | scsh-0.6, heimdal-dev, libwrap0-dev | libwrap-dev, libpam0g-dev | libpam-dev, libreadline5-dev | libreadline-dev, m4, autotools-dev |
Build-Depends: cdbs, debhelper (>= 4.1.16), dpatch, autotools-dev, |
libgmp3-dev, zlib1g-dev | libz-dev, liboop-dev, libxau-dev, libnettle-dev, |
texinfo (>= 4.2), guile-1.6 | scsh-0.6, heimdal-dev, libwrap0-dev | libwrap-dev, |
libpam0g-dev | libpam-dev, libreadline5-dev | libreadline-dev, m4 |
Package: lsh-utils |
Architecture: any |
12,7 → 15,6 |
Depends: lsh-client, ${shlibs:Depends} |
Recommends: lsh-server |
Suggests: lsh-doc |
Conflicts: nettle-bin (<< 1.12-1), |
Description: Secure Shell v2 (SSH2) protocol utilities |
lsh is GNU GPL'd implementation of the Secure Shell |
protocol version 2 (SSH2). The SSH (Secure SHell) protocol |
49,7 → 51,8 |
Package: lsh-client |
Architecture: any |
Depends: lsh-utils (= ${binary:Version}), ${shlibs:Depends} |
Conflicts: lsh-utils (<< 1.0.2-3) |
Conflicts: lsh-utils (<< 2.0.3-2) |
Replaces: lsh-utils (<< 2.0.3-2) |
Description: Secure Shell v2 (SSH2) protocol client |
lsh is GNU GPL'd implementation of the Secure Shell |
protocol version 2 (SSH2). The SSH (Secure SHell) protocol |
/trunk/debian/lsh-doc.docs |
---|
0,0 → 1,10 |
FAQ |
NEWS |
ChangeLog.1 |
doc/HACKING |
doc/NOTES |
doc/PORTS |
doc/TASKLIST |
doc/TODO |
doc/configuration.txt |
doc/lsh.html |
/trunk/debian/lsh-doc.info |
---|
0,0 → 1,0 |
doc/lsh.info |
/trunk/debian/lsh-doc.manpages |
---|
0,0 → 1,0 |
doc/*.5 |
/trunk/debian/lsh-server.manpages |
---|
0,0 → 1,6 |
debian/mans/lsh-execuv.8 |
debian/mans/lsh-pam-checkpw.8 |
debian/mans/lsh-krb-checkpw.8 |
debian/mans/lsh-server-config.8 |
doc/lshd.8 |
src/sftp/sftp-server.8* |
/trunk/debian/scripts/lshc |
---|
File deleted |
/trunk/debian/patches/20_sftp-server_mansection.dpatch |
---|
0,0 → 1,19 |
#! /bin/sh /usr/share/dpatch/dpatch-run |
## 20_sftp-server_mansection.dpatch by <magnus@proffe.kibibyte.se> |
## |
## All lines beginning with `## DP:' are a description of the patch. |
## DP: Invent manual section 8lsh for lsh's sftp-server |
@DPATCH@ |
diff -urNad trunk~/src/sftp/sftp-server.8 trunk/src/sftp/sftp-server.8 |
--- trunk~/src/sftp/sftp-server.8 2006-05-08 21:11:17.000000000 +0200 |
+++ trunk/src/sftp/sftp-server.8 2007-10-03 20:48:35.000000000 +0200 |
@@ -22,7 +22,7 @@ |
.\" maintainers of the package you received this manual from and make your |
.\" modified versions available to them. |
.\" |
-.TH SFTP-SERVER 8 "NOVEMBER 2004" SFTP-SERVER "Lsh Manuals" |
+.TH SFTP-SERVER 8lsh "NOVEMBER 2004" SFTP-SERVER "Lsh Manuals" |
.SH NAME |
sftp-server - Server for the sftp subsystem |
.SH SYNOPSIS |
Property changes: |
Added: svn:executable |
## -0,0 +1 ## |
+* |
\ No newline at end of property |
Index: trunk/debian/patches/00list |
=================================================================== |
--- trunk/debian/patches/00list (nonexistent) |
+++ trunk/debian/patches/00list (revision 8) |
@@ -0,0 +1,2 @@ |
+20_sftp-server_mansection |
+30_nonettle |
Index: trunk/debian/patches/30_nonettle.dpatch |
=================================================================== |
--- trunk/debian/patches/30_nonettle.dpatch (nonexistent) |
+++ trunk/debian/patches/30_nonettle.dpatch (revision 8) |
@@ -0,0 +1,27 @@ |
+#!/bin/sh |
+## 30_nonettle.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
+## |
+## DP: Link dynamically with libnettle-dev instead of the bundled version |
+ |
+set -e |
+FILES=`find src -name nettle -prune -o -name Makefile.in -print` |
+ |
+dpatch_patch() { |
+ if [ ! -f debian/patched/30_nonettle_orig.tar.gz ]; then |
+ tar -czf debian/patched/30_nonettle_orig.tar.gz $FILES |
+ sed -ri -e '/^LDADD/s%(\.\.?/)*nettle/libnettle\.a%-lnettle%' \ |
+ -e 's%\s*(-[IL]\s*)?(\.\.?/)*\bnettle(/libnettle\.a)?\b%%g' $FILES |
+ mv src/nettle src/nettle-unused |
+ fi |
+} |
+ |
+dpatch_unpatch() { |
+ if [ -f debian/patched/30_nonettle_orig.tar.gz ]; then |
+ mv src/nettle-unused src/nettle |
+ tar -xzf debian/patched/30_nonettle_orig.tar.gz |
+ fi |
+} |
+ |
+DPATCH_LIB_NO_DEFAULT=1 |
+ |
+. /usr/share/dpatch/dpatch.lib.sh |
Index: trunk/debian/changelog |
=================================================================== |
--- trunk/debian/changelog (revision 7) |
+++ trunk/debian/changelog (revision 8) |
@@ -1,7 +1,10 @@ |
-lsh (2.0.3-1) unstable; urgency=low |
+lsh (2.0.4-dfsg-1) unstable; urgency=low |
* New upstream release (Closes: #422199) |
+ - Repackaged without non-free RFC (src/nettle/testsuite/rfc1750.txt) |
+ (Closes: #408490). |
- Drop 01_fix_manpages.dpatch; incorporated upstream. |
+ - Fixes X11 forwarding bug. |
* New co-maintainer added. |
* Rename source package "lsh", as the previously clashing package is |
gone (Closes: #340354). Also, lsh-utils-doc becomes lsh-doc. |
@@ -9,18 +12,25 @@ |
- Drop 02_fix_perms.dpatch. |
- Add some extra cleanup in debian/rules. |
* Increase Standards-Version to 3.7.2. No changes needed. |
- * Fix spelling error lshc and its manpage (Closes: #417426). |
* Put some more docs in the packages: README and ChangeLog is now in all |
packages, AUTHORS in lsh-utils. Update debian/copyright to refer to |
/usr/share/doc/lsh-utils/AUTHORS (Closes: #421108). |
* debian/control: Use ${binary:Version} substitution variable instead of |
${source-version}. |
- * Review Build-depends: Drop patchutils, dpatch (temporarily), |
- comerr-dev (redundant), po-debconf (redundant), xutils (makes no |
- difference); add autotools-dev, scsh-0.6 (as alternative to |
- guile-1.6). |
+ * Review Build-depends: Drop patchutils, comerr-dev (redundant), |
+ po-debconf (redundant), xutils (makes no difference); add |
+ autotools-dev, scsh-0.6 (as alternative to guile-1.6). |
+ * Drop lshc, the deprecated alias for lsh (Closes: #417426). |
+ * 30_nonettle.dpatch: Link dynamically with libnettle-dev instead of |
+ statically with the bundled nettle (Closes: #412138). |
+ * Don't provide sexp-conv; let lsh-client depend on nettle-bin instead. |
+ * Move lsftp and lcp to lsh-client. |
+ * Put sftp-server in /usr/lib/lsh-server and put the manpage in section |
+ 8lsh instead of renaming it (new 20_sftp-server_mansection.dpatch). |
+ * Ship lsh.html in lsh-doc. |
+ * Add doc-base entry. |
- -- Magnus Holmgren <magnus@kibibyte.se> Wed, 03 Oct 2007 17:29:48 +0200 |
+ -- Magnus Holmgren <magnus@kibibyte.se> Wed, 03 Oct 2007 19:06:38 +0200 |
lsh-utils (2.0.2-1.1) unstable; urgency=low |
/trunk/debian/lsh-utils.install |
---|
0,0 → 1,11 |
usr/bin/lsh-authorize |
usr/bin/lsh-decode-key |
usr/bin/lsh-decrypt-key |
usr/bin/lsh-export-key |
usr/bin/lsh-keygen |
usr/bin/lsh-make-seed |
usr/bin/lsh-upgrade |
usr/bin/lsh-upgrade-key |
usr/bin/lsh-writekey |
usr/bin/srp-gen |
usr/bin/ssh-conv |
/trunk/debian/rules |
---|
2,9 → 2,7 |
include /usr/share/cdbs/1/class/autotools.mk |
include /usr/share/cdbs/1/rules/debhelper.mk |
#include /usr/share/cdbs/1/rules/simple-patchsys.mk |
# Currently no patches |
#include /usr/share/cdbs/1/rules/dpatch.mk |
include /usr/share/cdbs/1/rules/dpatch.mk |
# the used configure parameters for ./configure |
DEB_CONFIGURE_EXTRA_FLAGS := --enable-pam --enable-kerberos --enable-srp \ |
13,104 → 11,11 |
--with-zlib --with-tcpwrappers --with-sshd1=/usr/sbin/sshd \ |
--with-x XAUTH_PROGRAM=/usr/bin/xauth |
DEB_INSTALL_CHANGELOGS_ALL := $(DEB_SRCDIR)/ChangeLog |
DEB_INSTALL_DOCS_ALL := $(DEB_SRCDIR)/README |
DEB_INSTALL_CHANGELOGS_ALL := ChangeLog |
DEB_INSTALL_DOCS_ALL := README |
DEB_DH_INSTALL_SOURCEDIR := debian/tmp |
# cdbs options for lsh-client |
DEB_INSTALL_MANPAGES_lsh-client := $(DEB_SRCDIR)/doc/lsh.1 \ |
$(DEB_SRCDIR)/doc/lshg.1 debian/mans/lshc.1 |
DEB_INSTALL_DIRS_lsh-client := usr/bin |
# cdbs options for lsh-server |
DEB_INSTALL_MANPAGES_lsh-server := debian/mans/lsh-execuv.8 \ |
debian/mans/lsh-pam-checkpw.8 \ |
debian/mans/lsh-krb-checkpw.8 \ |
debian/mans/lsh-server-config.8 \ |
$(DEB_SRCDIR)/src/sftp/sftp-server.lsh.8 \ |
$(DEB_SRCDIR)/doc/lshd.8 |
DEB_INSTALL_DIRS_lsh-server := usr/sbin etc/default |
# cdbs options for lsh-utils |
DEB_INSTALL_MANPAGES_lsh-utils := $(DEB_SRCDIR)/src/sftp/lsftp.1 \ |
$(DEB_SRCDIR)/doc/lsh-authorize.1 \ |
$(DEB_SRCDIR)/doc/lsh-decode-key.1 \ |
$(DEB_SRCDIR)/doc/lsh-decrypt-key.1 \ |
$(DEB_SRCDIR)/doc/lsh-export-key.1 \ |
$(DEB_SRCDIR)/doc/lsh-make-seed.1 \ |
$(DEB_SRCDIR)/doc/lsh-upgrade.1 \ |
$(DEB_SRCDIR)/doc/lsh-upgrade-key.1 \ |
$(DEB_SRCDIR)/doc/ssh-conv.1 \ |
$(DEB_SRCDIR)/doc/lsh-keygen.1 \ |
$(DEB_SRCDIR)/doc/lsh-writekey.1 \ |
debian/mans/sexp-conv.lsh-utils.1 \ |
debian/mans/srp-gen.1 \ |
debian/mans/lcp.1 |
DEB_INSTALL_DOCS_lsh-utils := $(DEB_SRCDIR)/AUTHORS |
DEB_INSTALL_DIRS_lsh-utils := usr/bin |
# cdbs options for lsh-doc |
DEB_INSTALL_DOCS_lsh-doc := $(DEB_SRCDIR)/FAQ $(DEB_SRCDIR)/NEWS \ |
$(DEB_SRCDIR)/ChangeLog.1 \ |
$(DEB_SRCDIR)/doc/HACKING $(DEB_SRCDIR)/doc/NOTES \ |
$(DEB_SRCDIR)/doc/PORTS $(DEB_SRCDIR)/doc/TASKLIST \ |
$(DEB_SRCDIR)/doc/TODO $(DEB_SRCDIR)/doc/configuration.txt \ |
$(DEB_SRCDIR)/ChangeLog.1 |
DEB_INSTALL_MANPAGES_lsh-doc := $(DEB_SRCDIR)/doc/DSA.5 \ |
$(DEB_SRCDIR)/doc/SHA.5 \ |
$(DEB_SRCDIR)/doc/SPKI.5 \ |
$(DEB_SRCDIR)/doc/secsh.5 |
DEB_INSTALL_INFO_lsh-doc := $(DEB_SRCDIR)/doc/lsh.info |
reverse-config:: |
# make distclean misses this |
rm -f src/nettle/machine.m4 |
cleanbuilddir:: |
rm -f src/sftp/sftp-server.lsh.8 |
# override the default |
install/lsh-utils:: |
for i in \ |
lsftp \ |
lsh-authorize \ |
lsh-decode-key \ |
lsh-export-key \ |
lsh-keygen \ |
lsh-make-seed \ |
lsh-writekey \ |
srp-gen \ |
ssh-conv \ |
lsh-decrypt-key \ |
lsh-upgrade \ |
lsh-upgrade-key \ |
lcp \ |
; do \ |
mv debian/tmp/usr/bin/$$i debian/lsh-utils/usr/bin/$$i; done |
# Rename sexp-conv so that we can register it with the alternatives system |
mv debian/tmp/usr/bin/sexp-conv \ |
debian/lsh-utils/usr/bin/sexp-conv.lsh-utils |
install/lsh-server:: |
for i in \ |
lsh-execuv \ |
lsh-pam-checkpw \ |
lshd \ |
lsh-krb-checkpw \ |
; do \ |
mv debian/tmp/usr/sbin/$$i debian/lsh-server/usr/sbin/$$i; done |
# sftp-server has a name conflict with the program of the same name in |
# the "ssh" package. Maybe I should talk to the openssh maintainer about |
# using alternatives? |
mv debian/tmp/usr/sbin/sftp-server \ |
debian/lsh-server/usr/sbin/sftp-server.lsh |
cp -a $(DEB_SRCDIR)/src/sftp/sftp-server.8 \ |
$(DEB_SRCDIR)/src/sftp/sftp-server.lsh.8 |
common-install-arch:: |
install -m755 debian/scripts/lsh-server-config \ |
debian/lsh-server/usr/sbin |
install/lsh-client:: |
mv debian/tmp/usr/bin/lsh debian/lsh-client/usr/bin |
mv debian/tmp/usr/bin/lshg debian/lsh-client/usr/bin |
install -m755 debian/scripts/lshc debian/lsh-client/usr/bin |
debian/tmp/usr/sbin |
/trunk/debian/lsh-client.manpages |
---|
0,0 → 1,4 |
debian/mans/lcp.1 |
doc/lsh.1 |
doc/lshg.1 |
src/sftp/lsftp.1 |
/trunk/debian/mans/lshc.1 |
---|
File deleted |
/trunk/debian/mans/lcp.1 |
---|
53,7 → 53,7 |
.Tp |
.B LSFTP_RSH |
The program to use for the SSH tunnel. If the variable is not set, lcp |
defaults to using lshc. |
defaults to using lsh. |
.\" |
.Sh "REPORTING BUGS" |
Report bugs to <bug-lsh@gnu.org>. |
68,5 → 68,5 |
.Br rcp (1), |
.Br scp (1), |
.Br lsftp (1), |
.Br lshc (1), |
.Br lsh (1), |
.Br lshd (8), |
/trunk/debian/lsh-doc.install |
---|
--- trunk/debian/lsh-server.install (nonexistent) |
+++ trunk/debian/lsh-server.install (revision 8) |
@@ -0,0 +1,6 @@ |
+usr/sbin/lshd |
+usr/sbin/lsh-execuv |
+usr/sbin/lsh-krb-checkpw |
+usr/sbin/lsh-pam-checkpw |
+usr/sbin/lsh-server-config |
+usr/sbin/sftp-server usr/lib/lsh-server |
/trunk/debian/lsh-doc.doc-base |
---|
0,0 → 1,13 |
Document: lsh |
Title: LSH documentation |
Author: Niels Möller |
Abstract: This document describes `lsh' and related programs. |
Section: Apps/Net |
Format: HTML |
Index: /usr/share/doc/lsh-doc/lsh.html |
Files: /usr/share/doc/lsh-doc/lsh.html |
Format: Info |
Index: /usr/share/info/lsh.info.gz |
Files: /usr/share/info/lsh.info.gz |
/trunk/debian/lsh-client.install |
---|
0,0 → 1,4 |
usr/bin/lsh |
usr/bin/lshg |
usr/bin/lcp |
usr/bin/lsftp |
/trunk/debian/lsh-utils.docs |
---|
0,0 → 1,0 |
AUTHORS |
/trunk/debian/lsh-server.init.d |
---|
37,7 → 37,7 |
case "$ENABLE_SFTP" in |
true|y*|Y*) |
SFTP_FLAG="--subsystems sftp=/usr/sbin/sftp-server.lsh" |
SFTP_FLAG="--subsystems sftp=/usr/lib/lsh-server/sftp-server" |
;; |
*) |
SFTP_FLAG="" |
/trunk/debian/lsh-utils.manpages |
---|
0,0 → 1,11 |
debian/mans/srp-gen.1 |
doc/lsh-authorize.1 |
doc/lsh-decode-key.1 |
doc/lsh-decrypt-key.1 |
doc/lsh-export-key.1 |
doc/lsh-keygen.1 |
doc/lsh-make-seed.1 |
doc/lsh-upgrade.1 |
doc/lsh-upgrade-key.1 |
doc/lsh-writekey.1 |
doc/ssh-conv.1 |
/trunk/debian/README.Debian |
---|
29,8 → 29,9 |
Some notes about the sftp-server |
-------------------------------- |
The used sftp-server has been renamed to sftp-server.lsh, due to a manpage |
called sftp-server.8.gz already existing in the ssh package. |
The used sftp-server has been placed in /usr/lib/lsh-server, analoguously |
with openssh-server. Our manpage is in the special section 8lsh, to avoid |
conflict with the corresponding manpage in said package. |
Credits |
------- |
38,4 → 39,4 |
This package is based on work by Robert Bihlmeyer <robbe@orcus.priv.at> and |
Timshel Knoll <timshel@debian.org>. |
-- Stefan Pfetzing <dreamind@dreamind.de> Thu, 19 Jan 2006 01:55:21 +0100 |
-- Magnus Holmgren <magnus@kibibyte.se>, Wed, 3 Oct 2007 20:56:36 +0200 |