Bug#1075339: Patch for FTBFS

[Tim Woodall]

--- opendkim.orig/librbl/rbl.c  2018-11-15 00:47:38.000000000 +0000
+++ opendkim/librbl/rbl.c       2024-08-25 09:37:34.860816615 +0000
@@ -329,7 +329,7 @@
 rbl_res_close(void *srv)
 {
 #ifdef HAVE_RES_NINIT
-       struct state *res;
+       struct __res_state *res;

        res = srv;



This is the only change required. c.f. dkim_res_close in
libopendkim/dkim-dns.c. This appears to be a long standing typo.


Attached patch includes fix for the usrmerge migration but #1073606 for
lib/opendkim/opendkim.service.generate (Changelog says this file is
deprecated and perhaps the right option is to drop it but I've moved it
to /usr/lib/opendkim/opendkim.service.generate.

root@dirac:/build# dpkg --fsys-tarfile opendkim_2.11.0~beta2-9_amd64.deb | tar 
tvf - | awk '{print $6}' | cut -d/ -f 1-2 | sort -u
./
./etc
./usr
diff -ur opendkim.orig/debian/opendkim.default opendkim/debian/opendkim.default
--- opendkim.orig/debian/opendkim.default	2023-06-16 19:52:26.000000000 +0000
+++ opendkim/debian/opendkim.default	2024-08-25 14:31:08.938597424 +0000
@@ -3,8 +3,8 @@
 # /etc/opendkim.conf instead.
 #
 # Previously, one would edit the default settings here, and then execute
-# /lib/opendkim/opendkim.service.generate to generate systemd override files at
-# /etc/systemd/system/opendkim.service.d/override.conf and
+# /usr/lib/opendkim/opendkim.service.generate to generate systemd override
+# files at /etc/systemd/system/opendkim.service.d/override.conf and
 # /etc/tmpfiles.d/opendkim.conf. While this is still possible, it is now
 # recommended to adjust the settings directly in /etc/opendkim.conf.
 #
diff -ur opendkim.orig/debian/opendkim.install opendkim/debian/opendkim.install
--- opendkim.orig/debian/opendkim.install	2023-06-16 19:52:26.000000000 +0000
+++ opendkim/debian/opendkim.install	2024-08-25 14:24:50.877217867 +0000
@@ -1,5 +1,5 @@
 debian/README.PrivateKeys etc/dkimkeys
 debian/opendkim.conf etc
 debian/opendkim.m4 etc/mail/m4
-debian/opendkim.service-generate lib/opendkim
+debian/opendkim.service-generate usr/lib/opendkim
 usr/sbin/opendkim
diff -ur opendkim.orig/debian/rules opendkim/debian/rules
--- opendkim.orig/debian/rules	2024-08-25 12:03:57.239204374 +0000
+++ opendkim/debian/rules	2024-08-25 14:33:53.964910239 +0000
@@ -53,8 +53,8 @@
 
 override_dh_install:
 	dh_install
-	mv $(CURDIR)/debian/opendkim/lib/opendkim/opendkim.service-generate \
-		$(CURDIR)/debian/opendkim/lib/opendkim/opendkim.service.generate
+	mv $(CURDIR)/debian/opendkim/usr/lib/opendkim/opendkim.service-generate \
+		$(CURDIR)/debian/opendkim/usr/lib/opendkim/opendkim.service.generate
 
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASE_NOTES
diff -ur opendkim.orig/librbl/rbl.c opendkim/librbl/rbl.c
--- opendkim.orig/librbl/rbl.c	2018-11-15 00:47:38.000000000 +0000
+++ opendkim/librbl/rbl.c	2024-08-25 12:05:44.169015382 +0000
@@ -329,7 +329,7 @@
 rbl_res_close(void *srv)
 {
 #ifdef HAVE_RES_NINIT
-	struct state *res;
+	struct __res_state *res;
 
 	res = srv;