diff options
Diffstat (limited to 'debian/patches/debian')
-rw-r--r-- | debian/patches/debian/chown-non-deprecated.patch | 31 | ||||
-rw-r--r-- | debian/patches/debian/hardlink-tests-known-failed.patch | 23 | ||||
-rw-r--r-- | debian/patches/debian/lsfd-usrbin.patch | 21 | ||||
-rw-r--r-- | debian/patches/debian/man-getopt-examples.patch | 23 | ||||
-rw-r--r-- | debian/patches/debian/sensible-pager.patch | 22 | ||||
-rw-r--r-- | debian/patches/debian/verbose-tests.patch | 45 |
6 files changed, 165 insertions, 0 deletions
diff --git a/debian/patches/debian/chown-non-deprecated.patch b/debian/patches/debian/chown-non-deprecated.patch new file mode 100644 index 0000000..9c12d26 --- /dev/null +++ b/debian/patches/debian/chown-non-deprecated.patch @@ -0,0 +1,31 @@ +From: Chris Hofstaedtler <zeha@debian.org> +Date: Tue, 12 Apr 2022 15:41:05 +0000 +Subject: Use non-deprecated chown syntax + +Closes: #1007139 +--- + tests/functions.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/functions.sh b/tests/functions.sh +index 56b55a2..fa2ba5e 100644 +--- a/tests/functions.sh ++++ b/tests/functions.sh +@@ -440,7 +440,7 @@ function ts_init_suid { + TS_SUID_USER[$ct]=$(stat --printf="%U" $PROG) + TS_SUID_GROUP[$ct]=$(stat --printf="%G" $PROG) + +- chown root.root $PROG &> /dev/null ++ chown root:root $PROG &> /dev/null + chmod u+s $PROG &> /dev/null + } + +@@ -629,7 +629,7 @@ function ts_cleanup_on_exit { + for idx in $(seq 0 $((${#TS_SUID_PROGS[*]} - 1))); do + PROG=${TS_SUID_PROGS[$idx]} + chmod a-s $PROG &> /dev/null +- chown ${TS_SUID_USER[$idx]}.${TS_SUID_GROUP[$idx]} $PROG &> /dev/null ++ chown ${TS_SUID_USER[$idx]}:${TS_SUID_GROUP[$idx]} $PROG &> /dev/null + done + + for dev in "${TS_LOOP_DEVS[@]}"; do diff --git a/debian/patches/debian/hardlink-tests-known-failed.patch b/debian/patches/debian/hardlink-tests-known-failed.patch new file mode 100644 index 0000000..dbbb5ec --- /dev/null +++ b/debian/patches/debian/hardlink-tests-known-failed.patch @@ -0,0 +1,23 @@ +From: Chris Hofstaedtler <zeha@debian.org> +Date: Tue, 12 Apr 2022 20:35:57 +0000 +Subject: hardlink tests: set known failed + +sha256 cannot be initialized on some archs / buildds. +--- + tests/ts/hardlink/options | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/ts/hardlink/options b/tests/ts/hardlink/options +index fc1a0d6..6c452c3 100755 +--- a/tests/ts/hardlink/options ++++ b/tests/ts/hardlink/options +@@ -27,6 +27,9 @@ ts_check_prog xz + ts_check_prog tar + ts_check_prog wc + ++# on some archs sha256 cannot be used ++TS_KNOWN_FAIL="yes" ++ + SRCDIR="$TS_OUTDIR/testdir1" + + create_srcdir() diff --git a/debian/patches/debian/lsfd-usrbin.patch b/debian/patches/debian/lsfd-usrbin.patch new file mode 100644 index 0000000..3393cb5 --- /dev/null +++ b/debian/patches/debian/lsfd-usrbin.patch @@ -0,0 +1,21 @@ +From: Chris Hofstaedtler <zeha@debian.org> +Date: Thu, 14 Apr 2022 11:47:20 +0000 +Subject: Install lsfd into /usr/bin + +--- + misc-utils/Makemodule.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am +index cc18acb..9a91c88 100644 +--- a/misc-utils/Makemodule.am ++++ b/misc-utils/Makemodule.am +@@ -247,7 +247,7 @@ hardlink_CFLAGS = $(AM_CFLAGS) + endif + + if BUILD_LSFD +-bin_PROGRAMS += lsfd ++usrbin_exec_PROGRAMS += lsfd + MANPAGES += misc-utils/lsfd.1 + dist_noinst_DATA += misc-utils/lsfd.1.adoc + lsfd_SOURCES = \ diff --git a/debian/patches/debian/man-getopt-examples.patch b/debian/patches/debian/man-getopt-examples.patch new file mode 100644 index 0000000..a0c8754 --- /dev/null +++ b/debian/patches/debian/man-getopt-examples.patch @@ -0,0 +1,23 @@ +From: Matthew Vernon <matthew@debian.org> +Date: Tue, 6 Nov 2018 11:49:21 +0000 +Subject: util-linux: getopt(1) should point to where examples are on a Debian + system + +Debian BTS #913049 +--- + misc-utils/getopt.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc-utils/getopt.1 b/misc-utils/getopt.1 +index 54a5d85..9bb66b7 100644 +--- a/misc-utils/getopt.1 ++++ b/misc-utils/getopt.1 +@@ -155,7 +155,7 @@ In compatibility mode, leading \(aq\fB\-\fP\(aq and \(aq\fB+\fP\(aq characters i + \fBgetopt\fP returns error code \fB0\fP for successful parsing, \fB1\fP if \fBgetopt\fP(3) returns errors, \fB2\fP if it does not understand its own parameters, \fB3\fP if an internal error occurs like out\-of\-memory, and \fB4\fP if it is called with \fB\-T\fP. + .SH "EXAMPLES" + .sp +-Example scripts for (ba)sh and (t)csh are provided with the \fBgetopt\fP(1) distribution, and are installed in \fI/usr/share/doc/util\-linux\fP directory. ++Example scripts for (ba)sh and (t)csh are provided with the \fBgetopt\fP(1) distribution, and are installed in \fI/usr/share/doc/util\-linux/examples/\fP directory. + .SH "ENVIRONMENT" + .sp + \fBPOSIXLY_CORRECT\fP diff --git a/debian/patches/debian/sensible-pager.patch b/debian/patches/debian/sensible-pager.patch new file mode 100644 index 0000000..cc7ea10 --- /dev/null +++ b/debian/patches/debian/sensible-pager.patch @@ -0,0 +1,22 @@ +From: Chris Hofstaedtler <zeha@debian.org> +Date: Thu, 14 Jul 2022 09:54:01 +0000 +Subject: Use sensible-pager + +Closes: #1014368 +--- + lib/pager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/pager.c b/lib/pager.c +index 747521e..5f53cd0 100644 +--- a/lib/pager.c ++++ b/lib/pager.c +@@ -216,7 +216,7 @@ static void __setup_pager(void) + return; + + if (!pager) +- pager = "less"; ++ pager = "sensible-pager"; + else if (!*pager || !strcmp(pager, "cat")) + return; + diff --git a/debian/patches/debian/verbose-tests.patch b/debian/patches/debian/verbose-tests.patch new file mode 100644 index 0000000..578030a --- /dev/null +++ b/debian/patches/debian/verbose-tests.patch @@ -0,0 +1,45 @@ +From: Andreas Henriksson <andreas@fatal.se> +Date: Wed, 30 Jul 2014 14:28:17 +0200 +Subject: verbose-tests + +Enable verbose tests and print content of failing tests output file. +--- + tests/Makemodule.am | 2 +- + tests/functions.sh | 11 +++++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/tests/Makemodule.am b/tests/Makemodule.am +index 31cf70f..4001672 100644 +--- a/tests/Makemodule.am ++++ b/tests/Makemodule.am +@@ -13,7 +13,7 @@ clean-local-tests: + + CLEAN_LOCALS += clean-local-tests + +-TESTS_OPTIONS = --nonroot ++TESTS_OPTIONS = --nonroot --verbose --parallel=1 + TESTS_PARALLEL = --parallel + TESTS_COMMAND = $(top_srcdir)/tests/run.sh \ + --srcdir=$(abs_top_srcdir) \ +diff --git a/tests/functions.sh b/tests/functions.sh +index 5614122..56b55a2 100644 +--- a/tests/functions.sh ++++ b/tests/functions.sh +@@ -148,6 +148,17 @@ function ts_failed_subtest { + ts_report " $msg ($1)" + fi + ++ if [ "$TS_VERBOSE" = "yes" ]; then ++ echo ========= script: $TS_SCRIPT ================= ++ echo ================= OUTPUT ===================== ++ cat -n $TS_OUTPUT ++ echo ================= EXPECTED =================== ++ cat -n $TS_EXPECTED ++ echo ================= O/E diff =================== ++ diff -u $TS_OUTPUT $TS_EXPECTED ++ echo ============================================== ++ fi ++ + return $ret + } + |