Source: djbdns
Version: 1:1.05-15
Severity: wishlist
Tags: patch

dh-sysusers exists since 7 years and has gained 9 users in that time -
djbdns being one of them. Still it has a number of deficiencies such as
using useradd instead of the policy-recommended adduser or removing
users during package removal against project consensus and is not making
progress on addressing them. Meanwhile, a viable alternative with larger
adoption exists: sysusers.d. This mechanism is built into debhelper and
it no longer requires using systemd as multiple implementations now
exist. I therefore think it is time to call dh-sysusers a failed
experiment and move on. Do you agree with this reasoning? I'm attaching
a patch for your convenience.

Since djbdns currently FTBFS #1066632, I also had to fix that and my
patch also fixes that.

Helmut
diff -Nru djbdns-1.05/debian/axfrdns.sysuser djbdns-1.05/debian/axfrdns.sysuser
--- djbdns-1.05/debian/axfrdns.sysuser  2021-11-15 01:21:04.000000000 +0100
+++ djbdns-1.05/debian/axfrdns.sysuser  1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-axfrdns defaults
diff -Nru djbdns-1.05/debian/axfrdns.sysusers 
djbdns-1.05/debian/axfrdns.sysusers
--- djbdns-1.05/debian/axfrdns.sysusers 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05/debian/axfrdns.sysusers 2024-05-20 12:16:48.000000000 +0200
@@ -0,0 +1 @@
+u axfrdns      -       -       /nonexistent
diff -Nru djbdns-1.05/debian/changelog djbdns-1.05/debian/changelog
--- djbdns-1.05/debian/changelog        2021-11-15 01:21:04.000000000 +0100
+++ djbdns-1.05/debian/changelog        2024-05-20 12:16:48.000000000 +0200
@@ -1,3 +1,11 @@
+djbdns (1:1.05-15.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move from dh-sysuser to standard dh_installsysusers (Closes: #-1)
+  * Fix FTBFS. (Closes: #1066632)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 20 May 2024 12:16:48 +0200
+
 djbdns (1:1.05-15) unstable; urgency=medium
 
   * Fix the setgid directory FTBFS on kFreeBSD: let the test tool
diff -Nru djbdns-1.05/debian/control djbdns-1.05/debian/control
--- djbdns-1.05/debian/control  2021-11-15 01:21:04.000000000 +0100
+++ djbdns-1.05/debian/control  2024-05-20 12:14:59.000000000 +0200
@@ -6,7 +6,7 @@
  po-debconf,
  debhelper-compat (= 13),
  dh-runit (>= 2.8.13),
- dh-sysuser,
+ dh-sequence-installsysusers,
  ionit,
  python3 <!nocheck>,
  timelimit <!nocheck>,
diff -Nru djbdns-1.05/debian/dnscache.sysuser 
djbdns-1.05/debian/dnscache.sysuser
--- djbdns-1.05/debian/dnscache.sysuser 2021-11-15 01:21:04.000000000 +0100
+++ djbdns-1.05/debian/dnscache.sysuser 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-dnscache defaults
diff -Nru djbdns-1.05/debian/dnscache.sysusers 
djbdns-1.05/debian/dnscache.sysusers
--- djbdns-1.05/debian/dnscache.sysusers        1970-01-01 01:00:00.000000000 
+0100
+++ djbdns-1.05/debian/dnscache.sysusers        2024-05-20 12:16:48.000000000 
+0200
@@ -0,0 +1 @@
+u dnscache     -       -       /nonexistent
diff -Nru djbdns-1.05/debian/patches/ftbfs-implicit-declaration.patch 
djbdns-1.05/debian/patches/ftbfs-implicit-declaration.patch
--- djbdns-1.05/debian/patches/ftbfs-implicit-declaration.patch 1970-01-01 
01:00:00.000000000 +0100
+++ djbdns-1.05/debian/patches/ftbfs-implicit-declaration.patch 2024-05-20 
12:16:48.000000000 +0200
@@ -0,0 +1,82 @@
+Bug-Debian: https://bugs.debian.org/1066632
+--- djbdns-1.05.orig/seek_set.c
++++ djbdns-1.05/seek_set.c
+@@ -1,4 +1,5 @@
+ #include <sys/types.h>
++#include <unistd.h>
+ #include "seek.h"
+ 
+ #define SET 0 /* sigh */
+--- djbdns-1.05.orig/chkshsgr.c
++++ djbdns-1.05/chkshsgr.c
+@@ -1,3 +1,5 @@
++#include <grp.h>
++#include <unistd.h>
+ #include "exit.h"
+ 
+ int main()
+--- djbdns-1.05.orig/hier.c
++++ djbdns-1.05/hier.c
+@@ -1,5 +1,9 @@
+ #include "auto_home.h"
+ 
++void h(const char *home, int uid, int gid, int mode);
++void d(char *home, char *subdir, int uid, int gid, int mode);
++void c(const char *home, const char *subdir, char *file, int uid, int gid, 
int mode);
++
+ void hier()
+ {
+ /*
+--- djbdns-1.05.orig/install.c
++++ djbdns-1.05/install.c
+@@ -14,7 +14,7 @@
+ int fdsourcedir = -1;
+ 
+ void h(home,uid,gid,mode)
+-char *home;
++const char *home;
+ int uid;
+ int gid;
+ int mode;
+@@ -52,8 +52,8 @@
+ buffer ssout;
+ 
+ void c(home,subdir,file,uid,gid,mode)
+-char *home;
+-char *subdir;
++const char *home;
++const char *subdir;
+ char *file;
+ int uid;
+ int gid;
+--- djbdns-1.05.orig/utime.c
++++ djbdns-1.05/utime.c
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <utime.h>
+ #include "scan.h"
+ #include "exit.h"
+ 
+--- djbdns-1.05.orig/dnsq.c
++++ djbdns-1.05/dnsq.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include "uint16.h"
+ #include "strerr.h"
+ #include "buffer.h"
+--- djbdns-1.05.orig/dnsqr.c
++++ djbdns-1.05/dnsqr.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include "uint16.h"
+ #include "strerr.h"
+ #include "buffer.h"
+--- djbdns-1.05.orig/prot.c
++++ djbdns-1.05/prot.c
+@@ -1,3 +1,5 @@
++#include <grp.h>
++#include <unistd.h>
+ #include "hasshsgr.h"
+ #include "prot.h"
+ 
diff -Nru djbdns-1.05/debian/patches/series djbdns-1.05/debian/patches/series
--- djbdns-1.05/debian/patches/series   2021-11-15 01:21:04.000000000 +0100
+++ djbdns-1.05/debian/patches/series   2024-05-20 12:16:48.000000000 +0200
@@ -9,3 +9,4 @@
 0009-usr-sbin.patch
 0010-dnsroots.global.patch
 0011-datalimit.patch
+ftbfs-implicit-declaration.patch
diff -Nru djbdns-1.05/debian/rbldns.sysuser djbdns-1.05/debian/rbldns.sysuser
--- djbdns-1.05/debian/rbldns.sysuser   2021-11-15 01:21:04.000000000 +0100
+++ djbdns-1.05/debian/rbldns.sysuser   1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-rbldns defaults
diff -Nru djbdns-1.05/debian/rbldns.sysusers djbdns-1.05/debian/rbldns.sysusers
--- djbdns-1.05/debian/rbldns.sysusers  1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05/debian/rbldns.sysusers  2024-05-20 12:16:48.000000000 +0200
@@ -0,0 +1 @@
+u rbldns       -       -       /nonexistent
diff -Nru djbdns-1.05/debian/rules djbdns-1.05/debian/rules
--- djbdns-1.05/debian/rules    2021-11-15 01:21:04.000000000 +0100
+++ djbdns-1.05/debian/rules    2024-05-20 12:15:33.000000000 +0200
@@ -3,7 +3,7 @@
 export DEB_CPPFLAGS_MAINT_APPEND = -include /usr/include/errno.h
 
 %:
-       dh $@ --with runit,sysuser
+       dh $@ --with runit
 
 # On pickdns
 # ~~~~~~~~~~
diff -Nru djbdns-1.05/debian/tinydns.sysuser djbdns-1.05/debian/tinydns.sysuser
--- djbdns-1.05/debian/tinydns.sysuser  2021-11-15 01:21:04.000000000 +0100
+++ djbdns-1.05/debian/tinydns.sysuser  1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-tinydns defaults
diff -Nru djbdns-1.05/debian/tinydns.sysusers 
djbdns-1.05/debian/tinydns.sysusers
--- djbdns-1.05/debian/tinydns.sysusers 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05/debian/tinydns.sysusers 2024-05-20 12:16:48.000000000 +0200
@@ -0,0 +1 @@
+u tinydns      -       -       /nonexistent
diff -Nru djbdns-1.05/debian/walldns.sysuser djbdns-1.05/debian/walldns.sysuser
--- djbdns-1.05/debian/walldns.sysuser  2021-11-15 01:21:04.000000000 +0100
+++ djbdns-1.05/debian/walldns.sysuser  1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-walldns defaults
diff -Nru djbdns-1.05/debian/walldns.sysusers 
djbdns-1.05/debian/walldns.sysusers
--- djbdns-1.05/debian/walldns.sysusers 1970-01-01 01:00:00.000000000 +0100
+++ djbdns-1.05/debian/walldns.sysusers 2024-05-20 12:16:48.000000000 +0200
@@ -0,0 +1 @@
+u walldns      -       -       /nonexistent

Reply via email to