diff -pruN 2:3.3.17-6/debian/changelog 2:3.3.17-7/debian/changelog --- 2:3.3.17-6/debian/changelog 2022-01-13 08:46:59.000000000 +0000 +++ 2:3.3.17-7/debian/changelog 2022-03-07 11:05:15.000000000 +0000 @@ -1,3 +1,14 @@ +procps (2:3.3.17-7) unstable; urgency=medium + + * Update to Debian standards 4.6.0 + * Correct patch test_proc_siginfo Closes: #987557 again + * Install locale files for kfreebsd Closes: #1005285 + * kill: Correctly handle negative pids Closes: #1005376 + * pidwait: Check correct name for program Closes: #1005018 + * Remove ancient unrequired preinst script Closes: #1005392 + + -- Craig Small Mon, 07 Mar 2022 22:05:15 +1100 + procps (2:3.3.17-6) unstable; urgency=medium * Add reload option for init script Closes: #991151 diff -pruN 2:3.3.17-6/debian/control 2:3.3.17-7/debian/control --- 2:3.3.17-6/debian/control 2022-01-13 08:46:59.000000000 +0000 +++ 2:3.3.17-7/debian/control 2022-03-07 11:05:15.000000000 +0000 @@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13), libnuma-dev [amd64 i386 ia64 mips mipsel mips64 mips64el powerpc ppc64el], pkg-config, libsystemd-dev (>= 209) [linux-any] -Standards-Version: 4.1.3 +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/debian/procps Vcs-Git: https://salsa.debian.org/debian/procps.git Homepage: https://gitlab.com/procps-ng/procps diff -pruN 2:3.3.17-6/debian/patches/kill_negative_pids 2:3.3.17-7/debian/patches/kill_negative_pids --- 2:3.3.17-6/debian/patches/kill_negative_pids 1970-01-01 00:00:00.000000000 +0000 +++ 2:3.3.17-7/debian/patches/kill_negative_pids 2022-03-07 11:05:15.000000000 +0000 @@ -0,0 +1,21 @@ +Description: kill: Correctly handle negative pids + kill was using the wrong argv to work out what pid to kill when using + negative pids. +Author: Érico Rolim +Origin: upstream, https://gitlab.com/procps-ng/procps/-/merge_requests/139 +Bug: https://gitlab.com/procps-ng/procps/-/issues/211 +Bug-Debian: https://bugs.debian.org/1005376 +Applied-Upstream: https://gitlab.com/procps-ng/procps/-/commit/79097e55e4b08ec8c1de8332e32cf03c4be1d4ec +Reviewed-by: Craig Small +Last-Update: 2022-03-07 +--- a/skill.c ++++ b/skill.c +@@ -507,7 +507,7 @@ + } else { + /* Special case for signal digit negative + * PIDs */ +- pid = atoi(argv[optind-1]); ++ pid = atoi(argv[optind]); + if (kill((pid_t)pid, signo) != 0) + exitvalue = EXIT_FAILURE; + exit(exitvalue); diff -pruN 2:3.3.17-6/debian/patches/pwait_rename 2:3.3.17-7/debian/patches/pwait_rename --- 2:3.3.17-6/debian/patches/pwait_rename 2022-01-13 08:46:59.000000000 +0000 +++ 2:3.3.17-7/debian/patches/pwait_rename 2022-03-07 11:05:15.000000000 +0000 @@ -1,3 +1,10 @@ +Description: Rename pwait to pidwait + The program pwait alreadt exists, this minimal change just changes the name in + the man page and the program itself to find itself. +Origin: upstream, https://gitlab.com/procps-ng/procps/-/commit/52afb3a8d31871d28b1c39573a7ed5196c2d5023 +Bug-Debian: https://bugs.debian.org/1005018, https://bugs.debian.org/982391 +Reviewed-by: Craig Small +Last-Update: 2022-03-07 --- a/pgrep.1 +++ b/pgrep.1 @@ -9,7 +9,7 @@ @@ -99,3 +106,14 @@ process will never report itself as a match. .SH BUGS +--- a/pgrep.c ++++ b/pgrep.c +@@ -794,7 +794,7 @@ + }; + + #ifdef ENABLE_PWAIT +- if (strcmp (program_invocation_short_name, "pwait") == 0) { ++ if (strcmp (program_invocation_short_name, "pidwait") == 0) { + prog_mode = PWAIT; + strcat (opts, "e"); + } else diff -pruN 2:3.3.17-6/debian/patches/series 2:3.3.17-7/debian/patches/series --- 2:3.3.17-6/debian/patches/series 2022-01-13 08:46:59.000000000 +0000 +++ 2:3.3.17-7/debian/patches/series 2022-03-07 11:05:15.000000000 +0000 @@ -6,3 +6,4 @@ uptime_test ps_checks pwait_rename test_proc_siginfo +kill_negative_pids diff -pruN 2:3.3.17-6/debian/patches/test_proc_siginfo 2:3.3.17-7/debian/patches/test_proc_siginfo --- 2:3.3.17-6/debian/patches/test_proc_siginfo 2022-01-13 08:46:59.000000000 +0000 +++ 2:3.3.17-7/debian/patches/test_proc_siginfo 2022-03-07 11:05:15.000000000 +0000 @@ -2,13 +2,14 @@ Description: Cater for si_int not on Hur Author: Svante Signell Bug-Debian: https://bugs.debian.org/987557 Reviewed-by: Craig Small -Last-Update: 2021-10-13 +Last-Update: 2022-03-07 --- a/lib/test_process.c +++ b/lib/test_process.c -@@ -63,6 +63,11 @@ +@@ -62,7 +62,11 @@ + printf("SIG %s\n", signame); break; case SI_QUEUE: - printf("SIG %s value=%d\n", signame, siginfo->si_int); +- printf("SIG %s value=%d\n", signame, siginfo->si_int); +#ifndef __GNU__ + printf("SIG %s value=%d\n", signame, siginfo->si_int); +#else diff -pruN 2:3.3.17-6/debian/preinst 2:3.3.17-7/debian/preinst --- 2:3.3.17-6/debian/preinst 2022-01-13 08:46:59.000000000 +0000 +++ 2:3.3.17-7/debian/preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -#!/bin/sh -# preinst script for procps -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -prep_mv_conffile() -{ - PKGNAME=$1 - CONFFILE=$2 - - if [ -e "$CONFFILE" ]; then - md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" - if [ "$md5sum" = "$old_md5sum" ]; then - rm -f "$CONFFILE" - fi - fi -} - -upgradeoldconffile() -{ - f=/etc/init.d/procps.sh - [ ! -e "$f" ] && return - - curmd5=`md5sum "$f" |awk '{print $1}'` - oldmd5=`dpkg-query -W -f='${Conffiles}' procps | sed "{\\'^ $f ' ! d; s///}"` - [ "$curmd5" = "$oldmd5" ] && { - # The admin has not modified $f - echo "Preparing to remove obsolete, unmodified conffile: $f" - mv -fv "$f" "$f.from-preinst" - return - } >&2 - - # The admim modified $f; cause a deliberate conffile prompt - echo "Moving obsolete conffile to new pathname:" - mv -fv "$f" "${f%.sh}" -} - - -case "$1" in - install) - ;; - upgrade) - prep_mv_conffile procps "/etc/init.d/procps.sh" - ;; - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -pruN 2:3.3.17-6/debian/procps.install.kfreebsd 2:3.3.17-7/debian/procps.install.kfreebsd --- 2:3.3.17-6/debian/procps.install.kfreebsd 2022-01-13 08:46:59.000000000 +0000 +++ 2:3.3.17-7/debian/procps.install.kfreebsd 2022-03-07 11:05:15.000000000 +0000 @@ -2,3 +2,4 @@ bbin/kill.procps bin bbin/ps bin bin/* /usr/bin +usr/share/locale