Received: (at 861-done) by bugs.devuan.org; 16 Oct 2024 15:46:42 +0000 Return-Path: <[email protected]> Delivered-To: [email protected] Received: from email.devuan.org [2a01:4f9:fff1:13::5fd9:f9e4] by doc.devuan.org with IMAP (fetchmail-6.4.16) for <debbugs@localhost> (single-drop); Wed, 16 Oct 2024 15:46:42 +0000 (UTC) Received: from email.devuan.org by email.devuan.org with LMTP id MJ/TMaTfD2flbwAAmSBk0A (envelope-from <[email protected]>) for <[email protected]>; Wed, 16 Oct 2024 15:45:40 +0000 Received: by email.devuan.org (Postfix, from userid 109) id B22D7586; Wed, 16 Oct 2024 15:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=devuan.org; s=default; t=1729093540; bh=R4Yv+K7991VXR1AFL/TN1k7rj3xVVAB3+BupknstzHk=; h=From:To:Subject:Date:From; b=AnMnjy6zWBxtw6R1ROGbm5jDsbu9Ba56jRVAVu8bk/QRvaMlYOadOHn+CAr1rhGkG XLnBb5KtoKOS6035IFASYUVmExtskKfDnoQ6i8FKoOrtu6PN+yu3douhedFfd9Ly7A 81+oMVIjfpSsSMQHe9zSO3KK0AYy7I4JiULmwN2hRpn7Mb7mLm3ILBiH0jleBLxQEE lw1m+W00zuv7ZZ+jEEAU6m10SzVZPSuS0LvOU6L+EyurAWp60c1laHb5vbJIg6/KvV Bke+bzvZf8xTkK+cpLVy28w1qf/Vpt3gfpw9PN0YzdS0m7ZKQjlcqxWWHw4NPvOFQS ee7FMEpyDJtVA== X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on email.devuan.org X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 Received: from mail.devuan.dev (bonito.devuan.org [85.10.193.185]) by email.devuan.org (Postfix) with ESMTP id 8AD0D3D0 for <[email protected]>; Wed, 16 Oct 2024 15:45:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=devuan.org; s=default; t=1729093538; bh=R4Yv+K7991VXR1AFL/TN1k7rj3xVVAB3+BupknstzHk=; h=From:To:Subject:Date:From; b=gPbMlfGcRF9ugP6ZrS86lMdB05vbTVgvPMSZNoCIAwTfb/TyK4lKeWXQAwNB53FCP dzT0EuAmIyPLTXIGJSkMEWKbM+LBzpLejlPICgVDwABbotA1QAb18ilGY2Z2uTteW6 NPwpQChcArwqN17h7BpfrrtsDSQHp+/Qe6/y7jY/4F89TcKnUA9S5GdYbhE2P+foSr /0cHUEwk6YY2mXHTW6BYLBg43yuKj5Qwbucm3Q9uckay4XuRU3VkAnpcEKELXaNUUM oUKPHuZnUDbNZ6L4reiMROSjn41xTzawfPvYRzFgNAoXWGGC491SRnMJ4wkbezix4D a8tZ4dHowr2Pg== Received: from dak.localnet.devuan.org (dak.localnet.devuan.org [192.168.97.90]) by mail.devuan.dev (Postfix) with SMTP id E27C93E0005 for <[email protected]>; Wed, 16 Oct 2024 15:45:36 +0000 (UTC) Received: (nullmailer pid 11252 invoked by uid 107); Wed, 16 Oct 2024 15:45:36 -0000 From: [email protected] To: [email protected] Subject: #861: fixed in src:oddjob version 0.34.7-2.1devuan2 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Date: Wed, 16 Oct 2024 15:45:36 +0000 Message-Id: <[email protected]> Version: 0.34.7-2.1devuan2 Source package oddjob (0.34.7-2.1devuan2) added to Devuan suite unstable. This closes bug report 861. Thanks DAK managing the Devuan archive -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Wed, 16 Oct 2024 09:05:13 +0100 Source: oddjob Architecture: source Version: 0.34.7-2.1devuan2 Distribution: unstable Urgency: medium Maintainer: B. Stack <[email protected]> Changed-By: Mark Hindley <[email protected]> Closes: 861 Changes: oddjob (0.34.7-2.1devuan2) unstable; urgency=medium . * Non-maintainer upload * Use dh_installinit for init script (Closes: #861). Checksums-Sha1: cef1821936b94f0dd3d95ae1f98ffcf69f15a61f 1667 oddjob_0.34.7-2.1devuan2.dsc cb97bad7444bb4eb2a8dbd944a25fac0a213173f 5284 oddjob_0.34.7-2.1devuan2.debian.tar.xz d528516c5fffa8dc781a2deb058b1d084358d084 5452 oddjob_0.34.7-2.1devuan2_source.buildinfo Checksums-Sha256: 3755d7a030527703ceede395c7d2a06271153379820ec83448ef5311b4eae8ff 1667 oddjob_0.34.7-2.1devuan2.dsc 7e3f4957ac1456ba7db18a32018475a5c5a9239ef447b289a55207416aefc090 5284 oddjob_0.34.7-2.1devuan2.debian.tar.xz aa003d70e4c541eff2e69b18198d881b5ca7d6573abbede47be0c6a7af821e9d 5452 oddjob_0.34.7-2.1devuan2_source.buildinfo Files: 88cb575c2a34f25d43fbd87cc3c3131d 1667 admin optional oddjob_0.34.7-2.1devuan2.dsc 0a60a21236e70c27a4bd3a65d0dd2e24 5284 admin optional oddjob_0.34.7-2.1devuan2.debian.tar.xz 568892024781496c0312c566a16796a4 5452 admin optional oddjob_0.34.7-2.1devuan2_source.buildinfo -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEcuPLdzMV36LkZHQ9lFMhJFQZIvsFAmcPpxQACgkQlFMhJFQZ IvscJQf/TUrimuThzBE84prmeOQx42AR8eSTBFG3UFeDarEziPpqg8AcFSTMHoeN XWbGSJJaQNXd2TaLoW8272ygHJmprwFjeARZ+/BqDl6cj1IJHbVs5KhXUelePieM smuur2xX1dXRxeUIzjYaIghw0bEL//A78kIuNeQqj/aCOnJKX+udf1ER5hyFTMBr ezqEPTenuIOKdaMobrnFSAfWn4p+BR5eKBVDFjWAC8byzXnnZ4C54tKO6/Kf3Yg1 XANTvJGBQcvw4ccXXLMa5vnAJcpQL4s0/XdWN5G2eVcvvgWJjPvmXUGfrbFHFMU9 V5iiQsnu8Hwg5sElKbwV96h6YZsUMg== =bjux -----END PGP SIGNATURE-----
Mark Hindley <[email protected]>
:[email protected]
:Received: (at submit) by bugs.devuan.org; 16 Oct 2024 09:10:33 +0000 Return-Path: <[email protected]> Delivered-To: [email protected] Received: from email.devuan.org [2a01:4f9:fff1:13::5fd9:f9e4] by doc.devuan.org with IMAP (fetchmail-6.4.16) for <debbugs@localhost> (single-drop); Wed, 16 Oct 2024 09:10:33 +0000 (UTC) Received: from email.devuan.org by email.devuan.org with LMTP id P4vZOOqCD2dfYwAAmSBk0A (envelope-from <[email protected]>) for <[email protected]>; Wed, 16 Oct 2024 09:10:02 +0000 Received: by email.devuan.org (Postfix, from userid 109) id AFDFA661; Wed, 16 Oct 2024 09:10:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on email.devuan.org X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=RDNS_DYNAMIC,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=193.36.131.86; helo=mx.hindley.org.uk; [email protected]; receiver=<UNKNOWN> Received: from mx.hindley.org.uk (193-36-131-86.cfwn.uk [193.36.131.86]) by email.devuan.org (Postfix) with ESMTPS id 6ECD7173 for <[email protected]>; Wed, 16 Oct 2024 09:10:00 +0000 (UTC) Received: from hindley.org.uk (apollo.hindleynet [192.168.1.3]) by mx.hindley.org.uk (Postfix) with SMTP id 84529B1 for <[email protected]>; Wed, 16 Oct 2024 10:09:58 +0100 (BST) Received: (nullmailer pid 16213 invoked by uid 1000); Wed, 16 Oct 2024 09:09:57 -0000 Date: Wed, 16 Oct 2024 10:09:57 +0100 From: Mark Hindley <[email protected]> To: Devuan Bug Tracking System <[email protected]> Subject: src:oddjob: Fails to build on official builder (Lintian). Message-ID: <[email protected]> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="BdUjw4Wc7HFhgyaw" Content-Disposition: inline X-Reportbug-Version: 12.0.0+devuan2 X-Debbugs-No-Ack: No Thanks X-IMAPbase: 1220827534 0000000424 X-UID: 424 --BdUjw4Wc7HFhgyaw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Package: src:oddjob Version: 0.34.7-2.1devuan1 Severity: grave Tags: ftbfs patch Justification: renders package unusable Hi Ben, The official builds of the new version of src:oddjob you pushed yesterday have failed in the Lintian stage: Warning in processable architecture=amd64/oddjob_0.34.7-2.1devuan1_amd64.deb: Can't call method "pointer" on an undefined value at /usr/share/lintian/lib/Lintian/Check/InitD.pm line 266. warning: cannot run init-d check on package binary:oddjob_0.34.7-2.1devuan1_amd64 skipping check of binary:oddjob_0.34.7-2.1devuan1_amd64 script returned exit code 123 This is probably a lintian bug, but it is exposed by the missing prerm maintscript. I think it would be much better to use dh_installinit to handle the initscript. That will also ensure all the correct maintscript fragments are present and correct. It also reduces the delta wrt Debian. Suggested patch is attached. It is compile tested and lintian clean(er!), but I haven't checked functionality. The debdiff is also attached. As a side issue, you can also remove lsb-base from d/control as it is obsolete now. With best wishes Mark -- System Information: Distributor ID: Devuan Description: Devuan GNU/Linux 5 (daedalus) Release: 5 Codename: daedalus Architecture: x86_64 Kernel: Linux 6.1.0-22-amd64 (SMP w/2 CPU threads; PREEMPT) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en Shell: /bin/sh linked to /bin/dash Init: OpenRC (via /run/openrc), PID 1: init Versions of packages oddjob depends on: ii dbus 1.14.10-1~deb12u1devuan1 ii libc6 2.36-9+deb12u8 ii libdbus-1-3 1.14.10-1~deb12u1devuan1 ii libselinux1 3.4-1+b6 ii libxml2 2.9.14+dfsg-1.3~deb12u1 ii sysvinit-utils [lsb-base] 3.06-4devuan3 oddjob recommends no packages. oddjob suggests no packages. --BdUjw4Wc7HFhgyaw Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-Use-dh_installinit-for-init-script.patch" From c55c6326f89bb4e51008e42e58700eb2d3579a2f Mon Sep 17 00:00:00 2001 From: Mark Hindley <[email protected]> Date: Wed, 16 Oct 2024 09:03:31 +0100 Subject: [PATCH] Use dh_installinit for init script. --- debian/changelog | 7 ++ debian/control | 1 + debian/not-installed | 1 + debian/oddjob.install | 1 - debian/oddjob.lintian-overrides | 1 - debian/oddjob.oddjobd.init | 115 ++++++++++++++++++++++++++++++++ debian/oddjob.postinst | 3 - debian/patches/series | 1 - debian/patches/use-devuan.patch | 60 ----------------- debian/rules | 3 + 10 files changed, 127 insertions(+), 66 deletions(-) create mode 100644 debian/not-installed delete mode 100644 debian/oddjob.lintian-overrides create mode 100644 debian/oddjob.oddjobd.init delete mode 100644 debian/patches/use-devuan.patch diff --git a/debian/changelog b/debian/changelog index 7c85d93..508c1ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +oddjob (0.34.7-2.1devuan2) UNRELEASED; urgency=medium + + * Non-maintainer upload + * Use dh_installinit for init script (Closes: #-1). + + -- Mark Hindley <[email protected]> Wed, 16 Oct 2024 09:05:13 +0100 + oddjob (0.34.7-2.1devuan1) unstable; urgency=medium * Install PAM module into /usr. diff --git a/debian/control b/debian/control index 08efb5d..56edc00 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,7 @@ Vcs-Browser: https://git.devuan.org/devuan/oddjob Package: oddjob Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, dbus, lsb-base, diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 0000000..6f4ab0f --- /dev/null +++ b/debian/not-installed @@ -0,0 +1 @@ +etc/rc.d/init.d/oddjobd diff --git a/debian/oddjob.install b/debian/oddjob.install index 0875dd2..5812e09 100644 --- a/debian/oddjob.install +++ b/debian/oddjob.install @@ -1,7 +1,6 @@ etc/dbus-1/system.d/oddjob.conf etc/oddjobd.conf etc/oddjobd.conf.d/oddjobd-introspection.conf -etc/init.d/oddjobd usr/bin/oddjob_request usr/libexec/oddjob/sanity.sh usr/sbin/oddjobd diff --git a/debian/oddjob.lintian-overrides b/debian/oddjob.lintian-overrides deleted file mode 100644 index ce7ff85..0000000 --- a/debian/oddjob.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -script-in-etc-init.d-not-registered-via-update-rc.d [etc/init.d/oddjobd] diff --git a/debian/oddjob.oddjobd.init b/debian/oddjob.oddjobd.init new file mode 100644 index 0000000..cadc37e --- /dev/null +++ b/debian/oddjob.oddjobd.init @@ -0,0 +1,115 @@ +#!/bin/bash +# +# oddjobd This shell script takes care of starting and stopping +# oddjobd. +# +# chkconfig: - 98 02 +# description: oddjobd provides support for unprivileged applications which \ +# require one of a set of specified privileged operations to be \ +# performed on their behalf. +# +### BEGIN INIT INFO +# Provides: oddjobd +# Required-Start: $local_fs $remote_fs messagebus +# Required-Stop: $local_fs $remote_fs messagebus +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: start and stop oddjob services +# Description: The oddjob service provides support for unprivileged +# applications which require one of a set of specified privileged +# operations to be performed on their behalf. +### END INIT INFO + +prefix=/usr +exec_prefix=${prefix} +bindir=${exec_prefix}/bin +sbindir=/usr/sbin +sysconfdir=/etc +prog=oddjobd +oddjobd=${sbindir}/${prog} +pidfile=/var/run/${prog}.pid + +# Source function library. +. /lib/lsb/init-functions + +start() { + # Start daemons. + echo -n $"Starting $prog: " + start-stop-daemon --start --make-pidfile --pidfile ${pidfile} -R 300 --background --exec ${oddjobd} -- -n 2>/dev/null + RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + mkdir -p /var/lock/subsys 1>/dev/null 2>&1 + touch /var/lock/subsys/oddjobd + if [ -x /usr/bin/logger ]; then + /usr/bin/logger -t oddjobd 'oddjobd startup succeeded' + fi; + else + if [ -x /usr/bin/logger ]; then + /usr/bin/logger -t oddjobd 'oddjobd startup failed' + fi; + fi + return $RETVAL +} + +stop() { + # Stop daemons. + echo -n $"Shutting down $prog: " + killproc ${oddjobd} + RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/oddjobd + if [ -x /usr/bin/logger ]; then + /usr/bin/logger -t oddjobd 'oddjobd shutdown succeeded' + fi; + else + if [ -x /usr/bin/logger ]; then + /usr/bin/logger -t oddjobd 'oddjobd shutdown failed' + fi; + fi + return $RETVAL +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + RETVAL=$? + ;; + reload|force-reload) + echo -n $"Reloading $prog configuration: " + killproc ${oddjobd} -HUP + RETVAL=$? + echo + ;; + condrestart|try-restart) + if [ -f /var/lock/subsys/oddjobd ]; then + stop + start + RETVAL=$? + fi + ;; + status) + if pidofproc -p ${pidfile} ${oddjobd} 1>/dev/null ; + then + log_progress_msg "oddjobd running" + log_end_msg 0 + else + log_progress_msg "oddjobd is not running" + log_end_msg 1 + fi + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}" + exit 2 +esac + +exit $RETVAL diff --git a/debian/oddjob.postinst b/debian/oddjob.postinst index 0cdc883..6151c55 100644 --- a/debian/oddjob.postinst +++ b/debian/oddjob.postinst @@ -3,9 +3,6 @@ set -e #DEBHELPER# -if [ "$1" = configure ]; then - update-rc.d oddjobd defaults -fi if [ "$1" = triggered ]; then deb-systemd-invoke restart oddjobd.service diff --git a/debian/patches/series b/debian/patches/series index 420baa4..c61ac57 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ dont-run-dbus-launch.diff -use-devuan.patch diff --git a/debian/patches/use-devuan.patch b/debian/patches/use-devuan.patch deleted file mode 100644 index 1a677e5..0000000 --- a/debian/patches/use-devuan.patch +++ /dev/null @@ -1,60 +0,0 @@ -Origin: Devuan -Author: bgstack15 -Message: Modify init script for Devuan ---- a/scripts/Makefile.am -+++ b/scripts/Makefile.am -@@ -1,6 +1,6 @@ - EXTRA_DIST = oddjobd.in oddjobd.service.in - if SYSVINIT --initdir = $(sysconfdir)/rc.d/init.d -+initdir = $(sysconfdir)/init.d - init_SCRIPTS = oddjobd - endif - if SYSTEMD ---- a/scripts/oddjobd.in -+++ b/scripts/oddjobd.in -@@ -12,6 +12,8 @@ - # Provides: oddjobd - # Required-Start: $local_fs $remote_fs messagebus - # Required-Stop: $local_fs $remote_fs messagebus -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 - # Short-Description: start and stop oddjob services - # Description: The oddjob service provides support for unprivileged - # applications which require one of a set of specified privileged -@@ -28,15 +30,16 @@ oddjobd=${sbindir}/${prog} - pidfile=/var/run/${prog}.pid - - # Source function library. --. /etc/rc.d/init.d/functions -+. /lib/lsb/init-functions - - start() { - # Start daemons. - echo -n $"Starting $prog: " -- daemon ${oddjobd} -p ${pidfile} -t 300 2>/dev/null -+ start-stop-daemon --start --make-pidfile --pidfile ${pidfile} -R 300 --background --exec ${oddjobd} -- -n 2>/dev/null - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then -+ mkdir -p /var/lock/subsys 1>/dev/null 2>&1 - touch /var/lock/subsys/oddjobd - if [ -x /usr/bin/logger ]; then - /usr/bin/logger -t oddjobd 'oddjobd startup succeeded' -@@ -95,8 +98,14 @@ case "$1" in - fi - ;; - status) -- status ${oddjobd} -- RETVAL=$? -+ if pidofproc -p ${pidfile} ${oddjobd} 1>/dev/null ; -+ then -+ log_progress_msg "oddjobd running" -+ log_end_msg 0 -+ else -+ log_progress_msg "oddjobd is not running" -+ log_end_msg 1 -+ fi - ;; - *) - echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}" diff --git a/debian/rules b/debian/rules index ea07acf..6877451 100755 --- a/debian/rules +++ b/debian/rules @@ -29,6 +29,9 @@ override_dh_install: dh_install +override_dh_installinit: + dh_installinit --name=oddjobd + override_dh_clean: rm -rf tests/stderr tests/stdout tests/dbus-session-bus-* dh_clean -- 2.39.5 --BdUjw4Wc7HFhgyaw Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="oddjob.debdiff" [The following lists of changes regard files as different if they have different names, permissions or owners.] Files in second .deb but not in first ------------------------------------- -rwxr-xr-x root/root DEBIAN/postrm -rwxr-xr-x root/root DEBIAN/preinst -rwxr-xr-x root/root DEBIAN/prerm Files in first .deb but not in second ------------------------------------- -rw-r--r-- root/root /usr/share/lintian/overrides/oddjob Control files: lines which differ (wdiff format) ------------------------------------------------ Depends: libc6 (>= [-2.34),-] {+2.38),+} libdbus-1-3 (>= 1.9.14), libselinux1 (>= 3.1~), libxml2 (>= 2.7.4), [-dbus, lsb-base-] {+dbus+} {+Pre-Depends: init-system-helpers (>= 1.54~)+} Version: [-0.34.7-2devuan1-] {+0.34.7-2.1devuan2+} --BdUjw4Wc7HFhgyaw--
[email protected], B. Stack <[email protected]>
:bug#861
; Package src:oddjob
.
Full text available.Devuan BTS -- Powered by Debian bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.
Devuan Bugs Owner <[email protected]>.
Last modified:
Sat, 30 Nov 2024 22:39:01 UTC