[packages/apache-mod_dnssd] - fix apache 2.4 interoparability - rel 3
baggins
baggins at pld-linux.org
Sat May 7 08:57:21 CEST 2016
commit b75cd06b551b0d136fb926b67126648dadfb53ae
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat May 7 08:57:03 2016 +0200
- fix apache 2.4 interoparability
- rel 3
apache-2.4.patch | 24 ++++++++++++++++++++++++
apache-mod_dnssd.spec | 12 ++++--------
2 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/apache-mod_dnssd.spec b/apache-mod_dnssd.spec
index 26a68d1..4223500 100644
--- a/apache-mod_dnssd.spec
+++ b/apache-mod_dnssd.spec
@@ -1,20 +1,15 @@
-# TODO
-# - module not usable under apache 2.4:
-# httpd: Syntax error on line 70 of /etc/httpd/apache.conf:
-# Syntax error on line 1 of /etc/httpd/conf.d/90_mod_dnssd.conf:
-# Cannot load modules/mod_dnssd.so into server: /etc/httpd/modules/mod_dnssd.so: undefined symbol: unixd_setup_child
-
-%define apxs %{_sbindir}/apxs
+%define apxs %{_sbindir}/apxs
Summary: mod_dnssd - Apache HTTPD module which adds Zeroconf support via DNS-SD using Avahi
Summary(pl.UTF-8): mod_dnssd - moduł Apache HTTPD oddający obsługę Zeroconfa poprzez DNS-SD przy użyciu Avahi
Name: apache-mod_dnssd
Version: 0.6
-Release: 2.1
+Release: 3
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-%{version}.tar.gz
# Source0-md5: bed3d95a98168bf0515922d1c05020c5
Source1: mod_dnssd.conf
+Patch0: apache-2.4.patch
URL: http://0pointer.de/lennart/projects/mod_dnssd/
BuildRequires: %{apxs}
BuildRequires: apache-devel >= 2.2
@@ -38,6 +33,7 @@ poprzez DNS-SD przy użyciu Avahi.
%prep
%setup -q -n mod_dnssd-%{version}
+%patch0 -p1
%build
%configure \
diff --git a/apache-2.4.patch b/apache-2.4.patch
new file mode 100644
index 0000000..6eb5058
--- /dev/null
+++ b/apache-2.4.patch
@@ -0,0 +1,24 @@
+--- mod_dnssd-0.6/src/mod_dnssd.c.httpd24
++++ mod_dnssd-0.6/src/mod_dnssd.c
+@@ -26,6 +26,9 @@
+ #include <unixd.h>
+ #include <apr_signal.h>
+ #include <mpm_common.h>
++#if AP_MODULE_MAGIC_AT_LEAST(20090130,0)
++#include <mod_unixd.h>
++#endif
+
+ #include <unistd.h>
+
+@@ -576,7 +579,11 @@ static void child_process(apr_pool_t *p,
+
+ ap_assert(d);
+
++#if AP_MODULE_MAGIC_AT_LEAST(20090130,0)
++ ap_unixd_setup_child();
++#else
+ unixd_setup_child();
++#endif
+
+ if (pipe(sigterm_pipe_fds) < 0) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r.main_server, "pipe() failed: %s", strerror(errno));
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_dnssd.git/commitdiff/b75cd06b551b0d136fb926b67126648dadfb53ae
More information about the pld-cvs-commit
mailing list