diff --git a/.gitignore b/.gitignore index cae593d..b0b8954 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,3 @@ ddclient-3.8.0.tar.bz2 /ddclient-3.8.1.tar.bz2 /ddclient-3.8.2.tar.bz2 /ddclient-3.8.3.tar.bz2 -/ddclient-3.9.0.tar.gz -/ddclient-3.9.1.tar.gz -/ddclient-3.10.0.tar.gz -/ddclient-3.11.1.tar.gz -/ddclient-3.11.2.tar.gz -/ddclient-4.0.0.tar.gz diff --git a/ddclient-tmpfiles.conf b/ddclient-tmpfiles.conf index 6eed278..881d82f 100644 --- a/ddclient-tmpfiles.conf +++ b/ddclient-tmpfiles.conf @@ -1 +1 @@ -d /run/ddclient 0755 ddclient ddclient - +d /var/run/ddclient 0755 ddclient ddclient - diff --git a/ddclient.NetworkManager b/ddclient.NetworkManager index fe7c614..9ce54f1 100644 --- a/ddclient.NetworkManager +++ b/ddclient.NetworkManager @@ -4,7 +4,7 @@ export LC_ALL=C if [ "$2" = "down" ]; then /sbin/ip route ls | grep -q '^default' || { - [ -f /run/ddclient/ddclient.pid ] && /usr/bin/systemctl stop ddclient.service || : + [ -f /var/run/ddclient/ddclient.pid ] && /usr/bin/systemctl stop ddclient.service || : } && { :; } fi diff --git a/ddclient.service b/ddclient.service index 0ccec5a..3bdd806 100644 --- a/ddclient.service +++ b/ddclient.service @@ -1,14 +1,15 @@ [Unit] -Description=Dynamic DNS Update Client -After=syslog.target network-online.target nss-lookup.target +Description=A Perl Client Used To Update Dynamic DNS +After=syslog.target network.target nss-lookup.target [Service] User=ddclient Group=ddclient -Type=exec +Type=forking +PIDFile=/var/run/ddclient/ddclient.pid EnvironmentFile=-/etc/sysconfig/ddclient ExecStartPre=/bin/touch /var/cache/ddclient/ddclient.cache -ExecStart=/usr/sbin/ddclient $DDCLIENT_OPTIONS --foreground +ExecStart=/usr/sbin/ddclient $DDCLIENT_OPTIONS [Install] WantedBy=multi-user.target diff --git a/ddclient.spec b/ddclient.spec index e64e7d9..03bd59d 100644 --- a/ddclient.spec +++ b/ddclient.spec @@ -1,14 +1,14 @@ %global cachedir %{_localstatedir}/cache/ddclient -%global rundir %{_rundir}/ddclient +%global rundir %{_localstatedir}/run/ddclient Summary: Client to update dynamic DNS host entries Name: ddclient -Version: 4.0.0 -Release: 5%{?dist} -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: https://ddclient.net/ -Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Version: 3.8.3 +Release: 2%{?dist} +License: GPLv2+ +Group: System Environment/Daemons +URL: http://ddclient.sourceforge.net/ +Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 Source1: ddclient.rwtab Source2: ddclient.service Source3: ddclient.sysconfig @@ -17,38 +17,15 @@ Source5: ddclient-tmpfiles.conf BuildArch: noarch -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: make BuildRequires: perl-generators -BuildRequires: perl(Sys::Hostname) -BuildRequires: perl(version) BuildRequires: systemd +Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -# For tests -BuildRequires: iproute -BuildRequires: perl(HTTP::Daemon) -BuildRequires: perl(HTTP::Daemon::SSL) -BuildRequires: perl(HTTP::Message::PSGI) -BuildRequires: perl(HTTP::Request) -BuildRequires: perl(HTTP::Response) -BuildRequires: perl(IO::Socket::INET6) -BuildRequires: perl(Test::MockModule) -BuildRequires: perl(Test::TCP) -BuildRequires: perl(Test::Warnings) -BuildRequires: perl(Time::HiRes) - -Requires: perl(Data::Validate::IP) Requires: perl(Digest::SHA1) -Requires: perl(IO::Socket::INET6) Requires: perl(IO::Socket::SSL) -Requires: perl(JSON::PP) - -# Old NetworkManager expects the dispatcher scripts in a different place -Conflicts: NetworkManager < 1.20 %description ddclient is a Perl client used to update dynamic DNS entries for accounts @@ -58,25 +35,23 @@ updates for multiple addresses, MX, wildcards, abuse avoidance, retrying the failed updates and sending update status to syslog and through e-mail. %prep -%autosetup -p 1 +%setup -q +# Move pid file location for running as non-root. +sed -e 's|/var/run/ddclient.pid|%{rundir}/%{name}.pid|' \ + -i sample-etc_ddclient.conf # Send less mail by default, eg. not on every shutdown. -sed -e 's|^mail=|#mail=|' -i ddclient.conf.in -./autogen - -# Create a sysusers.d config file -cat >ddclient.sysusers.conf < /dev/null || %{_sbindir}/groupadd -r %{name} +getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/cache/%{name} -s /sbin/nologin -c "Dynamic DNS Client" %{name} +exit 0 %post %systemd_post %{name}.service @@ -121,7 +94,7 @@ fi %files %license COPYING COPYRIGHT -%doc README* ChangeLog.md sample-etc_ppp_ip-up.local +%doc README* RELEASENOTE ChangeLog Changelog.old sample-etc_ppp_ip-up.local %doc sample-etc_dhclient-exit-hooks sample-etc_cron.d_ddclient %doc sample-ddclient-wrapper.sh sample-etc_dhcpc_dhcpcd-eth0.exe @@ -133,116 +106,15 @@ fi %config(noreplace) %{_sysconfdir}/rwtab.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %attr(600,%{name},%{name}) %config(noreplace) %{_sysconfdir}/%{name}.conf -%{_prefix}/lib/NetworkManager/dispatcher.d/50-%{name} +%{_sysconfdir}/NetworkManager/dispatcher.d/50-%{name} # localstatedir %attr(0700,%{name},%{name}) %dir %{cachedir} %attr(0600,%{name},%{name}) %ghost %{cachedir}/%{name}.cache %ghost %attr(0755,%{name},%{name}) %dir %{rundir} -%{_sysusersdir}/ddclient.conf %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 4.0.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Apr 01 2025 Scott Talbert - 4.0.0-4 -- Switch systemd service to use exec and remove pid file (#2355909) - -* Tue Mar 25 2025 Scott Talbert - 4.0.0-3 -- Restore expected ddclient.conf dir to pre-4.0 location (#2354194) - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.0.0-2 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Wed Jan 22 2025 Scott Talbert - 4.0.0-1 -- Update to new upstream release 4.0.0 (#2334061) - -* Wed Jan 22 2025 Scott Talbert - 3.11.2-7 -- Fix FTBFS with newer autoconf - -* Thu Jan 16 2025 Fedora Release Engineering - 3.11.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 25 2024 Miroslav Suchý - 3.11.2-5 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 3.11.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 3.11.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.11.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Nov 29 2023 Scott Talbert - 3.11.2-1 -- Update to new upstream release 3.11.2 (#2251294) - -* Sat Nov 18 2023 Scott Talbert - 3.11.1-1 -- Update to new upstream release 3.11.1 (#2244514) - -* Thu Sep 14 2023 kenneth topp - 3.10.0-1 -- Update to new upstream release 3.10.0 - -* Thu Jan 19 2023 Fedora Release Engineering - 3.9.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 3.9.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 3.9.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 3.9.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.9.1-5 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 3.9.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Sep 12 2020 Scott Talbert - 3.9.1-3 -- Move pidfile from /var/run to /run (#1876265) - -* Mon Jul 27 2020 Fedora Release Engineering - 3.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Scott Talbert - 3.9.1-1 -- Update to new upstream release 3.9.1 (#1796923) - -* Tue Jan 28 2020 Fedora Release Engineering - 3.9.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Aug 22 2019 Lubomir Rintel - 3.9.0-4 -- Move the NetworkManager dispatcher script out of /etc - -* Wed Jul 24 2019 Fedora Release Engineering - 3.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 3.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Aug 10 2018 Scott Talbert - 3.9.0-1 -- New upstream release 3.9.0 - -* Thu Jul 12 2018 Fedora Release Engineering - 3.8.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 3.8.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Sep 09 2017 Scott Talbert - 3.8.3-5 -- Start after network-online.target rather than network.target (#1476999) - -* Wed Jul 26 2017 Fedora Release Engineering - 3.8.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.8.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - * Fri Dec 30 2016 Scott Talbert - 3.8.3-2 - Prevent NetworkManager from starting ddclient if it is disabled (#1409178) diff --git a/sources b/sources index 76f2cf8..53a415a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ddclient-4.0.0.tar.gz) = 095723aa43c4f08d7e3aa46c0bc47e753fdcbcb2cd0ac5f77cd687f98694985ad70e2f6509c05aaa232d0412fcb0aef8bb07a6d9e4302130ab1db047c14e1e86 +3b426ae52d509e463b42eeb08fb89e0b ddclient-3.8.3.tar.bz2