summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-11-16 14:40:13 +0000
committerPeter Volkov <pva@gentoo.org>2008-11-16 14:40:13 +0000
commitff5b5909a30498a7fa83eb074aa40134d42f2edc (patch)
tree9ce3a30bcfa493d3c6356c147c6e697c2dff6759 /net-analyzer/mtr
parentfix #238347; cleanup (diff)
downloadhistorical-ff5b5909a30498a7fa83eb074aa40134d42f2edc.tar.gz
historical-ff5b5909a30498a7fa83eb074aa40134d42f2edc.tar.bz2
historical-ff5b5909a30498a7fa83eb074aa40134d42f2edc.zip
Version bump, bug #226989, thank Krzysztof Olędzki for report. Finally removed all bind-now flags, #226989, thank Diego Pettenò for report. Remove old.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686
Diffstat (limited to 'net-analyzer/mtr')
-rw-r--r--net-analyzer/mtr/ChangeLog10
-rw-r--r--net-analyzer/mtr/Manifest19
-rw-r--r--net-analyzer/mtr/files/mtr-0.69-debian.patch93
-rw-r--r--net-analyzer/mtr/mtr-0.72.ebuild46
-rw-r--r--net-analyzer/mtr/mtr-0.73-r1.ebuild57
-rw-r--r--net-analyzer/mtr/mtr-0.73.ebuild53
-rw-r--r--net-analyzer/mtr/mtr-0.75.ebuild37
7 files changed, 49 insertions, 266 deletions
diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index f17efd8908ef..8eb542b4e12c 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-analyzer/mtr
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.81 2008/10/26 20:20:47 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.82 2008/11/16 14:40:13 pva Exp $
+
+*mtr-0.75 (16 Nov 2008)
+
+ 16 Nov 2008; Peter Volkov <pva@gentoo.org> -files/mtr-0.69-debian.patch,
+ -mtr-0.72.ebuild, -mtr-0.73.ebuild, -mtr-0.73-r1.ebuild, +mtr-0.75.ebuild:
+ Version bump, bug #226989, thank Krzysztof Olędzki for report. Finally
+ removed all bind-now flags, #226989, thank Diego Pettenò for report.
+ Remove old.
26 Oct 2008; Joshua Kinard <kumba@gentoo.org> mtr-0.73-r2.ebuild:
Mark mtr-0.73-r2 unstable on mips.
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 6aa092b11433..ba5976c606c1 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,23 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX mtr-0.69-debian.patch 2558 RMD160 0d2408192d16432e9a1702d7b5817491664f03d9 SHA1 b75752e905f4b20d9a755e5c5f08ee60fd2cd8e8 SHA256 5d86d791b0bbcbc75fdeb1f65b26955aa55d0f7caebdcd5d2dd6324e9c0684a2
AUX mtr-0.73-CVE-2008-2357.patch 9729 RMD160 39385b3820dbee784678006f9d565d10ee1e7f35 SHA1 b0553d92af0750da30f6db984b672b6f5211e605 SHA256 9a6bbf7c5f825c9f81f622a7cd65a50ed051593beb4c53ae44494ecb5ad3d8ad
AUX mtr-0.73-am_path_gtk.patch 728 RMD160 c2f4fe18a97033eac9ca74cd69017c7e85f69c38 SHA1 2eb9857c066a9add7d1bf12c12658c95836e55da SHA256 0a250cc9cb58340d2ecb29c1d1d209811e9956c7dc2ab6081702758651cf9f4b
AUX mtr-ac-res_mkquery.patch 510 RMD160 6ee5bdf1e8b52779eb4288ffad6bae05d134d68b SHA1 a0d54a26a355d4ccc01703b726fc365f32750079 SHA256 2a369c93e2244967b75e89fb45541edafeb92f012cc78b9ee043685e0eb51785
DIST gtk-2.0-for-mtr.m4.bz2 2508 RMD160 f5fc7a3a3c4fcfe03356170371113a1b0f18eda6 SHA1 c72993fdb224ffba6afeca43a60303ed0350c56f SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba
-DIST mtr-0.72.tar.gz 295845 RMD160 69843b82fb2de2b2a597c21a62d8eb9473df31b6 SHA1 afc26c9e8a30eba7ca92ba68d4489b0c9c07977d SHA256 1473b7880cd3570cff59fb9692c08c8579c334cc04d5a1df092088f1570318db
DIST mtr-0.73.tar.gz 558744 RMD160 09b9b2cea84b0596bf25a4055cdcb78e8faebc10 SHA1 52cf5bd1a1e6a8e14a0ebb70610bd2be9e597c15 SHA256 30bdf752ac048dd160aa28d5caff1ffe0986dd4df046c397087fa1d8c8e1ab51
-EBUILD mtr-0.72.ebuild 1214 RMD160 9cc03b1757cef8b8bb90b36a711912b4ef5120e9 SHA1 eff0b16ca8e5b63fddd263823886a01c23f4dbbd SHA256 cc0578ceb2f07fd527739c0dffe3effb9a3189a8a161d272cdeced1350dc3764
-EBUILD mtr-0.73-r1.ebuild 1446 RMD160 1390b9743235250176e50ff7d1fe40cb88660e47 SHA1 df52a8a86f5313dba695d68c8365a06ce936fec1 SHA256 ebb15b44047c3b6768a763d7ce33fe1c72eb3931d6b2a8a9207e030fe114c78c
+DIST mtr-0.75.tar.gz 179376 RMD160 d7df41c0c9b457eeff4034c9bc2f01456b8f6c68 SHA1 d9d3f849e32dda8aa5a7a297c25053e5d8504b27 SHA256 1d1a5de6b233289bf17a21e3bf83c82db47d22bb269af986229b788689e1f0f3
EBUILD mtr-0.73-r2.ebuild 1454 RMD160 804da616e0787d9c8b8cebebfc7aab27334ca9e7 SHA1 7d9907bf5c17e5b7871124d079aae160be682feb SHA256 3c6569af6b667d4d8dd081b9fc2d004cf370984f2766d13d44229534da9dfb5b
-EBUILD mtr-0.73.ebuild 1307 RMD160 db9a12394379e5437002ac22ffd402b868011d02 SHA1 8fac1a6380cf2141823cd018cb9ce6a0d2315fce SHA256 2005719a05f61a6cadd7940180b1ad3ddec7fd3b692274ee89ee07bb2b73e328
-MISC ChangeLog 9417 RMD160 577d5eeb8694926191d198c4af77e80ba8723424 SHA1 f03f813995f3999108a9b26bb9ff0a03461b3469 SHA256 628aaf8274c20b754cd7ffcd8bc8ff1f13e2c36df83c86c106e1560db0228b4f
+EBUILD mtr-0.75.ebuild 1074 RMD160 229d1372f08111ce3dab5e9dc64531ab98853bfa SHA1 601ef607386db5715472c3f67c14a0b190bd1e52 SHA256 72cd099eb68a7f2fe6dc6926d380406f35d38763b39e6d16bedd7a48b1060026
+MISC ChangeLog 9753 RMD160 a91f8fa072e493eae2a3e8cfa15614771d9b8c88 SHA1 1b2bf27ede55fab2309c0542989a7ee1585a22e0 SHA256 1affa664cf1e43d260d5f5e463a163641424e99b072f4213885eddb42853c7c6
MISC metadata.xml 244 RMD160 e017aaa0a93030fffb56cd11f8894d932ca77173 SHA1 6c242450f36154bb9453827b44e6c2dc99ddc634 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkW1FUACgkQ67wieSYcaxeUogCeJMkW/4zuO6HcHYEvCq9isqQL
-+psAoM0SjDaGnIYDDMZxcx+/Y062uLFI
-=EIuF
------END PGP SIGNATURE-----
diff --git a/net-analyzer/mtr/files/mtr-0.69-debian.patch b/net-analyzer/mtr/files/mtr-0.69-debian.patch
deleted file mode 100644
index 5842777d4de6..000000000000
--- a/net-analyzer/mtr/files/mtr-0.69-debian.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- mtr-0.69.orig/mtr.c
-+++ mtr-0.69/mtr.c
-@@ -388,10 +388,6 @@
- }
-
-
-- if (net_set_interfaceaddress (InterfaceAddress) != 0) {
-- fprintf (stderr, "mtr: Couldn't set interface addres.\n");
-- exit (1);
-- }
-
- #ifdef ENABLE_IPV6
- /* gethostbyname2() is deprecated so we'll use getaddrinfo() instead. */
-@@ -442,6 +438,11 @@
- exit(1);
- }
-
-+ if (net_set_interfaceaddress (InterfaceAddress) != 0) {
-+ fprintf (stderr, "mtr: Couldn't set interface address.\n");
-+ exit (1);
-+ }
-+
- display_open();
- dns_open();
-
---- mtr-0.69.orig/net.c
-+++ mtr-0.69/net.c
-@@ -322,7 +322,15 @@
- int oldavg; /* usedByMin */
- int oldjavg; /* usedByMin */
- int i; /* usedByMin */
-+#ifdef ENABLE_IPV6
-+ char addrcopy[sizeof(struct in6_addr)];
-+#else
-+ char addrcopy[sizeof(struct in_addr)];
-+#endif
-
-+ /* Copy the from address ASAP because it can be overwritten */
-+ addrcpy( (void *) &addrcopy, addr, af );
-+
- if (seq < 0 || seq >= MaxSequence)
- return;
-
-@@ -339,22 +347,22 @@
- if ( addrcmp( (void *) &(host[index].addr),
- (void *) &unspec_addr, af ) == 0 ) {
- // should be out of if as addr can change
-- addrcpy( (void *) &(host[index].addr), addr, af );
-+ addrcpy( (void *) &(host[index].addr), addrcopy, af );
- display_rawhost(index, (void *) &(host[index].addr));
-
- /* multi paths by Min */
-- addrcpy( (void *) &(host[index].addrs[0]), addr, af );
-+ addrcpy( (void *) &(host[index].addrs[0]), addrcopy, af );
- } else {
- for( i=0; i<MAXPATH; ) {
-- if( addrcmp( (void *) &(host[index].addrs[i]), (void *) &addr,
-+ if( addrcmp( (void *) &(host[index].addrs[i]), (void *) &addrcopy,
- af ) == 0 ||
- addrcmp( (void *) &(host[index].addrs[i]),
- (void *) &unspec_addr, af ) == 0 ) break;
- i++;
- }
-- if( addrcmp( (void *) &(host[index].addrs[i]), addr, af ) != 0 &&
-+ if( addrcmp( (void *) &(host[index].addrs[i]), addrcopy, af ) != 0 &&
- i<MAXPATH ) {
-- addrcpy( (void *) &(host[index].addrs[i]), addr, af );
-+ addrcpy( (void *) &(host[index].addrs[i]), addrcopy, af );
- }
- /* end multi paths */
- }
-@@ -911,8 +919,10 @@
-
- void net_close(void)
- {
-- close(sendsock);
-- close(recvsock);
-+ if (sendsock4 >= 0) close(sendsock4);
-+ if (recvsock4 >= 0) close(recvsock4);
-+ if (sendsock6 >= 0) close(sendsock6);
-+ if (recvsock6 >= 0) close(recvsock6);
- }
-
-
---- mtr-0.69.orig/net.h
-+++ mtr-0.69/net.h
-@@ -117,3 +117,6 @@
- extern char available_options[];
-
- ip_t unspec_addr;
-+
-+FILE *ADDRCMP;
-+int i;
diff --git a/net-analyzer/mtr/mtr-0.72.ebuild b/net-analyzer/mtr/mtr-0.72.ebuild
deleted file mode 100644
index 00994bc31e40..000000000000
--- a/net-analyzer/mtr/mtr-0.72.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.72.ebuild,v 1.12 2008/05/06 13:47:24 drac Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-IUSE="gtk ipv6"
-
-RDEPEND="sys-libs/ncurses
- gtk? ( >=x11-libs/gtk+-2 )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_compile() {
- local myconf
- use gtk || myconf="${myconf} --without-gtk"
-
- [[ ${CHOST} == *-darwin* ]] && append-flags "-DBIND_8_COMPAT"
- append-ldflags $(bindnow-flags)
-
- econf ${myconf} \
- $(use_enable gtk gtk2) \
- $(use_enable ipv6) \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- # this binary is universal. ie: it does both console and gtk.
- make DESTDIR="${D}" sbindir=/usr/bin install || die "make install failed"
-
- insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
-
- fowners root:wheel /usr/bin/mtr
- fperms 4710 /usr/bin/mtr
-
- dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
-}
diff --git a/net-analyzer/mtr/mtr-0.73-r1.ebuild b/net-analyzer/mtr/mtr-0.73-r1.ebuild
deleted file mode 100644
index 695da04ff4da..000000000000
--- a/net-analyzer/mtr/mtr-0.73-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.73-r1.ebuild,v 1.3 2008/11/09 12:15:15 vapier Exp $
-
-inherit flag-o-matic autotools eutils
-
-DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz
- mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~ppc s390 sh sparc x86"
-IUSE="gtk ipv6"
-
-RDEPEND="sys-libs/ncurses
- gtk? ( >=x11-libs/gtk+-2 )"
-DEPEND="${RDEPEND}
- gtk? ( dev-util/pkgconfig )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4
- epatch "${FILESDIR}"/${P}-am_path_gtk.patch
- epatch "${FILESDIR}"/${P}-CVE-2008-2357.patch
- AT_M4DIR="." eautoreconf
-}
-
-src_compile() {
- local myconf
- use gtk || myconf="${myconf} --without-gtk"
-
- [[ ${CHOST} == *-darwin* ]] && append-flags "-DBIND_8_COMPAT"
-
- econf ${myconf} \
- $(use_enable gtk gtk2) \
- $(use_enable ipv6) \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- # this binary is universal. ie: it does both console and gtk.
- emake DESTDIR="${D}" install || die "make install failed"
-
- insinto /usr/share/${PN}
- doins img/mtr_icon.xpm
-
- fowners root:wheel /usr/bin/mtr
- fperms 4710 /usr/bin/mtr
-
- dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
-}
diff --git a/net-analyzer/mtr/mtr-0.73.ebuild b/net-analyzer/mtr/mtr-0.73.ebuild
deleted file mode 100644
index c34c402e2114..000000000000
--- a/net-analyzer/mtr/mtr-0.73.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.73.ebuild,v 1.1 2008/05/18 12:21:59 cedk Exp $
-
-inherit flag-o-matic autotools eutils
-
-DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="gtk ipv6"
-
-RDEPEND="sys-libs/ncurses
- gtk? ( >=x11-libs/gtk+-2 )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-am_path_gtk.patch"
- eautoreconf
-}
-
-src_compile() {
- local myconf
- use gtk || myconf="${myconf} --without-gtk"
-
- [[ ${CHOST} == *-darwin* ]] && append-flags "-DBIND_8_COMPAT"
-
- econf ${myconf} \
- $(use_enable gtk gtk2) \
- $(use_enable ipv6) \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- # this binary is universal. ie: it does both console and gtk.
- emake DESTDIR="${D}" sbindir=/usr/bin install || die "make install failed"
-
- insinto /usr/share/${PN}
- doins img/mtr_icon.xpm
-
- fowners root:wheel /usr/bin/mtr
- fperms 4710 /usr/bin/mtr
-
- dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
-}
diff --git a/net-analyzer/mtr/mtr-0.75.ebuild b/net-analyzer/mtr/mtr-0.75.ebuild
new file mode 100644
index 000000000000..4a8fd31d5524
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.75.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.75.ebuild,v 1.1 2008/11/16 14:40:13 pva Exp $
+
+DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
+HOMEPAGE="http://www.bitwizard.nl/mtr/"
+SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz
+ mirror://gentoo/gtk-2.0-for-mtr.m4.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="gtk ipv6"
+
+RDEPEND="sys-libs/ncurses
+ gtk? ( >=x11-libs/gtk+-2.4.0 )"
+DEPEND="${RDEPEND}
+ gtk? ( dev-util/pkgconfig )"
+
+# I've kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf
+# mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4 #222909
+src_compile() {
+ econf \
+ $(use_with gtk) \
+ $(use_enable ipv6)
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+
+ fowners root:0 /usr/sbin/mtr
+ fperms 4710 /usr/sbin/mtr
+
+ dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO || die
+}