summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Domsch <matt@domsch.com>2022-09-05 13:41:20 -0400
committerMatt Domsch <matt@domsch.com>2022-09-05 13:41:20 -0400
commitf5642911f19a831382471c7319c71a295915be64 (patch)
tree794b8b59656757ac1cd9fe9c1718b5a450889e17
parent7c4e30e7b83a097618c45b4a80aab74a2b67106f (diff)
downloadopendkim_EL6-f5642911f19a831382471c7319c71a295915be64.tar.gz
Fix broken patch
It wasn't applying cleanly, failing the build.
-rw-r--r--opendkim-systemd-service-simple.patch16
-rw-r--r--opendkim.spec5
2 files changed, 16 insertions, 5 deletions
diff --git a/opendkim-systemd-service-simple.patch b/opendkim-systemd-service-simple.patch
index 930c7b9..412c932 100644
--- a/opendkim-systemd-service-simple.patch
+++ b/opendkim-systemd-service-simple.patch
@@ -1,7 +1,6 @@
-diff -urNp OpenDKIM-2.11.0-Beta2.orig/contrib/systemd/opendkim.service.in OpenDKIM-2.11.0-Beta2/contrib/systemd/opendkim.service.in
---- OpenDKIM-2.11.0-Beta2.orig/contrib/systemd/opendkim.service.in 2018-11-14 18:47:38.000000000 -0600
-+++ OpenDKIM-2.11.0-Beta2/contrib/systemd/opendkim.service.in 2022-05-24 07:32:47.264885433 -0500
-@@ -8,10 +8,9 @@ Documentation=man:opendkim(8) man:opendk
+--- OpenDKIM-2.11.0-Beta2.orig/contrib/systemd/opendkim.service.in 2022-09-05 13:34:39.099662836 -0400
++++ OpenDKIM-2.11.0-Beta2/contrib/systemd/opendkim.service.in 2022-09-05 13:36:33.580356467 -0400
+@@ -8,13 +8,18 @@ Documentation=man:opendkim(8) man:opendk
After=network.target nss-lookup.target syslog.target
[Service]
@@ -14,3 +13,12 @@ diff -urNp OpenDKIM-2.11.0-Beta2.orig/contrib/systemd/opendkim.service.in OpenDK
ExecReload=/bin/kill -USR1 $MAINPID
User=opendkim
Group=opendkim
++Restart=on-failure
++StandardOutput=null
++StandardError=null
++ProtectSystem=strict
++ProtectHome=true
++ReadWritePaths=@logdir@/opendkim
+
+ [Install]
+ WantedBy=multi-user.target
diff --git a/opendkim.spec b/opendkim.spec
index 10e97aa..8256e92 100644
--- a/opendkim.spec
+++ b/opendkim.spec
@@ -6,7 +6,7 @@
Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail
Name: opendkim
Version: 2.11.0
-Release: 0.30%{?dist}
+Release: 0.31%{?dist}
License: BSD and Sendmail
URL: http://%{name}.org/
Source0: https://github.com/trusteddomainproject/OpenDKIM/archive/%{full_version}.tar.gz
@@ -210,6 +210,9 @@ exit 0
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Sep 5 2022 Matt Domsch <mdomsch@fedoraproject.org> 2.11.0-0.31
+- fix systemd service type=simple patch to apply cleanly
+
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.0-0.30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild