Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2015-11-06 00:09:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-26 12:47:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2015-11-06 00:09:24.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Oct 26 09:34:28 UTC 2015 - [email protected] + +- do not build mod_http2 for older distros than 13.2 for now (nghttp2 + does not build there) + +------------------------------------------------------------------- +Mon Oct 26 09:14:29 UTC 2015 - [email protected] + +- Include directives really into /etc/apache2/sysconfig.d/include.conf, + fix from Erik Wegner [bsc#951901] + +------------------------------------------------------------------- +Wed Oct 21 07:35:30 UTC 2015 - [email protected] + +- gensslcert: CN now defaults to `hostname -f` [bnc#949766] + (internal), fix help [bnc#949771] (internal) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.UWHmYq/_old 2015-11-06 00:09:26.000000000 +0100 +++ /var/tmp/diff_new_pack.UWHmYq/_new 2015-11-06 00:09:26.000000000 +0100 @@ -167,7 +167,9 @@ BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(systemd) %endif +%if 0%{?suse_version} >= 1320 BuildRequires: pkgconfig(libnghttp2) >= 1.0.0 +%endif %description This version of httpd is a major release of the 2.4 stable branch, @@ -874,7 +876,9 @@ %{_libdir}/%{name}-prefork/mod_filter.so %{_libdir}/%{name}-prefork/mod_headers.so %{_libdir}/%{name}-prefork/mod_heartmonitor.so +%if 0%{?suse_version} >= 1320 %{_libdir}/%{name}-prefork/mod_http2.so +%endif %{_libdir}/%{name}-prefork/mod_imagemap.so %{_libdir}/%{name}-prefork/mod_include.so %{_libdir}/%{name}-prefork/mod_info.so @@ -995,7 +999,9 @@ %{_libdir}/%{name}-worker/mod_filter.so %{_libdir}/%{name}-worker/mod_headers.so %{_libdir}/%{name}-worker/mod_heartmonitor.so +%if 0%{?suse_version} >= 1320 %{_libdir}/%{name}-worker/mod_http2.so +%endif %{_libdir}/%{name}-worker/mod_imagemap.so %{_libdir}/%{name}-worker/mod_include.so %{_libdir}/%{name}-worker/mod_info.so @@ -1115,7 +1121,9 @@ %{_libdir}/%{name}-event/mod_file_cache.so %{_libdir}/%{name}-event/mod_filter.so %{_libdir}/%{name}-event/mod_headers.so +%if 0%{?suse_version} >= 1320 %{_libdir}/%{name}-event/mod_http2.so +%endif %{_libdir}/%{name}-event/mod_heartmonitor.so %{_libdir}/%{name}-event/mod_imagemap.so %{_libdir}/%{name}-event/mod_include.so ++++++ gensslcert ++++++ --- /var/tmp/diff_new_pack.UWHmYq/_old 2015-11-06 00:09:27.000000000 +0100 +++ /var/tmp/diff_new_pack.UWHmYq/_new 2015-11-06 00:09:27.000000000 +0100 @@ -23,7 +23,7 @@ -l city $L -o organisation "$O" -u organisational unit "$U" - -n fully qualified domain name $CN (\$FQHOSTNAME) + -n fully qualified domain name $CN (hostname -f) -e email address of webmaster webmaster@$CN -y days server cert is valid for $srvdays -Y days CA cert is valid for $CAdays @@ -40,7 +40,7 @@ r=$ROOT . $r/etc/sysconfig/network/config -FQHOSTNAME=`cat /etc/HOSTNAME` +FQHOSTNAME=`hostname -f` # defaults comment="mod_ssl server certificate" ++++++ start_apache2 ++++++ --- /var/tmp/diff_new_pack.UWHmYq/_old 2015-11-06 00:09:27.000000000 +0100 +++ /var/tmp/diff_new_pack.UWHmYq/_new 2015-11-06 00:09:27.000000000 +0100 @@ -95,11 +95,19 @@ fi # APACHE_CONF_INCLUDE_FILES -> include.conf for file in $APACHE_CONF_INCLUDE_FILES; do - echo "Include $file" >> include.conf + test ${file:0:1} = / || file=/etc/apache2/$file + if [ ! -e $file ]; then + continue + fi + echo "Include $file" >> ${sysconfd_dir}/include.conf done # APACHE_CONF_INCLUDE_DIRS -> include.conf for dir in $APACHE_CONF_INCLUDE_DIRS; do - echo "Include $dir" >> include.conf + test ${dir:0:1} = / || dir=/etc/apache2/$dir + if [ ! -e $dir ]; then + continue + fi + echo "Include $dir" >> ${sysconfd_dir}/include.conf done # APACHE_SERVERADMIN -> global.conf if [ -n "$APACHE_SERVERADMIN" ]; then
