Hello community, here is the log from the commit of package apache2 for openSUSE:Leap:15.2 checked in at 2020-03-02 17:21:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/apache2 (Old) and /work/SRC/openSUSE:Leap:15.2/.apache2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Mon Mar 2 17:21:37 2020 rev:44 rq:780367 version:2.4.41 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/apache2/apache2.changes 2020-02-04 17:54:11.232740856 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.apache2.new.26092/apache2.changes 2020-03-02 17:21:41.230102665 +0100 @@ -2 +2,35 @@ -Mon Jan 20 13:08:55 UTC 2020 - pgaj...@suse.com +Wed Feb 26 10:33:47 UTC 2020 - pgaj...@suse.com + +- use r1874196 [SLE-7472] [bsc#1164820c#6] +- 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 - pgaj...@suse.com + +- require just libbrotli-devel + +------------------------------------------------------------------- +Thu Feb 13 18:38:57 UTC 2020 - pgaj...@suse.com + +- build mod_proxy_http2 extension + +------------------------------------------------------------------- +Wed Feb 12 13:13:05 UTC 2020 - pgaj...@suse.com + +- fix build for older distributions + +------------------------------------------------------------------- +Fri Jan 31 18:22:09 UTC 2020 - Cristian RodrÃguez <crrodrig...@opensuse.org> + +- define DEFAULT_LISTENBACKLOG=APR_INT32_MAX. We want apache + to honour net.core.somaxconn sysctl as the mandatory limit. + the old value of 511 was never used as until v5.4-rc6 it was + clamped to 128, in current kernels the default limit is 4096. + Cannot use the apr_socket_listen(.., -1) idiom because the function + expects a positive integer argument. + +------------------------------------------------------------------- +Mon Jan 20 13:04:23 UTC 2020 - pgaj...@suse.com @@ -7 +41,8 @@ -Fri Nov 8 09:01:45 UTC 2019 - pgaj...@suse.com +Wed Dec 18 16:36:08 UTC 2019 - pgaj...@suse.com + +- add openssl call to DEFAULT_SUSE comment [bsc#1159480] +- modified sources + % apache2-ssl-global.conf + +------------------------------------------------------------------- +Fri Nov 8 08:58:25 UTC 2019 - pgaj...@suse.com @@ -25,5 +65,0 @@ - -------------------------------------------------------------------- -Fri Sep 6 10:39:26 UTC 2019 - pgaj...@suse.com - -- added to SLE-15-SP2 [bsc#1149608] Old: ---- apache2-load-certificates-from-pkcs11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.8f9tDA/_old 2020-03-02 17:21:42.766105625 +0100 +++ /var/tmp/diff_new_pack.8f9tDA/_new 2020-03-02 17:21:42.770105633 +0100 @@ -146,10 +146,8 @@ # PATCH-FEATURE-UPSTREAM kstreit...@suse.com -- 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 \ @@ -451,7 +453,7 @@ mv include/ap_config_auto.h.new include/ap_config_auto.h sed -i -e "s@%{_localstatedir}/run@%{runtimedir}@g" include/ap_config_layout.h - make CFLAGS="%{optflags} -fvisibility=hidden -fPIC -Wall -DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"'" %{?_smp_mflags} + make CFLAGS="%{optflags} -fvisibility=hidden -fPIC -Wall -DDEFAULT_LISTENBACKLOG=APR_INT32_MAX -DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"'" %{?_smp_mflags} make DESTDIR=%{buildroot} install -j1 # show pathnames in config files @@ -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:Leap:15.2/apache2/apache2-load-private-keys-from-pkcs11.patch ++++ and /work/SRC/openSUSE:Leap:15.2/.apache2.new.26092/apache2-load-private-keys-from-pkcs11.patch ++++++ apache2-ssl-global.conf ++++++ --- /var/tmp/diff_new_pack.8f9tDA/_old 2020-03-02 17:21:43.318106689 +0100 +++ /var/tmp/diff_new_pack.8f9tDA/_new 2020-03-02 17:21:43.318106689 +0100 @@ -94,7 +94,7 @@ # List the ciphers that the client is permitted to negotiate. # See the mod_ssl documentation for a complete list. # The magic string "DEFAULT_SUSE" expands to an openssl defined - # secure list of default ciphers. + # secure list of default ciphers (openssl ciphers -v DEFAULT_SUSE). SSLCipherSuite DEFAULT_SUSE # SSLHonorCipherOrder
