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 | |
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')
-rw-r--r-- | net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch | 19 | ||||
-rw-r--r-- | net-misc/whois/metadata.xml | 3 | ||||
-rw-r--r-- | net-misc/whois/whois-5.5.6-r1.ebuild (renamed from net-misc/whois/whois-5.5.6.ebuild) | 11 | ||||
-rw-r--r-- | net-misc/whois/whois-9999.ebuild | 11 |
4 files changed, 38 insertions, 6 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 diff --git a/net-misc/whois/metadata.xml b/net-misc/whois/metadata.xml index fcd1dc3acbf9..742ee751212e 100644 --- a/net-misc/whois/metadata.xml +++ b/net-misc/whois/metadata.xml @@ -5,6 +5,9 @@ <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> </maintainer> + <use> + <flag name="xcrypt">Enable crypt through <pkg>sys-libs/libxcrypt</pkg> package</flag> + </use> <upstream> <remote-id type="github">rfc1036/whois</remote-id> </upstream> diff --git a/net-misc/whois/whois-5.5.6.ebuild b/net-misc/whois/whois-5.5.6-r1.ebuild index d99078f32be7..33c2eb43e69e 100644 --- a/net-misc/whois/whois-5.5.6.ebuild +++ b/net-misc/whois/whois-5.5.6-r1.ebuild @@ -18,12 +18,15 @@ else fi LICENSE="GPL-2" SLOT="0" -IUSE="iconv idn nls" +IUSE="iconv idn nls xcrypt" RESTRICT="test" #59327 -RDEPEND="iconv? ( virtual/libiconv ) +RDEPEND=" + iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) + xcrypt? ( >=sys-libs/libxcrypt-4.1 ) +" DEPEND="${RDEPEND}" BDEPEND=" app-arch/xz-utils @@ -36,6 +39,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-4.7.2-config-file.patch "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch + "${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch ) src_prepare() { @@ -57,6 +61,7 @@ src_compile() { unset HAVE_ICONV HAVE_LIBIDN use iconv && export HAVE_ICONV=1 use idn && export HAVE_LIBIDN=1 + use xcrypt && export HAVE_XCRYPT=1 tc-export CC emake CFLAGS="${CFLAGS} ${CPPFLAGS}" } diff --git a/net-misc/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild index 84b8abe1134b..8aecce2f7642 100644 --- a/net-misc/whois/whois-9999.ebuild +++ b/net-misc/whois/whois-9999.ebuild @@ -18,12 +18,15 @@ else fi LICENSE="GPL-2" SLOT="0" -IUSE="iconv idn nls" +IUSE="iconv idn nls xcrypt" RESTRICT="test" #59327 -RDEPEND="iconv? ( virtual/libiconv ) +RDEPEND=" + iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) + xcrypt? ( >=sys-libs/libxcrypt-4.1 ) +" DEPEND="${RDEPEND}" BDEPEND=" app-arch/xz-utils @@ -34,6 +37,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-4.7.2-config-file.patch "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch + "${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch ) src_prepare() { @@ -55,6 +59,7 @@ src_compile() { unset HAVE_ICONV HAVE_LIBIDN use iconv && export HAVE_ICONV=1 use idn && export HAVE_LIBIDN=1 + use xcrypt && export HAVE_XCRYPT=1 tc-export CC emake CFLAGS="${CFLAGS} ${CPPFLAGS}" } |