pool/apache2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 830804 from Apache

Browse Source 
- gensslcert: add -a argument to override default SAN value (forwarded request 830773 from jtomasiak)

OBS-URL: https://build.opensuse.org/request/show/830804
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=171
This commit is contained in:
Dominique Leuenberger 2020-09-01 18:04:49 +00:00 committed by Git OBS Bridge
commit c96cd22332
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apache2.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Aug 31 11:08:16 UTC 2020 - Jacek Tomasiak <jtomasiak@suse.com>
- gensslcert: add -a argument to override default SAN value
-------------------------------------------------------------------
Tue Aug 31 09:07:44 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
- Provide mod_ssl to keep compatibility with other distributions.
Now obsoletes mod_ssl < %{version} instead of mod_ssl < 2.8.16.
-------------------------------------------------------------------
Thu Aug 27 11:33:07 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

3
apache2.spec
View File

@ -201,7 +201,8 @@ Provides: suse_maintenance_mmn_%{suse_maintenance_mmn}
Obsoletes: %{name}-mod_macro <= 1.2.1
Provides: apache = %{version}
Obsoletes: apache < 1.3.29
Obsoletes: mod_ssl < 2.8.16
Provides: mod_ssl = %{version}
Obsoletes: mod_ssl < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1210
BuildRequires: pkgconfig

9
gensslcert
View File

@ -24,6 +24,7 @@ function usage
-u organisational unit "$U"
-n fully qualified domain name $CN (hostname -f)
-e email address of webmaster webmaster@$CN
-a subject alternative name $altName
-y days server cert is valid for $srvdays
-Y days CA cert is valid for $CAdays
-d run in debug mode
@ -61,10 +62,11 @@ fi
O="SUSE Linux Web Server"
CN=$FQHOSTNAME
email=webmaster@$FQHOSTNAME
altName=DNS:$CN
CAdays=$((365 * 6))
srvdays=$((365 * 2))
while getopts C:N:c:s:l:o:u:n:e:y:Y:dh OPT; do
while getopts C:N:c:s:l:o:u:n:e:a:y:Y:dh OPT; do
case $OPT in
N) comment=$OPTARG;;
c) C=$OPTARG;;
@ -74,6 +76,7 @@ while getopts C:N:c:s:l:o:u:n:e:y:Y:dh OPT; do
o) O=$OPTARG;;
n) CN=$OPTARG;;
e) email=$OPTARG;;
a) altName=$OPTARG;;
y) srvdays=$OPTARG;;
Y) CAdays=$OPTARG;;
d) set -x;;
@ -84,7 +87,7 @@ done
GO_LEFT="\033[80D"
GO_MIDDLE="$GO_LEFT\033[15C"
for i in comment C ST L U O CN email srvdays CAdays; do
for i in comment C ST L U O CN email altName srvdays CAdays; do
eval "echo -e $i\"$GO_MIDDLE\" \$$i;"
done
@ -156,7 +159,7 @@ CN = $CN
emailAddress = $email
[ x509v3 ]
subjectAltName = DNS:$CN
subjectAltName = $altName
nsComment = $comment
nsCertType = server