diff options
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/whois/files/digest-whois-4.7.12 | 3 | ||||
-rw-r--r-- | net-misc/whois/files/digest-whois-4.7.19 | 3 | ||||
-rw-r--r-- | net-misc/whois/files/digest-whois-4.7.20 | 3 | ||||
-rw-r--r-- | net-misc/whois/files/digest-whois-4.7.21 | 3 | ||||
-rw-r--r-- | net-misc/whois/files/whois-4.7.2-gentoo-security.patch | 169 | ||||
-rw-r--r-- | net-misc/whois/whois-4.7.12.ebuild | 53 | ||||
-rw-r--r-- | net-misc/whois/whois-4.7.19.ebuild | 53 | ||||
-rw-r--r-- | net-misc/whois/whois-4.7.20.ebuild | 53 | ||||
-rw-r--r-- | net-misc/whois/whois-4.7.21.ebuild | 53 |
9 files changed, 0 insertions, 393 deletions
diff --git a/net-misc/whois/files/digest-whois-4.7.12 b/net-misc/whois/files/digest-whois-4.7.12 deleted file mode 100644 index 36dd08ab15bc..000000000000 --- a/net-misc/whois/files/digest-whois-4.7.12 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 31df01aa34c5dacaf0ddee5e50744077 whois_4.7.12.tar.gz 58652 -RMD160 3799855858b8a43f30f847440a217d18c3c6f346 whois_4.7.12.tar.gz 58652 -SHA256 89b0fea0cd105199035f8204dabf3276bd5635a2fad3d6a3873bbb78716b5b83 whois_4.7.12.tar.gz 58652 diff --git a/net-misc/whois/files/digest-whois-4.7.19 b/net-misc/whois/files/digest-whois-4.7.19 deleted file mode 100644 index 79726fe4b19b..000000000000 --- a/net-misc/whois/files/digest-whois-4.7.19 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 437585d938b0890ff276baad84b753c2 whois_4.7.19.tar.gz 60524 -RMD160 fcd01163739dfabc103665551772c7779868cdbe whois_4.7.19.tar.gz 60524 -SHA256 f39fa19bc834b9d78c3f0f182becf6397eaa010a70d1d1072645ae130df1486d whois_4.7.19.tar.gz 60524 diff --git a/net-misc/whois/files/digest-whois-4.7.20 b/net-misc/whois/files/digest-whois-4.7.20 deleted file mode 100644 index e335495e7c0d..000000000000 --- a/net-misc/whois/files/digest-whois-4.7.20 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 81cea7350890d2a4dc974f661be31c7d whois_4.7.20.tar.gz 60004 -RMD160 731daccb9fb2c7836967cd124982b0bb61a3b838 whois_4.7.20.tar.gz 60004 -SHA256 26c0249c2c7bc6c5a852a18d196f9cc661eb9ab775d71089ef034ce43b269b67 whois_4.7.20.tar.gz 60004 diff --git a/net-misc/whois/files/digest-whois-4.7.21 b/net-misc/whois/files/digest-whois-4.7.21 deleted file mode 100644 index 130023b483b1..000000000000 --- a/net-misc/whois/files/digest-whois-4.7.21 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 465479682f31f0627ebc4ab3e365b7d2 whois_4.7.21.tar.gz 60132 -RMD160 f29913db071d58874757c51d8fc1701645b19d9f whois_4.7.21.tar.gz 60132 -SHA256 c62dca7c1bc1da469cb98c08075e716c33ef631cbdf86b819949c306b417df77 whois_4.7.21.tar.gz 60132 diff --git a/net-misc/whois/files/whois-4.7.2-gentoo-security.patch b/net-misc/whois/files/whois-4.7.2-gentoo-security.patch deleted file mode 100644 index 39553a6ec3af..000000000000 --- a/net-misc/whois/files/whois-4.7.2-gentoo-security.patch +++ /dev/null @@ -1,169 +0,0 @@ ---- whois-4.7.2/whois.c -+++ whois-4.7.2/whois.c -@@ -76,7 +76,7 @@ int main(int argc, char *argv[]) - /* 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)) { -@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) - usage(); - - /* On some systems realloc only works on non-NULL buffers */ -- qstring = malloc(64); -+ qstring = xmalloc(64); - *qstring = '\0'; - - /* parse other parameters, if any */ -@@ -130,11 +130,11 @@ int main(int argc, char *argv[]) - - while (1) { - qslen += strlen(*argv) + 1 + 1; -- qstring = realloc(qstring, qslen); -- strcat(qstring, *argv++); -+ qstring = xrealloc(qstring, qslen); -+ strncat(qstring, *argv++, qslen-1); - if (argc == 1) - break; -- strcat(qstring, " "); -+ strncat(qstring, " ", qslen-1); - argc--; - } - } -@@ -428,8 +428,10 @@ char *queryformat(const char *server, co - char *buf; - 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 = xmalloc(buflen); - *buf = '\0'; - for (i = 0; ripe_servers[i]; i++) - if (strcmp(server, ripe_servers[i]) == 0) { -@@ -442,7 +444,7 @@ char *queryformat(const char *server, co - if (*flags) { - if (!isripe && strcmp(server, "whois.corenic.net") != 0) - puts(_("Warning: RIPE flags used with a traditional server.")); -- strcat(buf, flags); -+ strncat(buf, flags, buflen-1); - } - - #ifdef HAVE_LIBIDN -@@ -451,21 +453,21 @@ char *queryformat(const char *server, co - */ - if (isripe && strcmp(server, "whois.denic.de") == 0 && 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 - #endif - if (!isripe && (strcmp(server, "whois.nic.mil") == 0 || - strcmp(server, "whois.nic.ad.jp") == 0) && - strncasecmp(query, "AS", 2) == 0 && 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 && (strcmp(server, "whois.nic.ad.jp") == 0 || - strcmp(server, "whois.jprs.jp") == 0)) { - char *lang = getenv("LANG"); /* not a perfect check, but... */ - if (!lang || (strncmp(lang, "ja", 2) != 0)) -- 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 - strcat(buf, query); - return buf; -@@ -533,7 +535,7 @@ const char *do_query(const int sock, con - - if (sscanf(buf, REFERTO_FORMAT, nh, np, nq) == 3) { - /* XXX we are ignoring the new query string */ -- referral_server = malloc(300); -+ referral_server = xmalloc(300); - sprintf(referral_server, "%s:%s", nh, np); - } - } -@@ -582,7 +584,7 @@ const char *query_crsnic(const int sock, - int hide = hide_discl; - int state = 0; - -- temp = malloc(strlen(query) + 1 + 2 + 1); -+ temp = xmalloc(strlen(query) + 1 + 2 + 1); - *temp = '='; - strcpy(temp + 1, query); - strcat(temp, "\r\n"); -@@ -600,7 +602,7 @@ const char *query_crsnic(const int sock, - - for (p = buf; *p != ':'; p++); /* skip until colon */ - for (p++; *p == ' '; p++); /* skip colon and spaces */ -- ret = malloc(strlen(p) + 1); -+ ret = xmalloc(strlen(p) + 1); - for (q = ret; *p != '\n' && *p != '\r' && *p != ' '; *q++ = *p++) - ; /*copy data*/ - *q = '\0'; -@@ -625,7 +627,7 @@ const char *query_pir(const int sock, co - int hide = hide_discl; - int state = 0; - -- temp = malloc(strlen(query) + 5 + 2 + 1); -+ temp = xmalloc(strlen(query) + 5 + 2 + 1); - strcpy(temp, "FULL "); - strcat(temp, query); - strcat(temp, "\r\n"); -@@ -646,7 +648,7 @@ const char *query_pir(const int sock, co - for (p = buf; *p != ':'; p++); /* skip until colon */ - for (p++; *p != ':'; p++); /* skip until 2nd colon */ - for (p++; *p == ' '; p++); /* skip colon and spaces */ -- ret = malloc(strlen(p) + 1); -+ ret = xmalloc(strlen(p) + 1); - for (q = ret; *p != '\n' && *p != '\r'; *q++ = *p++); /*copy data*/ - *q = '\0'; - state = 2; -@@ -785,7 +787,7 @@ void split_server_port(const char *const - - char *convert_6to4(const char *s) - { -- char *new = malloc(sizeof("255.255.255.255")); -+ char *new = xmalloc(sizeof("255.255.255.255")); - unsigned int a, b; - - if (sscanf(s, "2002:%x:%x:", &a, &b) != 2) -@@ -848,6 +850,21 @@ void usage(void) - exit(0); - } - -+/* Memory allocation routines */ -+void *xmalloc(size_t size) -+{ -+ void *ptr; -+ if ((ptr = malloc(size)) == NULL) -+ err_sys("malloc"); -+ return ptr; -+} -+ -+void *xrealloc(void *ptr, size_t size) -+{ -+ if ((ptr = realloc(ptr, size)) == NULL) -+ err_sys("realloc"); -+ return ptr; -+} - - /* Error routines */ - void err_sys(const char *fmt, ...) ---- whois-4.7.2/whois.h -+++ whois-4.7.2/whois.h -@@ -32,6 +32,8 @@ const char *handle_query(const char *ser - void split_server_port(const char *const input, const char **server, - const char **port); - -+void *xmalloc(size_t); -+void *xrealloc(void *, size_t); - void err_quit(const char *,...); - void err_sys(const char *,...); - diff --git a/net-misc/whois/whois-4.7.12.ebuild b/net-misc/whois/whois-4.7.12.ebuild deleted file mode 100644 index 91c591bd5725..000000000000 --- a/net-misc/whois/whois-4.7.12.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.12.ebuild,v 1.11 2006/09/30 18:56:08 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.2-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 -} diff --git a/net-misc/whois/whois-4.7.19.ebuild b/net-misc/whois/whois-4.7.19.ebuild deleted file mode 100644 index 68cffe5d419f..000000000000 --- a/net-misc/whois/whois-4.7.19.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.19.ebuild,v 1.9 2006/12/21 14:53:50 corsair 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.19-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 -} diff --git a/net-misc/whois/whois-4.7.20.ebuild b/net-misc/whois/whois-4.7.20.ebuild deleted file mode 100644 index c6a4b501cf7b..000000000000 --- a/net-misc/whois/whois-4.7.20.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.20.ebuild,v 1.10 2007/05/14 16:28:15 armin76 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.19-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 -} diff --git a/net-misc/whois/whois-4.7.21.ebuild b/net-misc/whois/whois-4.7.21.ebuild deleted file mode 100644 index 5c7c93c7df7e..000000000000 --- a/net-misc/whois/whois-4.7.21.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.21.ebuild,v 1.9 2007/07/01 11:55:26 dertobi123 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.19-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 -} |