From d76ce5b2b2540e629328cc246974504afaa42db4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 5 May 2008 04:55:32 +0000 Subject: Version bump #219498 by Conrad Kostecki. Package-Manager: portage-2.2_pre5 --- net-misc/whois/ChangeLog | 8 ++- net-misc/whois/Manifest | 19 ++++-- .../whois/files/whois-4.7.26-gentoo-security.patch | 79 ++++++++++++++++++++++ net-misc/whois/whois-4.7.26.ebuild | 53 +++++++++++++++ 4 files changed, 153 insertions(+), 6 deletions(-) create mode 100644 net-misc/whois/files/whois-4.7.26-gentoo-security.patch create mode 100644 net-misc/whois/whois-4.7.26.ebuild diff --git a/net-misc/whois/ChangeLog b/net-misc/whois/ChangeLog index 160947e6be5a..50386d1b2d33 100644 --- a/net-misc/whois/ChangeLog +++ b/net-misc/whois/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/whois # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/ChangeLog,v 1.106 2008/01/08 14:32:49 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/ChangeLog,v 1.107 2008/05/05 04:55:32 vapier Exp $ + +*whois-4.7.26 (05 May 2008) + + 05 May 2008; Mike Frysinger + +files/whois-4.7.26-gentoo-security.patch, +whois-4.7.26.ebuild: + Version bump #219498 by Conrad Kostecki. 08 Jan 2008; Jeroen Roovers whois-4.7.24.ebuild: Stable for HPPA (bug #202595). diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index e4049969ee61..8e14ee85cdad 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -1,10 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX whois-4.7.19-gentoo-security.patch 6009 RMD160 27c4eef179be725c269e389824ff2056d26f242c SHA1 30017bc6b42dd19b9846e3f39673c25b5054e1d2 SHA256 27932d118db2fc5040bab6c833d64e6bc298c891406ac36760ed2925554f62ca AUX whois-4.7.2-config-file.patch 198 RMD160 874ed86cab594d8fa69ee9599e2a1c3b52c611c7 SHA1 83b2db998f9ee90398138029816952f19a91634a SHA256 b7ad9cb716a8dbd1bb64dc80c1d4460c4a5661ba9420b771f9323c4337dbbea2 -DIST whois_4.7.22.tar.gz 60511 RMD160 da2ff389d641aec45960bc152d15d6c09d419e9f SHA1 fcf7d35b188fba56fbefba2e1fd5b94dc516f0ae SHA256 9acdc5b93ad9145dd2da47ea592aeb5b2b170bdac29ca780b186bd4249b3b3a9 -DIST whois_4.7.23.tar.gz 61336 RMD160 042614b6d83368aca07e5878f10cef428e1509e7 SHA1 60d0428d237a11358c20bfe21d187322ae5739fd SHA256 1152be0904afedf66107d1b5dc49542913e57c4e2e2dbe62ed35a178d5acad5e +AUX whois-4.7.26-gentoo-security.patch 2846 RMD160 e68e6a00fa79ca7a1d06cf8732c01f338563fd1b SHA1 d1ed78c1f9bf21b0db6324901ed3dfbc1fbd2733 SHA256 33d7b92a7506d8de19b9311aac4ec137de82ad592b59116807eef384d81fe6e2 DIST whois_4.7.24.tar.gz 61416 RMD160 372f872be5c7ba534994a924d64e664873f59fe2 SHA1 1573cf8a7fc5435a439975ad492e710344cfc874 SHA256 9b2841222f122670850d157fd76228aa0942f2f7c19694262904439f5ba50fe0 -EBUILD whois-4.7.22.ebuild 1291 RMD160 9727f3869ee833874f1cae10c535cfc573c78d7f SHA1 76ba25be9a72aed92cdacac8b6c52d8787a3484c SHA256 4dca5d7af8c40b70c18d6e19bd64e7e9e3f70dd03ce8048844123190dbb31bc8 -EBUILD whois-4.7.23.ebuild 1293 RMD160 7ede032b68a3cd0b9aa22972eed80b4fa1fe43cc SHA1 9e79b143a62468b0f8e62bf01c4aa547edab1b09 SHA256 5827162a00fabb59de001be889443f6ef757b59f0d9a230fb499762d35b51fff +DIST whois_4.7.26.tar.gz 67809 RMD160 ef8c252c76d22a74ddbd5dc6194585cbafe224a2 SHA1 477c5eec6eb1413624e7a609dbef79e0707720dd SHA256 515ff7eae37f64f4786ce0fe5d9f7c91790cc64fe73bfda6764d5d4c627d1541 EBUILD whois-4.7.24.ebuild 1291 RMD160 05e1a164af975a6ac8909bb1355840e95fb38bc2 SHA1 2def9a2e298a62410d9624d9028803ada6b6629e SHA256 26065fce44e371b3ae3f469134b2d8645750c6c70e78fd538b03179891bcdc05 -MISC ChangeLog 13609 RMD160 78fde072241be1e59896de9705a62b397490085c SHA1 e8c081662f66ba4b8214c107b77e6c86c9f55ba4 SHA256 721ac0a3ae4ef0324d24c6a0d3ccfcbf94685b51a6dac78a9c3da7b9a313d3bb +EBUILD whois-4.7.26.ebuild 1302 RMD160 2c9021f1c213a4dd500a98dbcb8bd8461814cc23 SHA1 aeeba3ae763bda8da0560f3d9a73f0f052c35c76 SHA256 fae7f15d15746f06b353f63cb7e7704201a0cab0791d0a454075b56928e72dda +MISC ChangeLog 13802 RMD160 0a05562b59a32a7ee6bcff81410bce98c5ff8154 SHA1 3688250ebb0f5617479f171d474934fa28a0875e SHA256 1e66677d92f41ea811009479f2c76bfc1bbbe05140e92f73d9eb8799ea2b79aa MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFIHpNJj9hvisErhMIRAh3VAKCYjlJyqtS73btjxY7HCAKUlt+a9gCbBpRF +ylr4dTRHNgbDMU8LkM8lmms= +=4/zj +-----END PGP SIGNATURE----- diff --git a/net-misc/whois/files/whois-4.7.26-gentoo-security.patch b/net-misc/whois/files/whois-4.7.26-gentoo-security.patch new file mode 100644 index 000000000000..9757604bde13 --- /dev/null +++ b/net-misc/whois/files/whois-4.7.26-gentoo-security.patch @@ -0,0 +1,79 @@ +--- whois-4.7.26/whois.c ++++ whois-4.7.26/whois.c +@@ -87,7 +87,7 @@ + /* RIPE flags */ + if (strchr(ripeflags, ch)) { + for (p = fstring; *p; p++); +- sprintf(p--, "-%c ", ch); ++ snprintf(p--, sizeof(fstring), "-%c ", ch); + continue; + } + if (strchr(ripeflagsp, ch)) { +@@ -141,10 +141,10 @@ + while (1) { + qslen += strlen(*argv) + 1 + 1; + qstring = realloc(qstring, qslen); +- strcat(qstring, *argv++); ++ strncat(qstring, *argv++, qslen-1); + if (argc == 1) + break; +- strcat(qstring, " "); ++ strncat(qstring, " ", qslen-1); + argc--; + } + } +@@ -467,8 +467,10 @@ + char *buf, *p; + int i, isripe = 0; + ++ /* buflen was always 0 in original patch and buf was allocated twice /Aye */ + /* 64 bytes reserved for server-specific flags added later */ +- buf = malloc(strlen(flags) + strlen(query) + strlen(client_tag) + 64); ++ int buflen = strlen(flags) + strlen(query) + strlen(client_tag) + 64; ++ buf = malloc(buflen); + *buf = '\0'; + for (i = 0; ripe_servers[i]; i++) + if (streq(server, ripe_servers[i])) { +@@ -481,7 +483,7 @@ + if (*flags) { + if (!isripe && !streq(server, "whois.corenic.net")) + puts(_("Warning: RIPE flags used with a traditional server.")); +- strcat(buf, flags); ++ strncat(buf, flags, buflen-1); + } + + #ifdef HAVE_LIBIDN +@@ -490,28 +492,28 @@ + */ + if (streq(server, "whois.denic.de") && domcmp(query, ".de") + && !strchr(query, ' ') && !*flags) +- sprintf(buf, "-T dn,ace -C US-ASCII %s", query); ++ snprintf(buf, buflen-1, "-T dn,ace -C US-ASCII %s", query); + else + /* here we have another registrar who could not make things simple + * -C sets the language for both input and output + */ + if (!isripe && streq(server, "whois.cat") && domcmp(query, ".cat") + && !strchr(query, ' ')) +- sprintf(buf, "-C US-ASCII ace %s", query); ++ snprintf(buf, buflen-1, "-C US-ASCII ace %s", query); + else + #endif + if (!isripe && (streq(server, "whois.nic.mil") || + streq(server, "whois.nic.ad.jp")) && + strncaseeq(query, "AS", 2) && isasciidigit(query[2])) + /* FIXME: /e is not applied to .JP ASN */ +- sprintf(buf, "AS %s", query + 2); /* fix query for DDN */ ++ snprintf(buf, buflen-1, "AS %s", query + 2); /* fix query for DDN */ + else if (!isripe && (streq(server, "whois.nic.ad.jp") || + streq(server, "whois.jprs.jp"))) { + char *lang = getenv("LANG"); /* not a perfect check, but... */ + if (!lang || !strneq(lang, "ja", 2)) +- sprintf(buf, "%s/e", query); /* ask for english text */ ++ snprintf(buf, buflen-1, "%s/e", query); /* ask for english text */ + else +- strcat(buf, query); ++ strncat(buf, query, buflen-1); + } else if (!isripe && streq(server, "whois.arin.net") && + (p = strrchr(query, '/'))) { + strncat(buf, query, p - query); /* strip CIDR */ diff --git a/net-misc/whois/whois-4.7.26.ebuild b/net-misc/whois/whois-4.7.26.ebuild new file mode 100644 index 000000000000..adae4b288707 --- /dev/null +++ b/net-misc/whois/whois-4.7.26.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.26.ebuild,v 1.1 2008/05/05 04:55:32 vapier Exp $ + +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.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="nls" +RESTRICT="test" #59327 + +RDEPEND="net-dns/libidn" +DEPEND="${RDEPEND} + >=dev-lang/perl-5" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-4.7.26-gentoo-security.patch + epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch + + if use nls ; then + cd po + sed -i -e "s:/usr/bin/install:install:" Makefile + else + sed -i -e '/ENABLE_NLS/s:define:undef:' config.h + sed -i -e "s:cd po.*::" Makefile + fi +} + +src_compile() { + tc-export CC + emake OPTS="${CFLAGS}" HAVE_LIBIDN=1 || die +} + +src_install() { + dodir /usr/bin /usr/share/man/man1 + make BASEDIR="${D}" prefix=/usr install || die + insinto /etc + doins whois.conf + dodoc README + + if [[ "${USERLAND}" != "GNU" ]]; then + mv "${D}"/usr/share/man/man1/{whois,mdwhois}.1 + mv "${D}"/usr/bin/{whois,mdwhois} + fi +} -- cgit v1.2.3-65-gdbad