- up to 5.5.5

diff --git a/whois-mkpwdhash.patch b/whois-mkpwdhash.patch
index e7d90874414940e0e9cb354e695dcd561b54ae0d..8322af66cb00a204d27bf723d7aee7b659b2fcb7 100644 (file)
--- a/whois-mkpwdhash.patch
+++ b/whois-mkpwdhash.patch
@@ -15,39 +15,29 @@ diff -ur whois-5.3.0.orig/Makefile whois-5.3.0/Makefile
 diff -ur whois-5.3.0.orig/mkpasswd.1 whois-5.3.0/mkpasswd.1
 --- whois-5.3.0.orig/mkpasswd.1        2013-03-30 01:31:39.000000000 +0000
 +++ whois-5.3.0/mkpasswd.1     2018-04-16 16:51:17.853233430 +0000
-@@ -1,13 +1,13 @@
--.TH MKPASSWD 1 "21 March 2008" "Marco d'Itri" "Debian GNU/Linux"
-+.TH mkpwdhash 1 "21 March 2008" "Marco d'Itri" "Debian GNU/Linux"
+@@ -1,12 +1,12 @@
+ .TH MKPASSWD 1 "2019-12-30" "Marco d'Itri" "Debian GNU/Linux"
  .SH NAME
 -mkpasswd \- Overfeatured front end to crypt(3)
 +mkpwdhash \- Overfeatured front end to crypt(3)
  .SH SYNOPSIS
 -.B mkpasswd
 +.B mkpwdhash
- .BR PASSWORD
- .BR SALT
- .PP
+ .I PASSWORD
+ .RI [ SALT ]
  .SH DESCRIPTION
 -.B mkpasswd
 +.B mkpwdhash
  encrypts the given password with the
- .BR crypt(3)
- libc function using the given salt.
-@@ -37,7 +37,7 @@
- .B -s, --stdin
- Like \fI--password-fd=0\fP.
- .SH "ENVIRONMENT"
--.IP "MKPASSWD_OPTIONS"
-+.IP "mkpwdhash_OPTIONS"
- A list of options which will be evalued before the ones specified on the
- command line.
- .SH BUGS
-@@ -51,7 +51,7 @@
- .IR crypt(3),
- .IR getpass(3)
+ .BR crypt (3)
+ libc function, using the given salt.
+@@ -86,7 +86,7 @@ This programs suffers of a bad case of f
+ .IR crypt_gensalt (3),
+ .IR getpass (3).
  .SH AUTHOR
 -.B mkpasswd
 +.B mkpwdhash
- and this man page were written by Marco d'Itri <\fImd@linux.it\fP>
+ and this man page were written by Marco d'Itri
+ .RI < md@linux.it >
  and are licensed under the terms of the GNU General Public License,
- version 2 or higher.
+

diff --git a/whois.spec b/whois.spec
index e00bdbb77d091bf5a01183a52111d234d96a907c..e0826dbb4718a86d701b1df87f67cd163cdc8c4f 100644 (file)
--- a/whois.spec
+++ b/whois.spec
@@ -3,12 +3,12 @@ Summary(pl.UTF-8):    Rozszerzony klient WHOIS
 Summary(ru.UTF-8):     Улучшенный клиент WHOIS
 Summary(uk.UTF-8):     Покращений клієнт WHOIS
 Name:          whois
-Version:       5.5.2
+Version:       5.5.5
 Release:       1
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.xz
-# Source0-md5: 2680f65153e5c4f28c26a6d239be5c69
+# Source0-md5: f352b440b70ed0e090d49718d370cc4b
 Patch0:                %{name}-idn.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-mkpwdhash.patch