Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dkimproxy for openSUSE:Factory checked in at 2023-11-08 22:18:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dkimproxy (Old) and /work/SRC/openSUSE:Factory/.dkimproxy.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dkimproxy" Wed Nov 8 22:18:39 2023 rev:23 rq:1124184 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dkimproxy/dkimproxy.changes 2021-06-11 00:19:50.417438531 +0200 +++ /work/SRC/openSUSE:Factory/.dkimproxy.new.17445/dkimproxy.changes 2023-11-08 22:19:59.916178234 +0100 @@ -1,0 +2,7 @@ +Mon Nov 6 22:46:16 UTC 2023 - Robert Munteanu <[email protected]> + +- Fix boo#1216919 ++ create /run/dkimproxy using tmpfiles ++ use the correct env var for the hostname + +------------------------------------------------------------------- New: ---- dkimproxy-tmpfiles ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dkimproxy.spec ++++++ --- /var/tmp/diff_new_pack.ECdYqC/_old 2023-11-08 22:20:00.576202481 +0100 +++ /var/tmp/diff_new_pack.ECdYqC/_new 2023-11-08 22:20:00.576202481 +0100 @@ -1,7 +1,7 @@ # # spec file for package dkimproxy # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,12 +28,13 @@ Name: dkimproxy Version: 1.4.1 Release: 0 -URL: http://dkimproxy.sourceforge.net/ +URL: https://dkimproxy.sourceforge.net/ Source: %{name}-%{version}.tar.gz Source2: %{name}.sysconfig Source3: %{name}-in.service Source4: %{name}-out.service Source5: %{name}_env.sh +Source6: %{name}-tmpfiles %define services %{name}-in.service %{name}-out.service Patch0: dkimproxy-1.4.1-avoid-perl-provides.diff @@ -43,7 +44,8 @@ BuildRequires: perl-Mail-DKIM BuildRequires: perl-Net-Server BuildRequires: pwdutils -PreReq: pwdutils %fillup_prereq +PreReq: %fillup_prereq +PreReq: pwdutils Requires: git-core Requires: perl-Mail-DKIM Requires: perl-Net-Server @@ -76,6 +78,8 @@ install -m 0644 %{S:3} %{buildroot}%{_unitdir}/ install -m 0644 %{S:4} %{buildroot}%{_unitdir}/ install -m 0755 %{S:5} %{buildroot}%{_libexecdir}/%{name} + mkdir -p %{buildroot}%{_tmpfilesdir} + install -m 0744 %{S:6} %{buildroot}%{_tmpfilesdir}/%{name}.conf # --------------------------------------------------------------------------- ### Clean up buildroot @@ -96,6 +100,7 @@ %post %service_add_post %services %{fillup_only} +%tmpfiles_create %{name}.conf %postun %service_del_postun %services @@ -109,5 +114,8 @@ %{_unitdir}/%{name}-in.service %{_unitdir}/%{name}-out.service %{_libexecdir}/%{name}/ +%dir %{_tmpfilesdir} +%{_tmpfilesdir}/%{name}.conf +%ghost %{_rundir}/%{name} # --------------------------------------------------------------------------- ++++++ dkimproxy-in.service ++++++ --- /var/tmp/diff_new_pack.ECdYqC/_old 2023-11-08 22:20:00.612203803 +0100 +++ /var/tmp/diff_new_pack.ECdYqC/_new 2023-11-08 22:20:00.616203951 +0100 @@ -18,9 +18,9 @@ [Service] Type=forking ExecStartPre=/usr/lib/dkimproxy/dkimproxy_env.sh -EnvironmentFile=/run/sysconfig/dkimproxy -PIDFile=/run/dkimproxy_in.pid -ExecStart=/usr/share/dkimproxy/bin/dkimproxy.in --hostname=${FQHN} --conf_file=${DKIMPROXY_IN_CFG} --user=${DKIMPROXY_USER} --group=${DKIMPROXY_GROUP} --daemonize --pidfile=/run/dkimproxy_in.pid +EnvironmentFile=/run/dkimproxy/sysconfig +PIDFile=/run/dkimproxy/dkimproxy_in.pid +ExecStart=/usr/share/dkimproxy/bin/dkimproxy.in --hostname=${FQHN} --conf_file=${DKIMPROXY_IN_CFG} --user=${DKIMPROXY_USER} --group=${DKIMPROXY_GROUP} --daemonize --pidfile=/run/dkimproxy/dkimproxy_in.pid [Install] ++++++ dkimproxy-out.service ++++++ --- /var/tmp/diff_new_pack.ECdYqC/_old 2023-11-08 22:20:00.636204685 +0100 +++ /var/tmp/diff_new_pack.ECdYqC/_new 2023-11-08 22:20:00.640204832 +0100 @@ -18,8 +18,8 @@ [Service] Type=forking EnvironmentFile=/etc/sysconfig/dkimproxy -PIDFile=/run/dkimproxy_out.pid -ExecStart=/usr/share/dkimproxy/bin/dkimproxy.out --conf_file=${DKIMPROXY_OUT_CFG} --user=${DKIMPROXY_USER} --group=${DKIMPROXY_GROUP} --daemonize --pidfile=/run/dkimproxy_out.pid +PIDFile=/run/dkimproxy/dkimproxy_out.pid +ExecStart=/usr/share/dkimproxy/bin/dkimproxy.out --conf_file=${DKIMPROXY_OUT_CFG} --user=${DKIMPROXY_USER} --group=${DKIMPROXY_GROUP} --daemonize --pidfile=/run/dkimproxy/dkimproxy_out.pid [Install] ++++++ dkimproxy-tmpfiles ++++++ d /run/dkimproxy 0750 dkim dkim ++++++ dkimproxy_env.sh ++++++ --- /var/tmp/diff_new_pack.ECdYqC/_old 2023-11-08 22:20:00.688206596 +0100 +++ /var/tmp/diff_new_pack.ECdYqC/_new 2023-11-08 22:20:00.692206742 +0100 @@ -5,11 +5,11 @@ # systemd unit files. if [ -r /etc/sysconfig/dkimproxy ]; then - cat /etc/sysconfig/dkimproxy > /run/sysconfig/dkimproxy + cat /etc/sysconfig/dkimproxy > /run/dkimproxy/sysconfig fi -echo "#Fully qualified hostanme" >> /run/sysconfig/dkimproxy -echo "HFQHN=$( hostname -f )" >> /run/sysconfig/dkimproxy +echo "#Fully qualified hostanme" >> /run/dkimproxy/sysconfig +echo "FQHN=$( hostname -f )" >> /run/dkimproxy/sysconfig
