From f6954267f5df0a8a7f8c3f97033f121297d869a5 Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@debian.org>
Date: Sun, 18 Sep 2022 14:26:55 +0200
Subject: since base-passwd 3.6.1 the _apt user is in the default /etc/passwd

 - so do not call adduser if the _apt user already exists
 - make adduser dependency optional if base-passwd >= 3.6.1
 - do not call adduser if $DPKG_ROOT is non-empty as adduser doesn't
   support working on a custom root directory
---
 debian/apt.postinst | 2 +-
 debian/control      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'debian')

diff --git a/debian/apt.postinst b/debian/apt.postinst
index 8a623f2fd..54a0770b7 100755
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-if [ "$1" = 'configure' ]; then
+if [ "$1" = 'configure' ] && [ -z "$DPKG_ROOT" ] && ! getent passwd _apt >/dev/null; then
 	# add unprivileged user for the apt methods
 	adduser --force-badname --system --home /nonexistent  \
 	    --no-create-home --quiet _apt || true
diff --git a/debian/control b/debian/control
index 58c6be15e..5768d7301 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Vcs-Browser: https://salsa.debian.org/apt-team/apt
 
 Package: apt
 Architecture: any
-Depends: adduser,
+Depends: base-passwd (>= 3.6.1) | adduser,
          gpgv | gpgv2 | gpgv1,
          libapt-pkg6.0 (>= ${binary:Version}),
          ${apt:keyring},
-- 
cgit v1.2.3-70-g09d2