Hello community, here is the log from the commit of package dkimproxy for openSUSE:Factory checked in at 2018-11-28 11:15:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dkimproxy (Old) and /work/SRC/openSUSE:Factory/.dkimproxy.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dkimproxy" Wed Nov 28 11:15:28 2018 rev:19 rq:652242 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dkimproxy/dkimproxy.changes 2012-11-28 10:13:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dkimproxy.new.19453/dkimproxy.changes 2018-11-28 11:15:35.186715097 +0100 @@ -1,0 +2,6 @@ +Tue Nov 27 16:32:27 UTC 2018 - [email protected] + +- bsc#1116007 - Please convert SysV init scripts by dkimproxy into + native systemd services + +------------------------------------------------------------------- New: ---- dkimproxy-in.service dkimproxy-out.service dkimproxy.sysconfig dkimproxy_env.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dkimproxy.spec ++++++ --- /var/tmp/diff_new_pack.44McMD/_old 2018-11-28 11:15:39.454709140 +0100 +++ /var/tmp/diff_new_pack.44McMD/_new 2018-11-28 11:15:39.470709118 +0100 @@ -1,7 +1,7 @@ # # spec file for package dkimproxy # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,13 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%if %{undefined _fillupdir} +%define _fillupdir /var/adm/fillup-templates/ +%endif +# +# sysvinit -- build for SysVinit and not for systemd +# +%if %{undefined systemd_requires} +%global with_sysvinit 1 +%endif +%bcond_with sysvinit + %define dkimproxy_prefix /usr/share/dkimproxy Summary: DKIMproxy is an SMTP-proxy that implements the DKIM and DomainKeys standards -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Networking/Email/Utilities Name: dkimproxy @@ -26,7 +37,16 @@ Release: 0 Url: http://dkimproxy.sourceforge.net/ Source: %{name}-%{version}.tar.gz +%if %{with sysvinit} Source1: %{name}.init +%else +Source2: %{name}.sysconfig +Source3: %{name}-in.service +Source4: %{name}-out.service +Source5: %{name}_env.sh +%define services %{name}-in.service %{name}-out.service +%endif + Patch0: dkimproxy-1.4.1-avoid-perl-provides.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -60,9 +80,19 @@ %install %makeinstall chmod 644 $( find %{buildroot}/%{dkimproxy_prefix} -name "*.pm" ) -mkdir -p %{buildroot}{%{_sbindir},/etc/init.d} -install -m755 %{SOURCE1} %{buildroot}/etc/init.d/%{name} -ln -sf ../../etc/init.d/%{name} %{buildroot}/usr/sbin/rc%{name} +%if %{with sysvinit} + mkdir -p %{buildroot}{%{_sbindir},/etc/init.d} + install -m755 %{SOURCE1} %{buildroot}/etc/init.d/%{name} + ln -sf ../../etc/init.d/%{name} %{buildroot}/usr/sbin/rc%{name} +%else + mkdir -p %{buildroot}%{_fillupdir} + mkdir -p %{buildroot}%{_unitdir} + mkdir -p %{buildroot}%{_libexecdir}/%{name} + install -m 0644 %{S:2} %{buildroot}%{_fillupdir}/sysconfig.%{name} + install -m 0644 %{S:3} %{buildroot}%{_unitdir}/ + install -m 0644 %{S:4} %{buildroot}%{_unitdir}/ + install -m 0755 %{S:5} %{buildroot}%{_libexecdir}/%{name} +%endif # --------------------------------------------------------------------------- ### Clean up buildroot find %{buildroot} -name .packlist -exec %{__rm} {} \; @@ -74,24 +104,45 @@ %pre /usr/sbin/groupadd -r dkim 2> /dev/null || : /usr/sbin/useradd -r -g dkim -s /bin/false -c "DKIMproxy Daemon" -d /var/spool/dkim dkim 2> /dev/null || : -# --------------------------------------------------------------------------- +%if %{without sysvinit} +%service_add_pre %services +%endif %preun +%if %{with sysvinit} %stop_on_removal %{name} -# --------------------------------------------------------------------------- +%else +%service_del_preun %services +%endif %post +%if %{without sysvinit} +%service_add_post %services +%{fillup_only} +%endif %postun +%if %{with sysvinit} %restart_on_update %{name} %insserv_cleanup +%else +%service_del_postun %services +%endif %files %defattr(-, root, root, 0755) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO smtpprox.ChangeLog smtpprox.README smtpprox.TODO +%doc AUTHORS ChangeLog INSTALL NEWS README TODO smtpprox.ChangeLog smtpprox.README smtpprox.TODO +%license COPYING %{dkimproxy_prefix} +%if %{with sysvinit} %{_sbindir}/rcdkimproxy %config /etc/init.d/%{name} +%else +%{_fillupdir}/sysconfig.%{name} +%{_unitdir}/%{name}-in.service +%{_unitdir}/%{name}-out.service +%{_libexecdir}/%{name}/ +%endif # --------------------------------------------------------------------------- %changelog ++++++ dkimproxy-in.service ++++++ # This file is part of package dkimproxy. # # Copyright (c) 2018 SuSE LINUX Products GmbH, Germany. # Author: Peter Varkoly # Please send feedback to http://www.suse.de/feedback # # Description: # # Used to start the DKIMproxy. This is an SMTP-proxy # that implements the DKIM and DomainKeys standards # [Unit] Description=Inbound DKIM-proxy (dkimproxy.in) After=remote-fs.target [Service] PreExecStart=/usr/lib/dkimproxy/dkimproxy_env.sh EnvironmentFile=/run/sysconfig/dkimproxy PIDFile=/run/dkimporxy_in.pid ExecStart=/usr/share/dkimproxy/bin/dkimproxy.in --hostname=$FQHN --conf_file=$DKIMPROXY_IN_CFG --user=$DKIMPROXY_USER --group=$DKIMPROXY_GROUP --daemonize ++++++ dkimproxy-out.service ++++++ # This file is part of package dkimproxy. # # Copyright (c) 2018 SuSE LINUX Products GmbH, Germany. # Author: Peter Varkoly # Please send feedback to http://www.suse.de/feedback # # Description: # # Used to start the DKIMproxy. This is an SMTP-proxy # that implements the DKIM and DomainKeys standards # [Unit] Description=Outbound DKIM-proxy (dkimproxy.out) After=remote-fs.target [Service] EnvironmentFile=/etc/sysconfig/dkimproxy PIDFile=/run/dkimporxy_out.pid ExecStart=/usr/share/dkimproxy/bin/dkimproxy.out --conf_file=$DKIMPROXY_OUT_CFG --user=$DKIMPROXY_USER --group=$DKIMPROXY_GROUP --daemonize ++++++ dkimproxy.sysconfig ++++++ ## Path: Network/Mail/DKIMProxy ## Description: Basic configuration of the DKIMProxy ## Type: string ## Default: "dkim" # DKIMPROXY_USER=dkim ## Description: Basic configuration of the DKIMProxy ## Type: string ## Default: "dkim" # DKIMPROXY_GROUP=dkim ## Description: Basic configuration of the DKIMProxy ## Type: string ## Default: "dkim" # DKIMPROXY_IN_CFG="/usr/share/dkimproxy/etc/dkimproxy_in.conf" ## Description: Basic configuration of the DKIMProxy ## Type: string ## Default: "dkim" # DKIMPROXY_OUT_CFG="/usr/share/dkimproxy/etc/dkimproxy_out.conf" ++++++ dkimproxy_env.sh ++++++ #!/bin/sh # extract configuration from /etc/sysconfig/dkimproxy and write # environment to /run/sysconfig/dkimproxy to be used by # systemd unit files. if [ -r /etc/sysconfig/dkimproxy ]; then cat /etc/sysconfig/dkimproxy > /run/sysconfig/dkimproxy fi echo "#Fully qualified hostanme" >> /run/sysconfig/dkimproxy echo "HFQHN=$( hostname -f )" >> /run/sysconfig/dkimproxy
