From 1f395dd88493ac0c30b6ec9bca1d08fea4793bbc Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 16:11:36 +0100 Subject: [PATCH] net-misc/whois: Sync with gentoo It's from gentoo commit 4553005e06139057d25c7e95bda6c810ab2fa822. --- .../portage-stable/net-misc/whois/Manifest | 5 +- .../files/whois-5.3.0-libidn_automagic.patch | 23 ++++++ .../whois-5.5.6-libxcrypt_automagic.patch | 19 +++++ .../net-misc/whois/metadata.xml | 16 ++-- .../net-misc/whois/whois-5.2.12.ebuild | 60 -------------- .../net-misc/whois/whois-5.2.16.ebuild | 60 -------------- ...s-5.2.17.ebuild => whois-5.5.10-r1.ebuild} | 41 ++++++---- .../net-misc/whois/whois-5.5.11.ebuild | 78 +++++++++++++++++++ .../net-misc/whois/whois-9999.ebuild | 78 +++++++++++++++++++ 9 files changed, 239 insertions(+), 141 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.12.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.16.ebuild rename sdk_container/src/third_party/portage-stable/net-misc/whois/{whois-5.2.17.ebuild => whois-5.5.10-r1.ebuild} (54%) create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.11.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest index 61246a0a50..2ba008a3ee 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest @@ -1,3 +1,2 @@ -DIST whois_5.2.12.tar.xz 80428 SHA256 b26d4027b8987d9911466aa06ce2c167a50017cd59a622a429bd506222f6cdf1 SHA512 df40e2e7cbd11d00984f865e122ad4ece882a6a45e2f75ad5ea24ce937b7e9452b01fd886f43bae55fd065a6556cfc4577e7126151b5fd43fa806c4b0c886ced WHIRLPOOL a2c5a3e9f01dd0cbb127269632c60e6c71c981df4d4e53fdf37e2c1932252f3ae2b13961a1c8606b542fd9997bf9fcb62a6cef592a01dbd04ff18c75e3f9b3ec -DIST whois_5.2.16.tar.xz 82108 SHA256 e9d208b61ccea96b611e522d30fb753dbefed0d44cfabe346e1928690453fc3a SHA512 08e75edbdab2c094150b92570e04de0fc10d42a18643e404262bef4366338bd67a4f23cef248660a4c2a435825cf5ebcc396c71d5702905ca97746686a5c8f06 WHIRLPOOL 2a8db3a9ac764ee31712b312a6c3408932fb98d98404a50bb6f1f7ca4a59e850a8e9434f8cc7372d1e8769d1d0711f82161027d6146eef0ae33f64e329f8be5c -DIST whois_5.2.17.tar.xz 82360 SHA256 257585678f571e18964667b41dc6543fe9da6123ac95743660c9c3ae1eba9664 SHA512 b65de384ac935518bde0cee42f46f4bf99dc94e94e411b103df8eb73291c317409837adba2a358dfebdae6e1c46d85ccfe8debf86233be64eb91ebfe86a29152 WHIRLPOOL 4ed1eca099fd1c4337e555564b37e604b4115ca520b751531470c5e70ab9013a3e43a3db3318307e04b10d357743bd2495cdf2051c159a3a661c36d29f919af2 +DIST whois-5.5.10.tar.gz 102555 BLAKE2B 9f1236ceeaea839e5f2a33aa63b39fa7e0566eeb4d2131b88b47dd62f037639a5860719a645d9cc2d0707faa1e86c9822634dda37e1a7a8d3b31a78cf34ecce2 SHA512 5ee92c15146353e77dddcbeddb6e704e0c42d29b8c0ff899ecce80f8e39903e8c796daec7f3de3f197d382f88e7cd4abd470463ea6c13a01347d0cd15d99af28 +DIST whois-5.5.11.tar.gz 102806 BLAKE2B be1a5f04ee5af4987224151116d1d7e37ad580b8cc00c3fd4752e10b2cbc1dc46a528591cf75e95a83a99884c961f20865802246e00508c90e338590e7e0be37 SHA512 a7e400a727dd88b4c8f1df2e850879ece882b9af1d5daaff22bb3e1c88be01b4e5430f74f9d4afd4c73538d87022536e40d5f3f63a501a95845396fe0be595b4 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch b/sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch new file mode 100644 index 0000000000..4e01eb5668 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch @@ -0,0 +1,23 @@ +We don't want libidn(2) being detected automagically. +Partially reverting upstream stupidity. + +--- whois-5.3.0/Makefile ++++ whois-5.3.0/Makefile +@@ -33,17 +33,9 @@ + DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\" + endif + +-# libidn support has been autodetected since 5.2.18 + ifdef HAVE_LIBIDN +-$(error Please fix your build system to stop defining HAVE_LIBIDN!) +-endif +- +-ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),) + whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2) + DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2) +-else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),) +-whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn) +-DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn) + endif + + ifdef HAVE_ICONV diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch b/sdk_container/src/third_party/portage-stable/net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch new file mode 100644 index 0000000000..f7bafd513d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/net-misc/whois/metadata.xml b/sdk_container/src/third_party/portage-stable/net-misc/whois/metadata.xml index 56c1244130..88d3d5768b 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/metadata.xml @@ -1,8 +1,14 @@ - + - - base-system@gentoo.org - Gentoo Base System - + + base-system@gentoo.org + Gentoo Base System + + + Enable crypt through sys-libs/libxcrypt package + + + rfc1036/whois + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.12.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.12.ebuild deleted file mode 100644 index 4a8e916eba..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.12.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -MY_P=${P/-/_} -DESCRIPTION="improved Whois Client" -HOMEPAGE="http://www.linux.it/~md/software/" -SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="iconv idn nls" -RESTRICT="test" #59327 - -RDEPEND="iconv? ( virtual/libiconv ) - idn? ( net-dns/libidn ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - >=dev-lang/perl-5 - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch - - 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/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.16.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.16.ebuild deleted file mode 100644 index e14820d2ef..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.16.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -MY_P=${P/-/_} -DESCRIPTION="improved Whois Client" -HOMEPAGE="http://www.linux.it/~md/software/" -SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="iconv idn nls" -RESTRICT="test" #59327 - -RDEPEND="iconv? ( virtual/libiconv ) - idn? ( net-dns/libidn ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - >=dev-lang/perl-5 - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch - - 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/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.17.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.10-r1.ebuild similarity index 54% rename from sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.17.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.10-r1.ebuild index 68d961e766..633807559d 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.2.17.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.10-r1.ebuild @@ -1,30 +1,44 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit toolchain-funcs -MY_P=${P/-/_} +MY_P="${P/-/_}" DESCRIPTION="improved Whois Client" -HOMEPAGE="http://www.linux.it/~md/software/" -SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - +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" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="iconv idn nls" +IUSE="iconv idn nls xcrypt" RESTRICT="test" #59327 -RDEPEND="iconv? ( virtual/libiconv ) - idn? ( net-dns/libidn ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} +RDEPEND=" + iconv? ( virtual/libiconv ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) + xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) + !xcrypt? ( virtual/libcrypt:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" app-arch/xz-utils >=dev-lang/perl-5 + virtual/pkgconfig nls? ( sys-devel/gettext )" 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() { @@ -40,12 +54,13 @@ src_prepare() { fi } -src_configure() { :;} # expected no-op +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}" } diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.11.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.11.ebuild new file mode 100644 index 0000000000..290ecaeceb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.11.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 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:= ) + !xcrypt? ( virtual/libcrypt:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + >=dev-lang/perl-5 + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +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/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild new file mode 100644 index 0000000000..350b7b60b3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2021 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:= ) + !xcrypt? ( virtual/libcrypt:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + >=dev-lang/perl-5 + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +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 +}