Subversion Repositories lsh

Compare Revisions

Ignore whitespace Rev 107 → Rev 119

/tags/2.1-2/debian/changelog
1,3 → 1,20
lsh-utils (2.1-2) unstable; urgency=low
 
* new-readline-completion-function-typedef.patch: switch to new-style
readline typedef for lsftp_rl_completion pointer cast (Closes:
#741771).
* Dutch Debconf translation update from Vincent Zweije and the
debian-l10n-dutch team (Closes: #692831).
* Override Lintian error concerning non-free IETF document
doc/srp-spec.nroff. See debian/copyright for details.
* rl_completion-segfault.patch (new): Avoid crashing when tab-completing
an empty command line in lsftp.
* lsh-doc: Drop dependency on dpkg (>= 1.15.4) | install-info (change in
policy § 12.2).
* With the above, raise Standards-Version to 3.9.5.
 
-- Magnus Holmgren <holmgren@debian.org> Tue, 01 Apr 2014 22:30:06 +0200
 
lsh-utils (2.1-1) unstable; urgency=low
 
* New upstream release.
/tags/2.1-2/debian/control
3,7 → 3,7
Priority: extra
Maintainer: Magnus Holmgren <holmgren@debian.org>
Uploaders: Stefan Pfetzing <dreamind@dreamind.de>
Standards-Version: 3.9.4
Standards-Version: 3.9.5
Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), dh-autoreconf, automake,
libgmp-dev, zlib1g-dev | libz-dev, liboop-dev, libxau-dev, nettle-dev (>= 2.2~), nettle-bin,
texinfo (>= 4.2), guile-1.6 | scsh-0.6, heimdal-dev, libwrap0-dev | libwrap-dev,
66,7 → 66,7
Package: lsh-doc
Architecture: all
Section: doc
Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
Depends: ${misc:Depends}
Suggests: lsh-utils, lsh-server, lsh-client
Conflicts: lsh-utils (<< 1.0.2-3)
Breaks: lsh-utils-doc (<< 2.0.4-dfsg-1)
/tags/2.1-2/debian/copyright
36,6 → 36,13
complete list of the authors and licenses of various components
within lsh, see the file `/usr/share/doc/lsh-utils/AUTHORS'
 
doc/srp-spec.nroff is an old IETF Internet draft written by Niels, and
as such the actual text, from the abstract and up to and including the
references can be assumed to be freely reusable, which should be good
enough. Despite what the copyright notice says the IETF doesn't claim
copyright to the contents of the draft, only the complete draft in its
special form.
 
The Debian patch debian/patches/blacklist.patch contains code from
the openssh package, apparently written by Colin Watson (cjwatson) and
released under a BSD license.
/tags/2.1-2/debian/patches/blacklist.patch
206,7 → 206,7
+}
--- a/src/dsa.c
+++ b/src/dsa.c
@@ -189,6 +189,14 @@ do_dsa_public_spki_key(struct verifier *
@@ -187,6 +187,14 @@ do_dsa_public_spki_key(struct verifier *
"y", self->key.y);
}
221,7 → 221,7
static void
init_dsa_verifier(struct dsa_verifier *self)
{
@@ -199,6 +207,7 @@ init_dsa_verifier(struct dsa_verifier *s
@@ -197,6 +205,7 @@ init_dsa_verifier(struct dsa_verifier *s
self->super.verify = do_dsa_verify;
self->super.public_spki_key = do_dsa_public_spki_key;
self->super.public_key = do_dsa_public_key;
/tags/2.1-2/debian/patches/new-readline-completion-function-typedef.patch
0,0 → 1,11
--- a/src/sftp/rl.c
+++ b/src/sftp/rl.c
@@ -116,7 +116,7 @@ void lsftp_rl_init()
rl_basic_word_break_characters =" \n\t"; /* Only whitespace break words */
RL_CHAR_IS_QUOTED = char_quoted;
- rl_attempted_completion_function = (CPPFunction *)lsftp_rl_completion;
+ rl_attempted_completion_function = (rl_completion_func_t *)lsftp_rl_completion;
interactive = 1; /* Set the interactive flag in the main program */
/tags/2.1-2/debian/patches/rl_completion-segfault.patch
0,0 → 1,37
Author: Magnus Holmgren
Description: Avoid crashing when tab-completing an empty command line in lsftp
The problem was that lsftp_s_skip returns NULL if nothing but
separator characters are found, and that case wasn't handled.
 
--- a/src/sftp/rl.c
+++ b/src/sftp/rl.c
@@ -205,7 +205,7 @@ int char_quoted( char* text, int index )
char** lsftp_rl_completion(char* text, int start, int end)
{
char** matches=NULL;
- int s;
+ const char *s;
/* If this word is at the start of the line, then it is a command to
* complete.
@@ -213,9 +213,9 @@ char** lsftp_rl_completion(char* text, i
rl_completion_append_character = ' '; /* Trailing space after word */
- s = lsftp_s_skip( rl_line_buffer, " \n\t\r" ) - rl_line_buffer;
+ s = lsftp_s_skip( rl_line_buffer, " \n\t\r" );
- if ( start == s ) /* The first word should be a command, even with spaces in front */
+ if ( !s || rl_line_buffer + start == s ) /* The first word should be a command, even with spaces in front */
{
matches = RL_COMPLETION_MATCHES(
text,
@@ -231,7 +231,7 @@ char** lsftp_rl_completion(char* text, i
/* Get the first word from the line (the command) */
- lsftp_s_strtok( rl_line_buffer+s," \n\t\r", &tmp );
+ lsftp_s_strtok( s," \n\t\r", &tmp );
while( (cmdname = commands[i].name) )
{
/tags/2.1-2/debian/patches/series
1,2 → 1,4
sftp-server-mansection.patch
blacklist.patch
new-readline-completion-function-typedef.patch
rl_completion-segfault.patch
/tags/2.1-2/debian/patches/sftp-server-mansection.patch
2,9 → 2,8
(To avoid conflicts without having to rename the sftp-server binary.)
Author: Magnus Holmgren <holmgren@debian.org>
 
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
--- a/src/sftp/sftp-server.8
+++ b/src/sftp/sftp-server.8
@@ -22,7 +22,7 @@
.\" maintainers of the package you received this manual from and make your
.\" modified versions available to them.
/tags/2.1-2/debian/po/nl.po
13,12 → 13,12
#
msgid ""
msgstr ""
"Project-Id-Version: lsh-utils 2.0.1cdbs-4\n"
"Project-Id-Version: lsh-utils 2.0.4-dfsg\n"
"Report-Msgid-Bugs-To: lsh-utils@packages.debian.org\n"
"POT-Creation-Date: 2012-09-09 11:31-0400\n"
"PO-Revision-Date: 2012-06-29 23:39+0200\n"
"Last-Translator: Luk Claes <luk@debian.org>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
"POT-Creation-Date: 2012-09-29 12:42-0400\n"
"PO-Revision-Date: 2012-10-21 09:56+0000\n"
"Last-Translator: Vincent Zweije <vincent@zweije.nl>\n"
"Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
33,13 → 33,6
#. Type: string
#. Description
#: ../lsh-server.templates:2001
#, fuzzy
#| msgid ""
#| "The default port for lshd is 22. If you would like lshd to run on a "
#| "different port, please specify the alternative port here. If you specify "
#| "22, you will need to manually disable any other ssh servers you have "
#| "running on port 22, other than OpenSSH (from the `openssh-server' "
#| "package). OpenSSH will be automatically disabled, if you choose 22 here."
msgid ""
"The default port for lshd is 22. If lshd should run on a different port, "
"please specify the alternative port here. If you specify 22, you will need "
50,42 → 43,31
"De standaardpoort voor lshd is 22. Als u wilt dat lshd draait op een andere "
"poort, specificeer deze alternatieve poort dan hier. Als u 22 aangeeft, dan "
"zult u andere ssh-servers die draaien op poort 22 verschillend van OpenSSH "
"(uit het `openssh-server'-pakket) handmatig moeten uitschakelen. OpenSSH zal "
"automatisch uigeschakeld worden als u hier 22 kiest."
"(uit het `openssh-server'-pakket) handmatig moeten uitzetten. OpenSSH zal "
"automatisch uitgezet worden als u hier 22 kiest."
 
#. Type: boolean
#. Description
#: ../lsh-server.templates:3001
msgid "Enable the SFTP subsystem?"
msgstr "Het SFTP-subsysteem aanschakelen?"
msgstr "Het SFTP-subsysteem aanzetten?"
 
#. Type: boolean
#. Description
#: ../lsh-server.templates:3001
#, fuzzy
#| msgid ""
#| "Please choose whether you want to use the EXPERIMENTAL SFTP support now."
msgid ""
"Please choose whether you want to use the EXPERIMENTAL lsh SFTP support."
msgstr "Kies nu of u de EXPERIMENTELE SFTP-ondersteuning wilt gebruiken."
msgstr "Kies nu of u de EXPERIMENTELE lsh-SFTP-ondersteuning wilt gebruiken."
 
#. Type: boolean
#. Description
#: ../lsh-server.templates:3001
#, fuzzy
#| msgid ""
#| "If you want to use SFTP with lsh, you will need this subsystem. Please "
#| "bear in mind, that it's still experimental. Therefore the default is "
#| "disabled but can be enabled now or later by manually changing /etc/"
#| "default/lsh-server."
msgid ""
"Since it is experimental, the default is for it to be disabled, but it can "
"be enabled now or later by manually changing /etc/default/lsh-server."
msgstr ""
"Als u SFTP wilt gebruiken met lsh, dan zal u dit subsysteem nodig hebben. "
"Merk echter op dat het nog altijd experimenteel is. Daarom wordt het "
"standaard uitgeschakeld, maar kan het nu of later worden aangeschakeld door /"
"etc/default/lsh-server handmatig te bewerken."
"Aangezien dit experimenteel is, staat het standaard uit, maar kan het nu "
"of later worden aangezet door /etc/default/lsh-server handmatig te bewerken."
 
#. Type: boolean
#. Description
100,8 → 82,8
"When this package is installed, a host key is generated to authenticate your "
"host."
msgstr ""
"Wanneer dit pakket wordt geïnstalleerd, wordt er een host-sleutel aangemaakt "
"om uw computer te authenticeren."
"Wanneer dit pakket wordt geïnstalleerd, wordt er een host-sleutel\n"
"aangemaakt om uw computer te authenticeren."
 
#. Type: boolean
#. Description
118,3 → 100,4
#: ../lsh-server.templates:5001
msgid "Additional arguments to pass to lshd:"
msgstr ""
"Extra argumenten om aan lshd mee te geven:"
/tags/2.1-2/debian/source/lintian-overrides
0,0 → 1,5
# Internet-draft by LSH author; may be used under free licenseas long
# as IETF parts are deleted. Contrast with GFDL-licensed documents
# with invariant sections, where the invariant sections may not be
# removed.
lsh-utils source: license-problem-non-free-RFC doc/srp-spec.nroff