/trunk/debian/lsh-server.manpages |
---|
File deleted |
/trunk/debian/lsh-utils.docs |
---|
File deleted |
/trunk/debian/lsh-doc.doc-base |
---|
File deleted |
/trunk/debian/lsh-server.install |
---|
File deleted |
/trunk/debian/lsh-utils.manpages |
---|
File deleted |
/trunk/debian/lsh-doc.docs |
---|
File deleted |
/trunk/debian/patches/00list |
---|
File deleted |
/trunk/debian/patches/30_nonettle.dpatch |
---|
File deleted |
/trunk/debian/patches/20_sftp-server_mansection.dpatch |
---|
File deleted |
Property changes: |
Deleted: svn:executable |
## -1 +0,0 ## |
-* |
\ No newline at end of property |
Index: lsh-doc.manpages |
=================================================================== |
--- lsh-doc.manpages (revision 8) |
+++ lsh-doc.manpages (nonexistent) |
@@ -1 +0,0 @@ |
-doc/*.5 |
Index: lsh-doc.info |
=================================================================== |
--- lsh-doc.info (revision 8) |
+++ lsh-doc.info (nonexistent) |
@@ -1 +0,0 @@ |
-doc/lsh.info |
Index: lsh-client.manpages |
=================================================================== |
--- lsh-client.manpages (revision 8) |
+++ lsh-client.manpages (nonexistent) |
@@ -1,4 +0,0 @@ |
-debian/mans/lcp.1 |
-doc/lsh.1 |
-doc/lshg.1 |
-src/sftp/lsftp.1 |
Index: lsh-client.install |
=================================================================== |
--- lsh-client.install (revision 8) |
+++ lsh-client.install (nonexistent) |
@@ -1,4 +0,0 @@ |
-usr/bin/lsh |
-usr/bin/lshg |
-usr/bin/lcp |
-usr/bin/lsftp |
Index: lsh-utils.install |
=================================================================== |
--- lsh-utils.install (revision 8) |
+++ lsh-utils.install (nonexistent) |
@@ -1,11 +0,0 @@ |
-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 |
Index: changelog |
=================================================================== |
--- changelog (revision 8) |
+++ changelog (revision 7) |
@@ -1,10 +1,7 @@ |
-lsh (2.0.4-dfsg-1) unstable; urgency=low |
+lsh (2.0.3-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. |
@@ -12,25 +9,18 @@ |
- 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, 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. |
+ * 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). |
- -- Magnus Holmgren <magnus@kibibyte.se> Wed, 03 Oct 2007 19:06:38 +0200 |
+ -- Magnus Holmgren <magnus@kibibyte.se> Wed, 03 Oct 2007 17:29:48 +0200 |
lsh-utils (2.0.2-1.1) unstable; urgency=low |
/trunk/debian/rules |
---|
2,7 → 2,9 |
include /usr/share/cdbs/1/class/autotools.mk |
include /usr/share/cdbs/1/rules/debhelper.mk |
include /usr/share/cdbs/1/rules/dpatch.mk |
#include /usr/share/cdbs/1/rules/simple-patchsys.mk |
# Currently no patches |
#include /usr/share/cdbs/1/rules/dpatch.mk |
# the used configure parameters for ./configure |
DEB_CONFIGURE_EXTRA_FLAGS := --enable-pam --enable-kerberos --enable-srp \ |
11,11 → 13,104 |
--with-zlib --with-tcpwrappers --with-sshd1=/usr/sbin/sshd \ |
--with-x XAUTH_PROGRAM=/usr/bin/xauth |
DEB_INSTALL_CHANGELOGS_ALL := ChangeLog |
DEB_INSTALL_DOCS_ALL := README |
DEB_DH_INSTALL_SOURCEDIR := debian/tmp |
DEB_INSTALL_CHANGELOGS_ALL := $(DEB_SRCDIR)/ChangeLog |
DEB_INSTALL_DOCS_ALL := $(DEB_SRCDIR)/README |
# 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 |
common-install-arch:: |
# 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 |
install -m755 debian/scripts/lsh-server-config \ |
debian/tmp/usr/sbin |
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 |
/trunk/debian/control |
---|
5,10 → 5,7 |
Uploaders: Stefan Pfetzing <dreamind@dreamind.de>, |
Magnus Holmgren <magnus@kibibyte.se> |
Standards-Version: 3.7.2 |
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 |
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 |
Package: lsh-utils |
Architecture: any |
15,6 → 12,7 |
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 |
51,8 → 49,7 |
Package: lsh-client |
Architecture: any |
Depends: lsh-utils (= ${binary:Version}), ${shlibs:Depends} |
Conflicts: lsh-utils (<< 2.0.3-2) |
Replaces: lsh-utils (<< 2.0.3-2) |
Conflicts: lsh-utils (<< 1.0.2-3) |
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/scripts/lshc |
---|
0,0 → 1,16 |
#!/bin/sh |
cat << EOF >&2 |
/---------------------------------------------------------------------------\\ |
| WARNING: lshc is deprecated | |
| | |
| The lsh-client binary has been renamed to 'lsh' as its the default with | |
| the upstream source. Please switch to using lsh instead of lshc. | |
| | |
| See /usr/share/doc/lsh-client/NEWS.Debian.gz | |
| | |
| Executing lsh now. | |
\\---------------------------------------------------------------------------/ |
EOF |
exec lsh $@ |
/trunk/debian/lsh-server.dirs |
---|
0,0 → 1,3 |
etc/default |
usr/sbin |
usr/share/lintian/overrides |
/trunk/debian/mans/lshc.1 |
---|
0,0 → 1,29 |
.\" Hey, EMACS: -*- nroff -*- |
.\" First parameter, NAME, should be all caps |
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection |
.\" other parameters are allowed: see man(7), man(1) |
.TH LSHC 1 "Nov 15, 2005" lshc "lsh manuals" |
.\" Please adjust this date whenever revising the manpage. |
.\" |
.\" Some roff macros, for reference: |
.\" .nh disable hyphenation |
.\" .hy enable hyphenation |
.\" .ad l left justify |
.\" .ad b justify to both left and right margins |
.\" .nf disable filling |
.\" .fi enable filling |
.\" .br insert line break |
.\" .sp <n> insert n+1 empty lines |
.\" for manpage-specific macros, see man(7) |
.SH NAME |
lshc \- depricated command for lsh |
.SH DESCRIPTION |
lshc is the |
.B deprecated |
name of the lsh-client binary. It has been renamed to lsh - as it was its upstream |
name. |
.SH SEE ALSO |
.BR lsh (1), |
.SH AUTHOR |
This manual page was written by Stefan Pfetzing <dreamind@dreamind.de>, |
for the Debian GNU/Linux system (but may be used by others). |
/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 lsh. |
defaults to using lshc. |
.\" |
.Sh "REPORTING BUGS" |
Report bugs to <bug-lsh@gnu.org>. |
68,5 → 68,5 |
.Br rcp (1), |
.Br scp (1), |
.Br lsftp (1), |
.Br lsh (1), |
.Br lshc (1), |
.Br lshd (8), |
/trunk/debian/lsh-utils.postinst |
---|
0,0 → 1,49 |
#! /bin/sh |
# postinst script for lsh-utils |
# |
# see: dh_installdeb(1) |
# |
# |
set -e |
# summary of how this script can be called: |
# * <postinst> `configure' <most-recently-configured-version> |
# * <old-postinst> `abort-upgrade' <new version> |
# * <conflictor's-postinst> `abort-remove' `in-favour' <package> |
# <new-version> |
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' |
# <failed-install-package> <version> `removing' |
# <conflicting-package> <version> |
# for details, see http://www.debian.org/doc/debian-policy/ or |
# the debian-policy package |
# |
# quoting from the policy: |
# Any necessary prompting should almost always be confined to the |
# post-installation script, and should be protected with a conditional |
# so that unnecessary prompting doesn't happen if a package's |
# installation fails and the `postinst' is called with `abort-upgrade', |
# `abort-remove' or `abort-deconfigure'. |
case "$1" in |
configure) |
/usr/sbin/update-alternatives --install /usr/bin/sexp-conv sexp-conv /usr/bin/sexp-conv.lsh-utils 9 \ |
--slave /usr/share/man/man1/sexp-conv.1.gz sexp-conv.1.gz /usr/share/man/man1/sexp-conv.lsh-utils.1.gz |
;; |
abort-upgrade|abort-remove|abort-deconfigure) |
;; |
*) |
echo "postinst called with unknown argument \`$1'" >&2 |
exit 1 |
;; |
esac |
# dh_installdeb will replace this with shell code automatically |
# generated by other debhelper scripts. |
#DEBHELPER# |
exit 0 |
/trunk/debian/lsh-utils.prerm |
---|
0,0 → 1,40 |
#! /bin/sh |
# prerm script for lsh-utils |
# |
# see: dh_installdeb(1) |
# |
# |
set -e |
# summary of how this script can be called: |
# * <prerm> `remove' |
# * <old-prerm> `upgrade' <new-version> |
# * <new-prerm> `failed-upgrade' <old-version> |
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> |
# * <deconfigured's-prerm> `deconfigure' `in-favour' |
# <package-being-installed> <version> `removing' |
# <conflicting-package> <version> |
# for details, see http://www.debian.org/doc/debian-policy/ or |
# the debian-policy package |
case "$1" in |
remove|upgrade|deconfigure) |
update-alternatives --remove sexp-conv /usr/bin/sexp-conv.lsh-utils |
;; |
failed-upgrade) |
;; |
*) |
echo "prerm called with unknown argument \`$1'" >&2 |
exit 1 |
;; |
esac |
# dh_installdeb will replace this with shell code automatically |
# generated by other debhelper scripts. |
#DEBHELPER# |
exit 0 |
/trunk/debian/lsh-server.init.d |
---|
37,7 → 37,7 |
case "$ENABLE_SFTP" in |
true|y*|Y*) |
SFTP_FLAG="--subsystems sftp=/usr/lib/lsh-server/sftp-server" |
SFTP_FLAG="--subsystems sftp=/usr/sbin/sftp-server.lsh" |
;; |
*) |
SFTP_FLAG="" |
/trunk/debian/README.Debian |
---|
29,9 → 29,8 |
Some notes about the sftp-server |
-------------------------------- |
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. |
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. |
Credits |
------- |
39,4 → 38,4 |
This package is based on work by Robert Bihlmeyer <robbe@orcus.priv.at> and |
Timshel Knoll <timshel@debian.org>. |
-- Magnus Holmgren <magnus@kibibyte.se>, Wed, 3 Oct 2007 20:56:36 +0200 |
-- Stefan Pfetzing <dreamind@dreamind.de> Thu, 19 Jan 2006 01:55:21 +0100 |