From 4428c31df12873955ee9be3098afe8f31ee156accdf3c6cc9dd19d0fd50214d9 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Sat, 5 Aug 2023 18:54:54 +0000 Subject: [PATCH 1/5] - Adapt spec file to work nicer with containers, like no systemd OBS-URL: https://build.opensuse.org/package/show/server:dns/nsd?expand=0&rev=103 --- nsd.changes | 5 +++++ nsd.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nsd.changes b/nsd.changes index 141e7a4..d0e6784 100644 --- a/nsd.changes +++ b/nsd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 14 06:37:13 UTC 2023 - Adam Majer + +- Adapt spec file to work nicer with containers, like no systemd + ------------------------------------------------------------------- Wed Jun 21 13:52:55 UTC 2023 - Andrea Manzini diff --git a/nsd.spec b/nsd.spec index e24ab07..597d385 100644 --- a/nsd.spec +++ b/nsd.spec @@ -51,12 +51,12 @@ BuildRequires: pkgconfig BuildRequires: pwdutils BuildRequires: tcpd-devel Requires: shadow -Requires(post): coreutils -Requires(post): findutils +Requires(post): (coreutils or busybox-coreutils) +Requires(post): (findutils or busybox-findutils) Requires(post): shadow -Requires(pre): coreutils +Requires(pre): (coreutils or busybox-coreutils) Requires(pre): shadow -%{?systemd_requires} +%{?systemd_ordering} %description NSD is a complete implementation of an authoritative domain name server, developed From 1afd3ebfaa558d2818cd69b2e80feb32f6b0d38f2150c5845f64a36ec76fd51b Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Sat, 5 Aug 2023 18:58:10 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/server:dns/nsd?expand=0&rev=104 --- nsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsd.spec b/nsd.spec index 597d385..e70ccc6 100644 --- a/nsd.spec +++ b/nsd.spec @@ -79,7 +79,7 @@ by NLnet Labs, with the purpose of creating more diversity in the DNS landscape. --enable-mmap \ --with-user=_nsd \ --enable-ratelimit -%make_build +make -O V=1 VERBOSE=1 %{?_smp_mflags} iconv -f iso8859-1 -t utf-8 doc/RELNOTES > doc/RELNOTES.utf8 iconv -f iso8859-1 -t utf-8 doc/CREDITS > doc/CREDITS.utf8 mv -f doc/RELNOTES.utf8 doc/RELNOTES From 129431ca2a7fde1e08b4341af7aa54f4160cd0d2b750c7650e3e39136cc5a1e5 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Sat, 5 Aug 2023 19:00:19 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/server:dns/nsd?expand=0&rev=105 --- nsd.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nsd.spec b/nsd.spec index e70ccc6..63c39fe 100644 --- a/nsd.spec +++ b/nsd.spec @@ -50,12 +50,12 @@ BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: pwdutils BuildRequires: tcpd-devel -Requires: shadow +Requires: (shadow or busybox-adduser) Requires(post): (coreutils or busybox-coreutils) Requires(post): (findutils or busybox-findutils) -Requires(post): shadow +Requires(post): (shadow or busybox-adduser) Requires(pre): (coreutils or busybox-coreutils) -Requires(pre): shadow +Requires(pre): (shadow or busybox-adduser) %{?systemd_ordering} %description From 728df9c9dffdf9ee963b5a6066b99a3c81fa5062f1d46912285e56fb75e26b08 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Sat, 5 Aug 2023 19:41:51 +0000 Subject: [PATCH 4/5] - Fix build for SLE12 OBS-URL: https://build.opensuse.org/package/show/server:dns/nsd?expand=0&rev=106 --- nsd.changes | 1 + nsd.spec | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/nsd.changes b/nsd.changes index d0e6784..b24ebab 100644 --- a/nsd.changes +++ b/nsd.changes @@ -2,6 +2,7 @@ Fri Jul 14 06:37:13 UTC 2023 - Adam Majer - Adapt spec file to work nicer with containers, like no systemd +- Fix build for SLE12 ------------------------------------------------------------------- Wed Jun 21 13:52:55 UTC 2023 - Andrea Manzini diff --git a/nsd.spec b/nsd.spec index 63c39fe..ad6f546 100644 --- a/nsd.spec +++ b/nsd.spec @@ -50,12 +50,12 @@ BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: pwdutils BuildRequires: tcpd-devel -Requires: (shadow or busybox-adduser) -Requires(post): (coreutils or busybox-coreutils) -Requires(post): (findutils or busybox-findutils) -Requires(post): (shadow or busybox-adduser) -Requires(pre): (coreutils or busybox-coreutils) -Requires(pre): (shadow or busybox-adduser) +Requires: shadow +Requires(post): coreutils +Requires(post): findutils +Requires(post): shadow +Requires(pre): coreutils +Requires(pre): shadow %{?systemd_ordering} %description From e7f502d426e028c0af471b681deebaf7b99e7b84405b9ddaf5ba4c143a1798e4 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Sat, 5 Aug 2023 19:45:02 +0000 Subject: [PATCH 5/5] fix changes date OBS-URL: https://build.opensuse.org/package/show/server:dns/nsd?expand=0&rev=107 --- nsd.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsd.changes b/nsd.changes index b24ebab..9352963 100644 --- a/nsd.changes +++ b/nsd.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Jul 14 06:37:13 UTC 2023 - Adam Majer +Fri Aug 4 21:21:36 UTC 2023 - Adam Majer - Adapt spec file to work nicer with containers, like no systemd - Fix build for SLE12