rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=490

Browse Source
This commit is contained in:
Petr Gajdos 2016-12-09 12:22:28 +00:00 committed by Git OBS Bridge
parent f13d5adf85
commit f9441d9b86
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache2.spec
View File

@ -266,8 +266,8 @@ for development using the Apache API.
%package doc %package doc
Summary: Additional Package Documentation Summary: Additional Package Documentation
Group: Documentation/Other
# Remove after 13.2 is out of support scope # Remove after 13.2 is out of support scope
Group: Documentation/Other
Provides: apache-doc = %{version} Provides: apache-doc = %{version}
Obsoletes: apache-doc < %{version} Obsoletes: apache-doc < %{version}
%if 0%{?suse_version} >= 1120 %if 0%{?suse_version} >= 1120
@ -280,8 +280,8 @@ this package's base documentation.
%package example-pages %package example-pages
Summary: Example Pages for the Apache 2 Web Server Summary: Example Pages for the Apache 2 Web Server
Group: Productivity/Networking/Web/Servers
# Remove after 13.2 is out of support scope # Remove after 13.2 is out of support scope
Group: Productivity/Networking/Web/Servers
Provides: apache-example-pages Provides: apache-example-pages
Obsoletes: apache-example-pages Obsoletes: apache-example-pages

29
httpd-2.4.3-mod_systemd.patch
View File

@ -1,20 +1,31 @@
--- httpd-2.4.11.orig/modules/arch/unix/config5.m4 Index: httpd-2.4.23/modules/arch/unix/config5.m4
+++ httpd-2.4.11/modules/arch/unix/config5.m4 ===================================================================
@@ -18,6 +18,12 @@ APACHE_MODULE(privileges, Per-virtualhos --- httpd-2.4.23.orig/modules/arch/unix/config5.m4 2016-12-09 12:29:49.398598223 +0100
+++ httpd-2.4.23/modules/arch/unix/config5.m4 2016-12-09 13:00:35.429783217 +0100
@@ -18,6 +18,19 @@ APACHE_MODULE(privileges, Per-virtualhos
fi fi
]) ])
+ +
+APACHE_MODULE(systemd, Systemd support, , , $unixd_mods_enabled, [ +APACHE_MODULE(systemd, Systemd support, , , $unixd_mods_enabled, [
+ PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) + PKG_CHECK_MODULES([SYSTEMD],
+ [libsystemd >= 209],
+ [have_systemd=yes],
+ [PKG_CHECK_MODULES([SYSTEMD],
+ [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32],
+ [have_systemd=yes],
+ [have_systemd=no])])
+ APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS]) + APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS])
+]) +])
+
+ +
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
APACHE_MODPATH_FINISH APACHE_MODPATH_FINISH
--- /dev/null Index: httpd-2.4.23/modules/arch/unix/mod_systemd.c
+++ httpd-2.4.11/modules/arch/unix/mod_systemd.c ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ httpd-2.4.23/modules/arch/unix/mod_systemd.c 2016-12-09 12:30:21.935147438 +0100
@@ -0,0 +1,138 @@ @@ -0,0 +1,138 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more +/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with
@ -154,8 +165,10 @@
+ NULL, + NULL,
+ systemd_register_hooks, + systemd_register_hooks,
+}; +};
--- httpd-2.4.11.orig/configure.in Index: httpd-2.4.23/configure.in
+++ httpd-2.4.11/configure.in ===================================================================
--- httpd-2.4.23.orig/configure.in 2016-12-09 12:29:49.398598223 +0100
+++ httpd-2.4.23/configure.in 2016-12-09 12:30:21.939147506 +0100
@@ -77,6 +77,7 @@ dnl shared library support for these pac @@ -77,6 +77,7 @@ dnl shared library support for these pac
dnl work on some platforms dnl work on some platforms