Record boxbackup (0.13~~git20200326.g8e8b63c-2) in archive suite sid

13 files changed, 156 insertions, 121 deletions

diff --git a/debian/boxbackup-client.config b/debian/boxbackup-client.config
index a2ed866d..4be916dd 100644
--- a/debian/boxbackup-client.config
+++ b/debian/boxbackup-client.config
@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+set -e
+
 # Source debconf library
 . /usr/share/debconf/confmodule
 
diff --git a/debian/boxbackup-server.config b/debian/boxbackup-server.config
index d9c07299..f98ae970 100644
--- a/debian/boxbackup-server.config
+++ b/debian/boxbackup-server.config
@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+set -e
+
 # Source debconf library
 . /usr/share/debconf/confmodule
 
diff --git a/debian/changelog b/debian/changelog
index 42a51c4b..29b51e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+boxbackup (0.13~~git20200326.g8e8b63c-2) unstable; urgency=medium
+
+  [ Ileana Dumitrescu ]
+  * debian/control: debhelper-compat version 13
+                    removed some lintian warnings
+                    updated maintainer (Closes: #817078)
+  * debian/rules: converted to new dh format
+  * debian/copyright: updated to dep5 version 1.0 format
+  * debian/boxbackup-client.config: added set -e
+  * debian/boxbackup-server.config: added set -e
+  * debian/compat: removed for new dh format
+
+  [ Simon Chopin ]
+  * debian/patches: added patch c++17.diff (Closes: #984002)
+
+ -- Ileana Dumitrescu <ileanadumi95@protonmail.com>  Wed, 05 Jan 2022 14:24:10 +0100
+
 boxbackup (0.13~~git20200326.g8e8b63c-1) unstable; urgency=medium
 
   * QA upload.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28b..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index c858dfe0..048f6371 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
 Source: boxbackup
 Section: utils
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ileana Dumitrescu <ileanadumi95@protonmail.com>
 Build-Depends:
  autoconf,
  automake,
- debhelper (>> 10),
+ debhelper-compat (= 13),
  docbook-utils,
  docbook-xml,
  docbook-xsl,
@@ -19,6 +19,7 @@ Standards-Version: 4.5.0
 Homepage: http://boxbackup.org
 Vcs-Git: https://salsa.debian.org/debian/boxbackup.git
 Vcs-Browser: https://salsa.debian.org/debian/boxbackup
+Rules-Requires-Root: no
 
 Package: boxbackup-server
 Architecture: any
@@ -32,6 +33,7 @@ Depends:
  ucf,
  ${misc:Depends},
  ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Recommends: e2fsprogs
 Description: server for the BoxBackup remote backup system
  BoxBackup is an automatic on-line backup system.
@@ -50,6 +52,7 @@ Depends:
  ucf,
  ${misc:Depends},
  ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Description: client for the BoxBackup remote backup system
  BoxBackup is an automatic on-line backup system.
  The client watches for changes on the local file system,
diff --git a/debian/copyright b/debian/copyright
index ffb3eead..782aece7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,48 +1,45 @@
-This package was debianized by Jérôme Schell <jerome@myreseau.org> on
-Tue,  1 Jun 2004 07:51:24 +0000.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: boxbackup
+Upstream-Contact: Ben Summers <ben@fluffy.co.uk>
+Source: http://boxbackup.org
+
+Files: *
+Copyright: 2003-2004, Ben Summers <ben@fluffy.co.uk>
+License: BSD-4-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. All use of this software and associated advertising materials must
+    display the following acknowledgement:
+        This product includes software developed by Ben Summers.
+ 4. The names of the Authors may not be used to endorse or promote
+    products derived from this software without specific prior written
+    permission.
+ .
+ [Where legally impermissible the Authors do not disclaim liability for
+ direct physical injury or death caused solely by defects in the software
+ unless it is modified by a third party.]
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
+ .
+ Commentary
+ .
+ This license is based on a standard BSD license. Some minor changes in wording have been made to fit in with English law.
+ .
+ © Ben Summers, 2003, 2004
 
-It was downloaded from http://boxbackup.org
-
-Upstream Author: Ben Summers <ben@fluffy.co.uk>
-
-Copyright:
-
-Copyright (c) 2003, 2004
-     Ben Summers.  All rights reserved.
-
-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. All use of this software and associated advertising materials must
-   display the following acknowledgement:
-       This product includes software developed by Ben Summers.
-4. The names of the Authors may not be used to endorse or promote
-   products derived from this software without specific prior written
-   permission.
-
-[Where legally impermissible the Authors do not disclaim liability for
-direct physical injury or death caused solely by defects in the software
-unless it is modified by a third party.]
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
-
-Commentary
-
-This license is based on a standard BSD license. Some minor changes in wording have been made to fit in with English law.
-
-© Ben Summers, 2003, 2004
diff --git a/debian/patches/c++17.diff b/debian/patches/c++17.diff
new file mode 100644
index 00000000..1db1f485
--- /dev/null
+++ b/debian/patches/c++17.diff
@@ -0,0 +1,62 @@
+Description: Mark the comparator object as const callabled
+ This fixes the build when using C++17
+Author: Simon Chopin <simon.chopin@canonical.com>
+--- a/lib/bbackupd/BackupDaemon.cpp
++++ b/lib/bbackupd/BackupDaemon.cpp
+@@ -2339,7 +2339,7 @@
+ 	// by code, rather than the OS.
+ 	typedef struct
+ 	{
+-		bool operator()(const std::string &s1, const std::string &s2)
++		bool operator()(const std::string &s1, const std::string &s2) const
+ 		{
+ 			if(s1.size() == s2.size())
+ 			{
+--- a/lib/backupstore/HousekeepStoreAccount.cpp
++++ b/lib/backupstore/HousekeepStoreAccount.cpp
+@@ -561,7 +561,7 @@
+ //		Created: 11/12/03
+ //
+ // --------------------------------------------------------------------------
+-bool HousekeepStoreAccount::DelEnCompare::operator()(const HousekeepStoreAccount::DelEn &x, const HousekeepStoreAccount::DelEn &y)
++bool HousekeepStoreAccount::DelEnCompare::operator()(const HousekeepStoreAccount::DelEn &x, const HousekeepStoreAccount::DelEn &y) const
+ {
+ 	// STL spec says this:
+ 	// A Strict Weak Ordering is a Binary Predicate that compares two objects, returning true if the first precedes the second.
+--- a/lib/backupstore/HousekeepStoreAccount.h
++++ b/lib/backupstore/HousekeepStoreAccount.h
+@@ -72,7 +72,7 @@
+ 	
+ 	struct DelEnCompare
+ 	{
+-		bool operator()(const DelEn &x, const DelEn &y);
++		bool operator()(const DelEn &x, const DelEn &y) const;
+ 	};
+ 	
+ 	int mAccountID;
+--- a/lib/common/DebugMemLeakFinder.cpp
++++ b/lib/common/DebugMemLeakFinder.cpp
+@@ -703,7 +703,7 @@
+ }
+ */
+ 
+-void *operator new[](size_t size) throw (std::bad_alloc)
++void *operator new[](size_t size) noexcept(false)
+ {
+ 	return internal_new(size, "standard libraries", 0);
+ }
+@@ -717,12 +717,12 @@
+ 	//TRACE1("delete[]() called, %08x\n", ptr);
+ }
+ 
+-void operator delete[](void *ptr) throw ()
++void operator delete[](void *ptr) noexcept
+ {
+ 	internal_delete(ptr);
+ }
+ 
+-void operator delete(void *ptr) throw ()
++void operator delete(void *ptr) noexcept
+ {
+ 	internal_delete(ptr);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index f52e7b08..c14c90e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 03-adjust-syslog-facility.diff
 05-dont_use_net_for_docs.diff
+c++17.diff
diff --git a/debian/rules b/debian/rules
index b67b9519..902bbc40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 include /usr/share/dpkg/pkg-info.mk
@@ -19,25 +19,31 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
+%:
+	dh $@
+	
+override_dh_autoreconf:
 	echo "$(DEB_VERSION_UPSTREAM_REVISION)" > VERSION.txt
 	echo "boxbackup" >> VERSION.txt
 	sh -x ./bootstrap
-	./configure $(DEB_EXTRA_CONFIG_FLAGS) LDFLAGS="-Wl,--as-needed"
-	touch configure-stamp
-
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) V=1
+	dh_autoreconf
+	
+override_dh_auto_configure:
+	./configure $(DEB_EXTRA_CONFIG_FLAGS)
+	
+override_dh_auto_test:
 # the testsuite is only really maintained on i386 and amd64
 ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	./runtest.pl ALL
 endif
 endif
-	touch build-stamp
+	
+override_dh_auto_install:
+	mkdir -p $(TMP)/etc/logcheck/ignore.d.workstation
+	mkdir -p $(TMP)/etc/logcheck/ignore.d.server
+	install -m 644 debian/boxbackup-server.logcheck.ignore $(TMP)/etc/logcheck/ignore.d.workstation/boxbackup-server
+	install -m 644 debian/boxbackup-server.logcheck.ignore $(TMP)/etc/logcheck/ignore.d.server/boxbackup-server
 
 docs/docbook/instguide.pdf:
 	$(MAKE) -C docs instguide
@@ -49,57 +55,3 @@ docs/docbook/adminguide.pdf: configure-stamp
 
 docs: docs/docbook/instguide.pdf docs/docbook/adminguide.pdf
 	$(MAKE) -C docs manpages
-
-build-arch: build-stamp
-build-indep: docs
-
-build: build-arch build-indep
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean build-stamp configure-stamp
-	echo "USE_SVN_VERSION" > VERSION.txt
-	echo "boxbackup" >> VERSION.txt
-	[ ! -f Makefile ] || make clean
-	sh debian/clean.sh
-	dh_clean config.log config.status 
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	mkdir -p $(TMP)/etc/logcheck/ignore.d.workstation
-	mkdir -p $(TMP)/etc/logcheck/ignore.d.server
-	install -m 644 debian/boxbackup-server.logcheck.ignore $(TMP)/etc/logcheck/ignore.d.workstation/boxbackup-server
-	install -m 644 debian/boxbackup-server.logcheck.ignore $(TMP)/etc/logcheck/ignore.d.server/boxbackup-server
-
-	dh_install
-
-binary-indep:
-#  no architecture independant packages are being built
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdebconf -a
-	dh_installdocs -a -A ExceptionCodes.txt docs/docbook/instguide.pdf docs/docbook/adminguide.pdf
-	dh_installinit -a
-	dh_installcron -a
-	dh_installman
-	dh_installchangelogs  -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install docs
diff --git a/lib/backupstore/HousekeepStoreAccount.cpp b/lib/backupstore/HousekeepStoreAccount.cpp
index d5acf62c..78165538 100644
--- a/lib/backupstore/HousekeepStoreAccount.cpp
+++ b/lib/backupstore/HousekeepStoreAccount.cpp
@@ -561,7 +561,7 @@ bool HousekeepStoreAccount::ScanDirectory(int64_t ObjectID,
 //		Created: 11/12/03
 //
 // --------------------------------------------------------------------------
-bool HousekeepStoreAccount::DelEnCompare::operator()(const HousekeepStoreAccount::DelEn &x, const HousekeepStoreAccount::DelEn &y)
+bool HousekeepStoreAccount::DelEnCompare::operator()(const HousekeepStoreAccount::DelEn &x, const HousekeepStoreAccount::DelEn &y) const
 {
 	// STL spec says this:
 	// A Strict Weak Ordering is a Binary Predicate that compares two objects, returning true if the first precedes the second.
diff --git a/lib/backupstore/HousekeepStoreAccount.h b/lib/backupstore/HousekeepStoreAccount.h
index ff9e9ffe..908d6ec1 100644
--- a/lib/backupstore/HousekeepStoreAccount.h
+++ b/lib/backupstore/HousekeepStoreAccount.h
@@ -72,7 +72,7 @@ private:
 	
 	struct DelEnCompare
 	{
-		bool operator()(const DelEn &x, const DelEn &y);
+		bool operator()(const DelEn &x, const DelEn &y) const;
 	};
 	
 	int mAccountID;
diff --git a/lib/bbackupd/BackupDaemon.cpp b/lib/bbackupd/BackupDaemon.cpp
index f4dcf270..4dac5f2e 100644
--- a/lib/bbackupd/BackupDaemon.cpp
+++ b/lib/bbackupd/BackupDaemon.cpp
@@ -2339,7 +2339,7 @@ void BackupDaemon::SendSyncStartOrFinish(bool SendStart)
 	// by code, rather than the OS.
 	typedef struct
 	{
-		bool operator()(const std::string &s1, const std::string &s2)
+		bool operator()(const std::string &s1, const std::string &s2) const
 		{
 			if(s1.size() == s2.size())
 			{
diff --git a/lib/common/DebugMemLeakFinder.cpp b/lib/common/DebugMemLeakFinder.cpp
index 58a82c0e..dd42173d 100644
--- a/lib/common/DebugMemLeakFinder.cpp
+++ b/lib/common/DebugMemLeakFinder.cpp
@@ -703,7 +703,7 @@ void *operator new(size_t size)
 }
 */
 
-void *operator new[](size_t size) throw (std::bad_alloc)
+void *operator new[](size_t size) noexcept(false)
 {
 	return internal_new(size, "standard libraries", 0);
 }
@@ -717,12 +717,12 @@ void internal_delete(void *ptr)
 	//TRACE1("delete[]() called, %08x\n", ptr);
 }
 
-void operator delete[](void *ptr) throw ()
+void operator delete[](void *ptr) noexcept
 {
 	internal_delete(ptr);
 }
 
-void operator delete(void *ptr) throw ()
+void operator delete(void *ptr) noexcept
 {
 	internal_delete(ptr);
 }