From d13e8c2a91c13a6e1c95cf727e78fef2aa2bb2ec Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 20 Apr 2020 12:05:18 +0200 Subject: net-misc/whois: Revbump to fix automagic dep on sys-libs/libxcrypt Thanks-to: Eugene Shalygin Closes: https://bugs.gentoo.org/718104 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Lars Wendler --- .../files/whois-5.5.6-libxcrypt_automagic.patch | 19 ++++++ net-misc/whois/metadata.xml | 3 + net-misc/whois/whois-5.5.6-r1.ebuild | 79 ++++++++++++++++++++++ net-misc/whois/whois-5.5.6.ebuild | 74 -------------------- net-misc/whois/whois-9999.ebuild | 11 ++- 5 files changed, 109 insertions(+), 77 deletions(-) create mode 100644 net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch create mode 100644 net-misc/whois/whois-5.5.6-r1.ebuild delete mode 100644 net-misc/whois/whois-5.5.6.ebuild (limited to 'net-misc/whois') 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 @@ base-system@gentoo.org Gentoo Base System + + Enable crypt through sys-libs/libxcrypt package + rfc1036/whois diff --git a/net-misc/whois/whois-5.5.6-r1.ebuild b/net-misc/whois/whois-5.5.6-r1.ebuild new file mode 100644 index 000000000000..33c2eb43e69e --- /dev/null +++ b/net-misc/whois/whois-5.5.6-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_P="${P/-/_}" +DESCRIPTION="improved Whois Client" +HOMEPAGE="https://github.com/rfc1036/whois" +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rfc1036/whois.git" +else + #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" + SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi +LICENSE="GPL-2" +SLOT="0" +IUSE="iconv idn nls xcrypt" +RESTRICT="test" #59327 + +RDEPEND=" + iconv? ( virtual/libiconv ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) + xcrypt? ( >=sys-libs/libxcrypt-4.1 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + >=dev-lang/perl-5 + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +#S="${WORKDIR}/${PN}" + +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() { + default + if use nls ; then + sed -i -e 's:#\(.*pos\):\1:' Makefile || die + else + sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die + + # don't generate po files when nls is disabled (bug #419889) + sed -i -e '/^all:/s/ pos//' \ + -e '/^install:/s/ install-pos//' Makefile || die + fi +} + +src_configure() { :; } # expected no-op + +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}" +} + +src_install() { + emake BASEDIR="${ED}" prefix=/usr install + insinto /etc + doins whois.conf + dodoc README debian/changelog + + if [[ ${USERLAND} != "GNU" ]]; then + mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die + mv "${ED}"/usr/bin/{whois,mdwhois} || die + fi +} diff --git a/net-misc/whois/whois-5.5.6.ebuild b/net-misc/whois/whois-5.5.6.ebuild deleted file mode 100644 index d99078f32be7..000000000000 --- a/net-misc/whois/whois-5.5.6.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P="${P/-/_}" -DESCRIPTION="improved Whois Client" -HOMEPAGE="https://github.com/rfc1036/whois" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/rfc1036/whois.git" -else - #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi -LICENSE="GPL-2" -SLOT="0" -IUSE="iconv idn nls" -RESTRICT="test" #59327 - -RDEPEND="iconv? ( virtual/libiconv ) - idn? ( net-dns/libidn2:= ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - >=dev-lang/perl-5 - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -#S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.7.2-config-file.patch - "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch -) - -src_prepare() { - default - if use nls ; then - sed -i -e 's:#\(.*pos\):\1:' Makefile || die - else - sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die - - # don't generate po files when nls is disabled (bug #419889) - sed -i -e '/^all:/s/ pos//' \ - -e '/^install:/s/ install-pos//' Makefile || die - fi -} - -src_configure() { :; } # expected no-op - -src_compile() { - unset HAVE_ICONV HAVE_LIBIDN - use iconv && export HAVE_ICONV=1 - use idn && export HAVE_LIBIDN=1 - tc-export CC - emake CFLAGS="${CFLAGS} ${CPPFLAGS}" -} - -src_install() { - emake BASEDIR="${ED}" prefix=/usr install - insinto /etc - doins whois.conf - dodoc README debian/changelog - - if [[ ${USERLAND} != "GNU" ]]; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi -} 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}" } -- cgit v1.2.3-65-gdbad