From ab90db0c48faeda5dac4ba056251a616ba7396f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 10 Nov 2014 16:20:37 +0100 Subject: [PATCH] - up to 20141019 --- ca-certificates-DESTDIR.patch | 18 +++++++++--------- ca-certificates-etc-certs.patch | 10 +++++----- ca-certificates.spec | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ca-certificates-DESTDIR.patch b/ca-certificates-DESTDIR.patch index 087dcd9..c5f66fc 100644 --- a/ca-certificates-DESTDIR.patch +++ b/ca-certificates-DESTDIR.patch @@ -8,15 +8,15 @@ while [ $# -gt 0 ]; do case $1 in -@@ -30,6 +31,8 @@ - verbose=1;; - --fresh|-f) - fresh=1;; -+ --destdir) -+ DESTDIR=$2; shift;; - --help|-h|*) - echo "$0: [--verbose] [--fresh]" - exit;; +@@ -31,6 +31,8 @@ do + verbose=1;; + --fresh|-f) + fresh=1;; ++ --destdir) ++ DESTDIR=$2; shift;; + --help|-h|*) + echo "$0: [--verbose] [--fresh]" + exit;; @@ -37,11 +40,11 @@ shift done diff --git a/ca-certificates-etc-certs.patch b/ca-certificates-etc-certs.patch index 262a987..0427ca2 100644 --- a/ca-certificates-etc-certs.patch +++ b/ca-certificates-etc-certs.patch @@ -37,12 +37,12 @@ if test -L "$PEM" then rm -f "$PEM" -@@ -89,6 +89,7 @@ +@@ -90,6 +90,7 @@ if [ "$fresh" = 1 ]; then do - case $(readlink $symlink) in - $CERTSDIR*) rm -f $symlink;; -+ $LOCALCERTSDIR*) rm -f $symlink;; - esac + case $(readlink $symlink) in + $CERTSDIR*) rm -f $symlink;; ++ $LOCALCERTSDIR*) rm -f $symlink;; + esac done find . -type l -print | while read symlink @@ -111,24 +111,18 @@ diff --git a/ca-certificates.spec b/ca-certificates.spec index 620ddb2..e6b944f 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: 20140927 +Version: 20141019 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.xz -# Source0-md5: 743b90a08e08f6638d51cc6fdf2f773a +# Source0-md5: f619282081c8bfc65ea64c37fa5285ed Source1: https://www.verisign.com/support/thawte-roots.zip # Source1-md5: 21a284ebdc6e8f4178d5cc10fb9e1ef2 Source2: http://www.certum.pl/keys/CA.pem -- 2.43.0