Date: Mon, 25 Oct 2004 11:43:04 +0200 (CEST) From: Janos Mohacsi <janos.mohacsi@niif.hu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73107: [MAINTAINER] net/beacon: update to 1.1 Message-ID: <200410250943.i9P9h4Un029701@scone.ki.iif.hu> Resent-Message-ID: <200410250950.i9P9oU2v069493@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73107
>Category: ports
>Synopsis: [MAINTAINER] net/beacon: update to 1.1
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 25 09:50:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 5.3-STABLE i386
>Organization:
NIIF/HUNGARNET
>Environment:
System: FreeBSD scone.ki.iif.hu 5.3-STABLE FreeBSD 5.3-STABLE #4: Mon Oct 18 13:14:24 CEST 2004
>Description:
Maintainer Update of net/beacon to 1.1
Unbreak fetchability with update.
Changes:
* Fix TCP connection overflow bug.
* SysLog facility support.
* Rework some of the HTML generation code to clean the display up a bit.
* Central Server changed from becaon.ncsa.uiuc.edu to beacon.dast.nlanr.net.
* Blind Beacons now marked with white writing on blue background on
Beacon Info page.
* Added "Blind" Beacon filter for HTML output.
A "Blind" Beacon is one which is reporting normally to the
Central Beacon Server via TCP, but which only sees itself,
and is only seen *by* itself. These are filtered out of the
main HTML matrix and listed below the main table, under the
heading "Blind Beacons".
* Added a hyperlink to the Beacon FAQ for IP addresses which resolve to
"Localhost".
* Support for multiple NICs.
* Automatic backgrounding of the Beacon process at startup possible
* Specify CONTACTNAME/INFO/LOCATION on command line or in beacon.conf.
* Fixed bug history file update.
* Link on HTML output pages pointing Code Contributions and Patches.
* Getting hostname of local Beacon. Using both Sys::Hostname and
Net::Domain together now to make it more robust.
* OUTPUTDIR spec for beacon.conf and command line interface
* Various bug fixes
* Ability to change UID to non-privileged user
* Link on Beacon Info page to FAQ for those running their Beacon as root
* Burst testing -- 100 consecutive RTP packets out as fast as it can.
* Silence testing -- During a Silence test, the Beacon stops sending
RTP/RTCP data to the group for three minutes, as a means of testing
the mutlicast leave/join mechanism as the connection is torn down
and then rebuilt after it times out.
Port Changes:
* IPv6 support honors WITH_IPv6 flags
* IPv6 reverse lookup support
Added file(s):
- files/extra-patch-src_beacon.in
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
Apply this diff.
>Fix:
--- beacon-1.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/beacon.orig/Makefile /usr/ports/net/beacon/Makefile
--- /usr/ports/net/beacon.orig/Makefile Wed Sep 29 14:46:26 2004
+++ /usr/ports/net/beacon/Makefile Mon Oct 25 11:17:43 2004
@@ -6,9 +6,10 @@
#
PORTNAME= beacon
-PORTVERSION= 0.9.55
+PORTVERSION= 1.1
CATEGORIES= net perl5 mbone ipv6
MASTER_SITES= http://dast.nlanr.net/Projects/Beacon/releases/
+DISTNAME= ${PORTNAME}-${PORTVERSION}-0
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Beacon active measurement tool to monitor multicast
@@ -16,14 +17,19 @@
BUILD_DEPENDS= ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
RUN_DEPENDS= ${BUILD_DEPENDS}
-BROKEN= Unfetchable
-
WWW_DIR?= ${PREFIX}/www/
PLIST_SUB+= VERSION=${PORTVERSION}
USE_PERL5= yes
USE_AUTOCONF_VER= 259
-CONFIGURE_ARGS= --enable-ipv6 --bindir=${WWW_DIR}/${PORTNAME}-${PORTVERSION}
+CONFIGURE_ARGS= --bindir=${WWW_DIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+.ifdef(WITH_IPV6)
+#enable IPv6 name lookup, and sending IPv6 multicast
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_beacon.in
+CONFUGURE_ARGS+= --enable-ipv6
+.endif
.include <bsd.port.pre.mk>
diff -ruN --exclude=CVS /usr/ports/net/beacon.orig/distinfo /usr/ports/net/beacon/distinfo
--- /usr/ports/net/beacon.orig/distinfo Sun Jul 11 22:06:33 2004
+++ /usr/ports/net/beacon/distinfo Mon Oct 25 10:33:30 2004
@@ -1,2 +1,2 @@
-MD5 (beacon-0.9.55.tar.gz) = edc9876c2ca094e12a773e9bef930a86
-SIZE (beacon-0.9.55.tar.gz) = 240630
+MD5 (beacon-1.1-0.tar.gz) = 93c7c9278b1b37a1bb6b9f4bd0af9d9d
+SIZE (beacon-1.1-0.tar.gz) = 247815
diff -ruN --exclude=CVS /usr/ports/net/beacon.orig/files/extra-patch-src_beacon.in /usr/ports/net/beacon/files/extra-patch-src_beacon.in
--- /usr/ports/net/beacon.orig/files/extra-patch-src_beacon.in Thu Jan 1 01:00:00 1970
+++ /usr/ports/net/beacon/files/extra-patch-src_beacon.in Mon Oct 25 11:15:53 2004
@@ -0,0 +1,95 @@
+
+$FreeBSD$
+
+--- src/beacon.in.orig
++++ src/beacon.in
+@@ -34,6 +34,7 @@
+ use Net::Multicast::Beacon; # Make rtp.c RTP calls available in Perl
+ use Getopt::Long; # Allow both -g -p and --group --port cmd lines
+ use IO::Socket; # For reverse IP lookups to get hostname
++use Socket6; # For reverse IPv6 lookup
+ use IO::Select;
+ use Net::Domain; # For getting the FQDN of the current host
+ use Sys::Hostname; # Other way of getting the name of the current host
+@@ -3387,21 +3388,41 @@
+ $thishost = $host;
+ $thisuser = $user;
+
+-my $packed = gethostbyname($host);
+-if (! defined $packed) { # Couldn't get it - Mark it bad
+- $thisip = "UNKN";
+-} else { # Unpack it into a string var
+- $thisip = inet_ntoa($packed); # "141.142.2.168"
+-}
++#if group address an IPv6 address, we have to find IPv6 addresses
+
+-# Do the best job we can do for getting FQDN for the hostname
+-my $lookup = gethostbyaddr(inet_aton($thisip), AF_INET);
+-if (defined $lookup) { # Only update if it worked
+- $thishost = $host = $lookup;
++if ($GROUP =~ ":" ) {
++ my @res=getaddrinfo($host,'daytime',AF_INET6);
++ my($packed,$port) = getnameinfo($res[3],NI_NUMERICHOST);
++ my($packed2,$port2) = getnameinfo($res[3]);
++
++ if( !defined $packed) {
++ $thisip = "UNKN";
++ } else {
++ $thisip = $packed;
++ }
++ if (!defined $packed2) {
++ $thishost = $host = $packed2;
++ } else {
++ $thishost = $thisip;
++ }
+ } else {
+- $thishost = $thisip;
++ my $packed = gethostbyname($host);
++ if (! defined $packed) { # Couldn't get i t - Mark it bad
++ $thisip = "UNKN";
++ } else { # Unpack it into a string var
++ $thisip = inet_ntoa($packed); # "141.142.2.168"
++ }
++
++ # Do the best job we can do for getting FQDN for the hostname
++ my $lookup = gethostbyaddr(inet_aton($thisip), AF_INET);
++ if (defined $lookup) { # Only update if it worked
++ $thishost = $host = $lookup;
++ } else {
++ $thishost = $thisip;
++ }
+ }
+
++
+ # If host still "UNKN" at this point, things are too confused to continue
+ if ($thishost eq "UNKN") {
+ die "Unable to resolve hostname -- Please check your system
+@@ -3642,11 +3663,23 @@
+
+ # Get the IP address of the hostname given in $h
+ my $hostip;
+- my $packed = gethostbyname($h);
+- if (! defined $packed) { # Couldn't get it - Mark it bad
+- $hostip = "UNKN";
+- } else { # Unpack it into a string var
+- $hostip = inet_ntoa($packed);
++ if ( $GROUP =~ ":" ) {
++ my @res = getaddrinfo($h,'daytime', AF_INET6);
++ my ($packed,$port) = getnameinfo($res[3],NI_NUMERICHOST);
++ my ($packed2,$port2) = getnameinfo($res[3]);
++ if(defined $packed) {
++ $hostip = $packed;
++ }
++ if(defined $packed2) {
++ $hostip = $packed2;
++ }
++ } else {
++ my $packed = gethostbyname($h);
++ if (! defined $packed) { # Couldn't get it - Mark it bad
++ $hostip = "UNKN";
++ } else { # Unpack it into a string var
++ $hostip = inet_ntoa($packed);
++ }
+ }
+
+ # Create a sortname using hostname and SSRC
--- beacon-1.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410250943.i9P9h4Un029701>