Subversion Repositories lsh

Compare Revisions

Ignore whitespace Rev 47 → Rev 46

/branches/experimental/debian/control
4,7 → 4,7
Maintainer: Magnus Holmgren <holmgren@debian.org>
Uploaders: Stefan Pfetzing <dreamind@dreamind.de>
Standards-Version: 3.7.3
Build-Depends: cdbs, debhelper (>= 5), dpatch, autotools-dev,
Build-Depends: cdbs, debhelper (>= 4.1.16), dpatch, autotools-dev,
libgmp3-dev, zlib1g-dev | libz-dev, liboop-dev, libxau-dev, nettle-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
/branches/experimental/debian/lsh-server.manpages
3,4 → 3,4
debian/mans/lsh-krb-checkpw.8
debian/mans/lsh-server-config.8
doc/lshd.8
sftp/sftp-server.8*
src/sftp/sftp-server.8*
/branches/experimental/debian/patches/40_better_errmsg_when_dotlsh_missing.dpatch
0,0 → 1,36
#! /bin/sh /usr/share/dpatch/dpatch-run
## 40_mkdir_dotlsh.dpatch by <holmgren@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
 
@DPATCH@
diff -urNad trunk~/src/unix_random.c trunk/src/unix_random.c
--- trunk~/src/unix_random.c 2006-01-23 18:47:10.000000000 +0100
+++ trunk/src/unix_random.c 2008-06-24 22:29:29.000000000 +0200
@@ -353,6 +353,15 @@
yarrow256_init(&self->yarrow, RANDOM_NSOURCES, self->sources);
+ if (access(lsh_get_cstring(seed_file_name), F_OK) < 0)
+ {
+ werror("No seed file. Please create one by running\n");
+ werror("lsh-make-seed -o \"%S\".\n", seed_file_name);
+
+ KILL(self);
+ return NULL;
+ }
+
verbose("Reading seed-file `%S'\n", seed_file_name);
self->lock
@@ -374,8 +383,7 @@
self->seed_file_fd = open(lsh_get_cstring(seed_file_name), O_RDWR);
if (self->seed_file_fd < 0)
{
- werror("No seed file. Please create one by running\n");
- werror("lsh-make-seed -o \"%S\".\n", seed_file_name);
+ werror("Could not open seed file \"%S\".\n", seed_file_name);
KILL_RESOURCE(lock);
KILL(self);
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: debian/patches/00list
===================================================================
--- debian/patches/00list (revision 47)
+++ debian/patches/00list (revision 46)
@@ -1 +1,3 @@
20_sftp-server_mansection
+30_nonettle
+40_better_errmsg_when_dotlsh_missing
Index: debian/patches/20_sftp-server_mansection.dpatch
===================================================================
--- debian/patches/20_sftp-server_mansection.dpatch (revision 47)
+++ debian/patches/20_sftp-server_mansection.dpatch (revision 46)
@@ -1,5 +1,5 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_sftp-server_mansection.dpatch by Magnus Holmgren <holmgren@debian.org>
+## 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
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad trunk~/src/sftp/sftp-server.8 trunk/src/sftp/sftp-server.8
---- trunk~/sftp/sftp-server.8 2006-05-08 21:11:17.000000000 +0200
-+++ trunk/sftp/sftp-server.8 2007-10-03 20:48:35.000000000 +0200
+--- 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.
/branches/experimental/debian/changelog
1,21 → 1,10
lsh-utils (2.9.1-exp+cvs20090902-1) experimental; urgency=low
lsh (2.9.1-exp+cvs20090504-1) experimental; urgency=low
 
* New upstream CVS snapshot. Now free from non-free RFCs.
* New upstream CVS snapshot.
- Drop 30_nonettle.dpatch, since configure allows us to specify that
the bundled nettle shall not be used.
- Drop 40_better_errmsg_when_dotlsh_missing.dpatch; fixed upstream.
* The sftp subdirectory has moved from src/ to the top level; update
20_sftp-server_mansection.dpatch, lsh-server.manpages and
lsh-client.manpages accordingly.
* A number of binaries are now installed in /usr/lib/lsh; update
.install files accordingly and let sftp-server live there too.
- Some utilities (srp-gen, lsh-krb-checkpw, lsh-pam-checkpw) don't work
at the moment and hence are not installed.
- lsh-write-key has been merged into lsh-keygen.
* Increase Debhelper compat level to 5.
* Update watch file for experimental tracking.
the bundled nettle shall not be used.
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 29 Aug 2009 19:01:21 +0200
-- Magnus Holmgren <holmgren@debian.org> Wed, 05 Aug 2009 23:35:15 +0200
 
lsh-utils (2.0.4-dfsg-2) unstable; urgency=low
 
/branches/experimental/debian/lsh-utils.install
6,5 → 6,6
usr/bin/lsh-make-seed
usr/bin/lsh-upgrade
usr/bin/lsh-upgrade-key
#usr/bin/srp-gen
usr/bin/lsh-writekey
usr/bin/srp-gen
usr/bin/ssh-conv
/branches/experimental/debian/rules
8,9 → 8,8
DEB_CONFIGURE_EXTRA_FLAGS := --enable-pam --enable-kerberos --enable-srp \
--with-pty --enable-tcp-forward --enable-x11-forward \
--enable-agent-forward --enable-ipv6 --enable-utmp \
--with-zlib --with-tcpwrappers --libexecdir=/usr/lib/lsh \
--with-x --with-system-nettle --with-system-argp \
XAUTH_PROGRAM=/usr/bin/xauth
--with-zlib --with-tcpwrappers --with-sshd1=/usr/sbin/sshd \
--with-x --with-system-nettle XAUTH_PROGRAM=/usr/bin/xauth
 
DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
DEB_INSTALL_DOCS_ALL := README
/branches/experimental/debian/lsh-client.manpages
1,4 → 1,4
debian/mans/lcp.1
doc/lsh.1
doc/lshg.1
sftp/lsftp.1
src/sftp/lsftp.1
/branches/experimental/debian/lsh-server.install
1,6 → 1,6
usr/sbin/lshd
#usr/sbin/lsh-krb-checkpw
#usr/sbin/lsh-pam-checkpw
usr/sbin/lsh-execuv
usr/sbin/lsh-krb-checkpw
usr/sbin/lsh-pam-checkpw
usr/sbin/lsh-server-config
usr/lib/lsh/sftp-server
usr/lib/lsh/lshd-*
usr/sbin/sftp-server usr/lib/lsh-server
/branches/experimental/debian/watch
1,2 → 1,5
# use the newest watch file format.
version=3
ftp://ftp.lysator.liu.se/pub/security/lsh/lsh-([^-]*)-exp\.tar\.gz
# Site+Directory Pattern Version Script
opts=dversionmangle=s/-dfsg$// \
ftp://ftp.lysator.liu.se/pub/security/lsh/lsh-([^-]*)\.tar\.gz debian uupdate
/branches/experimental/debian/lsh-client.install
2,4 → 2,3
usr/bin/lshg
usr/bin/lcp
usr/bin/lsftp
usr/lib/lsh/lsh-*
/branches/experimental/debian/compat
1,0 → 0,0
5
4