Date: Wed, 26 Jan 2011 09:49:21 +0300 (MSK) From: Yuri Pankov <yuri.pankov@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ohauer@FreeBSD.org Subject: ports/154300: [PATCH] net/sflowtool: update to 3.18 Message-ID: <201101260649.p0Q6nLgk041173@darklight.org.ru> Resent-Message-ID: <201101260720.p0Q7K6nQ061134@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154300
>Category: ports
>Synopsis: [PATCH] net/sflowtool: update to 3.18
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 26 07:20:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Yuri Pankov
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD darklight.org.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r217871: Wed Jan 26 08:55:13 MSK
>Description:
- Update to 3.18
- Add a patch to make sflowtool actually work (bind to wildcard ipv4 address), otherwise:
> sflowtool
bind() failed, port = 6343 : Invalid argument
> truss sflowtool
...
bind(3,{ AF_INET6 [93d3:202c:bd39:78dc:705f:5100::]:0 },28) ERR#22 'Invalid argument'
...
Added file(s):
- files/patch-src__sflowtool.c
Port maintainer (ohauer@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- sflowtool-3.18.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/sflowtool/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 30 Dec 2010 17:56:02 -0000 1.5
+++ Makefile 26 Jan 2011 06:30:42 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= sflowtool
-PORTVERSION= 3.17
+PORTVERSION= 3.18
CATEGORIES= net
MASTER_SITES= http://www.inmon.com/bin/
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/sflowtool/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 30 Dec 2010 17:56:02 -0000 1.5
+++ distinfo 26 Jan 2011 06:30:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (sflowtool-3.17.tar.gz) = e102c4edcc9dde91cd6f020ce4699fbf55f43fa5ffd215809436da5e6848af0b
-SIZE (sflowtool-3.17.tar.gz) = 153277
+SHA256 (sflowtool-3.18.tar.gz) = b671156553915fcba84d90d932e12599c67a183fea86a8956d58cc9f4a22ac5e
+SIZE (sflowtool-3.18.tar.gz) = 148020
Index: files/patch-src__sflowtool.c
===================================================================
RCS file: files/patch-src__sflowtool.c
diff -N files/patch-src__sflowtool.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-src__sflowtool.c 26 Jan 2011 06:30:42 -0000
@@ -0,0 +1,31 @@
+--- ./src/sflowtool.c.orig 2011-01-26 04:35:22.270624572 +0300
++++ ./src/sflowtool.c 2011-01-26 04:36:29.375609602 +0300
+@@ -3238,14 +3238,14 @@
+ static int openInputUDPSocket(u_int16_t port)
+ {
+ int soc;
+- struct sockaddr_in6 myaddr_in;
++ struct sockaddr_in myaddr_in;
+ long save_fd;
+
+ /* Create socket */
+- memset((char *)&myaddr_in, 0, sizeof(struct sockaddr_in6));
+- myaddr_in.sin6_family = AF_INET6;
+- //myaddr_in.sin_addr.s_addr = INADDR_ANY;
+- myaddr_in.sin6_port = htons(port);
++ memset((char *)&myaddr_in, 0, sizeof(struct sockaddr_in));
++ myaddr_in.sin_family = AF_INET;
++ myaddr_in.sin_addr.s_addr = INADDR_ANY;
++ myaddr_in.sin_port = htons(port);
+
+ if ((soc = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
+ fprintf(stderr, "socket() failed, %s\n", strerror(errno));
+@@ -3260,7 +3260,7 @@
+ #endif /* WIN32 */
+
+ /* Bind the socket */
+- if (bind(soc, (struct sockaddr *)&myaddr_in, sizeof(struct sockaddr_in6)) == -1) {
++ if (bind(soc, (struct sockaddr *)&myaddr_in, sizeof(struct sockaddr_in)) == -1) {
+ fprintf(stderr, "bind() failed, port = %d : %s\n", port, strerror(errno));
+ exit(-7);
+ }
--- sflowtool-3.18.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?201101260649.p0Q6nLgk041173>