diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
| commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
| tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch | |
| parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) | |
gentoo resync : 25.04.2020
Diffstat (limited to 'net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch')
| -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 |