From e072e4b02e7d6791f7b70fcdedfbed439bb93dd4 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Fri, 13 May 2022 10:10:26 +0200 Subject: [PATCH] up to 3.7.5 --- gnutls-pl.po-update.patch | 66 +++++++++++++++++++-------------------- gnutls.spec | 6 ++-- zstd.patch | 11 ------- 3 files changed, 35 insertions(+), 48 deletions(-) delete mode 100644 zstd.patch diff --git a/gnutls-pl.po-update.patch b/gnutls-pl.po-update.patch index 3d71e94..1670916 100644 --- a/gnutls-pl.po-update.patch +++ b/gnutls-pl.po-update.patch @@ -1,5 +1,5 @@ ---- gnutls-3.7.3/po/pl.po.orig 2022-01-18 08:10:14.000000000 +0100 -+++ gnutls-3.7.3/po/pl.po 2022-01-20 17:14:04.762006498 +0100 +--- gnutls-3.7.5/po/pl.po.orig 2022-05-12 14:26:40.000000000 +0200 ++++ gnutls-3.7.5/po/pl.po 2022-05-13 10:00:56.188634102 +0200 @@ -1,14 +1,15 @@ # Polish translation for gnutls. # Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012, 2013 Free Software Foundation, Inc. @@ -13,13 +13,13 @@ -"Project-Id-Version: gnutls-3.6.8\n" +"Project-Id-Version: gnutls-3.7.3\n" "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n" - "POT-Creation-Date: 2022-03-17 11:12+0100\n" + "POT-Creation-Date: 2022-05-12 14:26+0200\n" -"PO-Revision-Date: 2019-06-01 08:22+0200\n" +"PO-Revision-Date: 2022-01-20 17:00+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" -@@ -412,10 +413,8 @@ msgid "Unsupported extension in X.509 ce +@@ -412,10 +413,8 @@ msgstr "Nieobsługiwane rozszerzenie w certyfikacie X.509." #: lib/errors.c:188 @@ -31,10 +31,10 @@ #: lib/errors.c:191 msgid "Key usage violation in certificate has been detected." -@@ -1070,10 +1069,10 @@ msgid "%sdirectoryName: %.*s\n" +@@ -1070,10 +1069,10 @@ msgstr "%sdirectoryName: %.*s\n" - #: lib/x509/output.c:148 + #: lib/x509/output.c:149 -#, fuzzy, c-format +#, c-format #| msgid "%s\t\t\totherName OID: %.*s\n" @@ -42,12 +42,12 @@ -msgstr "%s\t\t\tOID otherName: %.*s\n" +msgstr "%sZarejestrowany ID: %.*s\n" - #: lib/x509/output.c:152 + #: lib/x509/output.c:153 #, c-format -@@ -1132,51 +1131,44 @@ msgid "\t\t\tAccess Method: %s (%s)\n" +@@ -1138,51 +1137,44 @@ msgstr "\t\t\tMetoda dostępu: %s (%s)\n" - #: lib/x509/output.c:479 + #: lib/x509/output.c:484 -#, fuzzy, c-format -#| msgid "\tRevoked certificates (%d):\n" +#, c-format @@ -55,13 +55,13 @@ -msgstr "\tUnieważnione certyfikaty (%d):\n" +msgstr "%s\t\t\tZnacznik czasu podpisanego certyfikatu %d:\n" - #: lib/x509/output.c:483 + #: lib/x509/output.c:488 #, c-format msgid "%s\t\t\t\tVersion: %d (unknown SCT version)\n" -msgstr "" +msgstr "%s\t\t\t\tWersja: %d (nieznana wersja SCT)\n" - #: lib/x509/output.c:498 + #: lib/x509/output.c:503 -#, fuzzy, c-format -#| msgid "\tVersion: %d\n" +#, c-format @@ -69,7 +69,7 @@ -msgstr "\tWersja: %d\n" +msgstr "%s\t\t\t\tWersja: %d\n" - #: lib/x509/output.c:500 + #: lib/x509/output.c:505 -#, fuzzy, c-format -#| msgid "%s\t\t\tASCII: " +#, c-format @@ -77,7 +77,7 @@ -msgstr "%s\t\t\tASCII: " +msgstr "%s\t\t\t\tLog ID: " - #: lib/x509/output.c:503 + #: lib/x509/output.c:508 -#, fuzzy, c-format -#| msgid "%s\t\t\tTime stamping.\n" +#, c-format @@ -85,7 +85,7 @@ -msgstr "%s\t\t\tOznaczanie czasu.\n" +msgstr "%s\t\t\t\tCzas: " - #: lib/x509/output.c:505 + #: lib/x509/output.c:510 -#, fuzzy, c-format -#| msgid "%s\tExtensions:\n" +#, c-format @@ -93,7 +93,7 @@ -msgstr "%s\tRozszerzenia:\n" +msgstr "%s\t\t\t\tRozszerzenia: brak\n" - #: lib/x509/output.c:507 + #: lib/x509/output.c:512 -#, fuzzy, c-format -#| msgid "\tSignature Algorithm: %s\n" +#, c-format @@ -101,7 +101,7 @@ -msgstr "\tAlgorytm podpisu: %s\n" +msgstr "%s\t\t\t\tAlgorytm podpisu: %s\n" - #: lib/x509/output.c:509 + #: lib/x509/output.c:514 -#, fuzzy, c-format -#| msgid "\tSignature:\n" +#, c-format @@ -109,12 +109,12 @@ -msgstr "\tPodpis:\n" +msgstr "%s\t\t\t\tPodpis: " - #: lib/x509/output.c:603 + #: lib/x509/output.c:608 #, c-format -@@ -1318,33 +1310,29 @@ msgid "%s\t\t\tHexdump: " +@@ -1330,33 +1322,29 @@ msgstr "%s\t\t\tZrzut hex: " - #: lib/x509/output.c:987 + #: lib/x509/output.c:994 -#, fuzzy, c-format -#| msgid "%s%s: %.*s\n" +#, c-format @@ -122,13 +122,13 @@ -msgstr "%s%s: %.*s\n" +msgstr "%s\t\t\t%.*s\n" - #: lib/x509/output.c:1015 + #: lib/x509/output.c:1022 #, c-format msgid "%s\t\t\tSignTool: %.*s\n" -msgstr "" +msgstr "%s\t\t\tSignTool: %.*s\n" - #: lib/x509/output.c:1023 + #: lib/x509/output.c:1030 -#, fuzzy, c-format -#| msgid "%s%s: %.*s\n" +#, c-format @@ -136,7 +136,7 @@ -msgstr "%s%s: %.*s\n" +msgstr "%s\t\t\tCATool: %.*s\n" - #: lib/x509/output.c:1031 + #: lib/x509/output.c:1038 -#, fuzzy, c-format -#| msgid "%s\t\t\totherName OID: %.*s\n" +#, c-format @@ -144,7 +144,7 @@ -msgstr "%s\t\t\tOID otherName: %.*s\n" +msgstr "%s\t\t\tSignToolCert: %.*s\n" - #: lib/x509/output.c:1039 + #: lib/x509/output.c:1046 -#, fuzzy, c-format -#| msgid "%s\t\t\totherName OID: %.*s\n" +#, c-format @@ -152,12 +152,12 @@ -msgstr "%s\t\t\tOID otherName: %.*s\n" +msgstr "%s\t\t\tCAToolCert: %.*s\n" - #: lib/x509/output.c:1106 + #: lib/x509/output.c:1113 #, c-format -@@ -1424,10 +1412,9 @@ msgid "%s\t\tAuthority Information Acces +@@ -1436,10 +1424,9 @@ msgstr "%s\t\tInformacje Authority Information Access (%s):\n" - #: lib/x509/output.c:1323 + #: lib/x509/output.c:1330 -#, fuzzy, c-format -#| msgid "%s\t\tProxy Certificate Information (%s):\n" +#, c-format @@ -165,12 +165,12 @@ -msgstr "%s\t\tInformacja o certyfikacie proxy (%s):\n" +msgstr "%s\t\tSCT precertyfikatu CT (%s):\n" - #: lib/x509/output.c:1334 + #: lib/x509/output.c:1341 #, c-format -@@ -1440,22 +1427,20 @@ msgid "%s\t\tTLS Features (%s):\n" +@@ -1452,22 +1439,20 @@ msgstr "%s\t\tWłaściwości TLS (%s):\n" - #: lib/x509/output.c:1352 + #: lib/x509/output.c:1359 -#, fuzzy, c-format -#| msgid "%s\t\tSubject Key Identifier (%s):\n" +#, c-format @@ -178,7 +178,7 @@ -msgstr "%s\t\tIdentyfikator klucza przedmiotu (%s):\n" +msgstr "%s\t\tNarzędzie podpisywania podmiotu(%s):\n" - #: lib/x509/output.c:1358 + #: lib/x509/output.c:1365 -#, fuzzy, c-format +#, c-format #| msgid "%s\t\tIssuer Alternative Name (%s):\n" @@ -186,7 +186,7 @@ -msgstr "%s\t\tAlternatywna nazwa wystawcy (%s):\n" +msgstr "%s\t\tNarzędzie podpisywania wystawcy (%s):\n" - #: lib/x509/output.c:1367 + #: lib/x509/output.c:1374 -#, fuzzy, c-format -#| msgid "%s\t\tKey Usage (%s):\n" +#, c-format @@ -194,9 +194,9 @@ -msgstr "%s\t\tUżycie klucza (%s):\n" +msgstr "%s\t\tNazwa (Common Name) (%s):\n" - #: lib/x509/output.c:1380 + #: lib/x509/output.c:1387 #, c-format -@@ -1810,6 +1795,3 @@ msgstr "Wystąpił błąd w kluczu publi +@@ -1822,6 +1807,3 @@ #: libdane/errors.c:69 msgid "Error in file." msgstr "Błąd w pliku." diff --git a/gnutls.spec b/gnutls.spec index 8e7766c..241a17a 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -13,16 +13,15 @@ Summary: The GNU Transport Layer Security Library Summary(pl.UTF-8): Biblioteka GNU TLS (Transport Layer Security) Name: gnutls -Version: 3.7.4 +Version: 3.7.5 Release: 1 License: LGPL v2.1+ (libgnutls), LGPL v3+ (libdane), GPL v3+ (openssl library and tools) Group: Libraries Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.7/%{name}-%{version}.tar.xz -# Source0-md5: 4bce06332c525eae540bb237433d4225 +# Source0-md5: 749eb6f0e5646b90dd00521b7853b7c7 Patch0: %{name}-info.patch Patch1: %{name}-link.patch Patch2: %{name}-pl.po-update.patch -Patch3: zstd.patch URL: https://www.gnutls.org/ BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.12.2 @@ -270,7 +269,6 @@ Wiązania Guile do GnuTLS. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %{__rm} po/stamp-po diff --git a/zstd.patch b/zstd.patch deleted file mode 100644 index 0f99583..0000000 --- a/zstd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnutls-3.7.4/configure.ac.orig 2022-03-17 10:05:02.000000000 +0100 -+++ gnutls-3.7.4/configure.ac 2022-03-18 10:25:53.449148726 +0100 -@@ -1040,7 +1040,7 @@ - if test x$ac_zstd != xno; then - AC_MSG_RESULT(yes) - PKG_CHECK_MODULES(LIBZSTD, [libzstd >= 1.3.0], [with_libzstd=yes], [with_libzstd=no]) -- if test "${with_libzstd}" = "yes" && test "${has_zstd_h}" = "yes"; then -+ if test "${with_libzstd}" = "yes"; then - AC_DEFINE([HAVE_LIBZSTD], 1, [Define if ZSTD compression is enabled.]) - if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then - GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd" -- 2.44.0