Bug#1051364: nvi uses Conflicts in violation of policy 10.1
X-Debbugs-CC: Tobias Frost
Dear Tobi, all,
I've prepared a patch + QA upload for unstable to address this.
The upload is on mentors.debian.net:
https://mentors.debian.net/package/nvi/
And the patch against the https://salsa.debian.org/debian/nvi
repo is attached.
I plan on preparing a separate QA upload for some other small
improvements, like updating the debian/watch file to point to
the git repo on repo.or.cz rather than the current broken page.
Or if you prefer, I can amend this change and do these as part
of this one.
>From d625f9ea73c9957cc479d13e985565d4e703c563 Mon Sep 17 00:00:00 2001
From: Amin Bandali
Date: Sun, 1 Oct 2023 23:16:05 -0400
Subject: [PATCH] debian/control: Remove 'Conflicts: nex' (Closes: #1051364)
---
debian/changelog | 8
debian/control | 1 -
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 67be40cf..d54e939c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nvi (1.81.6-19) unstable; urgency=medium
+
+ * QA upload.
+ * debian/control: Remove 'Conflicts: nex' to comply with
+Debian Policy section 10.1. (Closes: #1051364)
+
+ -- Amin Bandali Sun, 01 Oct 2023 23:12:24 -0400
+
nvi (1.81.6-18) unstable; urgency=medium
* QA upload.
diff --git a/debian/control b/debian/control
index 45b12a9b..d64d8550 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: nvi-doc
-Conflicts: nex
Description: 4.4BSD re-implementation of vi
Vi is the original screen based text editor for Unix systems.
It is considered the standard text editor, and is available on
--
2.39.2
Bug#942501: src:milter-greylist: please drop libbind-dev build dependency, it's not in use and libbind-dev is going away
Control: tags -1 pending X-Debbugs-CC: Tobias Frost Tobi, would you please sponsor this to unstable? https://salsa.debian.org/debian/milter-greylist I'll start work on #1002527 shortly. Thanks, -a
Bug#1002527: "milter-greylist -u user" considered harmful
X-Debbugs-CC: m...@renich.org, b...@debian.org, t...@zhadum.org.uk, t...@debian.org Hello, How do folks feel about the attached patch (against https://salsa.debian.org/debian/milter-greylist)? It implements Matthias's proposal of allowing the use of a user (and/or group) other than 'greylist' for systemd users as well. I understand it may not be a 100% "solution" that everyone would be happy with (e.g. postinst configure still sets 'greylist' as the owner user and group for /var/lib/milter-greylist), but I think it's an improvement over the current situation, as it makes milter-greylist respect the corresponding setting in its configuration file, and also adds an example of more suitable 'socket' and 'user' settings values to the configuration file for use with a chrooted Postfix. I'd appreciate any comments/feedback on this, but if there aren't any, I'd ask Tobi to sponsor it to unstable for me. Thanks, -a >From cbfdd5fb0dcc45639b313eea5cdf2f580be18f52 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 13 Oct 2023 01:28:35 -0400 Subject: [PATCH] Set user greylist in greylist.conf instead of milter-greylist.service --- debian/changelog | 12 debian/milter-greylist.service | 2 +- debian/patches/greylist.conf | 19 --- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a05494..f36f77a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +milter-greylist (4.6.4-1.2) unstable; urgency=medium + + * QA upload. + * Non-maintainer upload. + * Set user greylist in the configuration file rather than as a +command-line option in the service file (which always takes +precedence) to allow easier customization. (Closes: #1002527) + - debian/milter-greylist.service +- debian/patches/greylist.conf + + -- Amin Bandali Fri, 13 Oct 2023 18:43:39 -0400 + milter-greylist (4.6.4-1.1) unstable; urgency=medium * QA upload. diff --git a/debian/milter-greylist.service b/debian/milter-greylist.service index b5a6e80..bcef86f 100644 --- a/debian/milter-greylist.service +++ b/debian/milter-greylist.service @@ -5,7 +5,7 @@ Before=postfix.service [Service] Type=forking -ExecStart=/usr/sbin/milter-greylist -u greylist +ExecStart=/usr/sbin/milter-greylist Restart=on-failure PrivateTmp=true diff --git a/debian/patches/greylist.conf b/debian/patches/greylist.conf index 6e1d33d..216aae9 100644 --- a/debian/patches/greylist.conf +++ b/debian/patches/greylist.conf @@ -8,23 +8,28 @@ Index: milter-greylist-4.5.11/greylist.conf === --- milter-greylist-4.5.11.orig/greylist.conf 2014-07-30 09:29:48.543484591 +0100 +++ milter-greylist-4.5.11/greylist.conf 2014-07-30 09:29:48.539484522 +0100 -@@ -6,11 +6,17 @@ +@@ -6,11 +6,21 @@ # pidfile "/var/run/milter-greylist.pid" -socket "/var/milter-greylist/milter-greylist.sock" -dumpfile "/var/milter-greylist/greylist.db" 600 ++socket "/var/run/milter-greylist/milter-greylist.sock" +dumpfile "/var/lib/milter-greylist/greylist.db" 600 dumpfreq 1 -+ -+# For sendmail use the following two lines -+socket "/var/run/milter-greylist/milter-greylist.sock" - user "smmsp" +-user "smmsp" ++user "greylist" -+# For Postfix uncomment the following two lines and comment out the -+# sendmail ones above. ++# If using Postfix rather than Sendmail, uncomment the following ++# socket and user settings and comment out the socket and user above. +#socket "/var/run/milter-greylist/milter-greylist.sock" 660 +#user "postfix" ++ ++# If using a chrooted Postfix, you might want to use something like ++# the following instead (where "/var/spool/postfix" is the Postfix ++# chroot): ++#socket "/var/spool/postfix/milter-greylist/milter-greylist.sock" 660 ++#user "greylist:postfix" # Log milter-greylist activity to a file #stat ">>/var/milter-greylist/greylist.log" \ -- 2.39.2
Bug#1002527: milter-greylist -u user does not correctly ensure user can update greylist.db
Control: severity -1 important Control: tags -1 pending X-Debbugs-CC: t...@debian.org, m...@renich.org, b...@debian.org, t...@zhadum.org.uk Hi again folks, Per suggestion from Tobi, I'm reducing the severity of this bug from 'critical' (RC) to 'important', since the default configuration works fine out of the box on a Debian system (with systemd). Thanks to Tobi adding me to the ACL for salsa:debian/milter-greylist, I went ahead and pushed my proposed change to the repo, also attached as a patch for your convenience. https://salsa.debian.org/debian/milter-greylist/-/commit/d118c24c45674fe8ae75ae96b318a4cb1320 Tobi, if there are still no objections in the coming days, I'd appreciate it if you'd please sponsor this to unstable for me. Thanks, -a >From d118c24c45674fe8ae75ae96b318a4cb1320 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Tue, 24 Oct 2023 19:54:36 -0400 Subject: [PATCH] Set user greylist in greylist.conf instead of milter-greylist.service --- debian/changelog | 11 +++ debian/milter-greylist.service | 2 +- debian/patches/conf-dumpfreq | 6 +++--- debian/patches/greylist.conf | 19 --- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32f3de6..8832c9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +milter-greylist (4.6.4-3) UNRELEASED; urgency=medium + + * QA upload. + * Set user greylist in the configuration file rather than as a +command-line option in the service file (which always takes +precedence) to allow easier customization. (Closes: #1002527) +- debian/milter-greylist.service +- debian/patches/greylist.conf + + -- Amin Bandali Tue, 24 Oct 2023 19:49:53 -0400 + milter-greylist (4.6.4-2) unstable; urgency=medium [ Ondřej Surý ] diff --git a/debian/milter-greylist.service b/debian/milter-greylist.service index b5a6e80..bcef86f 100644 --- a/debian/milter-greylist.service +++ b/debian/milter-greylist.service @@ -5,7 +5,7 @@ Before=postfix.service [Service] Type=forking -ExecStart=/usr/sbin/milter-greylist -u greylist +ExecStart=/usr/sbin/milter-greylist Restart=on-failure PrivateTmp=true diff --git a/debian/patches/conf-dumpfreq b/debian/patches/conf-dumpfreq index 5400f40..a0de3db 100644 --- a/debian/patches/conf-dumpfreq +++ b/debian/patches/conf-dumpfreq @@ -8,11 +8,11 @@ Index: milter-greylist-4.3.5/greylist.conf --- milter-greylist-4.3.5.orig/greylist.conf 2010-03-15 14:48:16.0 + +++ milter-greylist-4.3.5/greylist.conf 2010-03-15 14:48:48.732009554 + @@ -7,7 +7,7 @@ - pidfile "/var/run/milter-greylist.pid" + socket "/var/run/milter-greylist/milter-greylist.sock" dumpfile "/var/lib/milter-greylist/greylist.db" 600 -dumpfreq 1 +dumpfreq 10m + user "greylist" - # For sendmail use the following two lines - socket "/var/run/milter-greylist/milter-greylist.sock" + # If using Postfix rather than Sendmail, uncomment the following diff --git a/debian/patches/greylist.conf b/debian/patches/greylist.conf index 6e1d33d..216aae9 100644 --- a/debian/patches/greylist.conf +++ b/debian/patches/greylist.conf @@ -8,23 +8,28 @@ Index: milter-greylist-4.5.11/greylist.conf === --- milter-greylist-4.5.11.orig/greylist.conf 2014-07-30 09:29:48.543484591 +0100 +++ milter-greylist-4.5.11/greylist.conf 2014-07-30 09:29:48.539484522 +0100 -@@ -6,11 +6,17 @@ +@@ -6,11 +6,21 @@ # pidfile "/var/run/milter-greylist.pid" -socket "/var/milter-greylist/milter-greylist.sock" -dumpfile "/var/milter-greylist/greylist.db" 600 ++socket "/var/run/milter-greylist/milter-greylist.sock" +dumpfile "/var/lib/milter-greylist/greylist.db" 600 dumpfreq 1 -+ -+# For sendmail use the following two lines -+socket "/var/run/milter-greylist/milter-greylist.sock" - user "smmsp" +-user "smmsp" ++user "greylist" -+# For Postfix uncomment the following two lines and comment out the -+# sendmail ones above. ++# If using Postfix rather than Sendmail, uncomment the following ++# socket and user settings and comment out the socket and user above. +#socket "/var/run/milter-greylist/milter-greylist.sock" 660 +#user "postfix" ++ ++# If using a chrooted Postfix, you might want to use something like ++# the following instead (where "/var/spool/postfix" is the Postfix ++# chroot): ++#socket "/var/spool/postfix/milter-greylist/milter-greylist.sock" 660 ++#user "greylist:postfix" # Log milter-greylist activity to a file #stat ">>/var/milter-greylist/greylist.log" \ -- 2.39.2
