forked from pool/whois
Accepting request 182579 from network:utilities
update to 5.0.25, fix build openSUSE 12.1 through factory (forwarded request 182578 from AndreasStieger) OBS-URL: https://build.opensuse.org/request/show/182579 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/whois?expand=0&rev=32
This commit is contained in:
commit
e6b86a9ff6
@ -1,13 +0,0 @@
|
||||
Index: po/Makefile
|
||||
===================================================================
|
||||
--- po/Makefile.orig 2010-01-27 13:41:24.000000000 +0100
|
||||
+++ po/Makefile 2010-07-19 14:59:06.000000000 +0200
|
||||
@@ -6,7 +6,7 @@ INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/
|
||||
|
||||
PACKAGE = whois
|
||||
|
||||
-CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo zh_CN.mo
|
||||
+CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo nb.mo pl.mo pt_BR.mo ru.mo zh_CN.mo
|
||||
|
||||
POTFILES=../whois.c ../mkpasswd.c
|
||||
|
@ -1,41 +0,0 @@
|
||||
From 757e302cc12f962ee1e04ccc572d0553bcfb780c Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Thu, 14 Jul 2011 13:38:08 +0200
|
||||
Subject: [PATCH whois 4/7] add support for the new 2y blowfish tag (CVE-2011-2483)
|
||||
|
||||
---
|
||||
mkpasswd.c | 9 +++++++--
|
||||
1 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mkpasswd.c b/mkpasswd.c
|
||||
index 8bdc7f3..281d970 100644
|
||||
--- a/mkpasswd.c
|
||||
+++ b/mkpasswd.c
|
||||
@@ -86,9 +86,13 @@ static const struct crypt_method methods[] = {
|
||||
#if defined FreeBSD
|
||||
{ "bf", "$2$", 22, 22, 0, "Blowfish (FreeBSD)" },
|
||||
#endif
|
||||
-#if defined OpenBSD || (defined __SVR4 && defined __sun) || defined HAVE_CRYPT_GENSALT
|
||||
+#if defined OpenBSD || (defined __SVR4 && defined __sun)
|
||||
{ "bf", "$2a$", 22, 22, 1, "Blowfish" },
|
||||
#endif
|
||||
+#if defined HAVE_CRYPT_GENSALT
|
||||
+ { "bf", "$2a$", 22, 22, 1, "Blowfish, system-specific on 8-bit chars" },
|
||||
+ { "bfy", "$2y$", 22, 22, 1, "Blowfish, correct handling of 8-bit chars" },
|
||||
+#endif
|
||||
#if defined FreeBSD
|
||||
{ "nt", "$3$", 0, 0, 0, "NT-Hash" },
|
||||
#endif
|
||||
@@ -226,7 +230,8 @@ int main(int argc, char *argv[])
|
||||
salt_prefix = methods[0].prefix;
|
||||
}
|
||||
|
||||
- if (streq(salt_prefix, "$2a$")) { /* OpenBSD Blowfish */
|
||||
+ if (streq(salt_prefix, "$2a$")
|
||||
+ || streq(salt_prefix, "$2y$")) { /* OpenBSD Blowfish */
|
||||
if (rounds <= 4)
|
||||
rounds = 4;
|
||||
/* actually for 2a it is the logarithm of the number of rounds */
|
||||
--
|
||||
1.7.3.4
|
||||
|
@ -1,28 +0,0 @@
|
||||
From b8cdda35e57303fa67e96165e8eb37a19e22171b Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Thu, 14 Jul 2011 13:06:56 +0200
|
||||
Subject: [PATCH whois 3/7] crypt_gensalt might change the prefix
|
||||
|
||||
It's undocumented behavior but be prepared for it.
|
||||
---
|
||||
mkpasswd.c | 4 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/mkpasswd.c b/mkpasswd.c
|
||||
index 59c7a58..8bdc7f3 100644
|
||||
--- a/mkpasswd.c
|
||||
+++ b/mkpasswd.c
|
||||
@@ -331,7 +331,9 @@ int main(int argc, char *argv[])
|
||||
fprintf(stderr, "crypt failed.\n");
|
||||
exit(2);
|
||||
}
|
||||
- if (!strneq(result, salt_prefix, strlen(salt_prefix))) {
|
||||
+ /* yes, using strlen(salt_prefix) on salt. It's not
|
||||
+ * documented whether crypt_gensalt may change the prefix */
|
||||
+ if (!strneq(result, salt, strlen(salt_prefix))) {
|
||||
fprintf(stderr, _("Method not supported by crypt(3).\n"));
|
||||
exit(2);
|
||||
}
|
||||
--
|
||||
1.7.3.4
|
||||
|
@ -1,34 +0,0 @@
|
||||
From a57b7374a00a93bc237f34c28f9226258adb6a82 Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Thu, 14 Jul 2011 13:42:01 +0200
|
||||
Subject: [PATCH whois 7/7] fix compiler warnings
|
||||
|
||||
---
|
||||
mkpasswd.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mkpasswd.c b/mkpasswd.c
|
||||
index 7408cbc..cb5f5ad 100644
|
||||
--- a/mkpasswd.c
|
||||
+++ b/mkpasswd.c
|
||||
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
char *p;
|
||||
rounds = strtol(optarg, &p, 10);
|
||||
- if (p == NULL || *p != '\0' || rounds < 0) {
|
||||
+ if (p == NULL || *p != '\0') {
|
||||
fprintf(stderr, _("Invalid number '%s'.\n"), optarg);
|
||||
exit(1);
|
||||
}
|
||||
@@ -296,7 +296,7 @@ int main(int argc, char *argv[])
|
||||
if (password) {
|
||||
} else if (password_fd != -1) {
|
||||
FILE *fp;
|
||||
- unsigned char *p;
|
||||
+ char *p;
|
||||
|
||||
if (isatty(password_fd))
|
||||
fprintf(stderr, _("Password: "));
|
||||
--
|
||||
1.7.3.4
|
||||
|
@ -1,43 +0,0 @@
|
||||
From cda3259facbb37e8775131cfde9822aeb09edf78 Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Thu, 14 Jul 2011 13:31:13 +0200
|
||||
Subject: [PATCH whois 6/7] remove obsolete settings
|
||||
|
||||
According to Solar Designer $2$ never was officially released,
|
||||
refers to a pre-version of blowfish crypt. FreeBSD is said to
|
||||
support $2a.
|
||||
|
||||
libxcrypt does not actually support {SHA}
|
||||
---
|
||||
mkpasswd.c | 8 +-------
|
||||
1 files changed, 1 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/mkpasswd.c b/mkpasswd.c
|
||||
index ee997ba..7408cbc 100644
|
||||
--- a/mkpasswd.c
|
||||
+++ b/mkpasswd.c
|
||||
@@ -83,10 +83,7 @@ static const struct crypt_method methods[] = {
|
||||
{ "des", "", 2, 2, 0,
|
||||
N_("standard 56 bit DES-based crypt(3)") },
|
||||
{ "md5", "$1$", 8, 8, 0, "MD5" },
|
||||
-#if defined FreeBSD
|
||||
- { "bf", "$2$", 22, 22, 0, "Blowfish (FreeBSD)" },
|
||||
-#endif
|
||||
-#if defined OpenBSD || (defined __SVR4 && defined __sun)
|
||||
+#if defined OpenBSD || defined FreeBSD || (defined __SVR4 && defined __sun)
|
||||
{ "bf", "$2a$", 22, 22, 1, "Blowfish" },
|
||||
#endif
|
||||
#if defined HAVE_CRYPT_GENSALT
|
||||
@@ -111,9 +108,6 @@ static const struct crypt_method methods[] = {
|
||||
#if defined __SVR4 && defined __sun
|
||||
{ "sunmd5", "$md5$", 8, 8, 1, "SunMD5" },
|
||||
#endif
|
||||
-#if defined HAVE_XCRYPT
|
||||
- { "sha", "{SHA}", 0, 0, 0, "SHA-1" },
|
||||
-#endif
|
||||
{ NULL, NULL, 0, 0, 0, NULL }
|
||||
};
|
||||
|
||||
--
|
||||
1.7.3.4
|
||||
|
@ -1,28 +0,0 @@
|
||||
From 45731d21f551b72e10e211edfa1b3c4e2ed3f8ad Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Thu, 14 Jul 2011 13:39:07 +0200
|
||||
Subject: [PATCH whois 5/7] set default blowfish rounds to 5
|
||||
|
||||
five rounds is the crypt_blowfish default
|
||||
---
|
||||
mkpasswd.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mkpasswd.c b/mkpasswd.c
|
||||
index 281d970..ee997ba 100644
|
||||
--- a/mkpasswd.c
|
||||
+++ b/mkpasswd.c
|
||||
@@ -232,8 +232,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
if (streq(salt_prefix, "$2a$")
|
||||
|| streq(salt_prefix, "$2y$")) { /* OpenBSD Blowfish */
|
||||
- if (rounds <= 4)
|
||||
- rounds = 4;
|
||||
+ if (rounds < 5)
|
||||
+ rounds = 5;
|
||||
/* actually for 2a it is the logarithm of the number of rounds */
|
||||
snprintf(rounds_str, sizeof(rounds_str), "%02u$", rounds);
|
||||
} else if (rounds_support && rounds)
|
||||
--
|
||||
1.7.3.4
|
||||
|
@ -1,42 +0,0 @@
|
||||
From b6d62022a7ab3694ed6cef0021a2f837c6b5d80b Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Thu, 14 Jul 2011 13:06:41 +0200
|
||||
Subject: [PATCH whois 2/7] support 8bit characters
|
||||
|
||||
8bit characters are accepted when typed interactively so there is no
|
||||
reason to reject them when read from a file.
|
||||
---
|
||||
mkpasswd.c | 17 +++--------------
|
||||
1 files changed, 3 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/mkpasswd.c b/mkpasswd.c
|
||||
index 43403d4..59c7a58 100644
|
||||
--- a/mkpasswd.c
|
||||
+++ b/mkpasswd.c
|
||||
@@ -312,20 +312,9 @@ int main(int argc, char *argv[])
|
||||
exit(2);
|
||||
}
|
||||
|
||||
- p = (unsigned char *)password;
|
||||
- while (*p) {
|
||||
- if (*p == '\n' || *p == '\r') {
|
||||
- *p = '\0';
|
||||
- break;
|
||||
- }
|
||||
- /* which characters are valid? */
|
||||
- if (*p > 0x7f) {
|
||||
- fprintf(stderr,
|
||||
- _("Illegal password character '0x%hhx'.\n"), *p);
|
||||
- exit(1);
|
||||
- }
|
||||
- p++;
|
||||
- }
|
||||
+ p = strpbrk(password, "\n\r");
|
||||
+ if (p)
|
||||
+ *p = '\0';
|
||||
} else {
|
||||
password = getpass(_("Password: "));
|
||||
if (!password) {
|
||||
--
|
||||
1.7.3.4
|
||||
|
@ -1,68 +0,0 @@
|
||||
From 1f6bc61a9b79472234571092493d6d980826e736 Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Thu, 14 Jul 2011 13:06:14 +0200
|
||||
Subject: [PATCH whois 1/7] support Owl patched libcrypt
|
||||
|
||||
Owl (and upcoming openSUSE) patch crypt_gensalt directly into libc's
|
||||
libcrypt.
|
||||
---
|
||||
Makefile | 7 ++++++-
|
||||
mkpasswd.c | 8 ++++++--
|
||||
2 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 44f09dd..66c4cbe 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -44,9 +44,14 @@ endif
|
||||
|
||||
ifdef HAVE_XCRYPT
|
||||
mkpasswd_LDADD += -lxcrypt
|
||||
-DEFS += -DHAVE_XCRYPT
|
||||
+DEFS += -DHAVE_XCRYPT -DHAVE_CRYPT_GENSALT
|
||||
else
|
||||
+ifdef HAVE_CRYPT_GENSALT
|
||||
+DEFS += -DHAVE_CRYPT_GENSALT
|
||||
mkpasswd_LDADD += -lcrypt
|
||||
+else
|
||||
+mkpasswd_LDADD += -lcrypt
|
||||
+endif
|
||||
endif
|
||||
|
||||
##############################################################################
|
||||
diff --git a/mkpasswd.c b/mkpasswd.c
|
||||
index 176d980..43403d4 100644
|
||||
--- a/mkpasswd.c
|
||||
+++ b/mkpasswd.c
|
||||
@@ -36,6 +36,10 @@
|
||||
#include <xcrypt.h>
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
+#ifdef HAVE_CRYPT_GENSALT
|
||||
+#define _OW_SOURCE
|
||||
+#include <crypt.h>
|
||||
+#endif
|
||||
#ifdef HAVE_GETTIMEOFDAY
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
@@ -82,7 +86,7 @@ static const struct crypt_method methods[] = {
|
||||
#if defined FreeBSD
|
||||
{ "bf", "$2$", 22, 22, 0, "Blowfish (FreeBSD)" },
|
||||
#endif
|
||||
-#if defined OpenBSD || (defined __SVR4 && defined __sun) || defined HAVE_XCRYPT
|
||||
+#if defined OpenBSD || (defined __SVR4 && defined __sun) || defined HAVE_CRYPT_GENSALT
|
||||
{ "bf", "$2a$", 22, 22, 1, "Blowfish" },
|
||||
#endif
|
||||
#if defined FreeBSD
|
||||
@@ -264,7 +268,7 @@ int main(int argc, char *argv[])
|
||||
strcat(salt, rounds_str);
|
||||
strcat(salt, salt_arg);
|
||||
} else {
|
||||
-#ifdef HAVE_XCRYPT
|
||||
+#ifdef HAVE_CRYPT_GENSALT
|
||||
void *entropy = get_random_bytes(64);
|
||||
|
||||
salt = crypt_gensalt(salt_prefix, rounds, entropy, 64);
|
||||
--
|
||||
1.7.3.4
|
||||
|
28
whois-5.0.25-nb.patch
Normal file
28
whois-5.0.25-nb.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From: Andreas Stieger <andreas.stieger@gmx.de>
|
||||
Date: Tue, 09 Jul 2013 01:29:39 +0100
|
||||
Subject: rename nb po to nb
|
||||
Upstream: never
|
||||
|
||||
Renames no po files to fix SLE build
|
||||
|
||||
whois: "/usr/share/locale/no/LC_MESSAGES/whois.mo" is not allowed anymore in SuSE Linux.
|
||||
Please use nb or nb_NO (and nn for nynorsk)
|
||||
see https://bugzilla.novell.com/show_bug.cgi?id=42748
|
||||
|
||||
---
|
||||
po/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: whois-5.0.25/po/Makefile
|
||||
===================================================================
|
||||
--- whois-5.0.25.orig/po/Makefile 2013-03-30 01:31:41.000000000 +0000
|
||||
+++ whois-5.0.25/po/Makefile 2013-07-09 01:21:06.000000000 +0100
|
||||
@@ -6,7 +6,7 @@ INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/
|
||||
|
||||
PACKAGE = whois
|
||||
|
||||
-CATALOGS = cs.mo da.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo zh_CN.mo
|
||||
+CATALOGS = cs.mo da.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo nb.mo pl.mo pt_BR.mo ru.mo zh_CN.mo
|
||||
|
||||
POTFILES=../whois.c ../mkpasswd.c
|
||||
|
114
whois.changes
114
whois.changes
@ -1,3 +1,117 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 9 00:30:08 UTC 2013 - andreas.stieger@gmx.de
|
||||
|
||||
- update to 5.0.25
|
||||
* Added the .ax, .bn, .iq, .pw and .rw TLD servers.
|
||||
* Updated one or more translations.
|
||||
- includes updates changes 5.0.24:
|
||||
* Merged documentation fixes and the whois.conf(5) man page
|
||||
* Added a new ASN allocation.
|
||||
* Updated one or more translations.
|
||||
- includes changes from 5.0.23
|
||||
* whois.nic.or.kr switched from EUC-KR to UTF-8.
|
||||
- includes changes from 5.0.22
|
||||
* Fixed cross-compiling
|
||||
- includes changes from 5.0.21
|
||||
* Fixed parsing of 6to4 addresses
|
||||
* Added the .xn--j1amh (.укр, Ukraine) TLD server.
|
||||
* Updated the .bi, .se and .vn TLD servers.
|
||||
* Removed whois.pandi.or.id from the list of servers which support the
|
||||
RIPE extensions, since it does not anymore and queries are broken.
|
||||
* Updated some disclaimer suppression strings.
|
||||
* Respect DEB_HOST_GNU_TYPE when selecting CC for cross-compiling.
|
||||
- includes changes form 5.0.20
|
||||
* Updated the .by, .ng, .om, .sm, .tn, .ug and .vn TLD servers.
|
||||
* Added the .bw, .td, .xn--mgb9awbf (عمان., Oman), .xn--mgberp4a5d4ar
|
||||
(.السعودية, Saudi Arabia) and .xn--mgbx4cd0ab (ﻢﻠﻴﺴﻳﺍ., Malaysia)
|
||||
TLD servers.
|
||||
* Removed the .kp, .mc, .rw and .xn--mgba3a4f16a (ایران., Iran) TLD servers.
|
||||
- includes changes from 5.0.19
|
||||
* Added the .post TLD server.
|
||||
* Updated the .co.za SLD servers.
|
||||
* Added the .alt.za, .net.za and .web.za SLD servers.
|
||||
* whois.ua changed (?) the encoding to utf-8.
|
||||
* Fixed the parsing of 6to4 addresses like whois 2002:xxxx::.
|
||||
- includes changes from 5.0.18
|
||||
* Updated the .ae and .xn--mgbaam7a8h (.امارات, United Arabs Emirates)
|
||||
TLDs.
|
||||
* Updated the server charset table for .fr and .it.
|
||||
- includes changes from whois 5.0.17
|
||||
* Updated the .bi, .fo, .gr and .gt TLD servers.
|
||||
* Removed support for recursion of .org queries, it has been a thick
|
||||
registry since 2005.
|
||||
- includes changes from 5.0.16
|
||||
* Added the .xn--80ao21a (.ҚАЗ, Kazakhstan) TLD server.
|
||||
* Updated the .ec and .ee TLD servers.
|
||||
* Removed the .xn--mgbc0a9azcg (.المغرب, Morocco) and .xn--mgberp4a5d4ar
|
||||
(.السعودية, Saudi Arabia) TLD servers.
|
||||
* Added a new ASN allocation.
|
||||
* Updated one or more translations.
|
||||
- includes changes from 5.0.15
|
||||
* Added the .xn--mgba3a4f16a (ایران., Iran) TLD server.
|
||||
* Updated the .pe TLD server, this time for real.
|
||||
* Updated one or more translations.
|
||||
- includes changes from 5.0.14
|
||||
* Added the .sx TLD server.
|
||||
* Updated the .pe TLD server.
|
||||
- includes changes from 5.0.13
|
||||
* Updated the .hr TLD server.
|
||||
* Improved the package description
|
||||
* Updated the FSF address in licenses.
|
||||
- includes changes from 5.0.12
|
||||
* Recursion disabled when the query string contains spaces, because
|
||||
probably the query format will not be compatible with the referral
|
||||
server (e.g. whois to rwhois or ARIN to RIPE).
|
||||
* Add the "+" flag by default to queries to whois.arin.net if the
|
||||
argument looks like an IP address. Also add the "a" and "n" flags.
|
||||
No thanks to ARIN for breaking every whois client.
|
||||
* Added the .cv, .lk, .mq, .sy, .so, .biz.ua, .co.ua, .pp.ua, .qa,
|
||||
.xn--3e0b707e (.한국, Korea), .xn--45brj9c (.ভারত, India, Bengali),
|
||||
.xn--90a3ac (.СРБ, Serbia), .xn--clchc0ea0b2g2a9gcd (.சிங்கப்பூர்,
|
||||
Singapore, Tamil), .xn--fpcrj9c3d (.భారత్, India, Telugu), .xn--fzc2c9e2c
|
||||
(.ලංකා, Sri Lanka, Sinhala), .xn--gecrj9c (.ભારત, India, Gujarati),
|
||||
.xn--h2brj9c (.भारत, India, Hindi), .xn--lgbbat1ad8j (.الجزائر, Algeria),
|
||||
.xn--mgbayh7gpa (.الاردن, Jordan), .xn--mgbbh1a71e (.بھارت, India, Urdu),
|
||||
.xn--mgbc0a9azcg (.المغرب, Morocco), .xn--ogbpf8fl (.سورية, Syria),
|
||||
.xn--s9brj9c (.ਭਾਰਤ, India, Punjabi), .xn--xkc2al3hye2a (.இலங்கை, Sri
|
||||
Lanka, Tamil), .xn--wgbl6a (.قطر, Qatar), .xn--xkc2dl3a5ee0h
|
||||
(.இந்தியா, India, Tamil), .xn--yfro4i67o (.新加坡, Singapore, Chinese) and
|
||||
.xxx TLD servers. (Closes: #642424),
|
||||
* Added the .priv.at pseudo-SLD server.
|
||||
* Updated the .co, .gf, .gp, .kr, .li, .rs, .ru, .su, .sv, .ua and
|
||||
.xn--p1ai TLD servers. (Closes: #590425, #634830, #627478)
|
||||
* Added a new ASN allocation.
|
||||
* Fixed a typo and -t syntax in whois(1). (Closes: #614973, #632588)
|
||||
* Made whois return an error in some cases, code contributed by
|
||||
David Souther.
|
||||
* Split HAVE_LINUX_CRYPT_GENSALT from HAVE_XCRYPT to support SuSE,
|
||||
which has it builtin in the libc. Added untested support for Solaris'
|
||||
crypt_gensalt(3). This and the following changes have been contributed
|
||||
by Ludwig Nussel of SuSE.
|
||||
* mkpasswd: stop rejecting non-ASCII characters.
|
||||
* mkpasswd: added support for the 2y algorithm, which fixes CVE-2011-2483.
|
||||
* mkpasswd: raised the number of rounds for 2a/2y from 4 to 5, which is
|
||||
the current default.
|
||||
* mkpasswd: removed support for 2 and {SHA}, which actually are not
|
||||
supported by FreeBSD and libxcrypt.
|
||||
- packaging changes
|
||||
* removed patches accepted upstream:
|
||||
whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff
|
||||
whois-5.0.11-mkpasswd-crypt_gensalt-might-change-the-prefix.diff
|
||||
whois-5.0.11-mkpasswd-support-8bit-characters.diff
|
||||
whois-5.0.11-mkpasswd-add-support-for-the-new-2y-blowfish-tag-CVE-2011-2483.diff
|
||||
whois-5.0.11-mkpasswd-set-default-blowfish-rounds-to-5.diff
|
||||
whois-5.0.11-mkpasswd-remove-obsolete-settings.diff
|
||||
* removed patches no longer required:
|
||||
whois-5.0.11-mkpasswd-fix-compiler-warnings.diff
|
||||
* updated patches:
|
||||
whois-4.7.33-nb.patch to whois-5.0.25-nb.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 4 13:06:30 UTC 2013 - schwab@suse.de
|
||||
|
||||
- crypt_gensalt moved to separate library libowcrypt (fate#314945)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 26 07:50:06 UTC 2011 - lnussel@suse.de
|
||||
|
||||
|
48
whois.spec
48
whois.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package whois
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,24 +16,17 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: whois
|
||||
Version: 5.0.11
|
||||
Release: 5
|
||||
Version: 5.0.25
|
||||
Release: 0
|
||||
Summary: Intelligent WHOIS client
|
||||
License: GPL-2.0+
|
||||
Summary: Whois Client Program
|
||||
Url: http://www.linux.it/~md/software/
|
||||
Group: Productivity/Networking/Other
|
||||
Source: http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.bz2
|
||||
Patch1: whois-4.7.33-nb.patch
|
||||
Patch2: whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff
|
||||
Patch3: whois-5.0.11-mkpasswd-crypt_gensalt-might-change-the-prefix.diff
|
||||
Patch4: whois-5.0.11-mkpasswd-support-8bit-characters.diff
|
||||
Patch5: whois-5.0.11-mkpasswd-add-support-for-the-new-2y-blowfish-tag-CVE-2011-2483.diff
|
||||
Patch6: whois-5.0.11-mkpasswd-set-default-blowfish-rounds-to-5.diff
|
||||
Patch7: whois-5.0.11-mkpasswd-remove-obsolete-settings.diff
|
||||
Patch8: whois-5.0.11-mkpasswd-fix-compiler-warnings.diff
|
||||
Url: http://www.linux.it/~md/software/
|
||||
Source: http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.xz
|
||||
Patch1: whois-5.0.25-nb.patch
|
||||
BuildRequires: libidn-devel
|
||||
BuildRequires: xz
|
||||
%if 0%{?suse_version} <= 1140
|
||||
BuildRequires: libxcrypt-devel
|
||||
%endif
|
||||
@ -41,22 +34,17 @@ Provides: ripe-whois-tools
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
This is a new whois (RFC 954) client rewritten from scratch by Marco
|
||||
d'Itri. It is derived from and compatible with the usual BSD and RIPE
|
||||
whois(1) programs. It is intelligent and can automatically select the
|
||||
appropriate whois server for most queries. This package also contains
|
||||
mkpasswd, a simple front-end to crypt(3).
|
||||
This package provides a commandline client for the WHOIS (RFC 3912)
|
||||
protocol, which queries online servers for information such as contact
|
||||
details for domains and IP address assignments.
|
||||
It can intelligently select the appropriate WHOIS server for most queries.
|
||||
|
||||
The package also contains mkpasswd, a features-rich front end to the
|
||||
password encryption function crypt(3).
|
||||
|
||||
%prep
|
||||
%setup -n whois-%{version}
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%setup -q -n whois-%{version}
|
||||
%patch1 -p1
|
||||
rename no nb po/no.*
|
||||
|
||||
%build
|
||||
@ -83,6 +71,6 @@ rm -rf %{buildroot}
|
||||
%{_bindir}/mkpasswd
|
||||
%{_bindir}/whois
|
||||
%{_mandir}/man1/mkpasswd.*
|
||||
%{_mandir}/man1/whois.*
|
||||
%{_mandir}/man?/whois.*
|
||||
|
||||
%changelog
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dc25181e116ffc5d8c6b08c38836a1ea730136ebd4f936cff797ad684e18a6a4
|
||||
size 71800
|
3
whois_5.0.25.tar.xz
Normal file
3
whois_5.0.25.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1207bea7bcc6241554c496608a834e4b3cc1ef4bc1ad5f161be999c6772a6861
|
||||
size 72540
|
Loading…
Reference in New Issue
Block a user