diff -Nru process-cpp-3.0.1/debian/changelog process-cpp-3.0.1/debian/changelog --- process-cpp-3.0.1/debian/changelog 2020-12-12 12:10:55.000000000 +0000 +++ process-cpp-3.0.1/debian/changelog 2021-12-21 07:35:29.000000000 +0000 @@ -1,14 +1,37 @@ -process-cpp (3.0.1-8build1) hirsute; urgency=medium +process-cpp (3.0.1-9) unstable; urgency=medium - * No-change rebuild for boost soname change. + [ Mike Gabriel ] + * debian/changelog: + + post-upload give credits to Chris Lamb for the patch regarding #961202. + * debian/control: + + Add Rules-Requires-Root: field and set it to 'no'. + + Bump Standards-Version: to 4.6.0. No changes needed. + + Add B-Ds: rdfind, symbols. + * debian/*.lintian-overrides: + + Drop files. Not required anymore. + * debian/{rules,libprocess-cpp-doc.install}: + + Move doc files into doc:pkg's doc folder. + * debian/rules: + + Enable all hardening build flags. + + Clean-up duplicate files in API docs and use symlinks instead. + * debian/patches: + + Add 1004-spelling-fixes.patch. Fix spelling of the word 'occurred'. + Thanks, lintian. + + Rename patch files to match our patch naming scheme. + + [ Aurelien Jarno ] + * debian/patches: + + Add 0003-link-pthread.patch. Fix FTBFS on riscv64, link with -lpthread + instead of -pthread. (Closes: 1002052). - -- Matthias Klose Sat, 12 Dec 2020 13:10:55 +0100 + -- Mike Gabriel Tue, 21 Dec 2021 08:35:29 +0100 process-cpp (3.0.1-8) unstable; urgency=medium * debian/patches: + Improve 0002-Reproducible-documentation.patch. Exclude link.txt from documentation. - This makes the build (even more) reproducible. (Closes: #961202). + This makes the build (even more) reproducible. (Closes: #961202). Thanks to + Chris Lamb for the patch. * debian/control: + Bump DH compat level to version 13. + Bump Standards-Version: to 4.5.0. No changes needed. diff -Nru process-cpp-3.0.1/debian/control process-cpp-3.0.1/debian/control --- process-cpp-3.0.1/debian/control 2020-10-18 18:11:07.000000000 +0000 +++ process-cpp-3.0.1/debian/control 2021-12-21 07:35:29.000000000 +0000 @@ -12,8 +12,11 @@ libboost-iostreams-dev, libboost-system-dev, libproperties-cpp-dev, - pkg-config -Standards-Version: 4.5.0 + pkg-config, + rdfind, + symlinks, +Standards-Version: 4.6.0 +Rules-Requires-Root: no Section: libs Homepage: https://gitlab.com/ubports/core/lib-cpp/process-cpp Vcs-Git: https://salsa.debian.org/ubports-team/process-cpp.git diff -Nru process-cpp-3.0.1/debian/libprocess-cpp-cpp3.lintian-overrides process-cpp-3.0.1/debian/libprocess-cpp-cpp3.lintian-overrides --- process-cpp-3.0.1/debian/libprocess-cpp-cpp3.lintian-overrides 2020-01-25 14:07:32.000000000 +0000 +++ process-cpp-3.0.1/debian/libprocess-cpp-cpp3.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -no-upstream-changelog diff -Nru process-cpp-3.0.1/debian/libprocess-cpp-dev.lintian-overrides process-cpp-3.0.1/debian/libprocess-cpp-dev.lintian-overrides --- process-cpp-3.0.1/debian/libprocess-cpp-dev.lintian-overrides 2020-01-25 14:07:32.000000000 +0000 +++ process-cpp-3.0.1/debian/libprocess-cpp-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -no-upstream-changelog diff -Nru process-cpp-3.0.1/debian/libprocess-cpp-doc.install process-cpp-3.0.1/debian/libprocess-cpp-doc.install --- process-cpp-3.0.1/debian/libprocess-cpp-doc.install 2018-07-24 08:28:18.000000000 +0000 +++ process-cpp-3.0.1/debian/libprocess-cpp-doc.install 2021-12-21 07:35:29.000000000 +0000 @@ -1 +1 @@ -usr/share/doc/process-cpp/ +usr/share/doc/libprocess-cpp-doc/html/ diff -Nru process-cpp-3.0.1/debian/libprocess-cpp-doc.lintian-overrides process-cpp-3.0.1/debian/libprocess-cpp-doc.lintian-overrides --- process-cpp-3.0.1/debian/libprocess-cpp-doc.lintian-overrides 2020-01-25 14:07:32.000000000 +0000 +++ process-cpp-3.0.1/debian/libprocess-cpp-doc.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -no-upstream-changelog diff -Nru process-cpp-3.0.1/debian/patches/0001-Don-t-run-tests.patch process-cpp-3.0.1/debian/patches/0001-Don-t-run-tests.patch --- process-cpp-3.0.1/debian/patches/0001-Don-t-run-tests.patch 2020-01-25 14:07:32.000000000 +0000 +++ process-cpp-3.0.1/debian/patches/0001-Don-t-run-tests.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -From: Chris Lamb -Date: Mon, 22 Jan 2018 14:10:39 +1100 -Subject: Don't run tests. - ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae822e249525..063c8ec4e4dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,4 +73,3 @@ add_subdirectory(doc) - add_subdirectory(data) - add_subdirectory(include) - add_subdirectory(src) --add_subdirectory(tests) diff -Nru process-cpp-3.0.1/debian/patches/0002-Reproducible-documentation.patch process-cpp-3.0.1/debian/patches/0002-Reproducible-documentation.patch --- process-cpp-3.0.1/debian/patches/0002-Reproducible-documentation.patch 2020-10-18 18:09:05.000000000 +0000 +++ process-cpp-3.0.1/debian/patches/0002-Reproducible-documentation.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From: Chris Lamb -Date: Mon, 22 Jan 2018 14:55:11 +1100 -Subject: Reproducible documentation - ---- - doc/Doxyfile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in -index 3d361df98c23..a831e17729fd 100644 ---- a/doc/Doxyfile.in -+++ b/doc/Doxyfile.in -@@ -119,7 +119,7 @@ INLINE_INHERITED_MEMB = NO - # path before files name in the file list and in the header files. If set - # to NO the shortest path that makes the file name unique will be used. - --FULL_PATH_NAMES = YES -+FULL_PATH_NAMES = NO - - # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag - # can be used to strip a user-defined part of the path. Stripping is -@@ -714,7 +714,7 @@ EXCLUDE_SYMLINKS = NO - # against the file with absolute path, so to exclude all test directories - # for example use the pattern */test/* - --EXCLUDE_PATTERNS = -+EXCLUDE_PATTERNS = */DartConfiguration.tcl */link.txt - - # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names - # (namespaces, classes, functions, etc.) that should be excluded from the diff -Nru process-cpp-3.0.1/debian/patches/1002-Reproducible-documentation.patch process-cpp-3.0.1/debian/patches/1002-Reproducible-documentation.patch --- process-cpp-3.0.1/debian/patches/1002-Reproducible-documentation.patch 1970-01-01 00:00:00.000000000 +0000 +++ process-cpp-3.0.1/debian/patches/1002-Reproducible-documentation.patch 2021-12-21 07:35:29.000000000 +0000 @@ -0,0 +1,30 @@ +From: Chris Lamb +Date: Mon, 22 Jan 2018 14:55:11 +1100 +Subject: Reproducible documentation + +--- + doc/Doxyfile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in +index 3d361df98c23..a831e17729fd 100644 +--- a/doc/Doxyfile.in ++++ b/doc/Doxyfile.in +@@ -119,7 +119,7 @@ INLINE_INHERITED_MEMB = NO + # path before files name in the file list and in the header files. If set + # to NO the shortest path that makes the file name unique will be used. + +-FULL_PATH_NAMES = YES ++FULL_PATH_NAMES = NO + + # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag + # can be used to strip a user-defined part of the path. Stripping is +@@ -714,7 +714,7 @@ EXCLUDE_SYMLINKS = NO + # against the file with absolute path, so to exclude all test directories + # for example use the pattern */test/* + +-EXCLUDE_PATTERNS = ++EXCLUDE_PATTERNS = */DartConfiguration.tcl */link.txt + + # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names + # (namespaces, classes, functions, etc.) that should be excluded from the diff -Nru process-cpp-3.0.1/debian/patches/1003-link-pthread.patch process-cpp-3.0.1/debian/patches/1003-link-pthread.patch --- process-cpp-3.0.1/debian/patches/1003-link-pthread.patch 1970-01-01 00:00:00.000000000 +0000 +++ process-cpp-3.0.1/debian/patches/1003-link-pthread.patch 2021-12-21 07:35:29.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Link with -pthread instead of -lpthread + The canonical way to link with the thread library is to use -pthread, which + brings in additional libraries like libatomic.so on riscv64. However cmake + defaults to link with -lpthread which only bring the libpthread.so library. + Fortunately it has the option THREADS_PREFER_PTHREAD_FLAG for that, which is + "highly recommended" but not the default. +Author: Aurelien Jarno +Last-Update: 2021-12-20 + +--- process-cpp-3.0.1.orig/CMakeLists.txt ++++ process-cpp-3.0.1/CMakeLists.txt +@@ -20,6 +20,7 @@ project(process-cpp) + + find_package(Boost COMPONENTS iostreams system REQUIRED) + find_package(PkgConfig REQUIRED) ++set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + + pkg_check_modules(PROPERTIES_CPP properties-cpp) diff -Nru process-cpp-3.0.1/debian/patches/1004-spelling-fixes.patch process-cpp-3.0.1/debian/patches/1004-spelling-fixes.patch --- process-cpp-3.0.1/debian/patches/1004-spelling-fixes.patch 1970-01-01 00:00:00.000000000 +0000 +++ process-cpp-3.0.1/debian/patches/1004-spelling-fixes.patch 2021-12-21 07:35:29.000000000 +0000 @@ -0,0 +1,57 @@ +Description: Fix spelling errors +Author: Mike Gabriel + +--- a/include/core/posix/wait.h ++++ b/include/core/posix/wait.h +@@ -59,7 +59,7 @@ + enum class Status + { + undefined, ///< Marks an undefined state. +- no_state_change, ///< No state change occured. ++ no_state_change, ///< No state change occurred. + exited, ///< The process exited normally. + signaled, ///< The process was signalled and terminated. + stopped, ///< The process was signalled and stopped. +--- a/include/core/testing/fork_and_run.h ++++ b/include/core/testing/fork_and_run.h +@@ -49,7 +49,7 @@ + * - Forks a process for the client and runs the respective closure. + * - After the client has finished, the service is signalled with sigterm. + * +- * @throw std::system_error if an error occured during process interaction. ++ * @throw std::system_error if an error occurred during process interaction. + * @throw std::runtime_error for signalling all other error conditions. + * @param [in] service The service to be executed in a child process. + * @param [in] client The client to be executed in a child process. +--- a/src/core/posix/fork.cpp ++++ b/src/core/posix/fork.cpp +@@ -93,12 +93,12 @@ + result = main(); + } catch(const std::exception& e) + { +- std::cerr << "core::posix::fork(): An unhandled std::exception occured in the child process:" << std::endl ++ std::cerr << "core::posix::fork(): An unhandled std::exception occurred in the child process:" << std::endl + << " what(): " << e.what() << std::endl; + print_backtrace(std::cerr, " "); + } catch(...) + { +- std::cerr << "core::posix::fork(): An unhandled exception occured in the child process." << std::endl; ++ std::cerr << "core::posix::fork(): An unhandled exception occurred in the child process." << std::endl; + print_backtrace(std::cerr, " "); + } + +@@ -150,12 +150,12 @@ + result = main(); + } catch(const std::exception& e) + { +- std::cerr << "core::posix::fork(): An unhandled std::exception occured in the child process:" << std::endl ++ std::cerr << "core::posix::fork(): An unhandled std::exception occurred in the child process:" << std::endl + << " what(): " << e.what() << std::endl; + print_backtrace(std::cerr, " "); + } catch(...) + { +- std::cerr << "core::posix::fork(): An unhandled exception occured in the child process." << std::endl; ++ std::cerr << "core::posix::fork(): An unhandled exception occurred in the child process." << std::endl; + print_backtrace(std::cerr, " "); + } + diff -Nru process-cpp-3.0.1/debian/patches/2001-Don-t-run-tests.patch process-cpp-3.0.1/debian/patches/2001-Don-t-run-tests.patch --- process-cpp-3.0.1/debian/patches/2001-Don-t-run-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ process-cpp-3.0.1/debian/patches/2001-Don-t-run-tests.patch 2021-12-21 07:35:29.000000000 +0000 @@ -0,0 +1,17 @@ +From: Chris Lamb +Date: Mon, 22 Jan 2018 14:10:39 +1100 +Subject: Don't run tests. + +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae822e249525..063c8ec4e4dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,4 +73,3 @@ add_subdirectory(doc) + add_subdirectory(data) + add_subdirectory(include) + add_subdirectory(src) +-add_subdirectory(tests) diff -Nru process-cpp-3.0.1/debian/patches/series process-cpp-3.0.1/debian/patches/series --- process-cpp-3.0.1/debian/patches/series 2020-01-25 14:07:32.000000000 +0000 +++ process-cpp-3.0.1/debian/patches/series 2021-12-21 07:35:29.000000000 +0000 @@ -1,2 +1,4 @@ -0001-Don-t-run-tests.patch -0002-Reproducible-documentation.patch +2001-Don-t-run-tests.patch +1002-Reproducible-documentation.patch +1003-link-pthread.patch +1004-spelling-fixes.patch diff -Nru process-cpp-3.0.1/debian/rules process-cpp-3.0.1/debian/rules --- process-cpp-3.0.1/debian/rules 2020-10-18 18:12:34.000000000 +0000 +++ process-cpp-3.0.1/debian/rules 2021-12-21 07:35:29.000000000 +0000 @@ -1,7 +1,22 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + %: dh $@ +override_dh_install: + mkdir -p debian/tmp/usr/share/doc/libprocess-cpp-doc/ + mv debian/tmp/usr/share/doc/process-cpp/html debian/tmp/usr/share/doc/libprocess-cpp-doc/ + rmdir debian/tmp/usr/share/doc/process-cpp/ + + # remove duplicate files and symlink them instead + rdfind -makesymlinks true "debian/tmp/usr/share/doc/libprocess-cpp-doc/" + symlinks -rc "debian/tmp/usr/share/doc/libprocess-cpp-doc/" + + dh_install + get-orig-source: uscan --noconf --force-download --rename --download-current-version --destdir=.