Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2020-02-29 21:19:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Sat Feb 29 21:19:40 2020 rev:166 rq:779357 version:2.4.41 Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2020-02-06 13:06:57.132294587 +0100 +++ /work/SRC/openSUSE:Factory/.apache2.new.26092/apache2.changes 2020-02-29 21:19:53.002008040 +0100 @@ -1,0 +2,24 @@ +Wed Feb 26 10:33:47 UTC 2020 - [email protected] + +- use r1874196 [SLE-7653] +- modified patches + % apache2-load-private-keys-from-pkcs11.patch (upstream 2.4.x port) +- deleted patches + - apache2-load-certificates-from-pkcs11.patch (merged to above) + +------------------------------------------------------------------- +Tue Feb 18 12:49:55 UTC 2020 - [email protected] + +- require just libbrotli-devel + +------------------------------------------------------------------- +Thu Feb 13 18:38:57 UTC 2020 - [email protected] + +- build mod_proxy_http2 extension + +------------------------------------------------------------------- +Wed Feb 12 13:13:05 UTC 2020 - [email protected] + +- fix build for older distributions + +------------------------------------------------------------------- Old: ---- apache2-load-certificates-from-pkcs11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.79uBrn/_old 2020-02-29 21:19:57.618005831 +0100 +++ /var/tmp/diff_new_pack.79uBrn/_new 2020-02-29 21:19:57.622005829 +0100 @@ -146,10 +146,8 @@ # PATCH-FEATURE-UPSTREAM [email protected] -- backport of HttpContentLengthHeadZero and HttpExpectStrict Patch115: httpd-2.4.x-fate317766-config-control-two-protocol-options.diff Patch116: deprecated-scripts-arch.patch -# load private keys from openssl engine +# https://svn.apache.org/viewvc?view=revision&revision=1874196 Patch117: apache2-load-private-keys-from-pkcs11.patch -# load certificates from openssl engine -Patch118: apache2-load-certificates-from-pkcs11.patch BuildRequires: apache-rpm-macros-control BuildRequires: apr-util-devel #Since 2.4.7 the event MPM requires apr 1.5.0 or later. @@ -159,8 +157,7 @@ BuildRequires: firewall-macros %endif %if 0%{?suse_version} >= 1315 -BuildRequires: pkgconfig(libbrotlidec) -BuildRequires: pkgconfig(libbrotlienc) +BuildRequires: libbrotli-devel %endif BuildRequires: db-devel BuildRequires: ed @@ -344,7 +341,6 @@ %patch116 -p1 %endif %patch117 -p1 -%patch118 -p1 cat %{_sourcedir}/SUSE-NOTICE >> NOTICE # install READMEs a=$(basename %{SOURCE22}) @@ -408,6 +404,9 @@ --enable-case_filter \ --enable-case_filter_in \ --enable-imagemap \ +%if 0%{?build_http2} + --enable-http2 \ +%endif --with-ldap \ --enable-ldap \ --enable-authnz_ldap \ @@ -416,6 +415,9 @@ --enable-proxy-connect \ --enable-proxy-ftp \ --enable-proxy-http \ +%if 0%{?build_http2} + --enable-proxy-http2 \ +%endif --enable-proxy-fdpass \ --enable-cache \ --enable-disk-cache \ @@ -802,6 +804,19 @@ -e debug -t -f %{buildroot}/%{sysconfdir}/httpd.conf.test || exit 1 rm %{buildroot}/%{sysconfdir}/*.test +# taken from kdump/kdump.spec, thanks! +# Compatibility cruft +# there is no %%license prior to SLE12 +%if %{undefined _defaultlicensedir} +%define license %doc +%else +# filesystem before SLE12 SP3 lacks /usr/share/licenses +%if 0%(test ! -d %{_defaultlicensedir} && echo 1) +%define _defaultlicensedir %{_defaultdocdir} +%endif +%endif +# End of compatibility cruft + %files -f filelist %defattr(-,root,root) %doc INSTALL READM* ABOUT_APACHE CHANGES @@ -952,6 +967,7 @@ %{_libdir}/%{name}-prefork/mod_heartmonitor.so %if 0%{?build_http2} %{_libdir}/%{name}-prefork/mod_http2.so +%{_libdir}/%{name}-prefork/mod_proxy_http2.so %endif %{_libdir}/%{name}-prefork/mod_imagemap.so %{_libdir}/%{name}-prefork/mod_include.so @@ -1080,6 +1096,7 @@ %{_libdir}/%{name}-worker/mod_heartmonitor.so %if 0%{?build_http2} %{_libdir}/%{name}-worker/mod_http2.so +%{_libdir}/%{name}-worker/mod_proxy_http2.so %endif %{_libdir}/%{name}-worker/mod_imagemap.so %{_libdir}/%{name}-worker/mod_include.so @@ -1207,6 +1224,7 @@ %{_libdir}/%{name}-event/mod_headers.so %if 0%{?build_http2} %{_libdir}/%{name}-event/mod_http2.so +%{_libdir}/%{name}-event/mod_proxy_http2.so %endif %{_libdir}/%{name}-event/mod_heartmonitor.so %{_libdir}/%{name}-event/mod_imagemap.so ++++++ apache2-load-private-keys-from-pkcs11.patch ++++++ ++++ 743 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/apache2/apache2-load-private-keys-from-pkcs11.patch ++++ and /work/SRC/openSUSE:Factory/.apache2.new.26092/apache2-load-private-keys-from-pkcs11.patch
