Subversion Repositories lsh

Compare Revisions

Ignore whitespace Rev 103 → Rev 104

/trunk/debian/changelog
1,3 → 1,16
lsh-utils (2.1-1) unstable; urgency=low
 
* New upstream release.
* Upstream distribution no longer embeds old version of the Nettle
library containing non-free RFC document; drop nonettle.patch.
* Also drop better-errmsg-when-dotlsh-missing.patch, nettle-2.0.patch,
nettle-2.1.patch, terminate-on-connection-failure.patch,
ipv6-v6only.patch, and serpent-byteorder.patch, all incorporated
upstream; and testsuite-mini-inetd-localhost.patch, made unneeded by
new included version of mini-inetd.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 07 Jul 2013 18:46:50 +0200
 
lsh-utils (2.0.4-dfsg-11) unstable; urgency=low
 
* Review templates and package description by the debian-l10n-english team
/trunk/debian/patches/testsuite-mini-inetd-localhost.patch
File deleted
/trunk/debian/patches/nettle-2.0.patch
File deleted
/trunk/debian/patches/nettle-2.1.patch
File deleted
/trunk/debian/patches/serpent-byteorder.patch
File deleted
/trunk/debian/patches/better-errmsg-when-dotlsh-missing.patch
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/ipv6-v6only.patch
===================================================================
--- debian/patches/ipv6-v6only.patch (revision 103)
+++ debian/patches/ipv6-v6only.patch (nonexistent)
@@ -1,22 +0,0 @@
-Author: Magnus Holmgren <holmgren@debian.org>
-Description: Set the IPV6_V6ONLY socket option on AF_INET6 sockets
- Since lshd by default enumerates available address families and calls
- bind() once for each, conflicts will occur otherwise.
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/src/io.c trunk/src/io.c
---- trunk~/src/io.c 2006-01-23 18:49:58.000000000 +0100
-+++ trunk/src/io.c 2010-07-27 02:17:04.000000000 +0200
-@@ -1690,6 +1690,13 @@
- {
- int yes = 1;
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*)&yes, sizeof yes);
-+#if WITH_IPV6 && defined (IPV6_V6ONLY)
-+ if (local->sa_family == AF_INET6)
-+ {
-+ if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0)
-+ werror("setsockopt IPV6_V6ONLY failed: %e.\n", errno);
-+ }
-+#endif
- }
-
- if (bind(s, local, length) < 0)
/debian/patches/ipv6-v6only.patch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/nonettle.patch
===================================================================
--- debian/patches/nonettle.patch (revision 103)
+++ debian/patches/nonettle.patch (nonexistent)
@@ -1,214 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -778,7 +778,6 @@ if test x$enable_ipv6 = xyes ; then
- fi
-
- AC_CONFIG_SUBDIRS(src/argp)
--AC_CONFIG_SUBDIRS(src/nettle)
- AC_CONFIG_SUBDIRS(src/spki)
- AC_CONFIG_SUBDIRS(src/sftp)
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,15 +1,12 @@
- # 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
-
- BUILT_SOURCES = environ.h
-
--# Kludge needed for finding the nettle/nettle-types.h file in the build tree
--AM_CPPFLAGS = -I./nettle
--
- SCHEME = $(SCHEME_PROGRAM) -l $(srcdir)/scm/$(SCHEME_NAME)-compat.scm
-
- EXTRA_PROGRAMS = lsh-krb-checkpw lsh-pam-checkpw srp-gen
-@@ -116,7 +113,7 @@ lsh_krb_checkpw_LDADD=@KRB_LIBS@
-
- lsh_execuv_LDADD=
-
--LDADD = liblsh.a spki/libspki.a nettle/libnettle.a @LIBARGP@
-+LDADD = liblsh.a spki/libspki.a -lnettle @LIBARGP@
-
- # To avoid having to link lshg with nettle, link with dummy.o.
-
---- a/src/rsync/Makefile.am
-+++ b/src/rsync/Makefile.am
-@@ -3,10 +3,6 @@
- noinst_LIBRARIES = librsync.a
- noinst_HEADERS = rsync.h
-
--# Needed for finding the nettle include files in the source tree
--# and nettle-types.h in the build tree.
--AM_CPPFLAGS = -I$(srcdir)/.. -I../nettle
--
- librsync_a_SOURCES = generate.c receive.c checksum.c send.c
-
-
---- a/src/sftp/Makefile.am
-+++ b/src/sftp/Makefile.am
-@@ -1,8 +1,5 @@
- SUBDIRS = . testsuite
-
--# Needed for finding nettle-types.h in the build tree.
--AM_CPPFLAGS = -I..
--
- AUTOMAKE_OPTIONS = foreign
-
- bin_PROGRAMS = lsftp
---- a/src/spki/Makefile.am
-+++ b/src/spki/Makefile.am
-@@ -1,8 +1,5 @@
- SUBDIRS = . tools testsuite
-
--# FIXME: Create a link to nettle directory instead?
--AM_CPPFLAGS = -I$(srcdir)/.. -I../nettle
--
- noinst_LIBRARIES = libspki.a
- # libspkiincludedir = $(includedir)/nettle
-
---- a/src/spki/testsuite/Makefile.am
-+++ b/src/spki/testsuite/Makefile.am
-@@ -1,8 +1,4 @@
-
--# FIXME: Create a link to nettle directory instead?
--AM_CPPFLAGS = -O0 -I$(top_srcdir) -I$(top_srcdir)/.. -I../../nettle
--AM_LDFLAGS = -L../../nettle
--
- TS_PROGS = principal-test date-test tag-test read-acl-test \
- lookup-acl-test read-cert-test cdsa-reduce-test
-
---- a/src/spki/tools/Makefile.am
-+++ b/src/spki/tools/Makefile.am
-@@ -1,16 +1,12 @@
- noinst_PROGRAMS = spki-check-signature spki-make-signature \
- spki-delegate spki-reduce
-
--# FIXME: Create a link to nettle directory instead?
--AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/.. -I../../nettle
--AM_LDFLAGS = -L.. -L../../nettle/
--
- # 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
-+ ../libspki.a -lnettle
-
- spki_make_signature_SOURCES = spki-make-signature.c sign.c
- spki_delegate_SOURCES = spki-delegate.c sign.c
---- a/src/testsuite/Makefile.am
-+++ b/src/testsuite/Makefile.am
-@@ -3,7 +3,7 @@
- # -O0 is not recogniced on AIX
- # AM_CFLAGS = -O0
-
--AM_CPPFLAGS = -I$(srcdir)/.. -I.. -I../nettle
-+AM_CPPFLAGS = -I$(srcdir)/..
-
- TS_PROGS = arcfour-test aes-test blowfish-test cast128-test \
- des-test \
-@@ -34,7 +34,7 @@ noinst_PROGRAMS = $(TS_PROGS)
- # 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
-@@ -59,6 +59,6 @@ all:
-
- # sexp-conv may be dynamically linked
- check: $(TS_ALL)
-- LD_LIBRARY_PATH="`pwd`/../nettle/.lib" srcdir=$(srcdir) \
-+ srcdir=$(srcdir) \
- $(srcdir)/run-tests $(TS_ALL)
-
---- a/src/spki/testsuite/check-signature-test
-+++ b/src/spki/testsuite/check-signature-test
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- conv () {
-- echo "$1" | ../../nettle/tools/sexp-conv -s transport | tee test.in
-+ echo "$1" | sexp-conv -s transport | tee test.in
- }
-
- die () {
---- a/src/spki/testsuite/delegate-test
-+++ b/src/spki/testsuite/delegate-test
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- conv () {
-- ../../nettle/tools/sexp-conv -s transport | tee test.in
-+ sexp-conv -s transport | tee test.in
- }
-
- die () {
-@@ -12,7 +12,7 @@ die () {
- check_sexp () {
- file="$1"
- shift
-- ../../nettle/tools/sexp-conv -s canonical > test.canonical || die "sexp-conv failed"
-+ sexp-conv -s canonical > test.canonical || die "sexp-conv failed"
- cmp "$file" test.canonical || die "$@"
- }
-
---- a/src/spki/testsuite/make-signature-test
-+++ b/src/spki/testsuite/make-signature-test
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- conv () {
-- echo "$1" | ../../nettle/tools/sexp-conv -s transport | tee test.in
-+ echo "$1" | sexp-conv -s transport | tee test.in
- }
-
- die () {
-@@ -10,7 +10,7 @@ die () {
- }
-
- echo foo | ../tools/spki-make-signature "$srcdir/key-1" \
-- | ../../nettle/tools/sexp-conv -s transport > test.in
-+ | sexp-conv -s transport > test.in
-
- echo foo | ../tools/spki-check-signature "`cat test.in`" \
- || die "Valid signature failed"
---- a/src/spki/testsuite/reduce-test
-+++ b/src/spki/testsuite/reduce-test
-@@ -3,7 +3,7 @@
- # Test case from Oscar Cánovas Reverte
-
- conv () {
-- ../../nettle/tools/sexp-conv -s transport
-+ sexp-conv -s transport
- }
-
- die () {
-@@ -14,7 +14,7 @@ die () {
- check_sexp () {
- file="$1"
- shift
-- ../../nettle/tools/sexp-conv -s canonical > test.canonical || die "sexp-conv failed"
-+ sexp-conv -s canonical > test.canonical || die "sexp-conv failed"
- cmp "$file" test.canonical || die "$@"
- }
-
---- a/src/testsuite/functions.sh
-+++ b/src/testsuite/functions.sh
-@@ -9,7 +9,7 @@ set -e
- : ${LSH_YARROW_SEED_FILE:="$TEST_HOME/.lsh/yarrow-seed-file"}
-
- # For lsh-authorize
--: ${SEXP_CONV:="`pwd`/../nettle/tools/sexp-conv"}
-+: ${SEXP_CONV:="sexp-conv"}
-
- export LSH_YARROW_SEED_FILE SEXP_CONV
-
Index: debian/patches/terminate-on-connection-failure.patch
===================================================================
--- debian/patches/terminate-on-connection-failure.patch (revision 103)
+++ debian/patches/terminate-on-connection-failure.patch (nonexistent)
@@ -1,16 +0,0 @@
-Author: Magnus Holmgren <holmgren@debian.org>
-Description: Call exit() in lsh's default exception handler on EXC_IO_CONNECT
- Otherwise lsh won't terminate.
-
-diff -urNad trunk~/src/lsh.c trunk/src/lsh.c
---- trunk~/src/lsh.c 2005-03-16 21:06:23.000000000 +0100
-+++ trunk/src/lsh.c 2010-01-09 22:32:51.000000000 +0100
-@@ -959,6 +959,8 @@
- *self->status = EXIT_FAILURE;
-
- werror("%z, (errno = %i)\n", e->msg, exc->error);
-+ if (e->type == EXC_IO_CONNECT)
-+ exit(*self->status);
- }
- else
- switch(e->type)
/debian/patches/terminate-on-connection-failure.patch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/series
===================================================================
--- debian/patches/series (revision 103)
+++ debian/patches/series (revision 104)
@@ -1,10 +1,2 @@
-nonettle.patch
sftp-server-mansection.patch
-better-errmsg-when-dotlsh-missing.patch
-nettle-2.0.patch
-nettle-2.1.patch
blacklist.patch
-terminate-on-connection-failure.patch
-ipv6-v6only.patch
-testsuite-mini-inetd-localhost.patch
-serpent-byteorder.patch
Index: debian/copyright
===================================================================
--- debian/copyright (revision 103)
+++ debian/copyright (revision 104)
@@ -4,10 +4,6 @@
It was downloaded from ftp://ftp.lysator.liu.se/pub/security/lsh/
-The original upstream tarball has been repacked because it bundles
-Nettle 1.14 (actually a snapshot between 1.14 and 1.15), which
-contains a non-free RFC.
-
Upstream Authors: Niels Möller <nisse@lysator.liu.se>
Balázs Scheidler
Many others, too numerous to list here. See the file
@@ -40,6 +36,6 @@
complete list of the authors and licenses of various components
within lsh, see the file `/usr/share/doc/lsh-utils/AUTHORS'
-The Debian patch debian/patches/blacklist.dpatch contains code from
+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.