replace the nonsense cacert.org URL with actual source

[packages/ca-certificates.git] / ca-certificates.spec

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 620ddb2ed27602c7d1fb175a544ed572e2704100..64bf18aeb806208d0ca6001a6272ad0940fbf87d 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -2,17 +2,19 @@
 # - cleanup dead links from /etc/openssl/certs after -update uninstall
 # - https://bugzilla.mozilla.org/show_bug.cgi?id=549701 and
 #   http://groups.google.com/group/mozilla.dev.security.policy/browse_thread/thread/b6493a285ba79998#
-# - add certs noted in TODO file
+# - make amsn use system certs
+# - make pidgin use system certs
+# - swap %{certsdir}/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt regards file vs symlink
 #
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
-Version:       20140927
-Release:       1
+Version:       20150426
+Release:       2
 License:       GPL v2 (scripts), MPL v2 (mozilla certs), distributable (other certs)
 Group:         Libraries
 Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.xz
-# Source0-md5: 743b90a08e08f6638d51cc6fdf2f773a
+# Source0-md5: 717455f13fb31fd014a11a468ea3895d
 Source1:       https://www.verisign.com/support/thawte-roots.zip
 # Source1-md5: 21a284ebdc6e8f4178d5cc10fb9e1ef2
 Source2:       http://www.certum.pl/keys/CA.pem
@@ -39,31 +41,59 @@ Source12:   http://www.certum.pl/keys/class3.pem
 # Source12-md5:        07bc97e21da092ba53535c7379e1b58b
 Source13:      http://www.certum.pl/keys/class4.pem
 # Source13-md5:        99ef61d509539af89f1c025b67245965
-Source14:      http://crt.tcs.terena.org/TERENASSLCA.crt
-# Source14-md5:        f62cd1546a8ef14e31ba1ce8eecd234a
-Source15:      http://crt.tcs.terena.org/TERENAeScienceSSLCA.crt
-# Source15-md5:        5feea35ab01a373f115219706f1f57bd
-Source16:      http://crt.tcs.terena.org/TERENAPersonalCA.crt
-# Source16-md5:        53eaa497c8fb0b79f14fe9f69693689a
-Source17:      http://crt.tcs.terena.org/TERENAeSciencePersonalCA.crt
-# Source17-md5:        e25cc655d3ebe920ca9c187e3dde9191
-Source18:      http://crt.tcs.terena.org/TERENACodeSigningCA.crt
-# Source18-md5:        74c9f511ab03a4e6b7462e310abfa89b
-Source19:      http://www.sk.ee/upload/files/JUUR-SK.PEM.cer
-# Source19-md5:        805784c06c9eff3771a4b9bd631cd3f5
-Source20:      http://www.sk.ee/upload/files/ESTEID-SK.PEM.cer
-# Source20-md5:        387beee5b8539ab7d91628f486295899
-Source21:      http://www.sk.ee/upload/files/ESTEID-SK%202007.PEM.cer?/ESTEID-SK_2007.PEM.cer
-# Source21-md5:        2b1a2a77f565d68fdf5f19f6cc3a5600
-Source22:      http://www.sk.ee/upload/files/ESTEID-SK%202011.pem.cer?/ESTEID-SK_2011.pem.cer
-# Source22-md5:        cfcc1e592cb0ff305158a7e32730546c
+Source14:      http://www.certum.pl/CTNCA.pem
+# Source14-md5:        231b5b8bf05c5e93a9b2ebc4186eb6f7
+Source15:      http://repository.certum.pl/class1casha2.pem
+# Source15-md5:        b52dde6e2618a21965afbe6d6676d09f
+Source16:      http://repository.certum.pl/dvcasha2.pem
+# Source16-md5:        88ce64a84375c95ab6f7c8515dd2a117
+Source17:      http://repository.certum.pl/ovcasha2.pem
+# Source17-md5:        3149c923bd23469d6b14caa6334f8b63
+Source18:      http://repository.certum.pl/evcasha2.pem
+# Source18-md5:        ac54dc6cf3af7e243879b1c8b4aca8a3
+#Source19:     http://repository.certum.pl/dvcasha2.pem
+## Source19-md5:       88ce64a84375c95ab6f7c8515dd2a117
+Source20:      http://repository.certum.pl/gscasha2.pem
+# Source20-md5:        a29d37f95dafc08cef36015922e3b0d3
+Source21:      http://crt.tcs.terena.org/TERENASSLCA.crt
+# Source21-md5:        f62cd1546a8ef14e31ba1ce8eecd234a
+Source22:      http://crt.tcs.terena.org/TERENAeScienceSSLCA.crt
+# Source22-md5:        5feea35ab01a373f115219706f1f57bd
+Source23:      http://crt.tcs.terena.org/TERENAPersonalCA.crt
+# Source23-md5:        53eaa497c8fb0b79f14fe9f69693689a
+Source24:      http://crt.tcs.terena.org/TERENAeSciencePersonalCA.crt
+# Source24-md5:        e25cc655d3ebe920ca9c187e3dde9191
+Source25:      http://crt.tcs.terena.org/TERENACodeSigningCA.crt
+# Source25-md5:        74c9f511ab03a4e6b7462e310abfa89b
+Source26:      http://www.sk.ee/upload/files/JUUR-SK.PEM.cer
+# Source26-md5:        805784c06c9eff3771a4b9bd631cd3f5
+Source27:      http://www.sk.ee/upload/files/ESTEID-SK.PEM.cer
+# Source27-md5:        387beee5b8539ab7d91628f486295899
+Source28:      http://www.sk.ee/upload/files/ESTEID-SK%202007.PEM.cer?/ESTEID-SK_2007.PEM.cer
+# Source28-md5:        2b1a2a77f565d68fdf5f19f6cc3a5600
+Source29:      http://www.sk.ee/upload/files/ESTEID-SK%202011.pem.cer?/ESTEID-SK_2011.pem.cer
+# Source29-md5:        cfcc1e592cb0ff305158a7e32730546c
+Source30:      http://www.terena.org/activities/tcs/repository/sha2/TERENA_SSL_CA_2.pem
+# Source30-md5:        96700974350cecfcfbd904d52c3a3942
+Source31:      http://www.terena.org/activities/tcs/repository/sha2/TERENA_Personal_CA_2.pem
+# Source31-md5:        d40e5c821f8559faf5bcd55eac5e1371
+Source32:      http://www.terena.org/activities/tcs/repository/sha2/TERENA_Code_Signing_CA_2.pem
+# Source32-md5:        69ff653e730adf87ff59bf373950b357
+Source33:      http://www.terena.org/activities/tcs/repository-g3/TERENA_SSL_CA_3.pem
+# Source33-md5:        b22ed904900ed6b3bc129f9a35ba5a66
+Source34:      http://www.terena.org/activities/tcs/repository-g3/TERENA_Personal_CA_3.pem
+# Source34-md5:        eb5ddefe94750c2f8d4f11cb1f3af911
+Source35:      http://www.terena.org/activities/tcs/repository-g3/TERENA_Code_Signing_CA_3.pem
+# Source35-md5:        43375a208fba0a5e73f1912faa4db86d
+Source36:      http://www.terena.org/activities/tcs/repository-g3/TERENA_SSL_High_Assurance_CA_3.pem
+# Source36-md5:        6e00d9ede4460e739eb285ea023299f0
 Patch0:                %{name}-undebianize.patch
 Patch1:                %{name}-more-certs.patch
 Patch2:                %{name}-etc-certs.patch
 Patch3:                %{name}-c_rehash.sh.patch
 Patch5:                %{name}-DESTDIR.patch
 Patch6:                %{name}.d.patch
-URL:           http://www.cacert.org/
+URL:           https://packages.debian.org/sid/ca-certificates
 BuildRequires: openssl-tools
 BuildRequires: python
 BuildRequires: python-modules
@@ -141,6 +171,13 @@ cp -pi %{SOURCE10} certum
 cp -pi %{SOURCE11} certum
 cp -pi %{SOURCE12} certum
 cp -pi %{SOURCE13} certum
+cp -pi %{SOURCE14} certum
+cp -pi %{SOURCE15} certum
+cp -pi %{SOURCE16} certum
+cp -pi %{SOURCE17} certum
+cp -pi %{SOURCE18} certum
+#cp -pi %{SOURCE19} certum
+cp -pi %{SOURCE20} certum
 for a in certum/*.pem; do
        mv -i "$a" "${a%.pem}.crt"
 done
@@ -148,33 +185,40 @@ done
 # http://www.sk.ee/en/Repository/certs/rootcertificates
 # JUUR-SK, ESTEID-SK and ESTEID-SK 2007, ESTEID-SK 2011
 install -d esteid
-cp -pi %{SOURCE19} esteid
-cp -pi %{SOURCE20} esteid
-cp -pi %{SOURCE21} esteid/ESTEID-SK_2007.crt
-cp -pi %{SOURCE22} esteid/ESTEID-SK_2011.crt
+cp -pi %{SOURCE26} esteid
+cp -pi %{SOURCE27} esteid
+cp -pi %{SOURCE28} esteid/ESTEID-SK_2007.crt
+cp -pi %{SOURCE29} esteid/ESTEID-SK_2011.crt
 for a in esteid/*.PEM.cer; do
        mv -i "$a" "${a%.PEM.cer}.crt"
 done
 
 %build
 install -d terena
-openssl x509 -inform DER -in %{SOURCE14} -outform PEM -out terena/$(basename %{SOURCE14})
-openssl x509 -inform DER -in %{SOURCE15} -outform PEM -out terena/$(basename %{SOURCE15})
-openssl x509 -inform DER -in %{SOURCE16} -outform PEM -out terena/$(basename %{SOURCE16})
-openssl x509 -inform DER -in %{SOURCE17} -outform PEM -out terena/$(basename %{SOURCE17})
-openssl x509 -inform DER -in %{SOURCE18} -outform PEM -out terena/$(basename %{SOURCE18})
+openssl x509 -inform DER -in %{SOURCE21} -outform PEM -out terena/$(basename %{SOURCE21})
+openssl x509 -inform DER -in %{SOURCE22} -outform PEM -out terena/$(basename %{SOURCE22})
+openssl x509 -inform DER -in %{SOURCE23} -outform PEM -out terena/$(basename %{SOURCE23})
+openssl x509 -inform DER -in %{SOURCE24} -outform PEM -out terena/$(basename %{SOURCE24})
+openssl x509 -inform DER -in %{SOURCE25} -outform PEM -out terena/$(basename %{SOURCE25})
+cp %{SOURCE30} terena/$(basename %{SOURCE30} .pem).crt
+cp %{SOURCE31} terena/$(basename %{SOURCE31} .pem).crt
+cp %{SOURCE32} terena/$(basename %{SOURCE32} .pem).crt
+sed 's/\r//' %{SOURCE33} > terena/$(basename %{SOURCE33} .pem).crt
+sed 's/\r//' %{SOURCE34} > terena/$(basename %{SOURCE34} .pem).crt
+sed 's/\r//' %{SOURCE35} > terena/$(basename %{SOURCE35} .pem).crt
+sed 's/\r//' %{SOURCE36} > terena/$(basename %{SOURCE36} .pem).crt
 
 %{__make}
 
 # We have those and more in specific dirs
-rm mozilla/{Thawte,thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2,Juur-SK}*.crt
+rm mozilla/{thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2,Juur-SK}*.crt
 
 # See TODO
 # rm mozilla/RSA_Security_1024_v3.crt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir},/etc/pki/tls,%{_sysconfdir}/ca-certificates.d}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir},/etc/pki/tls/certs,%{_sysconfdir}/ca-certificates.d}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -190,6 +234,8 @@ install -d $RPM_BUILD_ROOT%{openssldir}
 ./sbin/update-ca-certificates --destdir $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{openssldir}
 
+ln -s %{certsdir}/ca-certificates.crt $RPM_BUILD_ROOT/etc/pki/tls/certs/ca-bundle.crt
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -200,6 +246,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc debian/README.Debian debian/changelog
 %dir /etc/pki/tls
+%dir /etc/pki/tls/certs
+%config(noreplace) %verify(not md5 mtime size) /etc/pki/tls/certs/ca-bundle.crt
 %config(noreplace) %verify(not md5 mtime size) %{certsdir}/ca-certificates.crt
 
 %files update