From fea5936cc11433322808d189655b42a7c45ec2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 11 Feb 2020 13:53:16 +0100 Subject: [PATCH] Add an upstream patch to fix a typo in the documentation --- libxcrypt-4.4.12-doc_crypt_5_typo_fix.patch | 22 +++++++++++++++++++++ libxcrypt.spec | 6 +++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 libxcrypt-4.4.12-doc_crypt_5_typo_fix.patch diff --git a/libxcrypt-4.4.12-doc_crypt_5_typo_fix.patch b/libxcrypt-4.4.12-doc_crypt_5_typo_fix.patch new file mode 100644 index 0000000..fa5c7fd --- /dev/null +++ b/libxcrypt-4.4.12-doc_crypt_5_typo_fix.patch @@ -0,0 +1,22 @@ +From 8664cb16c4913796b17b2cc2373582ab90031736 Mon Sep 17 00:00:00 2001 +From: Zack Weinberg +Date: Mon, 10 Feb 2020 19:50:56 -0500 +Subject: [PATCH] doc/crypt.5: typo fix. + +--- + doc/crypt.5 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/crypt.5 b/doc/crypt.5 +index 3dbab96..7be7161 100644 +--- a/doc/crypt.5 ++++ b/doc/crypt.5 +@@ -139,7 +139,7 @@ and does not show the division into prefix, options, salt, and hash. + .de hash + .Bl -tag -width 2n + .It Sy Prefix +-.\" mandoc bug: .Qq comes out with curly quptes. ++.\" mandoc bug: .Qq comes out with curly quotes. + .\" mandoc bug: .Li is hyperlinked to itself for no apparent reason. + .Bf Li + "\\$1" diff --git a/libxcrypt.spec b/libxcrypt.spec index c761430..02d477f 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -142,7 +142,7 @@ fi \ Name: libxcrypt Version: 4.4.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others # For explicit license breakdown, see the @@ -154,6 +154,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # Patch 0000 - 2999: Backported patches from upstream. Patch0000: %{url}/commit/a24eed01d5efce669b502bc37644ebb5e95860f5.patch#/%{name}-4.4.12-Explicitly_declare_all_non-static_functions_as_extern.patch Patch0001: %{url}/commit/8e99039823c712e3aa6ee0f76e68818225735dc1.patch#/%{name}-4.4.12-Speed_up_ka-sunmd5_by_skipping_most_of_the_test_phrases.patch +Patch0002: %{url}/commit/8664cb16c4913796b17b2cc2373582ab90031736.patch#/%{name}-4.4.12-doc_crypt_5_typo_fix.patch # Patch 3000 - 5999: Backported patches from pull requests. @@ -461,6 +462,9 @@ done %changelog +* Tue Feb 11 2020 Björn Esser - 4.4.12-3 +- Add an upstream patch to fix a typo in the documentation + * Wed Feb 05 2020 Björn Esser - 4.4.12-2 - Add two upstream patches to resolve minor bugs