Accepting request 1145142 from home:michals

- Use sysuser-tools to create user.

- Remove fix-configure_ac.patch
- Rebase disable-ip-test.patch

OBS-URL: https://build.opensuse.org/request/show/1145142
OBS-URL: https://build.opensuse.org/package/show/network/ddclient?expand=0&rev=70
This commit is contained in:
Christian Wittmer 2024-02-08 20:08:47 +00:00 committed by Git OBS Bridge
parent f8ea869665
commit 96fc7c8692
2 changed files with 16 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 5 10:10:56 UTC 2024 - Michal Suchanek <msuchanek@suse.com>
- Use sysuser-tools to create user.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 23 17:05:39 UTC 2023 - Valentin Lefebvre <valentin.lefebvre@suse.com> Thu Nov 23 17:05:39 UTC 2023 - Valentin Lefebvre <valentin.lefebvre@suse.com>
@ -42,8 +47,8 @@ Thu Nov 23 17:05:39 UTC 2023 - Valentin Lefebvre <valentin.lefebvre@suse.com>
* Fixed issues with Hetzner zones * Fixed issues with Hetzner zones
* The OVH provider now ignores extra data returned * The OVH provider now ignores extra data returned
* Merge multiple configs for the same hostname instead of use the last * Merge multiple configs for the same hostname instead of use the last
- Remove fix-configure_ac.patch - Remove fix-configure_ac.patch
- Rebase disable-ip-test.patch - Rebase disable-ip-test.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 1 10:41:36 UTC 2023 - munix9@googlemail.com Sun Jan 1 10:41:36 UTC 2023 - munix9@googlemail.com
@ -137,7 +142,7 @@ Tue May 18 14:43:16 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 12 15:09:21 UTC 2021 - Josef Möllers <josef.moellers@suse.com> Wed May 12 15:09:21 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
- Use an extended regular expression in sed to change (/var)?/run. - Use an extended regular expression in sed to change (/var)?/run.
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -1,7 +1,7 @@
# #
# spec file for package ddclient # spec file for package ddclient
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -34,6 +34,7 @@ BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: curl BuildRequires: curl
BuildRequires: make BuildRequires: make
BuildRequires: sysuser-tools
BuildRequires: perl(HTTP::Daemon) BuildRequires: perl(HTTP::Daemon)
BuildRequires: perl(HTTP::Message::PSGI) BuildRequires: perl(HTTP::Message::PSGI)
BuildRequires: perl(IO::Socket::SSL) BuildRequires: perl(IO::Socket::SSL)
@ -46,6 +47,7 @@ Requires(pre): shadow
Recommends: perl-IO-Socket-SSL Recommends: perl-IO-Socket-SSL
BuildArch: noarch BuildArch: noarch
%{?systemd_requires} %{?systemd_requires}
%sysusers_requires
%description %description
ddclient is a client requiring only Perl. Supported ddclient is a client requiring only Perl. Supported
@ -65,11 +67,13 @@ rm -f sample-etc_ddclient.conf.orig
chmod a-x sample-* chmod a-x sample-*
mkdir examples mkdir examples
mv sample-* examples mv sample-* examples
echo u ddclient - '"DDClient User"' %{_localstatedir}/cache/%{name} /bin/false > system-user-ddclient.conf
%build %build
./autogen ./autogen
%configure %configure
make make
%sysusers_generate_pre system-user-ddclient.conf ddclient system-user-ddclient.conf
%install %install
%make_install %make_install
@ -84,15 +88,12 @@ install -d -m 755 %{buildroot}%{_fillupdir}
install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name} install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name}
install -d -m 755 %{buildroot}%{_localstatedir}/cache/%{name} install -d -m 755 %{buildroot}%{_localstatedir}/cache/%{name}
install -d -m 755 %{buildroot}/run/%{name} install -d -m 755 %{buildroot}/run/%{name}
install -D -m 0644 system-user-ddclient.conf %{buildroot}%{_sysusersdir}/system-user-ddclient.conf
%check %check
make VERBOSE=1 check make VERBOSE=1 check
%pre %pre -f ddclient.pre
getent group %{name} >/dev/null || %{_sbindir}/groupadd -r %{name}
getent passwd %{name} >/dev/null || \
%{_sbindir}/useradd -c "DDClient User" -d %{_localstatedir}/cache/%{name} \
-g %{name} -r -s /bin/false %{name}
%service_add_pre %{name}.service %service_add_pre %{name}.service
%post %post
@ -116,5 +117,6 @@ getent passwd %{name} >/dev/null || \
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
%{_fillupdir}/sysconfig.%{name} %{_fillupdir}/sysconfig.%{name}
%dir %attr(700,%{name},root) %{_localstatedir}/cache/%{name} %dir %attr(700,%{name},root) %{_localstatedir}/cache/%{name}
%{_sysusersdir}/system-user-ddclient.conf
%changelog %changelog