Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2015-02-20 12:43:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2015-02-06 10:18:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2015-02-20 12:43:08.000000000 +0100 @@ -6,0 +7,8 @@ +Mon Jan 19 19:18:28 UTC 2015 - [email protected] + +- httpd-2.4.3-mod_systemd.patch find libsystemd-daemon + with pkg-config, this is the only correct way, in current + versions sd_notify is in libsystemd and in old products + in libsystemd-daemon. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.UtOCNX/_old 2015-02-20 12:43:10.000000000 +0100 +++ /var/tmp/diff_new_pack.UtOCNX/_new 2015-02-20 12:43:10.000000000 +0100 @@ -38,6 +38,7 @@ BuildRequires: libcap-devel %endif %if 0%{?suse_version} >= 1210 +BuildRequires: pkgconfig BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(libsystemd-daemon) %endif ++++++ httpd-2.4.3-mod_systemd.patch ++++++ --- /var/tmp/diff_new_pack.UtOCNX/_old 2015-02-20 12:43:10.000000000 +0100 +++ /var/tmp/diff_new_pack.UtOCNX/_new 2015-02-20 12:43:10.000000000 +0100 @@ -1,26 +1,20 @@ ---- httpd-2.4.6.orig/modules/arch/unix/config5.m4 -+++ httpd-2.4.6/modules/arch/unix/config5.m4 -@@ -18,6 +18,18 @@ APACHE_MODULE(privileges, Per-virtualhos +--- httpd-2.4.11.orig/modules/arch/unix/config5.m4 ++++ httpd-2.4.11/modules/arch/unix/config5.m4 +@@ -18,6 +18,12 @@ APACHE_MODULE(privileges, Per-virtualhos fi ]) + +APACHE_MODULE(systemd, Systemd support, , , $unixd_mods_enabled, [ -+ AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") -+ AC_CHECK_HEADERS(systemd/sd-daemon.h, [ap_HAVE_SD_DAEMON_H="yes"], [ap_HAVE_SD_DAEMON_H="no"]) -+ if test $ap_HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then -+ AC_MSG_WARN([Your system does not support systemd.]) -+ enable_systemd="no" -+ else ++ PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) + APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS]) -+ fi +]) + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) APACHE_MODPATH_FINISH --- /dev/null -+++ httpd-2.4.6/modules/arch/unix/mod_systemd.c ++++ httpd-2.4.11/modules/arch/unix/mod_systemd.c @@ -0,0 +1,138 @@ +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with @@ -160,3 +154,13 @@ + NULL, + systemd_register_hooks, +}; +--- httpd-2.4.11.orig/configure.in ++++ httpd-2.4.11/configure.in +@@ -77,6 +77,7 @@ dnl shared library support for these pac + dnl work on some platforms + + AC_CANONICAL_SYSTEM ++PKG_PROG_PKG_CONFIG + + orig_prefix="$prefix" + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
