Accepting request 1280332 from server:dns

no change for TW

- disable luajit on ppc64le for SLFO (bsc#1243566)

OBS-URL: https://build.opensuse.org/request/show/1280332
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dnsdist?expand=0&rev=14

_service

@@ -1,7 +0,0 @@
-<services>
-  <service name="cargo_vendor" mode="manual">
-    <param name="srcdir">dnsdist*/dnsdist-rust-lib/rust/</param>
-    <param name="update">false</param>
-    <param name="compression">xz</param>
-  </service>
-</services>

dnsdist-2.0.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da30742f51aac8be7e116677cb07bc49fbea979fc5443e7e1fa8fa7bd0a63fe5
-size 2275260

dnsdist.changes

@@ -1,42 +1,3 @@
--------------------------------------------------------------------
-Sun Aug 10 01:50:43 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
-
-- properly set the profilename for apparmor
-
--------------------------------------------------------------------
-Sat Aug  9 03:26:26 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
-
-- package the docs directory so we can reference it in the example
-  config
-
--------------------------------------------------------------------
-Fri Aug  8 22:02:53 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
-
-- Fix url to the sample configuration
-
--------------------------------------------------------------------
-Fri Aug  8 21:50:56 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
-
-- switch build system to meson 
-- fix code 15 build by forcing a newer gcc
-
--------------------------------------------------------------------
-Fri Aug  8 20:58:12 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
-
-- update to 2.0.0
-  https://www.dnsdist.org/changelog.html#change-2.0.0
-- new buildrequires:
-  - gnutls
-  - libebpf
-- build script needs python3-PyYAML to generate sources
-- preparation for enabling new features in the future:
-  - yaml-config:
-    - adds vendor.tar.xz to vendor the rust modules.
-      built linking fails currently
-  - xdp support
-    - not sure yet if that can be later toggled in the config
-  - quiche support which brings DoH3
-
 -------------------------------------------------------------------
 Mon May 26 11:13:10 UTC 2025 - Adam Majer <adam.majer@suse.de>
 

dnsdist.lua

@@ -1,7 +1,5 @@
 -- this is a base example configuration
--- for more see
---   https://github.com/PowerDNS/pdns/blob/master/pdns/dnsdistdist/dnsdistconf.lua
---   /usr/share/doc/packages/dnsdist/docs/reference/config.rst 
+-- for more see https://github.com/PowerDNS/pdns/blob/master/pdns/dnsdistconf.lua
 -- controlSocket("127.0.0.1")
 -- setKey(please generate a fresh private key with makeKey())
 

dnsdist.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dnsdist
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,22 @@
 
 
 %define home           %{_var}/lib/%{name}
-
-%if 0%{?suse_version} == 1500
-%global force_gcc_version 14
-%endif
 %if 0%{?suse_version}
 %bcond_without  apparmor
 %else
 %bcond_with     apparmor
 %endif
-%if 0%{?%{is_backports}} || 0%{?suse_version} >= 1599
+#
+# this should only be needed if we have to patch the ragel files
+# in which case it might be faster to just run it locally and put the regenerated file into the tarball
+%bcond_with     dnsdist_ragel
+
+%if 0%{?%is_backports} || 0%{?suse_version} >= 1599
 %bcond_without  dnsdist_re2
 %else
 %bcond_with     dnsdist_re2
 %endif
+
 %ifarch ppc64le
 %bcond_with     dnsdist_luajit
 %else
@@ -40,51 +42,38 @@
 %bcond_with     dnsdist_luajit
 %endif
 %endif
-#
-# this should only be needed if we have to patch the ragel files
-# in which case it might be faster to just run it locally and put the regenerated file into the tarball
-%bcond_with     dnsdist_ragel
-%bcond_with     dnsdist_yaml_config
-%bcond_with     dnsdist_quiche
-%bcond_with     dnsdist_xdp
+
 Name:           dnsdist
-Version:        2.0.0
+Version:        1.9.10
 Release:        0
 Summary:        A highly DNS-, DoS- and abuse-aware loadbalancer
 License:        GPL-2.0-only
 Group:          Productivity/Networking/DNS/Servers
 URL:            https://www.powerdns.com/
-Source0:        https://downloads.powerdns.com/releases/dnsdist-%{version}.tar.xz
-Source1:        https://downloads.powerdns.com/releases/dnsdist-%{version}.tar.xz.sig
+Source0:        https://downloads.powerdns.com/releases/dnsdist-%{version}.tar.bz2
+Source1:        https://downloads.powerdns.com/releases/dnsdist-%{version}.tar.bz2.sig
 Source2:        https://dnsdist.org/_static/dnsdist-keyblock.asc#/dnsdist.keyring
-Source3:        vendor.tar.xz
 Source10:       dnsdist.user
 Source11:       dnsdist.lua
 Source12:       usr.sbin.dnsdist
 Source13:       local.usr.sbin.dnsdist
 Source99:       series
-BuildRequires:  gcc%{?force_gcc_version}
-BuildRequires:  gcc%{?force_gcc_version}-c++
+BuildRequires:  gcc-c++
 BuildRequires:  libboost_headers-devel
-BuildRequires:  meson
+BuildRequires:  libedit-devel
+BuildRequires:  libfstrm-devel
+BuildRequires:  libsodium-devel
+BuildRequires:  lmdb-devel
+BuildRequires:  net-snmp-devel
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(libbpf)
+BuildRequires:  sysuser-shadow
+BuildRequires:  sysuser-tools
 BuildRequires:  pkgconfig(libcap)
-BuildRequires:  pkgconfig(libedit)
-BuildRequires:  pkgconfig(libfstrm)
 BuildRequires:  pkgconfig(libnghttp2)
-BuildRequires:  pkgconfig(libsodium)
 BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(lmdb)
-BuildRequires:  pkgconfig(netsnmp)
 BuildRequires:  pkgconfig(systemd)
-%if %{with dnsdist_yaml_config}
-BuildRequires:  cargo
-%endif
-%if %{with dnsdist_xdp}
-BuildRequires:  pkgconfig(libxdp)
-%endif
+%systemd_ordering
+%sysusers_requires
 %if %{with apparmor}
 BuildRequires:  apparmor-profiles
 %endif
@@ -92,18 +81,13 @@ BuildRequires:  apparmor-profiles
 BuildRequires:  ragel
 %endif
 %if %{with dnsdist_re2}
-BuildRequires:  pkgconfig(re2)
+BuildRequires:  re2-devel
 %endif
 %if %{with dnsdist_luajit}
 BuildRequires:  pkgconfig(luajit)
 %else
 BuildRequires:  pkgconfig(lua)
 %endif
-BuildRequires:  python3-PyYAML
-BuildRequires:  sysuser-shadow
-BuildRequires:  sysuser-tools
-%systemd_ordering
-%sysusers_requires
 
 %description
 dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its goal in life
@@ -114,68 +98,41 @@ dnsdist is dynamic, in the sense that its configuration can be changed at
 runtime, and that its statistics can be queried from a console-like interface.
 
 %prep
-%autosetup -p1 -a 3 -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}
 
 %build
-%if 0%{?force_gcc_version}
-export CC="gcc-%{?force_gcc_version}"
-export CXX="g++-%{?force_gcc_version}"
+export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
+%ifarch %{arm} %{ix86}
+export CFLAGS="$CFLAGS -D__USE_TIME_BITS64"
 %endif
-%meson \
-  --bindir=%{_sbindir} \
-  --sysconfdir=%{_sysconfdir}/%{name} \
-  -Ddnscrypt=enabled \
-  -Dlibcap=enabled \
-  -Dlibedit=enabled \
-  -Dlibsodium=enabled \
-  -Dtls-gnutls=enabled \
-  -Dtls-libssl-engines=true \
-  -Dtls-libssl-providers=true \
-%if %{with dnsdist_luajit}
-  -Dlua=luajit \
-%else
-  -Dlua=lua \
-%endif
-  -Dipcipher=enabled \
-  -Dreproducible=true \
-  -Dsnmp=enabled \
-  -Ddnstap=enabled \
-  -Dnghttp2=enabled \
-  -Dcdb=disabled \
-  -Dlmdb=enabled \
-%if %{with dnsdist_quiche}
-  -Dquiche=enabled \
-  -Ddns-over-http3=enabled \
-  -Ddns-over-quic=enabled \
-%else
-  -Dquiche=disabled \
-  -Ddns-over-http3=disabled \
-  -Ddns-over-quic=disabled \
-%endif
-%if %{with dnsdist_re2}
-  -Dre2=enabled \
-%else
-  -Dre2=disabled \
-%endif
-%if %{with dnsdist_xdp}
-  -Dxsk=enabled \
-%else
-  -Dxsk=disabled \
-%endif
-  -Debpf=enabled \
-%if %{with dnsdist_yaml_config}
-  -Dyaml=enabled \
-%else
-  -Dyaml=disabled \
-%endif
-  -Dman-pages=true \
-%nil
+export CXXFLAGS="$CFLAGS"
 
-%meson_build
+%configure \
+  --enable-dnstap \
+  --enable-dns-over-tls \
+  --enable-systemd \
+  --enable-lto \
+  --enable-dnscrypt \
+  --enable-dns-over-https \
+%if %{with dnsdist_re2}
+  --with-re2 \
+%endif
+  --with-ebpf \
+  --with-net-snmp \
+  --with-libcap \
+%if %{with dnsdist_luajit}
+  --with-lua=luajit \
+%endif
+  --with-lmdb \
+  --disable-silent-rules \
+  --bindir=%{_sbindir} \
+  --sysconfdir=%{_sysconfdir}/%{name}/
+
+%make_build
 %sysusers_generate_pre %{SOURCE10} %{name}
 
 %install
-%meson_install
+%make_install
 #
 %if 0%{?suse_version}
   ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
@@ -190,18 +147,6 @@ install -m 0640 %{SOURCE11} %{buildroot}%{_sysconfdir}/%{name}/dnsdist.conf
 
 install -D -m 0644 %{SOURCE10} %{buildroot}%{_sysusersdir}/dnsdist.conf
 
-rm -rv \
-  docs/*.py \
-  docs/manpages \
-  docs/requirements.* \
-  docs/_static \
-  docs/_templates
-find docs -type f -executable -print0 | xargs -r0 chmod -v a-x
-perl -p -i -e 's|\r\n|\n|g ; s|\r|\n|g' docs/reference/logging.rst
-
-%check
-%meson_test
-
 %pre -f %{name}.pre
 %service_add_pre %{name}.service %{name}@.service
 
@@ -216,8 +161,6 @@ perl -p -i -e 's|\r\n|\n|g ; s|\r|\n|g' docs/reference/logging.rst
 
 %files
 %doc README.md
-%license COPYING
-%doc docs/
 %{_sbindir}/dnsdist
 %{_mandir}/man1/dnsdist.1%{?ext_man}
 %{_unitdir}/%{name}*.service

usr.sbin.dnsdist

@@ -1,6 +1,6 @@
 #include <tunables/global>
 
-profile dnsdist /usr/sbin/dnsdist {
+/usr/sbin/dnsdist {
   #include <abstractions/base>
   #include <abstractions/nameservice>
 

vendor.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7488e879f3e429ce18f1ba1a491b5fb389ef28f0d811d919c40fc6d1896f42f6
-size 6655488