1
0

Accepting request 1173610 from Apache:Modules

- fix build with gcc14
- added patches
  work with apache 2.4
  + apache2-mod_dnssd-httpd24.patch (forwarded request 1172447 from pgajdos)

OBS-URL: https://build.opensuse.org/request/show/1173610
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2-mod_dnssd?expand=0&rev=21
This commit is contained in:
Ana Guerrero 2024-05-13 15:58:22 +00:00 committed by Git OBS Bridge
commit 28a56de475
3 changed files with 39 additions and 4 deletions

View File

@ -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 <apr_lib.h>
#include <ap_config.h>
#include <apr_strings.h>
-#include <unixd.h>
+#include <mod_unixd.h>
#include <apr_signal.h>
#include <mpm_common.h>
#include <unistd.h>
+#include <sys/types.h>
+#include <pwd.h>
#include <avahi-common/simple-watch.h>
#include <avahi-common/domain.h>
@@ -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));

View File

@ -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 <dimstar@opensuse.org>

View File

@ -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}