From f657ec2616ae4a8d7e647e12c88cd3ed59ec77c6 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sun, 16 Jul 2017 19:16:04 +0200 Subject: [PATCH] Add debconf warning about sashroot user instead of trying to remove it, since userdel is unable to properly delete it. Closes: #783031 --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/po/POTFILES.in | 1 + debian/po/templates.pot | 40 ++++++++++++++++++++++++++++++++++++++++ debian/prerm | 6 ++++-- debian/templates | 8 ++++++++ 6 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 debian/po/POTFILES.in create mode 100644 debian/po/templates.pot create mode 100644 debian/templates diff --git a/debian/changelog b/debian/changelog index f7c7c9c..1033744 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sash (3.8-4) unstable; urgency=medium + + * Add debconf warning about sashroot user instead of trying to remove + it, since userdel is unable to properly delete it. Closes: #783031 + + -- Tollef Fog Heen Sun, 16 Jul 2017 19:13:30 +0200 + sash (3.8-3) unstable; urgency=medium * Drop support for adosfs, mfs on FreeBSD. diff --git a/debian/control b/debian/control index 302b6a3..f471bf2 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.4 Build-Depends: zlib1g-dev (>= 1:1.2.2-7), debhelper (>= 9), e2fslibs-dev [!kfreebsd-amd64 !kfreebsd-i386], kfreebsd-kernel-headers [kfreebsd-amd64 kfreebsd-i386], - dctrl-tools + dctrl-tools, po-debconf Package: sash Architecture: any diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 0000000..cef83a3 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 0000000..f91f910 --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the sash package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: sash\n" +"Report-Msgid-Bugs-To: sash@packages.debian.org\n" +"POT-Creation-Date: 2017-07-16 19:14+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "sashroot user detected" +msgstr "" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"Previous versions of sash offered to create a root user with shell set to /" +"bin/sash. This system has such a user." +msgstr "" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"This can unfortunately not be automatically removed together with the " +"package, so you need to manually delete the sashroot user." +msgstr "" diff --git a/debian/prerm b/debian/prerm index c9abdee..861983e 100644 --- a/debian/prerm +++ b/debian/prerm @@ -4,10 +4,12 @@ # at least continue to work after sash is removed... set -e +. /usr/share/debconf/confmodule if [ "$1" = remove ]; then - if [ "$(getent passwd | grep ^sashroot:)" != "" ]; then - userdel sashroot + if getent passwd | grep -qs ^sashroot: ; then + db_input high sash/sashroot-user-detected || true + db_go || true fi for sashacct in $(getent passwd | \ awk -F: '{if ($7 == "/bin/sash") {print $1}}'); do diff --git a/debian/templates b/debian/templates new file mode 100644 index 0000000..15560ae --- /dev/null +++ b/debian/templates @@ -0,0 +1,8 @@ +Template: sash/sashroot-user-detected +Type: error +_Description: sashroot user detected + Previous versions of sash offered to create a root user with shell + set to /bin/sash. This system has such a user. + . + This can unfortunately not be automatically removed together with the + package, so you need to manually delete the sashroot user. -- 2.39.5