Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package spf-engine

The pyspf-milter binary is not configurable as currently in Buster.  Due to
doing upstream development and package testing on the same machine, I failed
to notice that, as packaged for Debian, no configuration file is installed and
it looks in /usr/local/etc for a configuration file.  Sigh.

There's no chance of regression with the fix.  The defaults in the now
provided config file (in /etc/pyspf-milter) are the same as the defaults
used internally by the milter if no configuration file is found.

I've tested upgrade from the broken version and fresh installs.  It's a new
binary for Buster, so there's no Stretch -> Buster upgrade path to test.

Scott K

unblock spf-engine/2.9.0-3
diff -Nru spf-engine-2.9.0/debian/changelog spf-engine-2.9.0/debian/changelog
--- spf-engine-2.9.0/debian/changelog	2019-02-05 19:06:03.000000000 -0500
+++ spf-engine-2.9.0/debian/changelog	2019-04-10 01:10:00.000000000 -0400
@@ -1,3 +1,10 @@
+spf-engine (2.9.0-3) unstable; urgency=medium
+
+  * Install pyspf-milter config file in /etc/pyspf-milter/pyspf-milter.conf
+    and update the service file so it is used (Closes: #926752)
+
+ -- Scott Kitterman <sc...@kitterman.com>  Wed, 10 Apr 2019 00:28:09 -0400
+
 spf-engine (2.9.0-2) unstable; urgency=high
 
   * Add Breaks/Replaces for python3-spf-engine to fix upgrade issues (Closes:
diff -Nru spf-engine-2.9.0/debian/patches/0001-install-conf-fix.patch spf-engine-2.9.0/debian/patches/0001-install-conf-fix.patch
--- spf-engine-2.9.0/debian/patches/0001-install-conf-fix.patch	2019-02-01 20:26:21.000000000 -0500
+++ spf-engine-2.9.0/debian/patches/0001-install-conf-fix.patch	2019-04-10 00:27:13.000000000 -0400
@@ -134,7 +134,7 @@
  Type=simple
  PIDFile=/var/run/pyspf-milter/pyspf-milter.pid
 -ExecStart=/usr/local/bin/pyspf-milter /usr/local/etc/pyspf-milter.conf 
-+ExecStart=/usr/bin/pyspf-milter 
++ExecStart=/usr/bin/pyspf-milter /etc/pyspf-milter/pyspf-milter.conf
  
  [Install]
  WantedBy=multi-user.target
diff -Nru spf-engine-2.9.0/debian/pyspf-milter.conf spf-engine-2.9.0/debian/pyspf-milter.conf
--- spf-engine-2.9.0/debian/pyspf-milter.conf	1969-12-31 19:00:00.000000000 -0500
+++ spf-engine-2.9.0/debian/pyspf-milter.conf	2019-04-10 01:09:32.000000000 -0400
@@ -0,0 +1,19 @@
+#  For a fully commented sample config file see policyd-spf.conf.commented
+
+debugLevel = 1 
+TestOnly = 1
+
+HELO_reject = Fail
+Mail_From_reject = Fail
+
+PermError_reject = False
+TempError_Defer = False
+
+skip_addresses = 127.0.0.0/8,::ffff:127.0.0.0/104,::1
+
+# Milter specific options
+Socket = local:/run/pyspf-milter/pyspf-milter.sock
+PidFile = /run/pyspf-milter/pyspf-milter.pid
+UserID = pyspf-milter
+InternalHosts = 127.0.0.1
+#MacroListVerify =
diff -Nru spf-engine-2.9.0/debian/pyspf-milter.install spf-engine-2.9.0/debian/pyspf-milter.install
--- spf-engine-2.9.0/debian/pyspf-milter.install	2019-02-01 20:43:29.000000000 -0500
+++ spf-engine-2.9.0/debian/pyspf-milter.install	2019-04-10 00:27:41.000000000 -0400
@@ -1,3 +1,4 @@
 system/pyspf-milter etc/init.d/
 system/pyspf-milter.service lib/systemd/system/
+debian/pyspf-milter.conf etc/pyspf-milter
 build/usr/bin/pyspf-milter /usr/bin

Reply via email to