diff --git a/v3.9.1.tar.gz b/ddclient-3.9.1.tar.gz similarity index 100% rename from v3.9.1.tar.gz rename to ddclient-3.9.1.tar.gz diff --git a/ddclient-3.8.1-config.patch b/ddclient-config.patch similarity index 89% rename from ddclient-3.8.1-config.patch rename to ddclient-config.patch index ee45b5b..609b127 100644 --- a/ddclient-3.8.1-config.patch +++ b/ddclient-config.patch @@ -2,7 +2,7 @@ Index: sample-etc_ddclient.conf =================================================================== --- sample-etc_ddclient.conf.orig +++ sample-etc_ddclient.conf -@@ -18,12 +18,16 @@ +@@ -16,12 +16,16 @@ ## are mentioned here. ## ###################################################################### @@ -15,13 +15,14 @@ Index: sample-etc_ddclient.conf -mail=root # mail all msgs to root +#mail=root # mail all msgs to root mail-failure=root # mail failed update msgs to root - pid=/var/run/ddclient.pid # record PID in file. +-pid=/var/run/ddclient.pid # record PID in file. -ssl=yes # use ssl-support. Works with ++pid=/run/ddclient/ddclient.pid # record PID in file. +ssl=no # use ssl-support. Works with # ssl-library # postscript=script # run script after updating. The # new IP is added as argument. -@@ -56,10 +60,18 @@ ssl=yes # use ssl-support. Works wi +@@ -54,10 +58,18 @@ ssl=yes # use ssl-support. Works wi ## get banned from their service. #use=web, web=checkip.dyndns.org/, web-skip='IP Address' # found after IP Address # @@ -40,7 +41,7 @@ Index: sample-etc_ddclient.conf #protocol=dyndns2 # default protocol #proxy=fasthttp.sympatico.ca:80 # default proxy #server=members.dyndns.org # default server -@@ -72,6 +84,16 @@ ssl=yes # use ssl-support. Works wi +@@ -70,6 +82,16 @@ ssl=yes # use ssl-support. Works wi #wildcard=yes|no # add wildcard CNAME? ## @@ -61,7 +62,7 @@ Index: ddclient =================================================================== --- ddclient.orig +++ ddclient -@@ -29,7 +29,7 @@ my $program = $programd; +@@ -33,7 +33,7 @@ my $program = $programd; $program =~ s/d$//; my $now = time; my $hostname = hostname(); diff --git a/ddclient-delay-main-process-for-systemd.patch b/ddclient-delay-main-process-for-systemd.patch index 498ecdc..e6d3b66 100644 --- a/ddclient-delay-main-process-for-systemd.patch +++ b/ddclient-delay-main-process-for-systemd.patch @@ -1,7 +1,7 @@ -Index: ddclient-3.9.1/ddclient +Index: ddclient =================================================================== ---- ddclient-3.9.1.orig/ddclient -+++ ddclient-3.9.1/ddclient +--- ddclient.orig ++++ ddclient @@ -847,6 +847,7 @@ if (opt('foreground') || opt('force')) { print STDERR "${program}: can not fork ($!)\n"; exit -1; diff --git a/ddclient.changes b/ddclient.changes index 631b6f1..bcac165 100644 --- a/ddclient.changes +++ b/ddclient.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Jul 12 16:08:36 UTC 2022 - chris@computersalat.de + +- fix for boo#1191885 + add SupplementaryGroups=maildrop to service file +- rename ddclient-3.8.1-config.patch to ddclient-config.patch +- rebase patch + * ddclient-delay-main-process-for-systemd.patch (p0) +- update ddclient-config.patch + * fix PID file path +- merge ddclient-replace-varrun-with-run.patch into + ddclient-config.patc +- merge changes file with SLES Maintained pkg +- update Source to %{name}-%{version} + ------------------------------------------------------------------- Fri Dec 24 07:56:20 UTC 2021 - Antonio Larrosa @@ -23,6 +38,23 @@ Tue May 18 14:43:16 UTC 2021 - Josef Möllers status". [ddclient, ddclient-delay-main-process-for-systemd.patch] +------------------------------------------------------------------- +Wed May 12 15:09:21 UTC 2021 - Josef Möllers + +- Use an extended regular expression in sed to change (/var)?/run. + +------------------------------------------------------------------- +Thu Apr 22 06:12:24 UTC 2021 - Josef Möllers + +- In the (sample) /etc/ddclient.conf, also replace /var/run with /run. + [ddclient-replace-varrun-with-run.patch, bsc#1185069] + +------------------------------------------------------------------- +Wed Apr 21 12:20:55 UTC 2021 - Josef Möllers + +- /var/run is deprecated, replaced by /run in ddclient-tmpfiles.conf + [ddclient-tmpfiles.conf, bsc#1185069] + ------------------------------------------------------------------- Wed Aug 19 09:56:26 UTC 2020 - Dominique Leuenberger diff --git a/ddclient.service b/ddclient.service index ef83905..70a5f8b 100644 --- a/ddclient.service +++ b/ddclient.service @@ -24,6 +24,7 @@ PIDFile=/run/ddclient/ddclient.pid EnvironmentFile=-/etc/sysconfig/ddclient ExecStartPre=/bin/touch /var/cache/ddclient/ddclient.cache ExecStart=/usr/sbin/ddclient $DDCLIENT_OPTIONS +SupplementaryGroups=maildrop [Install] WantedBy=multi-user.target diff --git a/ddclient.spec b/ddclient.spec index 90e7893..befbcdf 100644 --- a/ddclient.spec +++ b/ddclient.spec @@ -1,7 +1,7 @@ # # spec file for package ddclient # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 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,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -23,11 +23,11 @@ Summary: A Perl Client to Update Dynamic DNS Entries License: GPL-2.0-or-later Group: Productivity/Networking/DNS/Utilities URL: https://github.com/ddclient/ddclient -Source0: https://github.com/ddclient/ddclient/archive/v%{version}.tar.gz +Source0: https://github.com/ddclient/ddclient/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.service Source2: %{name}.sysconfig Source3: %{name}-tmpfiles.conf -Patch0: %{name}-3.8.1-config.patch +Patch0: %{name}-config.patch Patch1: %{name}-delay-main-process-for-systemd.patch Requires: perl >= 5.004 Requires: perl-Data-Validate-IP @@ -52,7 +52,7 @@ cron. %prep %setup -q %patch0 -%patch1 -p1 +%patch1 rm -f sample-etc_ddclient.conf.orig chmod a-x sample-* mkdir examples