diff -Nru timelimit-1.9.0/debian/changelog timelimit-1.9.2/debian/changelog --- timelimit-1.9.0/debian/changelog 2020-05-10 17:05:35.000000000 +0000 +++ timelimit-1.9.2/debian/changelog 2022-01-01 19:00:59.000000000 +0000 @@ -1,3 +1,15 @@ +timelimit (1.9.2-1) unstable; urgency=medium + + * Declare compliance with Policy 4.6.0 with no changes. + * Add the years 2021 and 2022 to my debian/* copyright notice. + * Explicitly declare dh-sequence-single-binary as a virtual build + dependency. + * New upstream release: + - update the upstream copyright years + - allow output to the standard error stream in the autopkgtest + + -- Peter Pentchev Sat, 01 Jan 2022 21:00:59 +0200 + timelimit (1.9.0-6) unstable; urgency=medium * Declare compliance with Debian Policy 4.5.0 with no changes. diff -Nru timelimit-1.9.0/debian/control timelimit-1.9.2/debian/control --- timelimit-1.9.0/debian/control 2020-05-10 17:05:35.000000000 +0000 +++ timelimit-1.9.2/debian/control 2022-01-01 19:00:59.000000000 +0000 @@ -2,8 +2,11 @@ Section: utils Priority: optional Maintainer: Peter Pentchev -Build-Depends: debhelper-compat (= 13), perl -Standards-Version: 4.5.0 +Build-Depends: + debhelper-compat (= 13), + dh-sequence-single-binary, + perl, +Standards-Version: 4.6.0 Vcs-Git: https://gitlab.com/timelimit/timelimit.git -b debian/master Vcs-Browser: https://gitlab.com/timelimit/timelimit/tree/debian/master Homepage: https://devel.ringlet.net/sysutils/timelimit/ diff -Nru timelimit-1.9.0/debian/copyright timelimit-1.9.2/debian/copyright --- timelimit-1.9.0/debian/copyright 2020-05-10 17:05:35.000000000 +0000 +++ timelimit-1.9.2/debian/copyright 2022-01-01 19:00:59.000000000 +0000 @@ -5,7 +5,7 @@ License: BSD-2-clause Files: * -Copyright: Copyright (c) 2001 - 2018 Peter Pentchev +Copyright: Copyright (c) 2001 - 2021 Peter Pentchev License: BSD-2-clause Files: t/tap-functions.sh @@ -13,7 +13,7 @@ License: GPL-2+ Files: debian/* -Copyright: Copyright (C) 2007 - 2011, 2014, 2016 - 2020 Peter Pentchev +Copyright: Copyright (C) 2007 - 2011, 2014, 2016 - 2022 Peter Pentchev License: BSD-2-clause License: BSD-2-clause diff -Nru timelimit-1.9.0/debian/tests/control timelimit-1.9.2/debian/tests/control --- timelimit-1.9.0/debian/tests/control 2020-05-10 17:05:35.000000000 +0000 +++ timelimit-1.9.2/debian/tests/control 2022-01-01 19:00:59.000000000 +0000 @@ -1,6 +1,7 @@ Test-Command: env TIMELIMIT='/usr/bin/timelimit' prove -v /usr/share/doc/timelimit/examples/tests Depends: @, perl Features: test-name=upstream +Restrictions: allow-stderr Test-Command: feature-check timelimit timelimit Depends: @, feature-check diff -Nru timelimit-1.9.0/NEWS timelimit-1.9.2/NEWS --- timelimit-1.9.0/NEWS 2018-04-14 15:32:48.000000000 +0000 +++ timelimit-1.9.2/NEWS 2021-05-16 20:51:44.000000000 +0000 @@ -1,5 +1,12 @@ Change log for timelimit, the process time limit tool +1.9.2 2021/05/16 + - happy 20th birthday, timelimit! + - fix a bug with propagating a SIGKILL or SIGSTOP signal on + at least some Linux/glibc systems + +1.9.1 (withdrawn) + 1.9.0 2018/04/14 - add the --features command-line option that always lists the "timelimit" feature (with the program version) and also diff -Nru timelimit-1.9.0/t/01-simple.t timelimit-1.9.2/t/01-simple.t --- timelimit-1.9.0/t/01-simple.t 2018-04-14 15:32:48.000000000 +0000 +++ timelimit-1.9.2/t/01-simple.t 2021-05-16 20:51:44.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2011, 2018 Peter Pentchev +# Copyright (c) 2011, 2018, 2021 Peter Pentchev # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ [ -z "$TIMELIMIT" ] && TIMELIMIT='./timelimit' -plan_ 37 +plan_ 39 diag_ 'timelimit with no arguments should exit with EX_USAGE' $TIMELIMIT > /dev/null 2>&1 @@ -130,6 +130,15 @@ res="$?" if [ "$res" = 64 ]; then ok_; else not_ok_ "-S '' exit code $res"; fi +diag_ 'propagate a TERM signal' +v=`$TIMELIMIT -s 15 -t 3 -p sh -c 'sleep 5' 2>/dev/null` +res="$?" +if [ "$res" = 143 ]; then ok_; else not_ok_ "args -s 15 -p exit code $res"; fi +diag_ 'propagate a KILL signal' +v=`$TIMELIMIT -s 9 -t 3 -p sh -c 'sleep 5' 2>/dev/null` +res="$?" +if [ "$res" = 137 ]; then ok_; else not_ok_ "args -s 9 -p exit code $res"; fi + diag_ 'timelimit --features should contain a "timelimit" entry' v=`$TIMELIMIT --features` res="$?" diff -Nru timelimit-1.9.0/timelimit.c timelimit-1.9.2/timelimit.c --- timelimit-1.9.0/timelimit.c 2018-04-14 15:32:48.000000000 +0000 +++ timelimit-1.9.2/timelimit.c 2021-05-16 20:51:44.000000000 +0000 @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2001, 2007 - 2010, 2016, 2018 Peter Pentchev + * Copyright (c) 2001, 2007 - 2010, 2016, 2018, 2021 Peter Pentchev * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -292,7 +292,7 @@ } if (listfeatures) { - puts("Features: timelimit=1.9.0" + puts("Features: timelimit=1.9.2" #ifdef HAVE_SETITIMER " subsecond=1.0" #endif @@ -357,11 +357,13 @@ if (nocld) act.sa_flags |= SA_NOCLDSTOP; #endif /* SA_NOCLDSTOP */ - if (sigaction(sig, &act, NULL) < 0) + if (sigaction(sig, &act, NULL) < 0 && + !(errno == EINVAL && (sig == SIGKILL || sig == SIGSTOP))) err(EX_OSERR, "%s signal handler for %d", what, sig); #else /* HAVE_SIGACTION */ (void)nocld; - if (signal(sig, handler) == SIG_ERR) + if (signal(sig, handler) == SIG_ERR && + !(errno == EINVAL && (sig == SIGKILL || sig == SIGSTOP))) err(EX_OSERR, "%s signal handler for %d", what, sig); #endif /* HAVE_SIGACTION */ }