diff --git a/apache2-gensslcert b/apache2-gensslcert index 028d691..7617dba 100644 --- a/apache2-gensslcert +++ b/apache2-gensslcert @@ -114,6 +114,7 @@ distinguished_name = req_distinguished_name attributes = req_attributes prompt = no output_password = mypass +x509_extensions = req_v3_ca [ req_distinguished_name ] C = $C @@ -125,7 +126,11 @@ CN = $CN emailAddress = $email [ req_attributes ] -challengePassword = $RANDOM$RANDOMA challenge password +challengePassword = $RANDOM$RANDOMA challenge password + +[req_v3_ca] +# bsc#1180530 +basicConstraints = critical,CA:true EOT echo;myecho creating CA request/certificate ... diff --git a/apache2-script-helpers b/apache2-script-helpers index 8de22c9..543c126 100644 --- a/apache2-script-helpers +++ b/apache2-script-helpers @@ -67,8 +67,9 @@ function get_module_list module_id=${module#mod_}_module - # special case + # special cases case $module_id in auth_mysql_module) module_id=mysql_auth_module;; esac + case $module_id in php[89]_module) module_id=php_module;; esac unset module_path for libdir in /usr/lib64 /usr/lib; do diff --git a/apache2.changes b/apache2.changes index 685041a..091ebb5 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Jan 12 22:29:52 UTC 2021 - Christian Boltz + +- re-add rcapache2 symlink (was lost about 6 weeks ago) + +------------------------------------------------------------------- +Tue Jan 12 11:24:20 UTC 2021 - pgajdos@suse.com + +- gensslcert sets CA:TRUE in basic constrains of CA cert [bsc#1180530] +- modified sources + % apache2-gensslcert + +------------------------------------------------------------------- +Fri Jan 8 14:59:12 UTC 2021 - pgajdos@suse.com + +- mod_php8 provides php_module +- modified sources + % apache2-script-helpers + ------------------------------------------------------------------- Thu Dec 17 17:22:23 UTC 2020 - pgajdos@suse.com diff --git a/apache2.spec b/apache2.spec index 48993fa..6070e12 100644 --- a/apache2.spec +++ b/apache2.spec @@ -1,7 +1,7 @@ # # spec file for package apache2 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -533,6 +533,7 @@ mkdir -p %{buildroot}%{_unitdir} install -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/apache2.service install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/apache2@.service install -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/apache2.target +ln -sf service %{buildroot}/%{_sbindir}/rcapache2 install -m 700 %{SOURCE102} %{buildroot}%{_sbindir}/apache2-systemd-ask-pass @@ -872,6 +873,7 @@ exit 0 %{_sbindir}/a2disflag %{_sbindir}/a2dismod %{_sbindir}/start_apache2 +%{_sbindir}/rcapache2 %{_datadir}/apache2/script-helpers %verify(not mode) %attr(0755,root,root) %{_sbindir}/suexec %if %{use_firewalld}