Bug#858778: unblock: nbd/1:3.15.2-2
Wouter Verhelst:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
>
> Please unblock package nbd
>
> This closes the (non-RC) bugs #846998 and #858291 (even though I used
> the wrong bug number for the latter bug in the changelog).
>
> The bugs are not RC for nbd, but they affect LTSP, they would be RC for
> LTSP, and the fix/workaround would be pretty ugly to be done in LTSP.
>
> While at it, I added a few minor cosmetic fixes as well:
>
> - Did some proper build tests on the kfreebsd porterbox, so that the
> build system will now actually work in the face of GnuTLS;
> - Fixed configure.ac so that the (upstream) version number remains at
> 3.15.2, rather than moving to something involving the wrong git tags;
> - Regenerated configure and Makefile.in files.
>
> debdiff:
>
Ack from me; CC'ing KiBi for a d-i ack Debdiff quoted in full below for
KiBi.
Thanks,
~Niels
> diff -u nbd-3.15.2/Makefile.am nbd-3.15.2/Makefile.am
> --- nbd-3.15.2/Makefile.am
> +++ nbd-3.15.2/Makefile.am
> @@ -19,6 +19,10 @@
> nbd_trdump_LDADD = libcliserv.la
> make_integrityhuge_SOURCES = make-integrityhuge.c cliserv.h nbd.h nbd-debug.h
> EXTRA_DIST = maketr CodingStyle autogen.sh README.md support/genver.sh
> +if GNUTLS
> +nbd_server_CFLAGS += @GnuTLS_CFLAGS@
> +nbd_server_LDADD += @GnuTLS_LIBS@
> +endif
> if CLIENT
> sbin_PROGRAMS = nbd-client
> if GNUTLS
> @@ -32,10 +36,6 @@
> -
> -nbd_server_CFLAGS += @GnuTLS_CFLAGS@
> -nbd_server_LDADD += @GnuTLS_LIBS@
> else
> nbd_client_SOURCES = $(client_srcs)
> nbd_client_CFLAGS = $(client_flags)
> nbd_client_LDADD = $(client_libs)
> endif
> endif
> -endif
> diff -u nbd-3.15.2/Makefile.in nbd-3.15.2/Makefile.in
> --- nbd-3.15.2/Makefile.in
> +++ nbd-3.15.2/Makefile.in
> @@ -91,10 +91,10 @@
> host_triplet = @host@
> bin_PROGRAMS = nbd-server$(EXEEXT) nbd-trdump$(EXEEXT)
> EXTRA_PROGRAMS = nbd-client$(EXEEXT) make-integrityhuge$(EXEEXT)
> +@GNUTLS_TRUE@am__append_1 = @GnuTLS_CFLAGS@
> +@GNUTLS_TRUE@am__append_2 = @GnuTLS_LIBS@
> @CLIENT_TRUE@sbin_PROGRAMS = nbd-client$(EXEEXT) $(am__EXEEXT_1)
> -@CLIENT_TRUE@@GNUTLS_TRUE@am__append_1 = min-nbd-client
> -@CLIENT_TRUE@@GNUTLS_TRUE@am__append_2 = @GnuTLS_CFLAGS@
> -@CLIENT_TRUE@@GNUTLS_TRUE@am__append_3 = @GnuTLS_LIBS@
> +@CLIENT_TRUE@@GNUTLS_TRUE@am__append_3 = min-nbd-client
> subdir = .
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> am__aclocal_m4_deps = $(top_srcdir)/support/libtool.m4 \
> @@ -446,13 +446,13 @@
>
> nbd_trdump_SOURCES = nbd-trdump.c cliserv.h nbd.h
> client_flags = @CFLAGS@
> -nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ $(am__append_2)
> +nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ $(am__append_1)
> nbd_trdump_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
> libnbdsrv_la_SOURCES = nbdsrv.c nbdsrv.h treefiles.c treefiles.h
> libnbdsrv_la_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
> client_libs = libcliserv.la
> nbd_server_LDADD = @GLIB_LIBS@ libnbdsrv.la libcliserv.la \
> - $(am__append_3)
> + $(am__append_2)
> nbd_trdump_LDADD = libcliserv.la
> make_integrityhuge_SOURCES = make-integrityhuge.c cliserv.h nbd.h nbd-debug.h
> EXTRA_DIST = maketr CodingStyle autogen.sh README.md support/genver.sh
> reverted:
> --- nbd-3.15.2/configure
> +++ nbd-3.15.2.orig/configure
> @@ -1,6 +1,6 @@
> #! /bin/sh
> # Guess values for system-dependent variables and create Makefiles.
> +# Generated by GNU Autoconf 2.69 for nbd 3.15.2.
> -# Generated by GNU Autoconf 2.69 for nbd debian-3.15.1-1-7-g4ba8130.
> #
> # Report bugs to <wouter@debian.org>.
> #
> @@ -590,8 +590,8 @@
> # Identity of this package.
> PACKAGE_NAME='nbd'
> PACKAGE_TARNAME='nbd'
> +PACKAGE_VERSION='3.15.2'
> +PACKAGE_STRING='nbd 3.15.2'
> -PACKAGE_VERSION='debian-3.15.1-1-7-g4ba8130'
> -PACKAGE_STRING='nbd debian-3.15.1-1-7-g4ba8130'
> PACKAGE_BUGREPORT='wouter@debian.org'
> PACKAGE_URL='http://nbd.sourceforge.net/'
>
> @@ -1356,7 +1356,7 @@
> # Omit some internal or obsolete options to make the list less imposing.
> # This message is too long to be a string in the A/UX 3.1 sh.
> cat <<_ACEOF
> +\`configure' configures nbd 3.15.2 to adapt to many kinds of systems.
> -\`configure' configures nbd debian-3.15.1-1-7-g4ba8130 to adapt to many kinds of systems.
>
> Usage: $0 [OPTION]... [VAR=VALUE]...
>
> @@ -1427,7 +1427,7 @@
>
> if test -n "$ac_init_help"; then
> case $ac_init_help in
> + short | recursive ) echo "Configuration of nbd 3.15.2:";;
> - short | recursive ) echo "Configuration of nbd debian-3.15.1-1-7-g4ba8130:";;
> esac
> cat <<\_ACEOF
>
> @@ -1560,7 +1560,7 @@
> test -n "$ac_init_help" && exit $ac_status
> if $ac_init_version; then
> cat <<\_ACEOF
> +nbd configure 3.15.2
> -nbd configure debian-3.15.1-1-7-g4ba8130
> generated by GNU Autoconf 2.69
>
> Copyright (C) 2012 Free Software Foundation, Inc.
> @@ -2269,7 +2269,7 @@
> This file contains any messages produced by compilers while
> running configure, to aid debugging if configure makes a mistake.
>
> +It was created by nbd $as_me 3.15.2, which was
> -It was created by nbd $as_me debian-3.15.1-1-7-g4ba8130, which was
> generated by GNU Autoconf 2.69. Invocation command line was
>
> $ $0 $@
> @@ -3133,7 +3133,7 @@
>
> # Define the identity of the package.
> PACKAGE='nbd'
> + VERSION='3.15.2'
> - VERSION='debian-3.15.1-1-7-g4ba8130'
>
>
> cat >>confdefs.h <<_ACEOF
> @@ -15338,7 +15338,7 @@
> # report actual input values of CONFIG_FILES etc. instead of their
> # values after options handling.
> ac_log="
> +This file was extended by nbd $as_me 3.15.2, which was
> -This file was extended by nbd $as_me debian-3.15.1-1-7-g4ba8130, which was
> generated by GNU Autoconf 2.69. Invocation command line was
>
> CONFIG_FILES = $CONFIG_FILES
> @@ -15405,7 +15405,7 @@
> cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
> ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
> ac_cs_version="\\
> +nbd config.status 3.15.2
> -nbd config.status debian-3.15.1-1-7-g4ba8130
> configured by $0, generated by GNU Autoconf 2.69,
> with options \\"\$ac_cs_config\\"
>
> diff -u nbd-3.15.2/debian/changelog nbd-3.15.2/debian/changelog
> --- nbd-3.15.2/debian/changelog
> +++ nbd-3.15.2/debian/changelog
> @@ -1,3 +1,17 @@
> +nbd (1:3.15.2-2) unstable; urgency=medium
> +
> + * Fix support for NFS-style exports that have ":/" in the name, to be
> + better at backwards compatibility. Patch from Vagrant Cascadian;
> + Closes: #846998. Thanks, Vagrant.
> + * Fix IPv6 case of port-specifying exports, too. Patch by Vagrant as
> + well; Closes: #840612.
> + * Fix up Makefile.am so it really works on kFreeBSD, now, and rerun
> + autotools.
> + * Change configure.ac to hardcode version number rather than regenerating it
> + from git tags (which doesn't work on the Debian branch...)
> +
> + -- Wouter Verhelst <wouter@debian.org> Tue, 21 Mar 2017 14:41:37 +0100
> +
> nbd (1:3.15.2-1) unstable; urgency=medium
>
> * New upstream release
> diff -u nbd-3.15.2/debian/nbd-client.initrd nbd-3.15.2/debian/nbd-client.initrd
> --- nbd-3.15.2/debian/nbd-client.initrd
> +++ nbd-3.15.2/debian/nbd-client.initrd
> @@ -61,6 +61,15 @@
> nbdsrv="${nbdroot%,*}"
> nbdport="${nbdroot#*,}"
> ;;
> + \[*\]:/*)
> + # [ipv6]:/path
> + # Note: this is specifically written to be compatible with NFS
> + # URLs
> + nbdsrv=${nbdroot%\]*}
> + nbdsrv=${nbdsrv#\[}
> + nbdpath=${nbdroot#\[$nbdsrv\]}
> + nbdpath=${nbdpath#:}
> + ;;
> \[*\]*)
> # [ipv6]:port/path
> nbdsrv=${nbdroot%\]*}
> @@ -68,7 +77,15 @@
> nbdportpath=${nbdroot#\[$nbdsrv\]}
> nbdportpath=${nbdportpath#:}
> nbdport=${nbdportpath%%/*}
> - nbdpath=${nbdportpath#$nbdport}
> + nbdpath=${nbdportpath#$nbdport/}
> + ;;
> + /*|*:/*)
> + # ipv4:/path
> + # Note: this is specifically written to be compatible with NFS
> + # URLs
> + nbdsrv=${nbdroot%%[:/]*}
> + nbdpath=${nbdroot#$nbdsrv}
> + nbdpath=${nbdpath#:}
> ;;
> *)
> # ipv4:port/path
> only in patch2:
> unchanged:
> --- nbd-3.15.2.orig/configure.ac
> +++ nbd-3.15.2/configure.ac
> @@ -2,7 +2,7 @@
> dnl (c) 1998 Martin Mares <mj@ucw.cz>, (c) 2000 Pavel Machek <pavel@ucw.cz>,
> dnl (c) 2003-2006 Wouter Verhelst <wouter@debian.org>
> AC_INIT([nbd],
> - m4_esyscmd(support/genver.sh | tr -d '\n'),
> + [3.15.2],
> [wouter@debian.org],,
> [http://nbd.sourceforge.net/])
> m4_define([serial_tests], [
>
> unblock nbd/1:3.15.2-2
>
> Thanks,
>
> [...]
>
Reply to: