rpm/whois
SHA256
1
0
Fork 0
forked from pool/whois
Code Pull Requests Activity

Accepting request 182504 from home:Andreas_Schwab:Factory

Browse Source 
- crypt_gensalt moved to separate library libowcrypt (fate#314945)

OBS-URL: https://build.opensuse.org/request/show/182504
OBS-URL: https://build.opensuse.org/package/show/network:utilities/whois?expand=0&rev=23
This commit is contained in:
Marcus Meissner 2013-07-08 14:17:03 +00:00 committed by Git OBS Bridge
parent 698feffbfb
commit 10ff6e8659
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff
View File

@ -10,11 +10,11 @@ libcrypt.
mkpasswd.c | 8 ++++++-- mkpasswd.c | 8 ++++++--
2 files changed, 12 insertions(+), 3 deletions(-) 2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile Index: whois-5.0.11/Makefile
index 44f09dd..66c4cbe 100644 ===================================================================
--- a/Makefile --- whois-5.0.11.orig/Makefile
+++ b/Makefile +++ whois-5.0.11/Makefile
@@ -44,9 +44,14 @@ endif @@ -44,8 +44,12 @@ endif
ifdef HAVE_XCRYPT ifdef HAVE_XCRYPT
mkpasswd_LDADD += -lxcrypt mkpasswd_LDADD += -lxcrypt
@ -23,17 +23,15 @@ index 44f09dd..66c4cbe 100644
else else
+ifdef HAVE_CRYPT_GENSALT +ifdef HAVE_CRYPT_GENSALT
+DEFS += -DHAVE_CRYPT_GENSALT +DEFS += -DHAVE_CRYPT_GENSALT
mkpasswd_LDADD += -lcrypt +mkpasswd_LDADD += -lowcrypt
+else
+mkpasswd_LDADD += -lcrypt
+endif +endif
mkpasswd_LDADD += -lcrypt
endif endif
############################################################################## Index: whois-5.0.11/mkpasswd.c
diff --git a/mkpasswd.c b/mkpasswd.c ===================================================================
index 176d980..43403d4 100644 --- whois-5.0.11.orig/mkpasswd.c
--- a/mkpasswd.c +++ whois-5.0.11/mkpasswd.c
+++ b/mkpasswd.c
@@ -36,6 +36,10 @@ @@ -36,6 +36,10 @@
#include <xcrypt.h> #include <xcrypt.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -45,7 +43,7 @@ index 176d980..43403d4 100644
#ifdef HAVE_GETTIMEOFDAY #ifdef HAVE_GETTIMEOFDAY
#include <sys/time.h> #include <sys/time.h>
#endif #endif
@@ -82,7 +86,7 @@ static const struct crypt_method methods[] = { @@ -82,7 +86,7 @@ static const struct crypt_method methods
#if defined FreeBSD #if defined FreeBSD
{ "bf", "$2$", 22, 22, 0, "Blowfish (FreeBSD)" }, { "bf", "$2$", 22, 22, 0, "Blowfish (FreeBSD)" },
#endif #endif
@ -63,6 +61,3 @@ index 176d980..43403d4 100644
void *entropy = get_random_bytes(64); void *entropy = get_random_bytes(64);
salt = crypt_gensalt(salt_prefix, rounds, entropy, 64); salt = crypt_gensalt(salt_prefix, rounds, entropy, 64);
--
1.7.3.4

5
whois.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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 Fri Aug 26 07:50:06 UTC 2011 - lnussel@suse.de

9
whois.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package whois # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,14 +16,13 @@
# #
Name: whois Name: whois
Version: 5.0.11 Version: 5.0.11
Release: 2 Release: 0
License: GPLv2+
Summary: Whois Client Program Summary: Whois Client Program
Url: http://www.linux.it/~md/software/ License: GPL-2.0+
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
Url: http://www.linux.it/~md/software/
Source: http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.bz2 Source: http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.bz2
Patch1: whois-4.7.33-nb.patch Patch1: whois-4.7.33-nb.patch
Patch2: whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff Patch2: whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff