From e809e73a3935f876a6b6d4d1018105f712780597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Thu, 10 Feb 2005 09:26:39 +0000 Subject: [PATCH] - Support UTF-8 charset in the Makefile.certificate (#134944) - Added cmp to BuildPrereq --- Makefile.certificate | 12 +++++++----- openssl.spec | 6 +++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile.certificate b/Makefile.certificate index 7bb61e7..e70ce25 100644 --- a/Makefile.certificate +++ b/Makefile.certificate @@ -1,3 +1,5 @@ +UTF8 := $(shell locale -c LC_CTYPE -k | grep -q charmap.*UTF-8 && echo -utf8) + .PHONY: usage .SUFFIXES: .key .csr .crt .pem .PRECIOUS: %.key %.csr %.crt %.pem @@ -30,7 +32,7 @@ usage: umask 77 ; \ PEM1=`/bin/mktemp /tmp/openssl.XXXXXX` ; \ PEM2=`/bin/mktemp /tmp/openssl.XXXXXX` ; \ - /usr/bin/openssl req -newkey rsa:1024 -keyout $$PEM1 -nodes -x509 -days 365 -out $$PEM2 ; \ + /usr/bin/openssl req $(UTF8) -newkey rsa:1024 -keyout $$PEM1 -nodes -x509 -days 365 -out $$PEM2 ; \ cat $$PEM1 > $@ ; \ echo "" >> $@ ; \ cat $$PEM2 >> $@ ; \ @@ -42,11 +44,11 @@ usage: %.csr: %.key umask 77 ; \ - /usr/bin/openssl req -new -key $^ -out $@ + /usr/bin/openssl req $(UTF8) -new -key $^ -out $@ %.crt: %.key umask 77 ; \ - /usr/bin/openssl req -new -key $^ -x509 -days 365 -out $@ + /usr/bin/openssl req $(UTF8) -new -key $^ -x509 -days 365 -out $@ KEY=/etc/httpd/conf/ssl.key/server.key CSR=/etc/httpd/conf/ssl.csr/server.csr @@ -58,8 +60,8 @@ testcert: $(CRT) $(CSR): $(KEY) umask 77 ; \ - /usr/bin/openssl req -new -key $(KEY) -out $(CSR) + /usr/bin/openssl req $(UTF8) -new -key $(KEY) -out $(CSR) $(CRT): $(KEY) umask 77 ; \ - /usr/bin/openssl req -new -key $(KEY) -x509 -days 365 -out $(CRT) + /usr/bin/openssl req $(UTF8) -new -key $(KEY) -x509 -days 365 -out $(CRT) diff --git a/openssl.spec b/openssl.spec index bc78b93..c39602f 100644 --- a/openssl.spec +++ b/openssl.spec @@ -64,7 +64,7 @@ License: BSDish Group: System Environment/Libraries URL: http://www.openssl.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPreReq: mktemp, krb5-devel, perl, sed, zlib-devel +BuildPreReq: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp Requires: mktemp %define solibbase %(echo %version | sed 's/[[:alpha:]]//g') @@ -406,6 +406,10 @@ popd %postun -p /sbin/ldconfig %changelog +* Thu Feb 10 2005 Tomas Mraz +- Support UTF-8 charset in the Makefile.certificate (#134944) +- Added cmp to BuildPrereq + * Thu Jan 27 2005 Joe Orton 0.9.7a-46 - generate new ca-bundle.crt from Mozilla certdata.txt (revision 1.32)