From 10ff6e8659e18b156e9028675521240d10ca085787a33ab49f0474cf35d2b00e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 8 Jul 2013 14:17:03 +0000 Subject: [PATCH] Accepting request 182504 from home:Andreas_Schwab:Factory - 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 --- ...mkpasswd-support-Owl-patched-libcrypt.diff | 29 ++++++++----------- whois.changes | 5 ++++ whois.spec | 9 +++--- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff b/whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff index 840a40b..b9f385a 100644 --- a/whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff +++ b/whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff @@ -10,11 +10,11 @@ libcrypt. 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 +Index: whois-5.0.11/Makefile +=================================================================== +--- whois-5.0.11.orig/Makefile ++++ whois-5.0.11/Makefile +@@ -44,8 +44,12 @@ endif ifdef HAVE_XCRYPT mkpasswd_LDADD += -lxcrypt @@ -23,17 +23,15 @@ index 44f09dd..66c4cbe 100644 else +ifdef HAVE_CRYPT_GENSALT +DEFS += -DHAVE_CRYPT_GENSALT - mkpasswd_LDADD += -lcrypt -+else -+mkpasswd_LDADD += -lcrypt ++mkpasswd_LDADD += -lowcrypt +endif + mkpasswd_LDADD += -lcrypt endif - ############################################################################## -diff --git a/mkpasswd.c b/mkpasswd.c -index 176d980..43403d4 100644 ---- a/mkpasswd.c -+++ b/mkpasswd.c +Index: whois-5.0.11/mkpasswd.c +=================================================================== +--- whois-5.0.11.orig/mkpasswd.c ++++ whois-5.0.11/mkpasswd.c @@ -36,6 +36,10 @@ #include #include @@ -45,7 +43,7 @@ index 176d980..43403d4 100644 #ifdef HAVE_GETTIMEOFDAY #include #endif -@@ -82,7 +86,7 @@ static const struct crypt_method methods[] = { +@@ -82,7 +86,7 @@ static const struct crypt_method methods #if defined FreeBSD { "bf", "$2$", 22, 22, 0, "Blowfish (FreeBSD)" }, #endif @@ -63,6 +61,3 @@ index 176d980..43403d4 100644 void *entropy = get_random_bytes(64); salt = crypt_gensalt(salt_prefix, rounds, entropy, 64); --- -1.7.3.4 - diff --git a/whois.changes b/whois.changes index 49809f6..ad936ac 100644 --- a/whois.changes +++ b/whois.changes @@ -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 diff --git a/whois.spec b/whois.spec index 1947ab5..5c6eb15 100644 --- a/whois.spec +++ b/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,14 +16,13 @@ # - Name: whois Version: 5.0.11 -Release: 2 -License: GPLv2+ +Release: 0 Summary: Whois Client Program -Url: http://www.linux.it/~md/software/ +License: GPL-2.0+ 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 Patch1: whois-4.7.33-nb.patch Patch2: whois-5.0.11-mkpasswd-support-Owl-patched-libcrypt.diff