Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2013-10-24 14:07:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-10-17 13:57:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2013-10-24 14:07:26.000000000 +0200 @@ -1,0 +2,33 @@ +Tue Oct 22 15:43:53 UTC 2013 - [email protected] + +- Correct build in old distros. + +------------------------------------------------------------------- +Tue Oct 22 15:09:21 UTC 2013 - [email protected] + +- disable (revert) mod_ssl changes in the previous + commit so it does not end in factory or 13.1 yet. + +------------------------------------------------------------------- +Tue Oct 22 15:06:19 UTC 2013 - [email protected] + +- make mod_systemd static so scenarios described in + [bnc#846897] do not happen again. + +------------------------------------------------------------------- +Mon Oct 21 23:44:19 UTC 2013 - [email protected] + +- mod_ssl: improve ephemeral key handling in particular, support DH params + with more than 1024 bits, and allow custom configuration. + This patch adjust DH parameters according to the relevant RFC + recommendations and permanently disables the usage of "export" + and "NULL" ciphers no matter what the user configuration is + (mod_ssl-2.4.x-ekh.diff, to be in 2.4.7) + +------------------------------------------------------------------- +Mon Oct 21 23:27:56 UTC 2013 - [email protected] + +- fix [bnc#846897] problems building kiwi images due to + systemd not being running in chroot. (submit to 13.1 ASAP) + +------------------------------------------------------------------- New: ---- mod_ssl-2.4.x-ekh.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.BaqCOe/_old 2013-10-24 14:07:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BaqCOe/_new 2013-10-24 14:07:29.000000000 +0200 @@ -69,10 +69,12 @@ %define localstatedir /var/lib/%{pname} %define proxycachedir /var/cache/%{pname} %define logfiledir /var/log/%{pname} -%if %suse_version > 1220 +%if %suse_version >= 1220 %define runtimedir /run +%define mods_static access_compat unixd systemd %else %define runtimedir /var/run +%define mods_static access_compat unixd %endif %define sysconfdir /etc/%{pname} %define includedir %{_includedir}/%{pname} @@ -85,6 +87,7 @@ %else %define _unitdir /lib/systemd %endif + # "Server:" header %define VENDOR SUSE %define platform_string Linux/%VENDOR @@ -160,6 +163,7 @@ Patch109: httpd-2.4.3-mod_systemd.patch Patch110: http://people.apache.org/~minfrin/httpd-event-ssl.patch Patch111: httpd-visibility.patch +#Patch112: mod_ssl-2.4.x-ekh.diff Url: http://httpd.apache.org/ Icon: Apache.xpm Summary: The Apache Web Server Version 2.2 @@ -383,6 +387,7 @@ %patch109 -p1 %patch110 %patch111 -p1 +#%patch112 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE # install READMEs a=$(basename %{S:22}) @@ -440,7 +445,7 @@ --enable-pie \ %endif --enable-mods-shared=all \ - --enable-mods-static="access_compat unixd" \ + --enable-mods-static="%{mods_static}" \ --enable-ssl=shared \ \ --disable-isapi \ ++++++ apache-20-22-upgrade ++++++ --- /var/tmp/diff_new_pack.BaqCOe/_old 2013-10-24 14:07:29.000000000 +0200 +++ /var/tmp/diff_new_pack.BaqCOe/_new 2013-10-24 14:07:29.000000000 +0200 @@ -67,10 +67,6 @@ fi done -if [ -x /usr/bin/systemd-notify ] && /usr/bin/systemd-notify --booted && ! a2enmod -q systemd; then - a2enmod systemd -fi - if ! a2enmod -q authn_core; then a2enmod authn_core fi ++++++ httpd-2.4.3-mod_systemd.patch ++++++ --- /var/tmp/diff_new_pack.BaqCOe/_old 2013-10-24 14:07:30.000000000 +0200 +++ /var/tmp/diff_new_pack.BaqCOe/_new 2013-10-24 14:07:30.000000000 +0200 @@ -1,6 +1,6 @@ ---- httpd-2.4.3/modules/arch/unix/config5.m4.systemd -+++ httpd-2.4.3/modules/arch/unix/config5.m4 -@@ -18,6 +18,19 @@ APACHE_MODULE(privileges, Per-virtualhos +--- 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 fi ]) @@ -13,15 +13,14 @@ + enable_systemd="no" + else + APR_ADDTO(MOD_SYSTEMD_LDADD, [$SYSTEMD_LIBS]) -+ enable_systemd="yes" + fi +]) + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) APACHE_MODPATH_FINISH ---- httpd-2.4.3/modules/arch/unix/mod_systemd.c.systemd -+++ httpd-2.4.3/modules/arch/unix/mod_systemd.c +--- /dev/null ++++ httpd-2.4.6/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 ++++++ mod_ssl-2.4.x-ekh.diff ++++++ ++++ 1587 lines (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
