diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2020-04-20 12:05:18 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-04-20 12:19:38 +0200 |
commit | d13e8c2a91c13a6e1c95cf727e78fef2aa2bb2ec (patch) | |
tree | a3ab1a8732c6055e3becd6df6093dabec2560e0e /net-misc/whois/files | |
parent | dev-python/packaging: s390 stable wrt bug #716404 (diff) | |
download | gentoo-d13e8c2a91c13a6e1c95cf727e78fef2aa2bb2ec.tar.gz gentoo-d13e8c2a91c13a6e1c95cf727e78fef2aa2bb2ec.tar.bz2 gentoo-d13e8c2a91c13a6e1c95cf727e78fef2aa2bb2ec.zip |
net-misc/whois: Revbump to fix automagic dep on sys-libs/libxcrypt
Thanks-to: Eugene Shalygin <eugene.shalygin@gmail.com>
Closes: https://bugs.gentoo.org/718104
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-misc/whois/files')
-rw-r--r-- | net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch b/net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch new file mode 100644 index 000000000000..f7bafd513dd4 --- /dev/null +++ b/net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch @@ -0,0 +1,19 @@ +We don't want libxcrypt being detected automagically. +Reverting upstream stupidity. + +--- whois-5.5.6/Makefile ++++ whois-5.5.6/Makefile +@@ -55,12 +55,9 @@ + DEFS += -DHAVE_ICONV + endif + +-ifeq ($(shell $(PKG_CONFIG) --exists 'libxcrypt >= 4.1' || echo NO),) ++ifdef HAVE_XCRYPT + DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT $(shell $(PKG_CONFIG) --cflags libcrypt) + mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt) +-else ifdef HAVE_XCRYPT +-DEFS += -DHAVE_XCRYPT_H -DHAVE_LINUX_CRYPT_GENSALT +-mkpasswd_LDADD += -lxcrypt + else ifdef HAVE_LIBOWCRYPT + # owl and openSUSE have crypt_gensalt(3) in libowcrypt + DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT -D_OW_SOURCE |