gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-10 06:57:08 -08:00
Code Issues Projects Releases Wiki Activity

net-misc/whois: Revbump to fix automagic dep on sys-libs/libxcrypt

Browse Source 
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>
This commit is contained in:
Lars Wendler
2020-04-20 12:19:38 +02:00
parent 1c89e92e3d
commit d13e8c2a91
9 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net-misc/whois/files/whois-5.5.6-libxcrypt_automagic.patch
+19
View File
@@ -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
net-misc/whois/metadata.xml
+3
View File
@@ -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>
net-misc/whois/whois-5.5.6.ebuild → net-misc/whois/whois-5.5.6-r1.ebuild
+8 -3
View File
@@ -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}"
}
net-misc/whois/whois-9999.ebuild
+8 -3
View File
@@ -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}"
}
profiles/arch/alpha/package.use.mask
+4
View File
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Lars Wendler <polynomial-c@gentoo.org> (2020-04-20)
# Not keyworded on alpha
net-misc/whois xcrypt
# Matt Turner <mattst88@gentoo.org> (2020-03-17)
# Requires an insane (and always growing) number of ruby deps
sys-block/thin-provisioning-tools test
profiles/arch/arm/package.use.mask
+4
View File
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Lars Wendler <polynomial-c@gentoo.org> (2020-04-20)
# Not keyworded on arm
net-misc/whois xcrypt
# Ettore Di Giacinto <mudler@gentoo.org> (2016-11-10)
# Dependency has no stable keyword
# and as for now we have only stable mate versions
profiles/arch/arm64/package.use.mask
+4
View File
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Lars Wendler <polynomial-c@gentoo.org> (2020-04-20)
# Not keyworded on arm64
net-misc/whois xcrypt
# Ettore Di Giacinto <mudler@gentoo.org> (2016-11-10)
# Dependency has no stable keyword
# and as for now we have only stable mate versions
profiles/arch/ia64/package.use.mask
+4
View File
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Lars Wendler <polynomial-c@gentoo.org> (2020-04-20)
# Not keyworded on ia64
net-misc/whois xcrypt
# Mikle Kolyada <zlogene@gentoo.org> (2020-04-20)
# dev-lang/ruby is not keyworded (a dep)
app-text/texlive context l10n_ja
profiles/arch/powerpc/package.use.mask
+4
View File
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Lars Wendler <polynomial-c@gentoo.org> (2020-04-20)
# Not keyworded on ppc
net-misc/whois xcrypt
# Patrick McLean <chutzpah@gentoo.org> (2020-04-03)
# Lots of deps for little gain
dev-python/joblib doc