Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2013-03-08 09:50:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2013-01-24 10:43:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2013-03-08 09:50:02.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Feb 25 08:19:41 UTC 2013 - [email protected] + +- Install apache2.service accordingly (/usr/lib/systemd for 12.3 + and up or /lib/systemd for older versions). + +------------------------------------------------------------------- +Sat Jan 26 05:06:07 UTC 2013 - [email protected] + +- Apache 2.4.3 +* SECURITY: CVE-2012-3502 +* SECURITY: CVE-2012-2687 +* mod_cache: Set content type in case we return stale content. +* lots of bugfixes see http://www.apache.org/dist/httpd/CHANGES_2.4.3 + +------------------------------------------------------------------- +Sat Jan 26 05:00:00 UTC 2013 - [email protected] + +- Improve systemd unit file (tested for months) + +------------------------------------------------------------------- @@ -4,0 +25,25 @@ + +------------------------------------------------------------------- +Wed Aug 1 04:10:13 UTC 2012 - [email protected] + +- Fix factory-auto (aka r2dbag) complains about URL. +- Provide a symlink for apxs2 new location otherwise + all buggy spec files of external modules will break. + +------------------------------------------------------------------- +Wed Aug 1 02:21:34 UTC 2012 - [email protected] + +- BuildRequire xz explicitly, fix build in !Factory +- Drop more old, unused patches + +------------------------------------------------------------------- +Wed Aug 1 01:14:35 UTC 2012 - [email protected] + +- Upgrade to apache 2.4.2 +** ATTENTION, before installing this update YOU MUST +READ http://httpd.apache.org/docs/2.4/upgrading.html +CAREFULLY otherwise your server will most likely +fail to start due to backward incompatible changes. + +* You can read the huge complete list of changes + at http://httpd.apache.org/docs/2.4/new_features_2_4.html Old: ---- apache2.2-mpm-itk-20090414-00.patch httpd-2.2.22.tar.bz2 httpd-2.2.22.tar.bz2.asc httpd-2.2.x-CVE-2011-3368-server_protocl_c.diff httpd-keepalivetimeout-millisecs.patch httpd-mod_deflate_head.patch httpd-new_pcre.patch ssl-mode-release-buffers.patch New: ---- apache2.4-mpm-itk-2.4.2-01.patch httpd-2.4.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.4enbnO/_old 2013-03-08 09:50:06.000000000 +0100 +++ /var/tmp/diff_new_pack.4enbnO/_new 2013-03-08 09:50:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ BuildRequires: openldap2-devel BuildRequires: openssl-devel BuildRequires: pcre-devel +BuildRequires: xz BuildRequires: zlib-devel %if %{?suse_version:1}0 && 0%{?sles_version} == 9 BuildRequires: libcap @@ -47,7 +48,7 @@ %define pname apache2 %define vers 2 %define httpd httpd2 -%define apache_mmn %(test -s %{S:0} && { echo -n apache_mmn_; bzcat %{S:0} | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; }) +%define apache_mmn %(test -s %{S:0} && { echo -n apache_mmn_; xzcat %{S:0} | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; }) %define default_mpm prefork %{!?prefork:%define prefork 1} %{!?worker:%define worker 1} @@ -71,17 +72,21 @@ %define installbuilddir %{_prefix}/share/%{pname}/build %define userdir public_html %define suexec_safepath /usr/local/bin:/usr/bin:/bin +%if %suse_version > 1220 +%define _unitdir /usr/lib/systemd +%else +%define _unitdir /lib/systemd +%endif # "Server:" header %define VENDOR SUSE %define platform_string Linux/%VENDOR -%define realver 2.2.22 -Version: 2.2.22 +%define realver 2.4.3 +Version: 2.4.3 Release: 0 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 -Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 +Source0: httpd-%{realver}.tar.xz # Add file to take mtime from it in prep section Source1: apache2.changes -Source5: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2.asc Source6: 60C5442D.key Source10: SUSE-NOTICE Source11: rc.%{pname} @@ -134,19 +139,13 @@ Source144: apache2.service Patch2: httpd-2.1.3alpha-layout.dif Patch23: httpd-2.1.9-apachectl.dif -Patch65: httpd-2.0.49-log_server_status.dif +#Patch65: httpd-2.0.49-log_server_status.dif Patch66: httpd-2.0.54-envvars.dif Patch67: httpd-2.2.0-apxs-a2enmod.dif Patch68: httpd-2.x.x-logresolve.patch Patch69: httpd-2.2.x-bnc690734.patch -Patch100: apache2.2-mpm-itk-20090414-00.patch +Patch100: apache2.4-mpm-itk-2.4.2-01.patch Patch101: httpd-2.2.19-linux3.patch -Patch102: httpd-keepalivetimeout-millisecs.patch -Patch104: httpd-mod_deflate_head.patch -Patch105: ssl-mode-release-buffers.patch -Patch106: httpd-2.2.x-CVE-2011-3368-server_protocl_c.diff -# PATCH-FIX-UPSTREAM https://issues.apache.org/bugzilla/show_bug.cgi?id=52623 -Patch107: httpd-new_pcre.patch # PATCH-FEATURE-UPSTREAM apache2-mod_ssl_npn.patch [email protected] -- Add npn support to mod_ssl (needed for spdy) Patch108: apache2-mod_ssl_npn.patch Provides: apache2(mod_ssl+npn) @@ -362,22 +361,15 @@ # %setup -q -n httpd-%{realver} %patch2 -p1 -%patch23 -p1 -%patch65 -p1 -%patch66 -p1 +%patch23 +#%patch65 -p1 +%patch66 %patch67 -p1 %patch68 -p1 -%patch69 -%patch100 +#%patch69 +%patch100 -p1 %patch101 -%patch102 -%patch104 -%patch105 -%patch106 -%if 0%{?suse_version} >= 1220 -%patch107 -%endif -%patch108 +%patch108 -p1 # cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE @@ -480,7 +472,8 @@ --with-suexec-userdir=%{userdir} \ --with-suexec-uidmin=96 \ --with-suexec-gidmin=96 \ - --with-suexec-safepath=%{suexec_safepath} + --with-suexec-safepath=%{suexec_safepath} \ + --disable-heartbeat } # @@ -637,9 +630,9 @@ install -m 744 $RPM_SOURCE_DIR/rc.%{pname} $RPM_BUILD_ROOT/etc/init.d/%{pname} install -m 744 $RPM_SOURCE_DIR/start_apache2 $RPM_BUILD_ROOT/usr/sbin/start_apache2 %if 0%{?suse_version} >= 1210 -mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/ +mkdir -p $RPM_BUILD_ROOT%{_unitdir}/system/ install -m 744 $RPM_SOURCE_DIR/apache2-systemd-ask-pass $RPM_BUILD_ROOT/usr/sbin/apache2-systemd-ask-pass -install -m 644 $RPM_SOURCE_DIR/apache2.service $RPM_BUILD_ROOT/lib/systemd/system/apache2.service +install -m 644 $RPM_SOURCE_DIR/apache2.service $RPM_BUILD_ROOT%{_unitdir}/system/apache2.service %endif ln -sf ../../etc/init.d/%{pname} $RPM_BUILD_ROOT/%{_sbindir}/rc%{pname} install -m 755 $RPM_SOURCE_DIR/load_configuration $RPM_BUILD_ROOT/%{_prefix}/share/%{pname}/ @@ -737,17 +730,21 @@ mv $i ${i%.*}%{vers}.${i#*.*.} || true done popd + +pushd $RPM_BUILD_ROOT/%{_bindir} +for i in ab dbmmanage htdbm htdigest htpasswd logresolve;do +mv $i ${i}%{vers} || true +done +popd + pushd $RPM_BUILD_ROOT/%{_sbindir} - for i in ab dbmmanage htdbm htdigest htpasswd logresolve rotatelogs suexec; do + for i in rotatelogs suexec; do mv $i ${i}%{vers} || true done mv apachectl apachectl.tmp; mv apachectl.tmp apache%{vers}ctl - for i in dbmmanage htdbm htdigest htpasswd; do - mv ${i}%{vers} ../bin/ - done popd # fix up apxs -pushd $RPM_BUILD_ROOT/%{_sbindir} +pushd $RPM_BUILD_ROOT/%{_bindir} for mpm in %{mpms_to_build}; do cat <<-EOT_ED | ed -s apxs H @@ -776,7 +773,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ install -m 644 %{S:49} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} install -m 644 %{S:50} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl - +ln -sf %{_bindir}/apxs%{vers} %{buildroot}%{_sbindir} # # filelists # @@ -785,7 +782,7 @@ echo %dir %{_libdir}/%{pname}-$mpm >> filelist ( echo %dir %{includedir}-$mpm - echo %{_sbindir}/apxs%{vers}-$mpm + echo %{_bindir}/apxs%{vers}-$mpm ) >> filelist-devel done find $RPM_BUILD_ROOT/%{includedir}/.. -type f -o -type l \ @@ -827,6 +824,7 @@ -e 's+%{sysconfdir}+'$RPM_BUILD_ROOT'%{sysconfdir}+' \ -e 's+%{datadir}+'$RPM_BUILD_ROOT'%{datadir}+' \ -e 's+\.conf$+&.test+' \ + -e 's+/var/log+'$RPM_BUILD_ROOT'/var/log+' \ httpd.conf > httpd.conf.test sed -e 's+%{sysconfdir}+'$RPM_BUILD_ROOT'%{sysconfdir}+' \ default-server.conf > default-server.conf.test @@ -900,7 +898,7 @@ %endif %config /etc/init.d/%{pname} %if 0%{?suse_version} >= 1210 -/lib/systemd/system/%{pname}.service +%{_unitdir}/system/%{pname}.service %endif # %{_sbindir}/rc%{pname} @@ -973,6 +971,7 @@ %dir %{_prefix}/share/%{pname} %dir %{installbuilddir} %dir %{includedir} +%{_bindir}/apxs%{vers} %{_sbindir}/apxs%{vers} %files doc @@ -999,6 +998,8 @@ %doc %{_mandir}/man?/logresolve%{vers}.?.* %doc %{_mandir}/man?/rotatelogs%{vers}.?.* %doc %{_mandir}/man?/suexec%{vers}.?.* +%{_sbindir}/fcgistarter +%{_mandir}/man8/fcgistarter2.8.* %{_bindir}/check_forensic%{vers} %{_bindir}/dbmmanage%{vers} %{_bindir}/gensslcert @@ -1006,10 +1007,10 @@ %{_bindir}/htdigest%{vers} %{_bindir}/htpasswd%{vers} %{_bindir}/split-logfile%{vers} -%{_sbindir}/ab%{vers} -%{_sbindir}/httxt2dbm +%{_bindir}/ab%{vers} +%{_bindir}/httxt2dbm %{_sbindir}/logresolve.pl%{vers} -%{_sbindir}/logresolve%{vers} +%{_bindir}/logresolve%{vers} %{_sbindir}/rotatelogs%{vers} %verify(not mode) %attr(0755,root,root) %_sbindir/suexec2 %if %prefork ++++++ apache-20-22-upgrade ++++++ --- /var/tmp/diff_new_pack.4enbnO/_old 2013-03-08 09:50:06.000000000 +0100 +++ /var/tmp/diff_new_pack.4enbnO/_new 2013-03-08 09:50:06.000000000 +0100 @@ -13,7 +13,6 @@ a2enmod authz_groupfile a2enmod authz_default a2enmod authz_user - cat <<-EOF @@ -61,4 +60,11 @@ a2enmod mod_authnz_ldap fi +for module in mod_authn_default mod_authz_default mod_mem_cache; do + if a2enmod -q "$module"; then + echo "!!ATTENTION! $module was removed from apache version 2.4 or later, CHECK YOUR CONFIGURATION!!!" + a2dismod "$module" + fi +done + echo 'Done.' ++++++ apache2-default-server.conf ++++++ --- /var/tmp/diff_new_pack.4enbnO/_old 2013-03-08 09:50:06.000000000 +0100 +++ /var/tmp/diff_new_pack.4enbnO/_new 2013-03-08 09:50:06.000000000 +0100 @@ -102,5 +102,5 @@ Include /etc/apache2/conf.d/*.conf # The manual... if it is installed ('?' means it won't complain) -Include /etc/apache2/conf.d/apache2-manual?conf +IncludeOptional /etc/apache2/conf.d/apache2-manual?conf ++++++ apache2-httpd.conf ++++++ --- /var/tmp/diff_new_pack.4enbnO/_old 2013-03-08 09:50:06.000000000 +0100 +++ /var/tmp/diff_new_pack.4enbnO/_new 2013-03-08 09:50:06.000000000 +0100 @@ -202,7 +202,7 @@ # You may use the command line option '-S' to verify your virtual host # configuration. # -Include /etc/apache2/vhosts.d/*.conf +IncludeOptional /etc/apache2/vhosts.d/*.conf # Note: instead of adding your own configuration here, consider ++++++ apache2-mod_ssl_npn.patch ++++++ ++++ 671 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/apache2/apache2-mod_ssl_npn.patch ++++ and /work/SRC/openSUSE:Factory/.apache2.new/apache2-mod_ssl_npn.patch ++++++ apache2.2-mpm-itk-20090414-00.patch -> apache2.4-mpm-itk-2.4.2-01.patch ++++++ ++++ 2160 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/apache2/apache2.2-mpm-itk-20090414-00.patch ++++ and /work/SRC/openSUSE:Factory/.apache2.new/apache2.4-mpm-itk-2.4.2-01.patch ++++++ apache2.service ++++++ --- /var/tmp/diff_new_pack.4enbnO/_old 2013-03-08 09:50:06.000000000 +0100 +++ /var/tmp/diff_new_pack.4enbnO/_new 2013-03-08 09:50:06.000000000 +0100 @@ -1,16 +1,14 @@ [Unit] -Description=apache -After=syslog.target network.target +Description=The Apache Webserver +After=network.target remote-fs.target nss-lookup.target [email protected] [Service] -Type=forking -PIDFile=/var/run/httpd2.pid +PrivateTmp=true EnvironmentFile=/etc/sysconfig/apache2 -ExecStart=/usr/sbin/start_apache2 -D SYSTEMD -k start -ExecReload=/usr/sbin/start_apache2 -D SYSTEMD -t -ExecReload=/bin/kill -HUP $MAINPID -ExecStop=/usr/sbin/httpd2 -D SYSTEMD -k stop +ExecStart=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -k start +ExecReload=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -t -k graceful +ExecStop=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -k graceful-stop [Install] WantedBy=multi-user.target ++++++ httpd-2.0.54-envvars.dif ++++++ --- /var/tmp/diff_new_pack.4enbnO/_old 2013-03-08 09:50:06.000000000 +0100 +++ /var/tmp/diff_new_pack.4enbnO/_new 2013-03-08 09:50:06.000000000 +0100 @@ -1,11 +1,17 @@ -diff -uNr httpd-2.0.54.orig/support/envvars-std.in httpd-2.0.54/support/envvars-std.in ---- httpd-2.0.54.orig/support/envvars-std.in 2005-02-04 21:21:18.000000000 +0100 -+++ httpd-2.0.54/support/envvars-std.in 2005-10-07 13:56:49.223546288 +0200 -@@ -19,6 +19,6 @@ +--- support/envvars-std.in.orig ++++ support/envvars-std.in +@@ -18,11 +18,9 @@ + # # This file is generated from envvars-std.in # --@SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@" +-if test "x$@SHLIBPATH_VAR@" != "x" ; then +- @SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@" +-else +- @SHLIBPATH_VAR@="@exp_libdir@" +-fi ++ +@SHLIBPATH_VAR@="@exp_libdir@${@SHLIBPATH_VAR@+:$@SHLIBPATH_VAR@}" ++ export @SHLIBPATH_VAR@ # @OS_SPECIFIC_VARS@ ++++++ httpd-2.1.9-apachectl.dif ++++++ --- /var/tmp/diff_new_pack.4enbnO/_old 2013-03-08 09:50:06.000000000 +0100 +++ /var/tmp/diff_new_pack.4enbnO/_new 2013-03-08 09:50:06.000000000 +0100 @@ -1,7 +1,6 @@ -diff -uNr httpd-2.1.3-alpha.orig/support/apachectl.in httpd-2.1.3-alpha/support/apachectl.in ---- httpd-2.1.3-alpha.orig/support/apachectl.in 2005-02-04 21:28:49.000000000 +0100 -+++ httpd-2.1.3-alpha/support/apachectl.in 2005-02-25 02:52:49.203566813 +0100 -@@ -41,17 +41,32 @@ +--- support/apachectl.in.orig ++++ support/apachectl.in +@@ -42,17 +42,32 @@ ARGV="$@" # -------------------- -------------------- # # the path to your httpd binary, including options if necessary @@ -36,16 +35,16 @@ # # the URL to your server's mod_status status page. If you do not # have one, then status and fullstatus will not work. -@@ -77,7 +92,7 @@ +@@ -78,7 +93,7 @@ fi - case $ARGV in + case $ACMD in start|stop|restart|graceful|graceful-stop) - $HTTPD -k $ARGV + $HTTPD ${httpd_conf+-f $httpd_conf} -k $ARGV ERROR=$? ;; startssl|sslstart|start-SSL) -@@ -87,7 +102,7 @@ +@@ -88,7 +103,7 @@ startssl|sslstart|start-SSL) ERROR=2 ;; configtest) @@ -54,12 +53,3 @@ ERROR=$? ;; status) -@@ -97,7 +112,7 @@ - $LYNX $STATUSURL - ;; - *) -- $HTTPD $ARGV -+ $HTTPD ${httpd_conf+-f $httpd_conf} $ARGV - ERROR=$? - esac - ++++++ httpd-2.2.x-bnc690734.patch ++++++ --- /var/tmp/diff_new_pack.4enbnO/_old 2013-03-08 09:50:06.000000000 +0100 +++ /var/tmp/diff_new_pack.4enbnO/_new 2013-03-08 09:50:06.000000000 +0100 @@ -1,7 +1,6 @@ -diff -ruN ../httpd-2.2.17-o/server/util_script.c ./server/util_script.c ---- ../httpd-2.2.17-o/server/util_script.c 2009-01-12 14:59:56.000000000 +0100 -+++ ./server/util_script.c 2011-07-26 15:39:50.000000000 +0200 -@@ -406,6 +406,7 @@ +--- server/util_script.c.orig ++++ server/util_script.c +@@ -415,6 +415,7 @@ AP_DECLARE(int) ap_scan_script_header_er { char x[MAX_STRING_LEN]; char *w, *l; @@ -9,7 +8,7 @@ int p; int cgi_status = HTTP_UNSET; apr_table_t *merge; -@@ -414,7 +415,14 @@ +@@ -425,7 +426,14 @@ AP_DECLARE(int) ap_scan_script_header_er if (buffer) { *buffer = '\0'; } @@ -25,17 +24,17 @@ /* temporary place to hold headers to merge in later */ merge = apr_table_make(r->pool, 10); -@@ -430,7 +438,7 @@ +@@ -441,7 +449,7 @@ AP_DECLARE(int) ap_scan_script_header_er while (1) { - int rv = (*getsfunc) (w, MAX_STRING_LEN - 1, getsfunc_data); + int rv = (*getsfunc) (w, wlen - 1, getsfunc_data); if (rv == 0) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, - "Premature end of script headers: %s", -@@ -537,9 +545,12 @@ - + const char *msg = "Premature end of script headers"; + if (first_header) +@@ -553,9 +561,12 @@ AP_DECLARE(int) ap_scan_script_header_er + if (!(l = strchr(w, ':'))) { if (!buffer) { /* Soak up all the script output - may save an outright kill */ - while ((*getsfunc) (w, MAX_STRING_LEN - 1, getsfunc_data)) { @@ -47,4 +46,4 @@ + buffer[MAX_STRING_LEN - 1] = 0; } - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, + ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
