jonathan/openssl
1
0
Fork 0
forked from rpms/openssl
Code Pull Requests Activity

- Support UTF-8 charset in the Makefile.certificate (#134944)

Browse Source 
- Added cmp to BuildPrereq
This commit is contained in:
Tomáš Mráz 2005-02-10 09:26:39 +00:00
parent 125b1331bf
commit e809e73a39
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.certificate
View File

@ -1,3 +1,5 @@
UTF8 := $(shell locale -c LC_CTYPE -k | grep -q charmap.*UTF-8 && echo -utf8)
.PHONY: usage .PHONY: usage
.SUFFIXES: .key .csr .crt .pem .SUFFIXES: .key .csr .crt .pem
.PRECIOUS: %.key %.csr %.crt %.pem .PRECIOUS: %.key %.csr %.crt %.pem
@ -30,7 +32,7 @@ usage:
umask 77 ; \ umask 77 ; \
PEM1=`/bin/mktemp /tmp/openssl.XXXXXX` ; \ PEM1=`/bin/mktemp /tmp/openssl.XXXXXX` ; \
PEM2=`/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 > $@ ; \ cat $$PEM1 > $@ ; \
echo "" >> $@ ; \ echo "" >> $@ ; \
cat $$PEM2 >> $@ ; \ cat $$PEM2 >> $@ ; \
@ -42,11 +44,11 @@ usage:
%.csr: %.key %.csr: %.key
umask 77 ; \ umask 77 ; \
/usr/bin/openssl req -new -key $^ -out $@ /usr/bin/openssl req $(UTF8) -new -key $^ -out $@
%.crt: %.key %.crt: %.key
umask 77 ; \ 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 KEY=/etc/httpd/conf/ssl.key/server.key
CSR=/etc/httpd/conf/ssl.csr/server.csr CSR=/etc/httpd/conf/ssl.csr/server.csr
@ -58,8 +60,8 @@ testcert: $(CRT)
$(CSR): $(KEY) $(CSR): $(KEY)
umask 77 ; \ umask 77 ; \
/usr/bin/openssl req -new -key $(KEY) -out $(CSR) /usr/bin/openssl req $(UTF8) -new -key $(KEY) -out $(CSR)
$(CRT): $(KEY) $(CRT): $(KEY)
umask 77 ; \ 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)

6
openssl.spec
View File

@ -64,7 +64,7 @@ License: BSDish
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.openssl.org/ URL: http://www.openssl.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root 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 Requires: mktemp
%define solibbase %(echo %version | sed 's/[[:alpha:]]//g') %define solibbase %(echo %version | sed 's/[[:alpha:]]//g')
@ -406,6 +406,10 @@ popd
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Thu Feb 10 2005 Tomas Mraz <tmraz@redhat.com>
- Support UTF-8 charset in the Makefile.certificate (#134944)
- Added cmp to BuildPrereq
* Thu Jan 27 2005 Joe Orton <jorton@redhat.com> 0.9.7a-46 * Thu Jan 27 2005 Joe Orton <jorton@redhat.com> 0.9.7a-46
- generate new ca-bundle.crt from Mozilla certdata.txt (revision 1.32) - generate new ca-bundle.crt from Mozilla certdata.txt (revision 1.32)