diff --git a/apache2-mod_dnssd-httpd24.patch b/apache2-mod_dnssd-httpd24.patch new file mode 100644 index 0000000..3ebacae --- /dev/null +++ b/apache2-mod_dnssd-httpd24.patch @@ -0,0 +1,28 @@ +Index: mod_dnssd-0.6/src/mod_dnssd.c +=================================================================== +--- mod_dnssd-0.6.orig/src/mod_dnssd.c ++++ mod_dnssd-0.6/src/mod_dnssd.c +@@ -23,11 +23,13 @@ + #include + #include + #include +-#include ++#include + #include + #include + + #include ++#include ++#include + + #include + #include +@@ -576,7 +578,7 @@ static void child_process(apr_pool_t *p, + + ap_assert(d); + +- unixd_setup_child(); ++ ap_unixd_setup_child(); + + if (pipe(sigterm_pipe_fds) < 0) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r.main_server, "pipe() failed: %s", strerror(errno)); diff --git a/apache2-mod_dnssd.changes b/apache2-mod_dnssd.changes index 598b934..12ce02a 100644 --- a/apache2-mod_dnssd.changes +++ b/apache2-mod_dnssd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 7 12:01:10 UTC 2024 - pgajdos@suse.com + +- fix build with gcc14 +- added patches + work with apache 2.4 + + apache2-mod_dnssd-httpd24.patch + ------------------------------------------------------------------- Tue Feb 20 11:00:51 UTC 2024 - Dominique Leuenberger diff --git a/apache2-mod_dnssd.spec b/apache2-mod_dnssd.spec index 56da525..8c9633c 100644 --- a/apache2-mod_dnssd.spec +++ b/apache2-mod_dnssd.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_dnssd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2009 Dominique Leuenberger, Almere, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -28,6 +28,8 @@ URL: http://0pointer.de/lennart/projects/mod_dnssd/ Source: %{_name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE apache2-mod_dnssd-apxs2-prefork.patch Patch0: apache2-mod_dnssd-apxs2-prefork.patch +# work with apache 2.4 +Patch1: apache2-mod_dnssd-httpd24.patch BuildRequires: apache-rpm-macros BuildRequires: apache2-devel BuildRequires: apr-devel @@ -52,9 +54,6 @@ DNS-SD using Avahi. %autosetup -p1 -n %{_name}-%{version} %build -%if %{apache_branch} >= 204 -sed -i 's/unixd_setup_child/ap_&/' src/mod_dnssd.c -%endif %configure \ --disable-lynx make %{?_smp_mflags}