Bug#1024850: bullseye-pu: package spf-engine/2.9.2-1

[Scott Kitterman <debian@kitterman.com>]

Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu

Negligible risk RC bug fix

[ Reason ]
Currently the pyspf-milter fails to start due to a leftover, invalid
import statement.  This fixes it, backported from the upstream fix.
There is no risk of regression since the milter binary doesn't work at
all.

[ Impact ]
pyspf-milter will continue not to work unless the end user hand edits
the file.

[ Tests ]
Can be tested manually by simply starting the milter.  No automated
tests.

[ Risks ]
None.  Fix is trivial and the package already doesn't work at all, so
can't get worse.

[ 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 (old)stable
  [X] the issue is verified as fixed in unstable

[ Changes ]
Added a patch that removes the bad import.  Same fix as upstream in
2.9.3, which is already in Testing/Unstable.

[ Other info ]
N/A

Scott K

diff -Nru spf-engine-2.9.2/debian/changelog spf-engine-2.9.2/debian/changelog
--- spf-engine-2.9.2/debian/changelog	2019-11-22 19:42:45.000000000 -0500
+++ spf-engine-2.9.2/debian/changelog	2022-11-26 14:10:35.000000000 -0500
@@ -1,3 +1,10 @@
+spf-engine (2.9.2-1+deb11u1) bullseye; urgency=medium
+
+  * Add d/p/0002-fix-leftover-import.patch from upstream to fix pyspf-milter
+    failing to start due to an invalid import statement (Closes: #1008828)
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 26 Nov 2022 14:10:35 -0500
+
 spf-engine (2.9.2-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru spf-engine-2.9.2/debian/patches/0002-fix-leftover-import.patch spf-engine-2.9.2/debian/patches/0002-fix-leftover-import.patch
--- spf-engine-2.9.2/debian/patches/0002-fix-leftover-import.patch	1969-12-31 19:00:00.000000000 -0500
+++ spf-engine-2.9.2/debian/patches/0002-fix-leftover-import.patch	2022-11-26 14:10:24.000000000 -0500
@@ -0,0 +1,23 @@
+From: Scott Kitterman <scott@kitterman.com>
+Date: Sat, 26 Nov 2022 14:04:57 -0500
+Subject: fix leftover import
+ Backport from 2.9.3
+Origin: upstream
+Bug-Debian: http://bugs.debian.org/1008828
+
+---
+ spf_engine/milter_spf.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/spf_engine/milter_spf.py b/spf_engine/milter_spf.py
+index 077b75b..eecf4f1 100644
+--- a/spf_engine/milter_spf.py
++++ b/spf_engine/milter_spf.py
+@@ -37,7 +37,6 @@ import spf_engine.policydspfsupp as config
+ from spf_engine.util import drop_privileges
+ from spf_engine.policydspfsupp import _setExceptHook
+ from spf_engine.util import write_pid
+-from spf_engine.util import own_socketfile
+ from spf_engine.util import fold
+ 
+ __version__ = "2.9.2"
diff -Nru spf-engine-2.9.2/debian/patches/series spf-engine-2.9.2/debian/patches/series
--- spf-engine-2.9.2/debian/patches/series	2019-11-22 19:35:53.000000000 -0500
+++ spf-engine-2.9.2/debian/patches/series	2022-11-26 14:05:06.000000000 -0500
@@ -1 +1,2 @@
 0001-install-conf-fix.patch
+0002-fix-leftover-import.patch