Import nbdkit_1.30.2-1.debian.tar.xz

[dgit import tarball nbdkit 1.30.2-1 nbdkit_1.30.2-1.debian.tar.xz]

diff --git a/README.source b/README.source
new file mode 100644 (file)
index 0000000..316069a
--- /dev/null
+++ b/README.source
@@ -0,0 +1,10 @@
+nbdkit for Debian
+-----------------
+
+Some tests that are run as part of the build process are built around
+libguestfs. While libguestfs can only be used if a Linux kernel image
+is found, the *guestfs* packages do not depend directly on linux-image
+packages, so this source package adds the extra build dependencies
+that are needed to run the tests.
+
+ -- Hilko Bengen <bengen@debian.org>, Tue,  6 Feb 2018 10:36:32 +0100

diff --git a/changelog b/changelog
new file mode 100644 (file)
index 0000000..b10f6e9
--- /dev/null
+++ b/changelog
@@ -0,0 +1,710 @@
+nbdkit (1.30.2-1) unstable; urgency=medium
+
+  * New upstream version 1.30.2
+  * Rebase patches
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 04 Apr 2022 10:03:51 +0200
+
+nbdkit (1.30.0-1) unstable; urgency=medium
+
+  * New upstream version 1.30.0
+  * Rebase patches
+  * nbdkit-streaming-plugin has been removed.
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 27 Feb 2022 22:21:49 +0100
+
+nbdkit (1.28.5-1) unstable; urgency=medium
+
+  * New upstream version 1.28.5
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 25 Jan 2022 22:28:21 +0100
+
+nbdkit (1.28.4-1) unstable; urgency=medium
+
+  * New upstream version 1.28.4
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 23 Jan 2022 17:13:10 +0100
+
+nbdkit (1.28.3-2) unstable; urgency=medium
+
+  * Add patch to disable test-delay-close.sh to avoid FTBFS
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 27 Dec 2021 20:19:37 +0100
+
+nbdkit (1.28.3-1) unstable; urgency=medium
+
+  * New upstream version 1.28.3
+  * Add gbp.conf
+  * Rebase patches; drop patch that has been integrated upstream
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 27 Dec 2021 15:10:14 +0100
+
+nbdkit (1.26.6-2) unstable; urgency=medium
+
+  * To avoid FTBFS, add checks for AF_VSOCK support in test scripts
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 25 Oct 2021 21:37:24 +0200
+
+nbdkit (1.26.6-1) unstable; urgency=medium
+
+  [ Simon McVittie ]
+  * d/rules: Specify canonical path to mke2fs (Closes: #992702)
+
+  [ Hilko Bengen ]
+  * Add patch to filter out build path from cc plugin (Closes: #992722)
+  * New upstream version 1.26.6
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 27 Sep 2021 13:40:05 +0200
+
+nbdkit (1.26.5-1) unstable; urgency=medium
+
+  * New upstream version 1.26.5
+    - Includes fix for CVE-2021-3716
+  * Switch to using xorriso instead of genisoimage (Closes: #982239)
+  * Add Suggests for external tools used by some plugins
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 19 Aug 2021 17:23:24 +0200
+
+nbdkit (1.26.3-1) unstable; urgency=medium
+
+  * New upstream version 1.26.3
+  * Update install file as gzip and tar plugins have been removed
+  * Update build-dependencies for running tests
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 15 Aug 2021 10:59:36 +0200
+
+nbdkit (1.24.1-2) unstable; urgency=medium
+
+  * Re-enable torrent plugin (Closes: #983735)
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 01 Mar 2021 17:02:30 +0100
+
+nbdkit (1.24.1-1) unstable; urgency=medium
+
+  * New upstream version 1.24.1
+  * Update patches
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 09 Feb 2021 23:22:05 +0100
+
+nbdkit (1.24.0-5) unstable; urgency=medium
+
+  * Disable more tests which have only failed on buildds
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 10 Jan 2021 19:17:23 +0100
+
+nbdkit (1.24.0-4) unstable; urgency=medium
+
+  * Disable test which only fails on buildds
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 10 Jan 2021 18:22:46 +0100
+
+nbdkit (1.24.0-3) unstable; urgency=medium
+
+  * Add patch to call bash for logging
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 10 Jan 2021 00:26:56 +0100
+
+nbdkit (1.24.0-2) unstable; urgency=medium
+
+  * Fix FTBFS (mistyped install path)
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 09 Jan 2021 16:59:02 +0100
+
+nbdkit (1.24.0-1) unstable; urgency=medium
+
+  * New upstream version 1.24.0
+  * Rebase patches; add patch to fix bashim in test case
+  * Add new plugins to install list
+  
+ -- Hilko Bengen <bengen@debian.org>  Sat, 09 Jan 2021 14:59:51 +0100
+
+nbdkit (1.22.4-1) unstable; urgency=medium
+
+  * New upstream version 1.22.4
+  * Enable zstd support (build dependency)
+  * Add lintian override for binary modules used in compatibility tests
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 22 Dec 2020 14:46:40 +0100
+
+nbdkit (1.22.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Temporarily stop building the torrent plugin since
+    libtorrent-rasterbar-dev is RC-buggy (see #956285), to allow nbdkit to
+    migrate to testing. The torrent plugin has never been available in
+    testing, so this does not represent a regression there (Closes: #974574) 
+
+ -- Dominic Hargreaves <dom@earth.li>  Sat, 14 Nov 2020 19:13:45 +0000
+
+nbdkit (1.22.3-1) unstable; urgency=medium
+
+  * New upstream version 1.22.3
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 23 Sep 2020 11:35:11 +0200
+
+nbdkit (1.22.2-1) unstable; urgency=medium
+
+  * New upstream version 1.22.2
+  * Add some build dependencies for running unit tests
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 17 Sep 2020 16:08:33 +0200
+
+nbdkit (1.22.1-2) unstable; urgency=medium
+
+  * Add missing Breaks/Replaces (Closes: #970135)
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 12 Sep 2020 15:55:41 +0200
+
+nbdkit (1.22.1-1) unstable; urgency=medium
+
+  * New upstream version 1.22.1
+  * Update build dependencies, install lists
+  * Rebase patches
+  * Add patch for libtorrent/1.2.5
+  * Enable libgeustfs debug log for tests
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 10 Sep 2020 01:15:00 +0200
+
+nbdkit (1.20.6-1) unstable; urgency=medium
+
+  * New upstream version 1.20.6
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 11 Aug 2020 11:18:28 +0200
+
+nbdkit (1.20.5-1) unstable; urgency=medium
+
+  * New upstream version 1.20.5
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 14 Jul 2020 09:57:33 +0200
+
+nbdkit (1.20.4-3) unstable; urgency=medium
+
+  * Don't look for mke2fs in /usr/sbin
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 28 Jun 2020 19:00:09 +0200
+
+nbdkit (1.20.4-2) unstable; urgency=medium
+
+  * Change PATH order, in hope of fixing reproducible build
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 27 Jun 2020 01:49:49 +0200
+
+nbdkit (1.20.4-1) unstable; urgency=medium
+
+  * New upstream version 1.20.4
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 23 Jun 2020 09:20:36 +0200
+
+nbdkit (1.20.3-1) unstable; urgency=medium
+
+  * New upstream version 1.20.3
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 11 Jun 2020 15:17:39 +0200
+
+nbdkit (1.20.2-1) unstable; urgency=medium
+
+  * New upstream version 1.20.2
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 01 Jun 2020 02:55:36 +0200
+
+nbdkit (1.18.4-1) unstable; urgency=medium
+
+  * New upstream version 1.18.4
+  * Make nbdkit Multi-Arch: foreign
+  * Lintian: Ignore shared-lib-without-dependency-information
+  * Packaging cleanups
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 03 May 2020 22:04:15 +0200
+
+nbdkit (1.18.3-1) unstable; urgency=medium
+
+  * New upstream version 1.18.3
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 29 Mar 2020 13:16:54 +0200
+
+nbdkit (1.18.2-1) unstable; urgency=medium
+
+  * New upstream version 1.18.2
+  * Install nbdkit binary to /usr/bin (Closes: #954199)
+  * Bump Standards-Version
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 18 Mar 2020 11:48:00 +0100
+
+nbdkit (1.18.0-1) unstable; urgency=medium
+
+  * New upstream version 1.18.0
+  * Update install rules (eval plugin)
+  * Rebase patches
+  * Add configure patch to check for mke2fs in sbin directories
+
+ -- Hilko Bengen <bengen@debian.org>  Fri, 28 Feb 2020 15:56:17 +0100
+
+nbdkit (1.16.2-1) unstable; urgency=medium
+
+  * New upstream version 1.16.2
+  * Rebase patches
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 29 Jan 2020 14:49:03 +0100
+
+nbdkit (1.16.1-3) unstable; urgency=medium
+
+  * Re-add libnbd-dev build-dependency
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 13 Jan 2020 01:49:05 +0100
+
+nbdkit (1.16.1-2) unstable; urgency=medium
+
+  * Stop distributing the VDDK plugin
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 12 Jan 2020 19:48:41 +0100
+
+nbdkit (1.16.1-1) unstable; urgency=medium
+
+  * New upstream version 1.16.1
+  * Switch Python plugin to Python3 (Closes: #937118)
+  * Update install rules
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 12 Jan 2020 16:36:17 +0100
+
+nbdkit (1.14.2-3) unstable; urgency=medium
+
+  * Add genisoimage build-dependency (Closes: #942390)
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 16 Oct 2019 09:44:24 +0200
+
+nbdkit (1.14.2-2) unstable; urgency=medium
+
+  * Remove libnbd-dev build-dependency for now (Closes: #941935)
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 08 Oct 2019 00:15:28 +0200
+
+nbdkit (1.14.2-1) unstable; urgency=medium
+
+  * New upstream version 1.14.2
+  * Correct Build-Depends typo
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 21 Sep 2019 12:35:41 +0200
+
+nbdkit (1.14.1-1) unstable; urgency=medium
+
+  * New upstream version 1.14.1
+  * Rebase patch
+
+ -- Hilko Bengen <bengen@debian.org>  Fri, 13 Sep 2019 08:23:32 +0200
+
+nbdkit (1.14.0-2) unstable; urgency=medium
+
+  * Update build-dependencies
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 09 Sep 2019 20:44:47 +0200
+
+nbdkit (1.14.0-1) unstable; urgency=medium
+
+  * New upstream version 1.14.0
+  * Update patches
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 29 Aug 2019 12:45:13 +0200
+
+nbdkit (1.12.4-1) unstable; urgency=medium
+
+  * New upstream version 1.12.4
+  * Bump Standards-Version
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 27 Jul 2019 11:45:20 +0200
+
+nbdkit (1.12.2-1) unstable; urgency=medium
+
+  * New upstream version 1.12.2
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 24 Apr 2019 10:42:15 +0200
+
+nbdkit (1.12.1-2) unstable; urgency=medium
+
+  * Disable tests on arm64
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 21 Apr 2019 13:08:28 +0200
+
+nbdkit (1.12.1-1) unstable; urgency=medium
+
+  * New upstream version 1.12.1
+  * Fix Vcs-* headers
+  * Install linuxdisk, ssh plugins
+  * xz is now implemented as a filter
+  * Add Lintian overrides
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 18 Apr 2019 23:58:20 +0200
+
+nbdkit (1.10.3-1) unstable; urgency=medium
+
+  * New upstream version 1.10.3
+
+ -- Hilko Bengen <bengen@debian.org>  Fri, 01 Feb 2019 00:01:49 +0100
+
+nbdkit (1.10.2-1) unstable; urgency=medium
+
+  * New upstream version 1.10.2
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 29 Jan 2019 11:02:03 +0100
+
+nbdkit (1.10.1-2) unstable; urgency=medium
+
+  * Modify podwrapper patch to use file mtime instead of trying to read it
+    like a changelog
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 27 Jan 2019 12:35:25 +0100
+
+nbdkit (1.10.1-1) unstable; urgency=medium
+
+  * New upstream version 1.10.1
+  * Update patches
+  * Add podwrapper patch in order to make build (more) reproducible
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 27 Jan 2019 05:02:04 +0100
+
+nbdkit (1.10.0-2) unstable; urgency=medium
+
+  * Don't run tests in parallel
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 22 Jan 2019 13:40:44 +0100
+
+nbdkit (1.10.0-1) unstable; urgency=medium
+
+  * New upstream version 1.10.0
+  * Bump Debhelper compat level
+  * Update install file
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 22 Jan 2019 11:31:03 +0100
+
+nbdkit (1.8.3-2) unstable; urgency=medium
+
+  * Add dh_missing exception to avoid FTBFS
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 14 Jan 2019 10:10:47 +0100
+
+nbdkit (1.8.3-1) unstable; urgency=medium
+
+  * New upstream version 1.8.3
+  * Update patches
+  * Bump Debhelper compat level
+  * Replace dh_install --fail-missing
+  * Bump Standards-Version
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 08 Jan 2019 04:26:12 +0100
+
+nbdkit (1.8.2-1) unstable; urgency=medium
+
+  * New upstream version 1.8.2
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 08 Dec 2018 13:15:48 +0100
+
+nbdkit (1.8.1-1) unstable; urgency=medium
+
+  * New upstream version 1.8.1
+  * Rebase patches
+  * Update nbdkit.install file
+
+ -- Hilko Bengen <bengen@debian.org>  Fri, 23 Nov 2018 17:42:34 +0100
+
+nbdkit (1.6.3-1) unstable; urgency=medium
+
+  * New upstream version 1.6.3
+  * Rebase patches
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 07 Nov 2018 11:08:29 +0100
+
+nbdkit (1.6.2-1) unstable; urgency=medium
+
+  * New upstream version 1.6.2
+  * Bump Standards-Version
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 19 Sep 2018 11:35:30 +0200
+
+nbdkit (1.6.1-1) unstable; urgency=medium
+
+  * New upstream version 1.6.1
+  * Add TCL plugin package
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 10 Sep 2018 00:01:41 +0200
+
+nbdkit (1.6.0-1) unstable; urgency=medium
+
+  * New upstream version 1.6.0
+  * Add Lua plugin package
+  * Update nbdkit.install for new plug-ins and manpages
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 03 Sep 2018 23:31:46 +0200
+
+nbdkit (1.4.3-1) unstable; urgency=medium
+
+  * New upstream version 1.4.3
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 20 Aug 2018 17:49:43 +0200
+
+nbdkit (1.4.2-1) unstable; urgency=medium
+
+  * New upstream version 1.4.2
+  * Bump Standards-Version
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 02 Aug 2018 07:50:55 +0200
+
+nbdkit (1.4.1-1) unstable; urgency=medium
+
+  * New upstream version 1.4.1
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 21 Jul 2018 18:26:46 +0200
+
+nbdkit (1.4.0-1) unstable; urgency=medium
+
+  * New upstream version 1.4.0
+  * Bump Standards-Version
+  * Update plugin list
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 11 Jul 2018 00:55:22 +0200
+
+nbdkit (1.2.4-1) unstable; urgency=medium
+
+  * New upstream version 1.2.4
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 16 Jun 2018 13:24:18 +0200
+
+nbdkit (1.2.2-2) unstable; urgency=medium
+
+  * Add ruby build-dependency (Closes: #897546)
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 06 May 2018 22:05:26 +0200
+
+nbdkit (1.2.2-1) unstable; urgency=medium
+
+  * New upstream version 1.2.2
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 22 Apr 2018 12:25:49 +0200
+
+nbdkit (1.2.1-3) unstable; urgency=medium
+
+  * Disable tests on all architectures except i386, amd64, arm64
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 16 Apr 2018 20:32:11 +0200
+
+nbdkit (1.2.1-2) unstable; urgency=medium
+
+  * Remove build-dependency for armel kernel image
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 16 Apr 2018 16:38:19 +0200
+
+nbdkit (1.2.1-1) unstable; urgency=medium
+
+  * New upstream version 1.2.1
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 10 Apr 2018 06:18:05 +0200
+
+nbdkit (1.2.0-1) unstable; urgency=medium
+
+  * New upstream version 1.2.0
+  * Update watch file
+  * Bump Standards-Version
+  * Update Vcs-* to salsa.debian.org
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 07 Apr 2018 09:29:51 +0200
+
+nbdkit (1.1.28-3) unstable; urgency=medium
+
+  * Document the need for linux-image-* build dependencies
+    (Closes: #889686)
+  * Disable some build dependencies for the nocheck build profile
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 06 Feb 2018 18:59:38 +0100
+
+nbdkit (1.1.28-2) unstable; urgency=medium
+
+  * Disable tests on armhf, mips64el for now
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 23 Jan 2018 21:47:12 +0100
+
+nbdkit (1.1.28-1) unstable; urgency=medium
+
+  * New upstream version 1.1.28
+  * Bump Standards-Version
+  * Drop patches related to NBD/QEMU test breakage, add versioned libguestfs
+    build-dependency instead
+  * Add entries to .install files: filters, pkg-config file
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 23 Jan 2018 10:27:03 +0100
+
+nbdkit (1.1.25-1) unstable; urgency=medium
+
+  * New upstream version 1.1.25
+  * Add tar plugin to nbdkit-plugin-perl
+  * Install all examples into nbdkit-plugin-dev
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 07 Dec 2017 09:24:35 +0100
+
+nbdkit (1.1.22-1) unstable; urgency=medium
+
+  * New upstream version 1.1.22
+  * Add workaround for libguestfs-related FTBFS in tests
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 04 Dec 2017 11:06:23 +0100
+
+nbdkit (1.1.20-1) unstable; urgency=medium
+
+  * New upstream version 1.1.20
+  * Add split plugin
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 03 Dec 2017 12:51:48 +0100
+
+nbdkit (1.1.19-1) unstable; urgency=medium
+
+  * New upstream version 1.1.19
+  * Add null, memory plugin
+  * Bump Standards-Version
+
+ -- Hilko Bengen <bengen@debian.org>  Fri, 01 Dec 2017 09:35:15 +0100
+
+nbdkit (1.1.18-2) unstable; urgency=medium
+
+  * Add nbdkit-nbd-plugin to .install file (Closes: #882428)
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 22 Nov 2017 23:46:04 +0100
+
+nbdkit (1.1.18-1) unstable; urgency=medium
+
+  * New upstream version 1.1.18
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 22 Nov 2017 10:09:46 +0100
+
+nbdkit (1.1.16-1) unstable; urgency=medium
+
+  * New upstream version 1.1.16
+  * Bump Standards-Version, change Priority to optional
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 21 Oct 2017 12:07:09 +0200
+
+nbdkit (1.1.15-1) unstable; urgency=medium
+
+  * New upstream version 1.1.15
+  * Build with TLS support, requiring GnuTLS >= 3.3 for building
+  * Build with SElinux support
+  * Add build-dependencies for tools used in tests
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 28 Sep 2017 00:08:07 +0200
+
+nbdkit (1.1.14-2) unstable; urgency=medium
+
+  * Disable tests on s390x, armel, mipsel, powerpc, this time
+    commenting on failures
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 03 Sep 2017 20:16:51 +0200
+
+nbdkit (1.1.14-1) unstable; urgency=medium
+
+  * New upstream version 1.1.14
+  * Mark nbdkit-plugin-* Multi-Arch: same
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 02 Sep 2017 15:55:20 +0200
+
+nbdkit (1.1.13-1) unstable; urgency=medium
+
+  * New upstream version 1.1.13
+  * Fix watch file
+  * Modernize package: Bump DH compat level, Standards-Version, adjust
+    Vcs-* URLs
+  * Enable building libguestfs stuff on all architectures, enable tests
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 26 Aug 2017 15:04:31 +0200
+
+nbdkit (1.1.12-1) unstable; urgency=medium
+
+  * New upstream version
+  * Bump Standards-Version
+  * Add Vcs-* headers
+  * Add nbdkit-plugin-ruby package
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 21 Jun 2016 23:18:59 +0200
+
+nbdkit (1.1.11-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 01 Nov 2015 11:46:37 +0100
+
+nbdkit (1.1.10-1) unstable; urgency=medium
+
+  * New upstream version
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 20 Jun 2015 16:54:02 +0200
+
+nbdkit (1.1.9-1) unstable; urgency=medium
+
+  * New upstream version
+  * Added streaming plugin
+
+ -- Hilko Bengen <bengen@debian.org>  Wed, 22 Oct 2014 10:52:20 +0200
+
+nbdkit (1.1.8-1) unstable; urgency=medium
+
+  * New upstream version
+  * Added curl plugin
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 22 Jun 2014 00:18:00 +0200
+
+nbdkit (1.1.7-1) unstable; urgency=medium
+
+  * New upstream version
+  * Dropped patch that was integrated upstream
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 21 Jun 2014 10:51:05 +0200
+
+nbdkit (1.1.6-2) unstable; urgency=low
+
+  * Fix FRBFS on architectures where libguestfs is not available
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 25 Feb 2014 08:14:11 +0100
+
+nbdkit (1.1.6-1) unstable; urgency=low
+
+  * New upstream version
+  * Split package
+  * Cherry-picked post-1.1.6-bugfix from upstream git
+
+ -- Hilko Bengen <bengen@debian.org>  Mon, 17 Feb 2014 19:31:33 +0100
+
+nbdkit (1.1.5-1) unstable; urgency=low
+
+  * New upstream version
+  * Removed patches as they have been integrated upstream
+  * Added build dependency for Python plugin
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 15 Feb 2014 11:26:47 +0100
+
+nbdkit (1.1.4-1) unstable; urgency=low
+
+  * New upstream version
+  * Added build dependency for Perl plugin
+  * Added patch to work around #738716
+  * Added patch to properly figure out linker options for building Perl
+    plugin
+  * Use dh-autoreconf instead of autotools-dev
+
+ -- Hilko Bengen <bengen@debian.org>  Thu, 13 Feb 2014 21:13:44 +0100
+
+nbdkit (1.1.3-2) unstable; urgency=low
+
+  * Added pkg-config build dependency so that plugins can be built
+    (Closes: #725504)
+  * Only build for Linux
+  * Disabled tests. At the moment a fully working libguestfs installation
+    in an autobuilder environment is not feasible.
+
+ -- Hilko Bengen <bengen@debian.org>  Tue, 08 Oct 2013 23:04:39 +0200
+
+nbdkit (1.1.3-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 06 Oct 2013 15:25:05 +0200
+
+nbdkit (1.1.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #718560)
+
+ -- Hilko Bengen <bengen@debian.org>  Fri, 02 Aug 2013 22:09:57 +0200

diff --git a/control b/control
new file mode 100644 (file)
index 0000000..bb41100
--- /dev/null
+++ b/control
@@ -0,0 +1,139 @@
+Source: nbdkit
+Section: admin
+Priority: optional
+Maintainer: Hilko Bengen <bengen@debian.org>
+Build-Depends: debhelper-compat (= 12),
+ perl,
+ pkg-config,
+ bash-completion,
+ xorriso,
+ comerr-dev,
+ libcurl4-gnutls-dev | libcurl-dev,
+ libext2fs-dev,
+ libgnutls28-dev (>= 3.3), gnutls-bin,
+ libguestfs-dev (>= 1:1.36.11-3),
+ liblzma-dev,
+ liblua5.3-dev,
+ libperl-dev,
+ python3-dev,
+ ruby, ruby-dev,
+ tcl-dev,
+ libselinux1-dev,
+ libssh-dev,
+ libtorrent-rasterbar-dev,
+ libvirt-dev,
+ zlib1g-dev,
+ libzstd-dev,
+ linux-image-arm64 [arm64] <!nocheck>,
+ linux-image-amd64 [amd64] <!nocheck>,
+ linux-image-686-pae [i386] <!nocheck> | linux-image-586 [i386] | linux-image-486 [i386] <!nocheck>,
+ busybox <!nocheck>,
+ iproute2 <!nocheck>,
+ jq <!nocheck>,
+ socat <!nocheck>,
+ libguestfs-tools <!nocheck>,
+ libnbd-dev,
+ libnbd-bin <!nocheck>,
+ python3-libnbd <!nocheck>,
+ expect <!nocheck>,
+ bsdmainutils <!nocheck>,
+ openssh-server <!nocheck>,
+ qemu-utils <!nocheck>,
+ openssh-server <!nocheck>,
+Standards-Version: 4.5.0
+Homepage: https://github.com/libguestfs/nbdkit
+Vcs-Git: https://salsa.debian.org/debian/nbdkit.git
+Vcs-Browser: https://salsa.debian.org/debian/nbdkit
+
+Package: nbdkit
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+Breaks: nbdkit-plugin-perl (<< 1.22)
+Replaces: nbdkit-plugin-perl (<< 1.22)
+Suggests:
+ nbdkit-plugin-guestfs,
+ nbdkit-plugin-libvirt,
+ nbdkit-plugin-perl,
+ nbdkit-plugin-python,
+# cc-plugin
+ gcc,
+# iso-plugin
+ xorriso,
+# cdi
+ podman, jq,
+Multi-Arch: foreign
+Description: toolkit for creating NBD servers
+ NBD is a protocol for accessing block Devices (hard disks and
+ disk-like things) over a network. nbdkit is a multithreaded NBD
+ server with a well-documented, simple plugin API with a stable ABI
+ guarantee that allows for easy creation of "unconventional" block
+ devices.
+ .
+ This package provides the nbdkit binary and a the file, gzip, and xz,
+ plugins.
+
+Package: nbdkit-plugin-dev
+Section: libdevel
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, nbdkit,
+Conflicts: nbdkit (<< 1.1.5-2~)
+Description: development files for nbdkit
+ Development files, documentation and example code for developing
+ plugins to nbdkit.
+
+Package: nbdkit-plugin-lua
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, nbdkit,
+Description: Lua plugin for nbdkit
+ This plugin allows nbdkit plugins to be written in Lua.
+
+Package: nbdkit-plugin-perl
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, nbdkit,
+Conflicts: nbdkit (<< 1.1.5-2~)
+Description: Perl plugin for nbdkit
+ This plugin allows nbdkit plugins to be written in Perl.
+
+Package: nbdkit-plugin-python
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, nbdkit, python3-boto3,
+Conflicts: nbdkit (<< 1.1.5-2~)
+Description: Python plugin for nbdkit
+ This plugin allows nbdkit plugins to be written in Python.
+
+Package: nbdkit-plugin-tcl
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, nbdkit,
+Description: TCL plugin for nbdkit
+ This plugin allows nbdkit plugins to be written in TCL.
+
+Package: nbdkit-plugin-libvirt
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, nbdkit,
+Conflicts: nbdkit (<< 1.1.5-2~)
+Description: libvirt plugin for nbdkit
+ nbdkit-libvirt-plugin is an nbdkit(1) plugin that makes the contents
+ of libvirt images accessible over NBD.
+
+Package: nbdkit-plugin-guestfs
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, nbdkit,
+Conflicts: nbdkit (<< 1.1.5-2~)
+Description: libguestfs plugin for nbdkit
+ nbdkit-guestfs-plugin is an nbdkit(1) plugin that makes the contents
+ of disk images accessible over NBD.
+
+Package: nbdkit-plugin-ruby
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, nbdkit,
+Conflicts: nbdkit (<< 1.1.5-2~)
+Description: Ruby plugin for nbdkit
+ This plugin allows nbdkit plugins to be written in Ruby.

diff --git a/copyright b/copyright
new file mode 100644 (file)
index 0000000..2d303b6
--- /dev/null
+++ b/copyright
@@ -0,0 +1,36 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nbdkit
+Source: https://github.com/libguestfs/nbdkit
+
+Files: *
+Copyright: 2013 Red Hat Inc.
+License: BSD-3-Clause
+
+Files: debian/*
+Copyright: 2013 Hilko Bengen <bengen@debian.org>
+License: BSD-3-Clause
+
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/docs b/docs
new file mode 100644 (file)
index 0000000..724e084
--- /dev/null
+++ b/docs
@@ -0,0 +1,2 @@
+README
+TODO

diff --git a/gbp.conf b/gbp.conf
new file mode 100644 (file)
index 0000000..9c63efa
--- /dev/null
+++ b/gbp.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = debian/master
+#upstream-tag = upstream/%(version)s
+#debian-tag = debian/%(version)s
+pristine-tar = True

diff --git a/nbdkit-plugin-dev.install b/nbdkit-plugin-dev.install
new file mode 100644 (file)
index 0000000..2b1e1bb
--- /dev/null
+++ b/nbdkit-plugin-dev.install
@@ -0,0 +1,6 @@
+/usr/share/man/man1/nbdkit-example*-plugin.1
+/usr/lib/*-*/nbdkit/plugins/nbdkit-example*-plugin*
+/usr/lib/*-*/pkgconfig/nbdkit.pc
+/usr/include/nbdkit-*.h
+/usr/share/man/man3/nbdkit-plugin.3
+/usr/share/man/man3/nbdkit-filter.3

diff --git a/nbdkit-plugin-dev.lintian-overrides b/nbdkit-plugin-dev.lintian-overrides
new file mode 100644 (file)
index 0000000..b21d5b5
--- /dev/null
+++ b/nbdkit-plugin-dev.lintian-overrides
@@ -0,0 +1 @@
+nbdkit-plugin-dev: unusual-interpreter

diff --git a/nbdkit-plugin-guestfs.install b/nbdkit-plugin-guestfs.install
new file mode 100644 (file)
index 0000000..0ec4ffb
--- /dev/null
+++ b/nbdkit-plugin-guestfs.install
@@ -0,0 +1,2 @@
+/usr/lib/*-*/nbdkit/plugins/nbdkit-guestfs-plugin.so
+/usr/share/man/man1/nbdkit-guestfs-plugin.1

diff --git a/nbdkit-plugin-libvirt.install b/nbdkit-plugin-libvirt.install
new file mode 100644 (file)
index 0000000..6693354
--- /dev/null
+++ b/nbdkit-plugin-libvirt.install
@@ -0,0 +1,2 @@
+/usr/lib/*-*/nbdkit/plugins/nbdkit-libvirt-plugin.so
+/usr/share/man/man1/nbdkit-libvirt-plugin.1

diff --git a/nbdkit-plugin-lua.install b/nbdkit-plugin-lua.install
new file mode 100644 (file)
index 0000000..4d2887b
--- /dev/null
+++ b/nbdkit-plugin-lua.install
@@ -0,0 +1,2 @@
+/usr/lib/*-*/nbdkit/plugins/nbdkit-lua-plugin.so
+/usr/share/man/man3/nbdkit-lua-plugin.3

diff --git a/nbdkit-plugin-perl.install b/nbdkit-plugin-perl.install
new file mode 100644 (file)
index 0000000..b550e19
--- /dev/null
+++ b/nbdkit-plugin-perl.install
@@ -0,0 +1,2 @@
+/usr/lib/*-*/nbdkit/plugins/nbdkit-perl-plugin.so
+/usr/share/man/man3/nbdkit-perl-plugin.3

diff --git a/nbdkit-plugin-perl.lintian-overrides b/nbdkit-plugin-perl.lintian-overrides
new file mode 100644 (file)
index 0000000..796be6c
--- /dev/null
+++ b/nbdkit-plugin-perl.lintian-overrides
@@ -0,0 +1 @@
+nbdkit-plugin-perl: unusual-interpreter

diff --git a/nbdkit-plugin-python.install b/nbdkit-plugin-python.install
new file mode 100644 (file)
index 0000000..e77d928
--- /dev/null
+++ b/nbdkit-plugin-python.install
@@ -0,0 +1,4 @@
+/usr/lib/*-*/nbdkit/plugins/nbdkit-python-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-S3-plugin
+/usr/share/man/man3/nbdkit-python-plugin.3
+/usr/share/man/man1/nbdkit-S3-plugin.1

diff --git a/nbdkit-plugin-ruby.install b/nbdkit-plugin-ruby.install
new file mode 100644 (file)
index 0000000..a9110fe
--- /dev/null
+++ b/nbdkit-plugin-ruby.install
@@ -0,0 +1,2 @@
+/usr/lib/*-*/nbdkit/plugins/nbdkit-ruby-plugin.so
+/usr/share/man/man3/nbdkit-ruby-plugin.3

diff --git a/nbdkit-plugin-tcl.install b/nbdkit-plugin-tcl.install
new file mode 100644 (file)
index 0000000..cfd012e
--- /dev/null
+++ b/nbdkit-plugin-tcl.install
@@ -0,0 +1,2 @@
+/usr/lib/*-*/nbdkit/plugins/nbdkit-tcl-plugin.so
+/usr/share/man/man3/nbdkit-tcl-plugin.3

diff --git a/nbdkit.install b/nbdkit.install
new file mode 100644 (file)
index 0000000..a423507
--- /dev/null
+++ b/nbdkit.install
@@ -0,0 +1,64 @@
+/usr/bin/nbdkit
+/usr/share/man/man1/nbdkit.1
+/usr/share/man/man1/nbdkit-captive.1
+/usr/share/man/man1/nbdkit-client.1
+/usr/share/man/man1/nbdkit-loop.1
+/usr/share/man/man1/nbdkit-probing.1
+/usr/share/man/man1/nbdkit-protocol.1
+/usr/share/man/man1/nbdkit-release-notes*.1
+/usr/share/man/man1/nbdkit-security.1
+/usr/share/man/man1/nbdkit-service.1
+/usr/share/man/man1/nbdkit-tls.1
+/usr/lib/*-*/nbdkit/plugins/nbdkit-cc-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-cdi-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-curl-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-data-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-eval-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-file-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-floppy-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-full-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-info-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-iso-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-linuxdisk-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-memory-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-nbd-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-null-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-ondemand-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-partitioning-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-pattern-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-random-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-sh-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-sparse-random-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-split-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-ssh-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-tmpdisk-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-torrent-plugin.so
+/usr/lib/*-*/nbdkit/plugins/nbdkit-zero-plugin.so
+/usr/lib/*-*/nbdkit/filters
+/usr/share/man/man3/nbdkit-cc-plugin.3
+/usr/share/man/man1/nbdkit-cdi-plugin.1
+/usr/share/man/man1/nbdkit-curl-plugin.1
+/usr/share/man/man1/nbdkit-data-plugin.1
+/usr/share/man/man1/nbdkit-eval-plugin.1
+/usr/share/man/man1/nbdkit-file-plugin.1
+/usr/share/man/man1/nbdkit-floppy-plugin.1
+/usr/share/man/man1/nbdkit-full-plugin.1
+/usr/share/man/man1/nbdkit-info-plugin.1
+/usr/share/man/man1/nbdkit-iso-plugin.1
+/usr/share/man/man1/nbdkit-linuxdisk-plugin.1
+/usr/share/man/man1/nbdkit-memory-plugin.1
+/usr/share/man/man1/nbdkit-nbd-plugin.1
+/usr/share/man/man1/nbdkit-null-plugin.1
+/usr/share/man/man1/nbdkit-ondemand-plugin.1
+/usr/share/man/man1/nbdkit-partitioning-plugin.1
+/usr/share/man/man1/nbdkit-pattern-plugin.1
+/usr/share/man/man1/nbdkit-random-plugin.1
+/usr/share/man/man3/nbdkit-sh-plugin.3
+/usr/share/man/man1/nbdkit-sparse-random-plugin.1
+/usr/share/man/man1/nbdkit-split-plugin.1
+/usr/share/man/man1/nbdkit-ssh-plugin.1
+/usr/share/man/man1/nbdkit-tmpdisk-plugin.1
+/usr/share/man/man1/nbdkit-torrent-plugin.1
+/usr/share/man/man1/nbdkit-zero-plugin.1
+/usr/share/man/man1/nbdkit-*-filter.1
+/usr/share/bash-completion

diff --git a/nbdkit.lintian-overrides b/nbdkit.lintian-overrides
new file mode 100644 (file)
index 0000000..632a945
--- /dev/null
+++ b/nbdkit.lintian-overrides
@@ -0,0 +1 @@
+nbdkit: shared-lib-without-dependency-information *

diff --git a/not-installed b/not-installed
new file mode 100644 (file)
index 0000000..0e1e9eb
--- /dev/null
+++ b/not-installed
@@ -0,0 +1 @@
+/usr/include/nbd-protocol.h

diff --git a/patches/0001-Look-for-lua-5.3.patch b/patches/0001-Look-for-lua-5.3.patch
new file mode 100644 (file)
index 0000000..d74c69c
--- /dev/null
+++ b/patches/0001-Look-for-lua-5.3.patch
@@ -0,0 +1,21 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Mon, 3 Sep 2018 22:48:55 +0200
+Subject: Look for lua 5.3
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6a3be4e..909b6e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -952,7 +952,7 @@ AC_ARG_ENABLE([lua],
+     [],
+     [enable_lua=yes])
+ AS_IF([test "x$enable_lua" != "xno"],[
+-    PKG_CHECK_MODULES([LUA], [lua], [
++    PKG_CHECK_MODULES([LUA], [lua5.3], [
+         AC_SUBST([LUA_CFLAGS])
+         AC_SUBST([LUA_LIBS])
+ 

diff --git a/patches/0002-Read-TCL-compiler-linker-flags-from-tclConfig.sh-if-.patch b/patches/0002-Read-TCL-compiler-linker-flags-from-tclConfig.sh-if-.patch
new file mode 100644 (file)
index 0000000..6166907
--- /dev/null
+++ b/patches/0002-Read-TCL-compiler-linker-flags-from-tclConfig.sh-if-.patch
@@ -0,0 +1,29 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Tue, 4 Sep 2018 16:39:46 +0200
+Subject: Read TCL compiler/linker flags from tclConfig.sh if pkg-config fails
+
+---
+ configure.ac | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 909b6e4..de0793e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -940,8 +940,14 @@ AS_IF([test "x$enable_tcl" != "xno"],[
+         AC_SUBST([TCL_CFLAGS])
+         AC_SUBST([TCL_LIBS])
+     ],[
+-        AC_MSG_WARN([Tcl not found])
+-        enable_tcl=no
++        AS_IF([test -x /usr/lib/tclConfig.sh],[
++            AC_MSG_NOTICE([Reading Tcl configuration from tclConfig.sh])
++            AC_SUBST([TCL_CFLAGS], [`. /usr/lib/tclConfig.sh; echo "$TCL_INCLUDE_SPEC"`])
++            AC_SUBST([TCL_LIBS], [`. /usr/lib/tclConfig.sh; echo "$TCL_LIB_SPEC"`])
++        ],[
++            AC_MSG_WARN([Tcl not found])
++            enable_tcl=no
++        ])
+     ])
+ ])
+ AM_CONDITIONAL([HAVE_TCL],[test "x$enable_tcl" = "xyes"])

diff --git a/patches/0003-USe-date-for-pod2man-from-README-mtime.patch b/patches/0003-USe-date-for-pod2man-from-README-mtime.patch
new file mode 100644 (file)
index 0000000..a0571ac
--- /dev/null
+++ b/patches/0003-USe-date-for-pod2man-from-README-mtime.patch
@@ -0,0 +1,32 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Sun, 27 Jan 2019 05:01:06 +0100
+Subject: USe date for pod2man from README mtime
+
+---
+ podwrapper.pl.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/podwrapper.pl.in b/podwrapper.pl.in
+index bd0cf3e..7d7a841 100755
+--- a/podwrapper.pl.in
++++ b/podwrapper.pl.in
+@@ -44,6 +44,7 @@ use Pod::Simple;
+ use Pod::Simple::Text;
+ use Pod::Simple::XHTML;
+ use File::Basename;
++use POSIX qw< strftime >;
+ 
+ # https://www.redhat.com/archives/libguestfs/2013-May/thread.html#00088
+ eval { $Text::Wrap::huge = "overflow" };
+@@ -238,6 +239,11 @@ if (!$date && -d $filename) {
+     local $ENV{GIT_DIR} = $filename;
+     $date = `git show -O/dev/null -s --format=format:%cs`;
+ }
++$filename = "$abs_top_srcdir/README";
++if (-r $filename) {
++    my $mtime = (stat $filename)[9];
++    $date = strftime ('%Y-%m-%d', gmtime($mtime));
++}
+ if (!$date) {
+     my ($day, $month, $year) = (gmtime($ENV{SOURCE_DATE_EPOCH} || time))[3,4,5];
+     $date = sprintf ("%04d-%02d-%02d", $year+1900, $month+1, $day);

diff --git a/patches/0004-Check-for-mke2fs-in-sbin-dirs-configure-path-into-li.patch b/patches/0004-Check-for-mke2fs-in-sbin-dirs-configure-path-into-li.patch
new file mode 100644 (file)
index 0000000..54c9534
--- /dev/null
+++ b/patches/0004-Check-for-mke2fs-in-sbin-dirs-configure-path-into-li.patch
@@ -0,0 +1,44 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Fri, 28 Feb 2020 14:16:06 +0100
+Subject: Check for mke2fs in sbin dirs, configure path into linuxdisk plugin
+
+---
+ configure.ac                   | 7 +++++--
+ plugins/linuxdisk/filesystem.c | 2 +-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index de0793e..3170654 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -647,12 +647,15 @@ dnl Check for mke2fs -d (used by linuxdisk plugin).  There are two
+ dnl possible outcomes that we care about: (1) We have mke2fs and
+ dnl it supports the -d option.  (2) We either don't have mke2fs
+ dnl or it's too old to support the -d option (eg. on RHEL 7).
++AC_PATH_PROG([MKE2FS], [mke2fs], [no], [$PATH:/usr/local/sbin:/usr/sbin:/sbin])
++AC_MSG_CHECKING([for $MKE2FS supporting the -d option])
+ mke2fs_with_d=no
+ AS_IF([test "$enable_linuxdisk" != "no"], [
+     AC_MSG_CHECKING([for mke2fs supporting the -d option])
+-    AS_IF([mke2fs -V >/dev/null 2>&1], [
+-        AS_IF([LANG=C mke2fs -d 2>&1 | grep -sq "option requires an argument"], [
++    AS_IF([$MKE2FS -V >/dev/null 2>&1], [
++        AS_IF([LANG=C $MKE2FS -d 2>&1 | grep -sq "option requires an argument"], [
+             mke2fs_with_d=yes
++            AC_DEFINE_UNQUOTED([MKE2FS], ["$MKE2FS"], [path to mke2fs binary])
+         ])
+     ])
+     AC_MSG_RESULT([$mke2fs_with_d])
+diff --git a/plugins/linuxdisk/filesystem.c b/plugins/linuxdisk/filesystem.c
+index a9f7064..e0b02b1 100644
+--- a/plugins/linuxdisk/filesystem.c
++++ b/plugins/linuxdisk/filesystem.c
+@@ -219,7 +219,7 @@ mke2fs (const char *filename)
+     return -1;
+   }
+ 
+-  fprintf (fp, "mke2fs -q -F -t %s ", type);
++  fprintf (fp, MKE2FS " -q -F -t %s ", type);
+   if (label) {
+     fprintf (fp, "-L ");
+     shell_quote (label, fp);

diff --git a/patches/0005-Change-torrent-so-it-can-be-built-with-libtorrent-1..patch b/patches/0005-Change-torrent-so-it-can-be-built-with-libtorrent-1..patch
new file mode 100644 (file)
index 0000000..5dc3ad4
--- /dev/null
+++ b/patches/0005-Change-torrent-so-it-can-be-built-with-libtorrent-1..patch
@@ -0,0 +1,27 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Fri, 28 Aug 2020 18:00:22 +0200
+Subject: Change torrent so it can be built with libtorrent 1.2.5
+
+---
+ plugins/torrent/torrent.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/torrent/torrent.cpp b/plugins/torrent/torrent.cpp
+index 9d109fc..ff8d44a 100644
+--- a/plugins/torrent/torrent.cpp
++++ b/plugins/torrent/torrent.cpp
+@@ -104,10 +104,10 @@ static struct setting settings[] = {
+ static const size_t nr_settings = sizeof settings / sizeof settings[0];
+ 
+ static libtorrent::alert_category_t alerts =
+-    libtorrent::alert_category::error
+-  | libtorrent::alert_category::piece_progress
+-  | libtorrent::alert_category::status
+-  | libtorrent::alert_category::storage
++    libtorrent::alert::error_notification
++  | libtorrent::alert::piece_progress_notification
++  | libtorrent::alert::status_notification
++  | libtorrent::alert::storage_notification
+   ;
+ 
+ /* This condition is used to signal the plugin when a piece has been

diff --git a/patches/0007-output-Replace-system-with-explicit-bash-invocation.patch b/patches/0007-output-Replace-system-with-explicit-bash-invocation.patch
new file mode 100644 (file)
index 0000000..22da172
--- /dev/null
+++ b/patches/0007-output-Replace-system-with-explicit-bash-invocation.patch
@@ -0,0 +1,46 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Sun, 10 Jan 2021 00:24:53 +0100
+Subject: output: Replace system() with explicit bash invocation
+
+Tehre is probably a better way to do this.
+---
+ filters/log/output.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/filters/log/output.c b/filters/log/output.c
+index c999150..89d2eab 100644
+--- a/filters/log/output.c
++++ b/filters/log/output.c
+@@ -44,6 +44,7 @@
+ #include <assert.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <sys/wait.h>
+ 
+ #include <nbdkit-filter.h>
+ 
+@@ -113,6 +114,8 @@ to_script (struct handle *h, log_id_t id, const char *act, enum type type,
+   CLEANUP_FREE char *str = NULL;
+   size_t len = 0;
+   int r;
++  int pid;
++  int wstatus = 0;
+ 
+   /* Create the shell variables + script. */
+   fp = open_memstream (&str, &len);
+@@ -140,7 +143,14 @@ to_script (struct handle *h, log_id_t id, const char *act, enum type type,
+   fclose (fp);
+ 
+   /* Run the script.  Log the status, but ignore it. */
+-  r = system (str);
++  if (pid = fork() == 0) {
++    execl ("/bin/bash", "sh", "-c", str, NULL);
++    exit (-errno);
++  } else if (pid > 0) {
++    waitpid (pid, &r, 0);
++  } else {
++    r = -1;
++  }
+   exit_status_to_nbd_error (r, "logscript");
+ }
+ 

diff --git a/patches/0008-Disable-some-tests.patch b/patches/0008-Disable-some-tests.patch
new file mode 100644 (file)
index 0000000..c7e2b57
--- /dev/null
+++ b/patches/0008-Disable-some-tests.patch
@@ -0,0 +1,30 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Sun, 10 Jan 2021 18:21:00 +0100
+Subject: Disable some tests
+
+These have failed on buildds but failures could not be reproduced in
+regular schroot/sbuild environments.
+---
+ tests/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 9b995e5..8307c51 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1595,7 +1595,6 @@ test_gzip_LDADD = libtest.la $(LIBGUESTFS_LIBS)
+ 
+ # ip filter test.
+ TESTS += \
+-      test-ip-filter.sh \
+       test-ip-filter-anyunix.sh \
+       test-ip-filter-anyvsock.sh \
+       test-ip-filter-pid.sh \
+@@ -1621,7 +1620,6 @@ TESTS += \
+       test-log-error.sh \
+       test-log-extents.sh \
+       test-log-script.sh \
+-      test-log-script-info.sh \
+       $(NULL)
+ EXTRA_DIST += \
+       test-log.sh \

diff --git a/patches/0009-cc-plugin-Filter-out-ffile-prefix-map-etc.-from-CFLA.patch b/patches/0009-cc-plugin-Filter-out-ffile-prefix-map-etc.-from-CFLA.patch
new file mode 100644 (file)
index 0000000..f480ed1
--- /dev/null
+++ b/patches/0009-cc-plugin-Filter-out-ffile-prefix-map-etc.-from-CFLA.patch
@@ -0,0 +1,36 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Mon, 23 Aug 2021 09:40:33 +0100
+Subject: cc plugin: Filter out -ffile-prefix-map etc. from CFLAGS
+
+The default CFLAGS from dpkg-buildflags include this compiler flag to
+rewrite nbdkit's own source directory in __FILE__, debug symbols and
+similar constructs so that the source directory used by the developer
+or the transient source directory used by an autobuilder is not
+written into the executable, which would make it non-reproducible
+between different build directories. Older versions used
+-fdebug-prefix-map for a similar (although more limited) purpose.
+
+However, these particular flags are not useful when compiling a new
+plugin at a later time, and because they include the package's source
+directory, including them in the binary makes it non-reproducible
+between different build directories.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Bug-Debian: https://bugs.debian.org/992722
+---
+ plugins/cc/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/cc/Makefile.am b/plugins/cc/Makefile.am
+index 0d05fce..46b02f5 100644
+--- a/plugins/cc/Makefile.am
++++ b/plugins/cc/Makefile.am
+@@ -46,7 +46,7 @@ nbdkit_cc_plugin_la_SOURCES = \
+ 
+ nbdkit_cc_plugin_la_CPPFLAGS = \
+       -DCC="\"$(CC)\"" \
+-      -DCFLAGS="\"$(CFLAGS) -fPIC -shared\"" \
++      -DCFLAGS="\"$(filter-out -ffile-prefix-map=% -fdebug-prefix-map=%,$(CFLAGS)) -fPIC -shared\"" \
+       -I$(top_srcdir)/common/include \
+       -I$(top_srcdir)/common/utils \
+       -I$(top_srcdir)/include \

diff --git a/patches/0010-Disable-test-delay-close.sh.patch b/patches/0010-Disable-test-delay-close.sh.patch
new file mode 100644 (file)
index 0000000..a1b7efc
--- /dev/null
+++ b/patches/0010-Disable-test-delay-close.sh.patch
@@ -0,0 +1,20 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Mon, 27 Dec 2021 20:18:46 +0100
+Subject: Disable test-delay-close.sh
+
+---
+ tests/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 8307c51..3ab1a77 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1485,7 +1485,6 @@ EXTRA_DIST += \
+ 
+ # delay filter tests.
+ TESTS += \
+-      test-delay-close.sh \
+       test-delay-open.sh \
+       test-delay-shutdown.sh \
+       $(NULL)

diff --git a/patches/series b/patches/series
new file mode 100644 (file)
index 0000000..a52f54d
--- /dev/null
+++ b/patches/series
@@ -0,0 +1,9 @@
+0001-Look-for-lua-5.3.patch
+0002-Read-TCL-compiler-linker-flags-from-tclConfig.sh-if-.patch
+0003-USe-date-for-pod2man-from-README-mtime.patch
+0004-Check-for-mke2fs-in-sbin-dirs-configure-path-into-li.patch
+0005-Change-torrent-so-it-can-be-built-with-libtorrent-1..patch
+0007-output-Replace-system-with-explicit-bash-invocation.patch
+0008-Disable-some-tests.patch
+0009-cc-plugin-Filter-out-ffile-prefix-map-etc.-from-CFLA.patch
+0010-Disable-test-delay-close.sh.patch

diff --git a/rules b/rules
new file mode 100755 (executable)
index 0000000..cc4497e
--- /dev/null
+++ b/rules
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+export DH_OPTIONS
+
+include /usr/share/dpkg/architecture.mk
+
+%:
+       dh $@ --with autoreconf
+
+override_dh_auto_configure:
+       dh_auto_configure -- --disable-vddk --sbindir=/usr/bin MKE2FS=/sbin/mke2fs
+
+# Workaround for unreliable changes in qemu behavior on the
+# autobuilders, e.g.:
+# - s390x: qemu-system-s390x won't start:
+#     "Initialization of device s390-ipl failed: could not find stage1 bootloader"
+# - mipsel, armel, powerpc: test suite hangs:
+#     "Build killed with signal TERM after 150 minutes of inactivity"
+# - armhf: qemu-system-arm crashes (#888182):
+#     "libguestfs: error: /usr/bin/qemu-system-arm killed by signal 11 (Segmentation fault)."
+# - arm64: qemu really wants KVM:
+#     qemu-system-aarch64: failed to initialize KVM: No such file or directory
+#     qemu-system-aarch64: Back to tcg accelerator
+#     qemu-system-aarch64: gic-version=host requires KVM
+# - mips64el: qemu-system-mips64el won't start:
+#     "libguestfs: error: /usr/bin/qemu-system-mips64el exited with error status 1."
+#     "qemu-system-mips64el: Initialization of device mc146818rtc failed: Invalid lost tick policy."
+# - ppc64, ppc64el: qemu-system-ppc64 crashes:
+#     "libguestfs: error: /usr/bin/qemu-system-ppc64 killed by signal 4 (Illegal instruction)."
+#     "libguestfs: error: /usr/bin/qemu-system-ppc64 killed by signal 11 (Segmentation fault)."
+override_dh_auto_test: PATH := $(PATH):/sbin
+override_dh_auto_test: export LIBGUESTFS_DEBUG=1
+override_dh_auto_test:
+ifneq (,$(findstring $(DEB_HOST_ARCH),i386 amd64))
+       dh_auto_test --no-parallel
+endif
+
+override_dh_missing:
+       dh_missing -X.la --fail-missing
+
+override_dh_install:
+       dh_install -X.la
+
+# Don't run dh_makeshlibs since no "real" shared libraries are built
+# Thus avoid Lintian warnings/errors:
+# - pkg-has-shlibs-control-file-but-no-actual-shared-libs
+# - post{inst,rm}-has-useless-call-to-ldconfig
+override_dh_makeshlibs:

diff --git a/source/format b/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/source/lintian-overrides b/source/lintian-overrides
new file mode 100644 (file)
index 0000000..629cdcf
--- /dev/null
+++ b/source/lintian-overrides
@@ -0,0 +1,3 @@
+# modules built with old nbdkit versions are only used in
+# compatibility tests.
+source-is-missing tests/old-plugins/*.so

diff --git a/watch b/watch
new file mode 100644 (file)
index 0000000..4d02c5d
--- /dev/null
+++ b/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://libguestfs.org/download/nbdkit/(.*)-stable/nbdkit-(.*)\.tar\.gz