From fba66a45e8406a9f0428b7203ea97c5f250f822f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 14 Mar 2014 14:49:01 +0200 Subject: [PATCH] up to 20140223; cacert.org dropped - Debian will no longer ship cacert.org certificates. - Update mozilla/certdata.txt to version 1.97. - Dropped endline.patch, fix is upstream --- ca-certificates-endline.patch | 10 ---------- ca-certificates-etc-certs.patch | 14 +++++++------- ca-certificates-more-certs.patch | 8 ++++---- ca-certificates.d.patch | 6 +++--- ca-certificates.spec | 12 ++++++------ 5 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 ca-certificates-endline.patch diff --git a/ca-certificates-endline.patch b/ca-certificates-endline.patch deleted file mode 100644 index 04bb6b0..0000000 --- a/ca-certificates-endline.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ca-certificates/sbin/update-ca-certificates~ 2010-02-09 15:15:01.599029404 +0100 -+++ ca-certificates/sbin/update-ca-certificates 2010-02-09 15:32:56.982153588 +0100 -@@ -70,6 +70,7 @@ - echo +$PEM >> "$ADDED" - fi - cat "$CERT" >> "$TEMPBUNDLE" -+ echo >> "$TEMPBUNDLE" - } - - remove() { diff --git a/ca-certificates-etc-certs.patch b/ca-certificates-etc-certs.patch index 0bbdbb3..262a987 100644 --- a/ca-certificates-etc-certs.patch +++ b/ca-certificates-etc-certs.patch @@ -1,5 +1,5 @@ ---- ca-certificates-20120212/sbin/update-ca-certificates~ 2012-05-12 11:41:03.000000000 +0300 -+++ ca-certificates-20120212/sbin/update-ca-certificates 2012-05-12 11:43:10.517657520 +0300 +--- ca-certificates-20140223/sbin/update-ca-certificates~ 2014-03-14 12:55:24.000000000 +0200 ++++ ca-certificates-20140223/sbin/update-ca-certificates 2014-03-14 14:38:31.587876211 +0200 @@ -37,7 +37,7 @@ CERTSCONF=/etc/ca-certificates.conf @@ -45,17 +45,17 @@ esac done find . -type l -print | while read symlink -@@ -110,24 +110,18 @@ +@@ -111,24 +111,18 @@ sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt do - if ! test -f "$CERTSDIR/$crt" + if test -f "$CERTSDIR/$crt" - then -- echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2 ++ then + add "$CERTSDIR/$crt" + elif test -f "$LOCALCERTSDIR/$crt" -+ then + then +- echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2 + add "$LOCALCERTSDIR/$crt" + else + echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $CERTSCONF." >&2 @@ -68,7 +68,7 @@ -# administrator. -if [ -d "$LOCALCERTSDIR" ] -then -- find -L "$LOCALCERTSDIR" -type f -name '*.crt' | while read crt +- find -L "$LOCALCERTSDIR" -type f -name '*.crt' | sort | while read crt - do - add "$crt" - done diff --git a/ca-certificates-more-certs.patch b/ca-certificates-more-certs.patch index 8e35307..6db7b2b 100644 --- a/ca-certificates-more-certs.patch +++ b/ca-certificates-more-certs.patch @@ -1,11 +1,11 @@ ---- ca-certificates-20130610/Makefile~ 2013-06-10 20:29:57.000000000 +0300 -+++ ca-certificates-20130610/Makefile 2013-06-11 11:58:47.673068113 +0300 +--- ca-certificates-20140223/Makefile~ 2014-03-13 14:43:00.000000000 +0200 ++++ ca-certificates-20140223/Makefile 2014-03-14 12:54:53.792082826 +0200 @@ -3,7 +3,7 @@ # CERTSDIR = /usr/share/ca-certificates --SUBDIRS = mozilla cacert.org spi-inc.org -+SUBDIRS = mozilla cacert.org spi-inc.org thawte certum terena esteid +-SUBDIRS = mozilla spi-inc.org ++SUBDIRS = mozilla spi-inc.org thawte certum terena esteid all: for dir in $(SUBDIRS); do \ diff --git a/ca-certificates.d.patch b/ca-certificates.d.patch index 80b2ba2..63c8da9 100644 --- a/ca-certificates.d.patch +++ b/ca-certificates.d.patch @@ -1,5 +1,5 @@ ---- ca-certificates-20120212/sbin/update-ca-certificates~ 2012-05-12 16:08:15.813747796 +0300 -+++ ca-certificates-20120212/sbin/update-ca-certificates 2012-05-12 16:09:57.727422190 +0300 +--- ca-certificates-20140223/sbin/update-ca-certificates 2014-03-14 14:42:21.171246343 +0200 ++++ ca-certificates-20140223/sbin/update-ca-certificates 2014-03-14 14:46:50.556014888 +0200 @@ -41,6 +41,7 @@ done @@ -32,7 +32,7 @@ -sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt -do - if test -f "$CERTSDIR/$crt" -- then +- then - add "$CERTSDIR/$crt" - elif test -f "$LOCALCERTSDIR/$crt" - then diff --git a/ca-certificates.spec b/ca-certificates.spec index 26872c6..83cf4ef 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -7,12 +7,12 @@ Summary: Common CA Certificates PEM files Summary(pl.UTF-8): Pliki PEM popularnych certyfikatów CA Name: ca-certificates -Version: 20130906 -Release: 2 +Version: 20140223 +Release: 1 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.gz -# Source0-md5: 67d42b6be21c616a8b7d3d85d95ae912 +Source0: ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.xz +# Source0-md5: ff4049c32342ea450cda82bb14026ffd Source1: https://www.verisign.com/support/thawte-roots.zip # Source1-md5: 21a284ebdc6e8f4178d5cc10fb9e1ef2 Source2: http://www.certum.pl/keys/CA.pem @@ -61,7 +61,6 @@ Patch0: %{name}-undebianize.patch Patch1: %{name}-more-certs.patch Patch2: %{name}-etc-certs.patch Patch3: %{name}-c_rehash.sh.patch -Patch4: %{name}-endline.patch Patch5: %{name}-DESTDIR.patch Patch6: %{name}.d.patch URL: http://www.cacert.org/ @@ -70,7 +69,9 @@ BuildRequires: python BuildRequires: python-modules BuildRequires: rpm >= 4.4.9-56 BuildRequires: sed >= 4.0 +BuildRequires: tar >= 1:1.22 BuildRequires: unzip +BuildRequires: xz Obsoletes: certificates BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -109,7 +110,6 @@ mv ca-certificates/* . %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 -- 2.43.0