rpms/openssl/devel openssl.spec, 1.108, 1.109 RHNS-CA-CERT, 1.2, NONE RHNS-CA-CERT.asc, 1.1, NONE ca-bundle.crt, 1.9, NONE

Joe Orton (jorton) fedora-extras-commits at redhat.com
Mon Jun 2 11:10:23 UTC 2008


Author: jorton

Update of /cvs/extras/rpms/openssl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19182

Modified Files:
	openssl.spec 
Removed Files:
	RHNS-CA-CERT RHNS-CA-CERT.asc ca-bundle.crt 
Log Message:
* Mon Jun  2 2008 Joe Orton <jorton at redhat.com> 0.9.8g-10
- move root CA bundle to ca-certificates package



Index: openssl.spec
===================================================================
RCS file: /cvs/extras/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- openssl.spec	28 May 2008 15:52:21 -0000	1.108
+++ openssl.spec	2 Jun 2008 11:06:57 -0000	1.109
@@ -22,15 +22,12 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8g
-Release: 9%{?dist}
+Release: 10%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
-Source3: ca-bundle.crt
-Source4: https://rhn.redhat.com/help/RHNS-CA-CERT
-Source5: https://rhn.redhat.com/help/RHNS-CA-CERT.asc
 Source6: make-dummy-cert
 Source8: openssl-thread-test.c
 Source9: opensslconf-new.h
@@ -68,7 +65,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp
 BuildRequires: /usr/bin/rename
-Requires: mktemp
+Requires: mktemp, ca-certificates >= 2008-5
 
 %description
 The OpenSSL toolkit provides support for secure communications between
@@ -265,17 +262,6 @@
 mkdir -m700 $RPM_BUILD_ROOT%{_sysconfdir}/pki/CA
 mkdir -m700 $RPM_BUILD_ROOT%{_sysconfdir}/pki/CA/private
 
-# Install root CA stuffs.
-cat << EOF > RHNS-blurb.txt
-#
-#  RHNS CA certificate.  Appended to the ca-bundle at package build-time.
-#
-EOF
-cat %{SOURCE3} RHNS-blurb.txt %{SOURCE4} > ca-bundle.crt
-install -m644 ca-bundle.crt $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/certs/
-ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/cert.pem
-# Reference timestamps to prevent multilib conflicts
-touch -r %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 touch -r %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/openssl.cnf
 
 # Fix libdir.
@@ -341,7 +327,6 @@
 %dir %{_sysconfdir}/pki/tls/certs
 %{_sysconfdir}/pki/tls/certs/make-dummy-cert
 %{_sysconfdir}/pki/tls/certs/Makefile
-%{_sysconfdir}/pki/tls/cert.pem
 %dir %{_sysconfdir}/pki/tls/misc
 %{_sysconfdir}/pki/tls/misc/CA
 %dir %{_sysconfdir}/pki/CA
@@ -350,7 +335,6 @@
 %{_sysconfdir}/pki/tls/private
 
 %config(noreplace) %{_sysconfdir}/pki/tls/openssl.cnf
-%config(noreplace) %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 
 %attr(0755,root,root) %{_bindir}/openssl
 %attr(0755,root,root) /%{_lib}/*.so.%{version}
@@ -382,6 +366,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Jun  2 2008 Joe Orton <jorton at redhat.com> 0.9.8g-10
+- move root CA bundle to ca-certificates package
+
 * Wed May 28 2008 Tomas Mraz <tmraz at redhat.com> 0.9.8g-9
 - fix CVE-2008-0891 - server name extension crash (#448492)
 - fix CVE-2008-1672 - server key exchange message omit crash (#448495)


--- RHNS-CA-CERT DELETED ---


--- RHNS-CA-CERT.asc DELETED ---


--- ca-bundle.crt DELETED ---




More information about the fedora-extras-commits mailing list