diff --git a/.gitignore b/.gitignore index 8b48f19..a5a35f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/man-pages-overrides-8.1.0.0.tar.xz +SOURCES/man-pages-overrides-8.2.0.2.tar.xz diff --git a/.man-pages-overrides.metadata b/.man-pages-overrides.metadata index f34c285..f767fbc 100644 --- a/.man-pages-overrides.metadata +++ b/.man-pages-overrides.metadata @@ -1 +1 @@ -5cc9a29c6b10da3c6ce28358b5d528ce6994e290 SOURCES/man-pages-overrides-8.1.0.0.tar.xz +4b380bc2070d835201d1567f251a67bb3d1a6898 SOURCES/man-pages-overrides-8.2.0.2.tar.xz diff --git a/SOURCES/1517305-mpo-8.2.0.1-jose-.1.patch b/SOURCES/1517305-mpo-8.2.0.1-jose-.1.patch new file mode 100644 index 0000000..7132072 --- /dev/null +++ b/SOURCES/1517305-mpo-8.2.0.1-jose-.1.patch @@ -0,0 +1,280 @@ +From f5546b84f888fe41d0b3288f237a7d7d5fa16a4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Wed, 18 Dec 2019 17:25:40 +0100 +Subject: [PATCH] jose-*.1: fix typographical errors + +--- + jose/man1/jose-fmt.1 | 6 +++--- + jose/man1/jose-jwe-enc.1 | 10 +++++----- + jose/man1/jose-jwk-exc.1 | 6 +++--- + jose/man1/jose-jwk-gen.1 | 20 ++++++++++---------- + jose/man1/jose-jwk-pub.1 | 4 ++-- + jose/man1/jose-jwk-thp.1 | 4 ++-- + jose/man1/jose-jwk-use.1 | 4 ++-- + jose/man1/jose-jws-sig.1 | 8 ++++---- + 8 files changed, 31 insertions(+), 31 deletions(-) + +diff --git a/jose/man1/jose-fmt.1 b/jose/man1/jose-fmt.1 +index 8e1b042..a423a99 100644 +--- a/jose/man1/jose-fmt.1 ++++ b/jose/man1/jose-fmt.1 +@@ -1,7 +1,7 @@ + .\" generated with Ronn/v0.7.3 + .\" http://github.com/rtomayko/ronn/tree/0.7.3 + . +-.TH "JOSE\-FMT" "1" "June 2017" "" "" ++.TH "JOSE\-FMT" "1" "August 2019" "" "" + . + .SH "NAME" + \fBjose\-fmt\fR \- Converts JSON between serialization formats +@@ -237,7 +237,7 @@ Change the algorithm in a JWK: + . + .nf + +-$ echo "$jwk" | jose fmt \-j\- \-j \'"A128GCM"\' \-s alg \-Uo\- ++$ echo "$jwk" | jose fmt \-j\- \-j \(aq"A128GCM"\(aq \-s alg \-Uo\- + {"kty":"oct","alg":"A128GCM",\.\.\.} + . + .fi +@@ -251,7 +251,7 @@ Build a JWE template: + . + .nf + +-$ jose fmt \-j \'{}\' \-cs unprotected \-q A128KW \-s alg \-UUo\- ++$ jose fmt \-j \(aq{}\(aq \-cs unprotected \-q A128KW \-s alg \-UUo\- + {"unprotected":{"alg":"A128KW"}} + . + .fi +diff --git a/jose/man1/jose-jwe-enc.1 b/jose/man1/jose-jwe-enc.1 +index ad4f49b..7cbed11 100644 +--- a/jose/man1/jose-jwe-enc.1 ++++ b/jose/man1/jose-jwe-enc.1 +@@ -1,7 +1,7 @@ + .\" generated with Ronn/v0.7.3 + .\" http://github.com/rtomayko/ronn/tree/0.7.3 + . +-.TH "JOSE\-JWE\-ENC" "1" "May 2017" "" "" ++.TH "JOSE\-JWE\-ENC" "1" "August 2019" "" "" + . + .SH "NAME" + \fBjose\-jwe\-enc\fR \- Encrypts plaintext using one or more JWK/password +@@ -66,7 +66,7 @@ Read JWK(Set) from FILE + Read JWK(Set) from standard input + . + .TP +-\fB\-p\fR, `\-\-password ++\fB\-p\fR, \fB\-\-password\fR + Prompt for an encryption password + . + .TP +@@ -96,7 +96,7 @@ Encrypt data with a symmetric key using JWE JSON Serialization: + . + .nf + +-$ jose jwk gen \-i \'{"alg":"A128GCM"}\' \-o key\.jwk ++$ jose jwk gen \-i \(aq{"alg":"A128GCM"}\(aq \-o key\.jwk + $ jose jwe enc \-I msg\.txt \-k key\.jwk \-o msg\.jwe + . + .fi +@@ -125,14 +125,14 @@ Compress plaintext before encryption: + . + .nf + +-$ jose jwe enc \-i \'{"protected":{"zip":"DEF"}}\' \.\.\. ++$ jose jwe enc \-i \(aq{"protected":{"zip":"DEF"}}\(aq \.\.\. + . + .fi + . + .IP "" 0 + . + .P +-Encrypt with two keys and two passwords: $ jose jwk gen \-i \'{"alg":"ECDH\-ES+A128KW"}\' \-o ec\.jwk $ jose jwk gen \-i \'{"alg":"RSA1_5"}\' \-o rsa\.jwk $ jose jwe enc \-I msg\.txt \-p \-k ec\.jwk \-p \-k rsa\.jwk \-o msg\.jwe Please enter a password: Please re\-enter the previous password: Please enter a password: Please re\-enter the previous password: ++Encrypt with two keys and two passwords: $ jose jwk gen \-i \(aq{"alg":"ECDH\-ES+A128KW"}\(aq \-o ec\.jwk $ jose jwk gen \-i \(aq{"alg":"RSA1_5"}\(aq \-o rsa\.jwk $ jose jwe enc \-I msg\.txt \-p \-k ec\.jwk \-p \-k rsa\.jwk \-o msg\.jwe Please enter a password: Please re\-enter the previous password: Please enter a password: Please re\-enter the previous password: + . + .SH "AUTHOR" + Nathaniel McCallum +diff --git a/jose/man1/jose-jwk-exc.1 b/jose/man1/jose-jwk-exc.1 +index adf25fa..39a1e22 100644 +--- a/jose/man1/jose-jwk-exc.1 ++++ b/jose/man1/jose-jwk-exc.1 +@@ -1,7 +1,7 @@ + .\" generated with Ronn/v0.7.3 + .\" http://github.com/rtomayko/ronn/tree/0.7.3 + . +-.TH "JOSE\-JWK\-EXC" "1" "June 2017" "" "" ++.TH "JOSE\-JWK\-EXC" "1" "July 2019" "" "" + . + .SH "NAME" + \fBjose\-jwk\-exc\fR \- Performs a key exchange using the two input keys +@@ -77,8 +77,8 @@ Perform a key exchange: + . + .nf + +-$ jose jwk gen \-i \'{"alg":"ECDH"}\' \-o local\.jwk +-$ jose jwk gen \-i \'{"alg":"ECDH"}\' | jose jwk pub \-i\- \-o remote\.jwk ++$ jose jwk gen \-i \(aq{"alg":"ECDH"}\(aq \-o local\.jwk ++$ jose jwk gen \-i \(aq{"alg":"ECDH"}\(aq | jose jwk pub \-i\- \-o remote\.jwk + $ jose jwk exc \-l local\.jwk \-r remote\.jwk \-o exchanged\.jwk + . + .fi +diff --git a/jose/man1/jose-jwk-gen.1 b/jose/man1/jose-jwk-gen.1 +index ac0d9e7..a422a01 100644 +--- a/jose/man1/jose-jwk-gen.1 ++++ b/jose/man1/jose-jwk-gen.1 +@@ -1,7 +1,7 @@ + .\" generated with Ronn/v0.7.3 + .\" http://github.com/rtomayko/ronn/tree/0.7.3 + . +-.TH "JOSE\-JWK\-GEN" "1" "June 2017" "" "" ++.TH "JOSE\-JWK\-GEN" "1" "July 2019" "" "" + . + .SH "NAME" + \fBjose\-jwk\-gen\fR \- Creates a random JWK for each input JWK template +@@ -51,9 +51,9 @@ Generate three keys, each targeting a different algorithm: + . + .nf + +-$ jose jwk gen \-i \'{"alg":"HS256"}\' \-o oct\.jwk +-$ jose jwk gen \-i \'{"alg":"RS256"}\' \-o rsa\.jwk +-$ jose jwk gen \-i \'{"alg":"ES256"}\' \-o ec\.jwk ++$ jose jwk gen \-i \(aq{"alg":"HS256"}\(aq \-o oct\.jwk ++$ jose jwk gen \-i \(aq{"alg":"RS256"}\(aq \-o rsa\.jwk ++$ jose jwk gen \-i \(aq{"alg":"ES256"}\(aq \-o ec\.jwk + . + .fi + . +@@ -66,9 +66,9 @@ Generate three keys using key parameters rather than algorithms: + . + .nf + +-$ jose jwk gen \-i \'{"kty":"oct","bytes":32}\' \-o oct\.jwk +-$ jose jwk gen \-i \'{"kty":"RSA","bits":4096}\' \-o rsa\.jwk +-$ jose jwk gen \-i \'{"kty":"EC","crv":"P\-256"}\' \-o ec\.jwk ++$ jose jwk gen \-i \(aq{"kty":"oct","bytes":32}\(aq \-o oct\.jwk ++$ jose jwk gen \-i \(aq{"kty":"RSA","bits":4096}\(aq \-o rsa\.jwk ++$ jose jwk gen \-i \(aq{"kty":"EC","crv":"P\-256"}\(aq \-o ec\.jwk + . + .fi + . +@@ -82,7 +82,7 @@ Create multiple keys at once using a JWKSet template: + .nf + + $ jose jwk gen \e +- \-i \'{"keys":[{"alg":"HS256"},{"alg":"ES256"}]}\' \e ++ \-i \(aq{"keys":[{"alg":"HS256"},{"alg":"ES256"}]}\(aq \e + \-o keys\.jwkset + . + .fi +@@ -97,8 +97,8 @@ Create multiple keys at once using multiple JWK templates: + .nf + + $ jose jwk gen \e +- \-i \'{"alg":"HS256"}\' \e +- \-i \'{"alg":"ES256"}\' \e ++ \-i \(aq{"alg":"HS256"}\(aq \e ++ \-i \(aq{"alg":"ES256"}\(aq \e + \-o keys\.jwkset + . + .fi +diff --git a/jose/man1/jose-jwk-pub.1 b/jose/man1/jose-jwk-pub.1 +index 108256c..c0332c9 100644 +--- a/jose/man1/jose-jwk-pub.1 ++++ b/jose/man1/jose-jwk-pub.1 +@@ -1,7 +1,7 @@ + .\" generated with Ronn/v0.7.3 + .\" http://github.com/rtomayko/ronn/tree/0.7.3 + . +-.TH "JOSE\-JWK\-PUB" "1" "June 2017" "" "" ++.TH "JOSE\-JWK\-PUB" "1" "July 2019" "" "" + . + .SH "NAME" + \fBjose\-jwk\-pub\fR \- Cleans private keys from a JWK +@@ -48,7 +48,7 @@ Clean private key material from a JWK: + . + .nf + +-$ jose jwk gen \-i \'{"alg":"ES256"}\' \-o prv\.jwk ++$ jose jwk gen \-i \(aq{"alg":"ES256"}\(aq \-o prv\.jwk + $ cat prv\.jwk + {"alg":"ES256","crv":"P\-256","key_ops":["sign","verify"],"kty":"EC", \.\.\.} + $ jose jwk pub \-i prv\.jwk \-o pub\.jwk +diff --git a/jose/man1/jose-jwk-thp.1 b/jose/man1/jose-jwk-thp.1 +index 4b037cf..4b0c4f6 100644 +--- a/jose/man1/jose-jwk-thp.1 ++++ b/jose/man1/jose-jwk-thp.1 +@@ -1,7 +1,7 @@ + .\" generated with Ronn/v0.7.3 + .\" http://github.com/rtomayko/ronn/tree/0.7.3 + . +-.TH "JOSE\-JWK\-THP" "1" "June 2017" "" "" ++.TH "JOSE\-JWK\-THP" "1" "July 2019" "" "" + . + .SH "NAME" + \fBjose\-jwk\-thp\fR \- Calculates the JWK thumbprint +@@ -53,7 +53,7 @@ Calculate the S1 thumbprint of a newly generated key: + . + .nf + +-$ jose jwk gen \-i \'{"alg":"ES256"}\' \-a S1 | jose jwk thp \-i\- ++$ jose jwk gen \-i \(aq{"alg":"ES256"}\(aq \-a S1 | jose jwk thp \-i\- + BzmSH6W8a8LlbQ1mD0iBJdYj4x4 + . + .fi +diff --git a/jose/man1/jose-jwk-use.1 b/jose/man1/jose-jwk-use.1 +index a9ef2ef..adf1540 100644 +--- a/jose/man1/jose-jwk-use.1 ++++ b/jose/man1/jose-jwk-use.1 +@@ -1,7 +1,7 @@ + .\" generated with Ronn/v0.7.3 + .\" http://github.com/rtomayko/ronn/tree/0.7.3 + . +-.TH "JOSE\-JWK\-USE" "1" "June 2017" "" "" ++.TH "JOSE\-JWK\-USE" "1" "July 2019" "" "" + . + .SH "NAME" + \fBjose\-jwk\-use\fR \- Validates a key for the specified use(s) +@@ -91,7 +91,7 @@ Examples of both success and failure from a private and public key: + . + .nf + +-$ jose jwk gen \-i \'{"alg":"ES256"}\' \-o prv\.jwk ++$ jose jwk gen \-i \(aq{"alg":"ES256"}\(aq \-o prv\.jwk + $ jose jwk pub \-i prv\.jwk \-o pub\.jwk + $ jose jwk use \-i prv\.jwk \-u sign + $ echo $? +diff --git a/jose/man1/jose-jws-sig.1 b/jose/man1/jose-jws-sig.1 +index ee827a3..336ead8 100644 +--- a/jose/man1/jose-jws-sig.1 ++++ b/jose/man1/jose-jws-sig.1 +@@ -1,7 +1,7 @@ + .\" generated with Ronn/v0.7.3 + .\" http://github.com/rtomayko/ronn/tree/0.7.3 + . +-.TH "JOSE\-JWS\-SIG" "1" "June 2017" "" "" ++.TH "JOSE\-JWS\-SIG" "1" "July 2019" "" "" + . + .SH "NAME" + \fBjose\-jws\-sig\fR \- Signs a payload using one or more JWKs +@@ -99,7 +99,7 @@ Sign data with a symmetric key using JWE JSON Serialization: + . + .nf + +-$ jose jwk gen \-i \'{"alg":"HS256"}\' \-o key\.jwk ++$ jose jwk gen \-i \(aq{"alg":"HS256"}\(aq \-o key\.jwk + $ jose jws sig \-I msg\.txt \-k key\.jwk \-o msg\.jws + . + .fi +@@ -126,8 +126,8 @@ Sign with two keys: + . + .nf + +-$ jose jwk gen \-i \'{"alg":"ES256"}\' \-o ec\.jwk +-$ jose jwk gen \-i \'{"alg":"RS256"}\' \-o rsa\.jwk ++$ jose jwk gen \-i \(aq{"alg":"ES256"}\(aq \-o ec\.jwk ++$ jose jwk gen \-i \(aq{"alg":"RS256"}\(aq \-o rsa\.jwk + $ jose jws sig \-I msg\.txt \-k ec\.jwk \-k rsa\.jwk \-o msg\.jws + . + .fi +-- +2.21.0 + diff --git a/SOURCES/1673142-mpo-8.2.0.0-copy_file_range.2.patch b/SOURCES/1673142-mpo-8.2.0.0-copy_file_range.2.patch new file mode 100644 index 0000000..e57d981 --- /dev/null +++ b/SOURCES/1673142-mpo-8.2.0.0-copy_file_range.2.patch @@ -0,0 +1,46 @@ +From 077bf992f0deb7d9bb17568726be33ca4209e89c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Fri, 13 Dec 2019 14:21:57 +0100 +Subject: [PATCH] copy_file_range.2: update ERRORS + +--- + man-pages/man2/copy_file_range.2 | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/man-pages/man2/copy_file_range.2 b/man-pages/man2/copy_file_range.2 +index 35c0967..f25ea95 100644 +--- a/man-pages/man2/copy_file_range.2 ++++ b/man-pages/man2/copy_file_range.2 +@@ -78,7 +78,7 @@ is adjusted appropriately. + The + .I flags + argument is provided to allow for future extensions +-and currently must be to 0. ++and currently must be set to 0. + .SH RETURN VALUE + Upon successful completion, + .BR copy_file_range () +@@ -109,7 +109,11 @@ maximum file size or the process's file size limit, + or to write at a position past the maximum allowed offset. + .TP + .B EINVAL +-Requested range extends beyond the end of the source file; or the ++Requested range extends beyond the end of the source file; or either ++.I fd_in ++or ++.I fd_out ++is not a regular file; or the + .I flags + argument is not 0. + .TP +@@ -117,6 +121,7 @@ argument is not 0. + A low-level I/O error occurred while copying. + .TP + .B EISDIR ++Either + .I fd_in + or + .I fd_out +-- +2.21.0 + diff --git a/SPECS/man-pages-overrides.spec b/SPECS/man-pages-overrides.spec index 5531c99..6141c01 100644 --- a/SPECS/man-pages-overrides.spec +++ b/SPECS/man-pages-overrides.spec @@ -2,8 +2,8 @@ Summary: Complementary and updated manual pages Name: man-pages-overrides -Version: 8.1.0.0 -Release: 2%{?dist} +Version: 8.2.0.2 +Release: 1%{?dist} # license is the same as for the man-pages package License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE Group: Documentation @@ -11,6 +11,8 @@ Group: Documentation Source: man-pages-overrides-%{version}.tar.xz Patch0: 1706882-mpo-8.1.0.0-rpc.3.patch +Patch1: 1673142-mpo-8.2.0.0-copy_file_range.2.patch +Patch2: 1517305-mpo-8.2.0.1-jose-.1.patch BuildArch: noarch @@ -59,6 +61,23 @@ done %{_mandir}/overrides/ %changelog +* Thu Dec 19 2019 Nikola Forró - 8.2.0.2-1 +- Upload new tarball +- kernel_lockdown.7: add missing .RE macro + related: #1781945 + +* Wed Dec 18 2019 Nikola Forró - 8.2.0.1-1 +- Upload new tarball +- jose-*.1: fix typographical errors + resolves: #1517305 + +* Fri Dec 13 2019 Nikola Forró - 8.2.0.0-1 +- Upload new tarball +- kernel_lockdown.7: add new manpage + resolves: #1781945 +- copy_file_range.2: update ERRORS + resolves: #1673142 + * Wed Jun 19 2019 Nikola Forró - 8.1.0.0-2 - Mark this package as man-pages supplement related: #1706882