From 4c15e1f28229483056345ea88a67e6e3db676fba13ebe93085fa47d5dc048f4f Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 8 Jan 2021 15:12:03 +0000 Subject: [PATCH 1/3] - mod_php8 provides php_module - modified sources % apache2-script-helpers OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=641 --- apache2-script-helpers | 3 ++- apache2.changes | 7 +++++++ apache2.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) 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..69d695b 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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..addde0b 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 From 8bf24e5ac67d4e5538517a736bca530cc00fccfb874b1f7e6b317de97a13a28e Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 12 Jan 2021 11:26:51 +0000 Subject: [PATCH 2/3] - gensslcert sets CA:TRUE in basic constrains of CA cert [bsc#1180530] - modified sources % apache2-gensslcert OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=642 --- apache2-gensslcert | 7 ++++++- apache2.changes | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) 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.changes b/apache2.changes index 69d695b..e84f086 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 From 8af689926acd04c2a4f19b3c5bc2364ed8e86d89c1ca5c23d347aae509f6bf99 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 13 Jan 2021 07:07:57 +0000 Subject: [PATCH 3/3] Accepting request 862727 from home:cboltz:branches:Apache - re-add rcapache2 symlink (was lost about 6 weeks ago) OBS-URL: https://build.opensuse.org/request/show/862727 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=643 --- apache2.changes | 5 +++++ apache2.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/apache2.changes b/apache2.changes index e84f086..091ebb5 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/apache2.spec b/apache2.spec index addde0b..6070e12 100644 --- a/apache2.spec +++ b/apache2.spec @@ -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}