Package: release.debian.org
Control: affects -1 + src:cyrus-sasl2
X-Debbugs-Cc: cyrus-sa...@packages.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package cyrus-sasl2.
[ Reason ]
Missing systemd service: #981438. There are some other minor changes because
originally this was supposed to get in bookworm before the full freeze.
I am not very keen to get this into bookworm but this was long requested and
it would be nice to have it available in bookworm.
[ Impact ]
The systemd generated sysv compatibility service has to be used.
[ Tests ]
Use systemctl to run sasl2-bin's service.
[ Risks ]
postfix had a chroot-based configuration in its autopkgtest that had
problems with the service change: #1032306. Users might have similar
configurations which would stop working with a bookworm update.
The change is in unstable for over 70 days by now and there were no
bug reports about it.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
cyrus-sasl2 is a key package because of libsasl2-2.
That binary package is not touched by the changes.
unblock cyrus-sasl2/2.1.28+dfsg-11
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/changelog
cyrus-sasl2-2.1.28+dfsg/debian/changelog
--- cyrus-sasl2-2.1.28+dfsg/debian/changelog 2022-11-22 17:48:33.000000000
+0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/changelog 2023-03-01 00:52:04.000000000
+0100
@@ -1,3 +1,19 @@
+cyrus-sasl2 (2.1.28+dfsg-11) unstable; urgency=medium
+
+ [ Debian Janitor ]
+ * Apply multi-arch hints. + cyrus-sasl2-doc: Add Multi-Arch: foreign.
+
+ [ Bastian Germann ]
+ * Add Romanian translation (Closes: #1031499)
+ * Fix lintian depends-on-obsolete-package (lsb-base)
+ * Add saslauthd.service (Closes: #981438)
+ * Remove dh_installinit params
+ * Install saslauthd.service similar to saslauthd.init
+ * Drop old NEWS
+ * Fix systemd-service-file-missing-documentation-key
+
+ -- Bastian Germann <b...@debian.org> Wed, 01 Mar 2023 00:52:04 +0100
+
cyrus-sasl2 (2.1.28+dfsg-10) unstable; urgency=medium
[ Helmut Grohne ]
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/control
cyrus-sasl2-2.1.28+dfsg/debian/control
--- cyrus-sasl2-2.1.28+dfsg/debian/control 2022-11-22 17:48:33.000000000
+0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/control 2023-02-28 19:06:06.000000000
+0100
@@ -36,7 +36,6 @@
Pre-Depends: ${misc:Pre-Depends}
Depends: db-util,
libsasl2-2 (>= ${binary:Version}),
- lsb-base,
${misc:Depends},
${perl:Depends},
${shlibs:Depends}
@@ -52,6 +51,7 @@
Architecture: all
Depends: ${misc:Depends},
sphinx-rtd-theme-common
+Multi-Arch: foreign
Description: Cyrus SASL - documentation
This is the Cyrus SASL API implementation, version 2.1. See package
libsasl2-2 and RFC 2222 for more information.
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/libsasl2-2.README.Debian
cyrus-sasl2-2.1.28+dfsg/debian/libsasl2-2.README.Debian
--- cyrus-sasl2-2.1.28+dfsg/debian/libsasl2-2.README.Debian 2022-11-22
17:48:33.000000000 +0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/libsasl2-2.README.Debian 2023-02-28
19:39:25.000000000 +0100
@@ -43,7 +43,7 @@
Use dpkg-statoverride to change the permission and the ownership of the
saslauthd socket /var/run/saslauthd and the sasldb user database /etc/sasldb2.
-For more information on saslauthd, see the README.Debian in the sasl2-bin
+For more information on saslauthd, see README.Debian.gz in the sasl2-bin
package.
Also see the following RFC
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/NEWS
cyrus-sasl2-2.1.28+dfsg/debian/NEWS
--- cyrus-sasl2-2.1.28+dfsg/debian/NEWS 2022-11-22 17:48:33.000000000 +0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/NEWS 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-cyrus-sasl2 (2.1.25.dfsg1-5) unstable; urgency=low
-
- As of version 2.1.25.dfsg1-5, configuration of SQL engine backends have
- changed from database specific configuration (e.g. 'mysql') to generic
- 'sql' auxprop plugin.
-
- You will need to change your configuration f.e. from:
-
- auxprop_plugin: mysql
-
- to
-
- auxprop_plugin: sql
- sql_engine: mysql
-
- Also the SQL query (if used) needs to have '%u' replaced with '%u@%r'
- because now user and realm is provided separately.
-
- -- Ondřej Surý <ond...@debian.org> Mon, 06 Aug 2012 13:12:22 +0200
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/po/ro.po
cyrus-sasl2-2.1.28+dfsg/debian/po/ro.po
--- cyrus-sasl2-2.1.28+dfsg/debian/po/ro.po 1970-01-01 01:00:00.000000000
+0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/po/ro.po 2023-02-28 19:06:06.000000000
+0100
@@ -0,0 +1,162 @@
+# Mesajele în limba română pentru pachetul cyrus-sasl2.
+# Romanian translation of cyrus-sasl2.
+# Copyright © 2023 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the cyrus-sasl2 package.
+#
+# Remus-Gabriel Chelu <remusgabriel.ch...@disroot.org>, 2023.
+#
+# Cronologia traducerii fișierului „cyrus-sasl2”:
+# Traducerea inițială, făcută de R-GC, pentru versiunea cyrus-sasl2
2.1.28+dfsg-10 (2007-10-02).
+# Actualizare a traducerii pentru versiunea Y, făcută de X, Y(anul).
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-sasl2 2.1.28+dfsg-10\n"
+"Report-Msgid-Bugs-To: pkg-cyrus-sasl2-debian-de...@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-02 07:23+0200\n"
+"PO-Revision-Date: 2023-02-13 11:24+0100\n"
+"Last-Translator: Remus-Gabriel Chelu <remusgabriel.ch...@disroot.org>\n"
+"Language-Team: Romanian <debian-l10n-roman...@lists.debian.org>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && "
+"n%100<=19) ? 1 : 2);\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 3.2.2\n"
+
+#. Type: boolean
+#. Description
+#: ../sasl2-bin.templates:2001
+msgid "Remove /etc/sasldb2?"
+msgstr "Eliminați fișierul „/etc/sasldb2”?"
+
+#. Type: boolean
+#. Description
+#: ../sasl2-bin.templates:2001
+msgid ""
+"Cyrus SASL can store usernames and passwords in the /etc/sasldb2 database
file."
+msgstr ""
+"Cyrus SASL poate stoca nume de utilizator și parole în fișierul de bază de
date "
+"„/etc/sasldb2”."
+
+#. Type: boolean
+#. Description
+#: ../sasl2-bin.templates:2001
+msgid ""
+"If important data is stored in that file, you should back it up now or choose
"
+"not to remove the file."
+msgstr ""
+"Dacă în acest fișier sunt stocate date importante, ar trebui să le faceți o "
+"copie de rezervă acum sau să alegeți să nu eliminați fișierul."
+
+#. Type: string
+#. Description
+#: ../sasl2-bin.templates:3001
+msgid "Backup file name for /etc/sasldb2:"
+msgstr "Numele fișierului de copie de rezervă pentru „/etc/sasldb2”:"
+
+#. Type: string
+#. Description
+#: ../sasl2-bin.templates:3001
+msgid ""
+"Cyrus SASL has stored usernames and passwords in the /etc/sasldb2 database
file."
+msgstr ""
+"Cyrus SASL a stocat nume de utilizator și parole în fișierul de bază de date
„/"
+"etc/sasldb2”."
+
+#. Type: string
+#. Description
+#: ../sasl2-bin.templates:3001
+msgid ""
+"That file has to be upgraded to a newer database format. First, a backup of
the "
+"current file will be created. You can use that if you need to manually "
+"downgrade Cyrus SASL. However, automatic downgrades are not supported."
+msgstr ""
+"Fișierul respectiv trebuie să fie actualizat la un format de bază de date mai
"
+"nou. Mai întâi, va fi creată o copie de rezervă a fișierului curent. Această "
+"copie de rezervă o veți putea folosi dacă trebuie să reveniți (manual) la "
+"versiunea mai veche a Cyrus SASL. Atenție, revenirea la versiunea veche nu se
"
+"gestionează în mod automat."
+
+#. Type: string
+#. Description
+#: ../sasl2-bin.templates:3001
+msgid ""
+"Please specify the backup file name. You should check the available disk
space "
+"in that location. If the backup file already exists, it will be overwritten. "
+"Leaving this field empty will select the default value (/var/backups/sasldb2."
+"bak)."
+msgstr ""
+"Specificați numele fișierului de copie de rezervă. Ar trebui să verificați "
+"spațiul disponibil pe disc în acea locație. Dacă fișierul de rezervă există "
+"deja, acesta va fi suprascris. Lăsând acest câmp gol, se va selecta valoarea "
+"implicită (/var/backups/sasldb2.bak)."
+
+#. Type: error
+#. Description
+#: ../sasl2-bin.templates:4001
+msgid "Failed to back up /etc/sasldb2"
+msgstr "Nu s-a putut face copia de rezervă pentru fișierul „/etc/sasldb2”"
+
+#. Type: error
+#. Description
+#: ../sasl2-bin.templates:4001
+msgid ""
+"The /etc/sasldb2 file could not be backed up with the file name you
specified."
+msgstr ""
+"Fișierul „/etc/sasldb2” nu a putut fi copiat de rezervă cu numele fișierului
pe "
+"care l-ați specificat."
+
+#. Type: error
+#. Description
+#. Type: error
+#. Description
+#: ../sasl2-bin.templates:4001 ../sasl2-bin.templates:5001
+msgid "This is a fatal error and will cause the package installation to fail."
+msgstr ""
+"Aceasta este o eroare fatală și va conduce la eșuarea instalării pachetului."
+
+#. Type: error
+#. Description
+#: ../sasl2-bin.templates:4001
+msgid ""
+"Please eliminate all possible reasons that might lead to this failure, and
try "
+"to configure this package again."
+msgstr ""
+"Eliminați toate motivele posibile care ar putea conduce la acest eșec și "
+"încercați din nou să configurați acest pachet."
+
+#. Type: error
+#. Description
+#: ../sasl2-bin.templates:5001
+msgid "Failed to upgrade /etc/sasldb2"
+msgstr "Nu s-a putut actualiza fișierul „/etc/sasldb2”"
+
+#. Type: error
+#. Description
+#: ../sasl2-bin.templates:5001
+msgid "The /etc/sasldb2 file could not be upgraded to the new database format."
+msgstr ""
+"Fișierul „/etc/sasldb2” nu a putut fi actualizat la noul format de bază de
date."
+
+#. Type: error
+#. Description
+#: ../sasl2-bin.templates:5001
+msgid ""
+"The configuration process will attempt to restore the backup of this file to "
+"its original location."
+msgstr ""
+"Procesul de configurare va încerca să restaureze copia de rezervă a acestui "
+"fișier în locația sa inițială."
+
+#. Type: error
+#. Description
+#: ../sasl2-bin.templates:5001
+msgid ""
+"Please eliminate all possible reasons that might lead to this failure, then
try "
+"to configure this package again."
+msgstr ""
+"Eliminați toate motivele posibile care ar putea conduce la acest eșec, apoi "
+"încercați din nou să configurați acest pachet."
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/rules
cyrus-sasl2-2.1.28+dfsg/debian/rules
--- cyrus-sasl2-2.1.28+dfsg/debian/rules 2022-11-22 17:48:33.000000000
+0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/rules 2023-02-28 19:26:32.000000000
+0100
@@ -235,7 +235,10 @@
dh_missing --fail-missing
override_dh_installinit:
- dh_installinit --no-enable $(DH_PACKAGE_EXCLUDES) --name=saslauthd
start 20 2 3 4 5 . stop 20 0 1 6 .
+ dh_installinit --no-enable $(DH_PACKAGE_EXCLUDES) --name=saslauthd
+
+execute_after_dh_installsystemd:
+ dh_installsystemd --no-enable $(DH_PACKAGE_EXCLUDES) --name=saslauthd
override_dh_installchangelogs:
dh_installchangelogs -XChangeLog
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.default
cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.default
--- cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.default 2022-11-22
17:48:33.000000000 +0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.default 2023-02-28
19:37:38.000000000 +0100
@@ -1,6 +1,6 @@
#
# Settings for saslauthd daemon
-# Please read /usr/share/doc/sasl2-bin/README.Debian for details.
+# Please read /usr/share/doc/sasl2-bin/README.Debian.gz for details.
#
# Description of this saslauthd instance. Recommended.
@@ -44,7 +44,6 @@
# a daemon. This will PREVENT YOUR SYSTEM FROM BOOTING PROPERLY. If you wish
# to run saslauthd in debug mode, please run it by hand to be safe.
#
-# See /usr/share/doc/sasl2-bin/README.Debian for Debian-specific information.
# See the saslauthd man page and the output of 'saslauthd -h' for general
# information about these options.
#
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.init
cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.init
--- cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.init 2022-11-22
17:48:33.000000000 +0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.init 2023-02-28
19:16:11.000000000 +0100
@@ -86,12 +86,6 @@
# Load defaults file for this instance.
. $1
- # If the daemon is not enabled, give the user a warning and stop.
- if [ "$START" != "yes" ]; then
- log_warning_msg "To enable $NAME, edit $1 and set START=yes"
- return 0
- fi
-
# If the short name of this instance is undefined, warn the user
# but choose a default name.
if [ -z "$NAME" ]; then
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.service
cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.service
--- cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.service 1970-01-01
01:00:00.000000000 +0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/sasl2-bin.saslauthd.service 2023-02-28
22:29:21.000000000 +0100
@@ -0,0 +1,13 @@
+[Unit]
+Description=SASL Authentication Daemon
+Documentation=man:saslauthd(8)
+
+[Service]
+Type=forking
+PIDFile=/var/run/saslauthd/saslauthd.pid
+EnvironmentFile=/etc/default/saslauthd
+ExecStart=/usr/sbin/saslauthd -a $MECHANISMS $MECH_OPTIONS $OPTIONS -n $THREADS
+RuntimeDirectory=saslauthd
+
+[Install]
+WantedBy=multi-user.target
diff -Nru cyrus-sasl2-2.1.28+dfsg/debian/tests/saslauthd
cyrus-sasl2-2.1.28+dfsg/debian/tests/saslauthd
--- cyrus-sasl2-2.1.28+dfsg/debian/tests/saslauthd 2022-11-22
17:48:33.000000000 +0100
+++ cyrus-sasl2-2.1.28+dfsg/debian/tests/saslauthd 2023-02-28
19:19:37.000000000 +0100
@@ -16,7 +16,6 @@
userdel -r "${sasluser}" > /dev/null 2>&1 || :
fi
systemctl stop saslauthd || :
- sed -r -i '/^START=/d' /etc/default/saslauthd || :
rm -f /etc/saslauthd.conf || :
}
@@ -33,11 +32,6 @@
_configure_saslauthd() {
sed -r -i "s,^MECHANISMS=.*,MECHANISMS=\"${1}\"," /etc/default/saslauthd
- if ! grep -q ^START /etc/default/saslauthd; then
- echo "START=\"yes\"" >> /etc/default/saslauthd
- else
- sed -r -i 's,^START=.*,START="yes",' /etc/default/saslauthd
- fi
if [ "${1}" = "ldap" ]; then
cat > /etc/saslauthd.conf <<EOF
ldap_servers: ldap://127.0.0.1
