* [gentoo-commits] proj/musl:master commit in: net-misc/whois/, net-misc/whois/files/
@ 2018-11-09 23:34 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2018-11-09 23:34 UTC (permalink / raw
To: gentoo-commits
commit: 294a49e572485cde7b0d2d77307eb193bc987099
Author: xdch47 <xdch47 <AT> posteo <DOT> de>
AuthorDate: Fri Nov 9 21:46:13 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Nov 9 23:33:14 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=294a49e5
net-misc/whois: musl patch for sha crypt
Package-Manager: Portage-2.3.49, Repoman-2.3.11
RepoMan-Options: --force
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-misc/whois/Manifest | 1 +
net-misc/whois/files/whois-4.7.2-config-file.patch | 12 ++++
.../whois/files/whois-5.3.0-libidn_automagic.patch | 23 ++++++++
net-misc/whois/metadata.xml | 8 +++
net-misc/whois/whois-5.2.20.ebuild | 64 ++++++++++++++++++++++
5 files changed, 108 insertions(+)
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
new file mode 100644
index 0000000..46bee29
--- /dev/null
+++ b/net-misc/whois/Manifest
@@ -0,0 +1 @@
+DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
diff --git a/net-misc/whois/files/whois-4.7.2-config-file.patch b/net-misc/whois/files/whois-4.7.2-config-file.patch
new file mode 100644
index 0000000..da91d5a
--- /dev/null
+++ b/net-misc/whois/files/whois-4.7.2-config-file.patch
@@ -0,0 +1,12 @@
+Enable /etc/whois.conf support.
+
+http://bugs.gentoo.org/show_bug.cgi?id=89417
+
+--- a/config.h
++++ b/config.h
+@@ -13,5 +13,3 @@
+ /* Configuration file */
+-/*
+ #define CONFIG_FILE "/etc/whois.conf"
+-*/
+
diff --git a/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch b/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch
new file mode 100644
index 0000000..4e01eb5
--- /dev/null
+++ b/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/net-misc/whois/metadata.xml b/net-misc/whois/metadata.xml
new file mode 100644
index 0000000..56c1244
--- /dev/null
+++ b/net-misc/whois/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild
new file mode 100644
index 0000000..ebbe2d8
--- /dev/null
+++ b/net-misc/whois/whois-5.2.20.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs flag-o-matic
+
+MY_P=${P/-/_}
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://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 )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.7.2-config-file.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 elibc_musl && append-cflags "-DHAVE_GETOPT_LONG -DHAVE_GETADDRINFO -DHAVE_SHA_CRYPT -D RANDOM_DEVICE='\"/dev/urandom\"'"
+ 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-misc/whois/, net-misc/whois/files/
@ 2020-04-27 12:25 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2020-04-27 12:25 UTC (permalink / raw
To: gentoo-commits
commit: b92ee975bf1a5ec55457c0a71ced73c96a685427
Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz>
AuthorDate: Sat Apr 25 02:47:44 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 12:25:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b92ee975
net-misc/whois: Patches in ::gentoo, CFLAGS not required, in-tree v5.4.3 OK
>>> Completed installing net-misc/whois-5.4.3 into /var/tmp/portage/net-misc/whois-5.4.3/image
>>> net-misc/whois-5.4.3 merged.
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-misc/whois/Manifest | 17 ------
net-misc/whois/files/whois-4.7.2-config-file.patch | 12 ----
.../whois/files/whois-5.3.0-libidn_automagic.patch | 23 --------
net-misc/whois/metadata.xml | 8 ---
net-misc/whois/whois-5.2.20.ebuild | 64 ---------------------
net-misc/whois/whois-5.3.2.ebuild | 66 ----------------------
net-misc/whois/whois-5.4.0.ebuild | 66 ----------------------
7 files changed, 256 deletions(-)
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
deleted file mode 100644
index 8f3bac4..0000000
--- a/net-misc/whois/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
-DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
-DIST whois_5.4.0.tar.xz 83576 BLAKE2B fb21094227bc254e7901d0af667206f742657093b2dc25dc066ccb727d07fbc9cef7443f29d0bd22e307d2127689f9fe33e55282e0311f968039bb0fbe48417f SHA512 d6b8f097eaaab216d862503c96aff32777caec3597b357fb2589b86e98c6ff52f35b18ea5f33d1ece23250c61f849daf9943a2895fe563b05fcbd26718b3b80e
------BEGIN PGP SIGNATURE-----
-
-iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAlvxp8cACgkQPcxEeC7Q
-fhxtxwf/fwQ5e/COnOs+KVqgUnotdUWRp2lOYDWuU3w5A9VlyO5dMCvkstKi4xjE
-xV1CH+UO0Tdw8KYf+A2HvVkjWukfd4VX7RRZzvHUZU95rkRuFr9ShvUcTGtxV9rI
-56fO4o7R8JbExy1Z199/wIxwKggK3Qmqze7Qm7eweVE0OkZogRGEeOqsvg07BtPt
-8+TfAFm4Oa17CndrroAZwI9ArpQyfFx5Hfa/nmlxUa8fRQ6CLfmN0EXMbPuWAMY5
-JXkn7CEtKOQjvsyUQFXU6UwugcJTRV6tHVg4Y/0CNBC4svtgC9rgm1whzkes8Zud
-q6Bw510fgch/gtQe/34FU5Qo+9+SEA==
-=zk1n
------END PGP SIGNATURE-----
diff --git a/net-misc/whois/files/whois-4.7.2-config-file.patch b/net-misc/whois/files/whois-4.7.2-config-file.patch
deleted file mode 100644
index da91d5a..0000000
--- a/net-misc/whois/files/whois-4.7.2-config-file.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Enable /etc/whois.conf support.
-
-http://bugs.gentoo.org/show_bug.cgi?id=89417
-
---- a/config.h
-+++ b/config.h
-@@ -13,5 +13,3 @@
- /* Configuration file */
--/*
- #define CONFIG_FILE "/etc/whois.conf"
--*/
-
diff --git a/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch b/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch
deleted file mode 100644
index 4e01eb5..0000000
--- a/net-misc/whois/files/whois-5.3.0-libidn_automagic.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/net-misc/whois/metadata.xml b/net-misc/whois/metadata.xml
deleted file mode 100644
index 56c1244..0000000
--- a/net-misc/whois/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild
deleted file mode 100644
index e1481c8..0000000
--- a/net-misc/whois/whois-5.2.20.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-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 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.7.2-config-file.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 elibc_musl && append-cflags "-DHAVE_GETOPT_LONG -DHAVE_GETADDRINFO -DHAVE_SHA_CRYPT -D RANDOM_DEVICE='\"/dev/urandom\"'"
- 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.3.2.ebuild b/net-misc/whois/whois-5.3.2.ebuild
deleted file mode 100644
index dcdcd9f..0000000
--- a/net-misc/whois/whois-5.3.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
- idn? ( net-dns/libidn2:= )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- 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
-)
-
-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 elibc_musl && append-cflags "-DHAVE_GETOPT_LONG -DHAVE_GETADDRINFO -DHAVE_SHA_CRYPT -D RANDOM_DEVICE='\"/dev/urandom\"'"
- 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.4.0.ebuild b/net-misc/whois/whois-5.4.0.ebuild
deleted file mode 100644
index 2a24ea9..0000000
--- a/net-misc/whois/whois-5.4.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
- idn? ( net-dns/libidn2:= )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- 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
-)
-
-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 elibc_musl && append-cflags "-DHAVE_GETOPT_LONG -DHAVE_GETADDRINFO -DHAVE_SHA_CRYPT -D RANDOM_DEVICE='\"/dev/urandom\"'"
- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-27 12:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-09 23:34 [gentoo-commits] proj/musl:master commit in: net-misc/whois/, net-misc/whois/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2020-04-27 12:25 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox