ports/131561: updcast upgrade to 20081213
Leon Kos
leon.kos at lecad.fs.uni-lj.si
Tue Feb 10 15:30:03 UTC 2009
>Number: 131561
>Category: ports
>Synopsis: updcast upgrade to 20081213
>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: Tue Feb 10 15:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Leon Kos
>Release: RELENG_7
>Organization:
University of Ljubljana
>Environment:
N/A
>Description:
ports/mbone/udpcast is form 2004 and it does not work with latest utilities like Trinity Rescue Kit.
Attached tar upgrades udpcast to latest version.
Some patches were removed. So please remove mbone/udpcast before unpacking.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# udpcast
# udpcast/files
# udpcast/files/patch-participants.h
# udpcast/files/patch-socklib.c
# udpcast/files/patch-udpr-negotiate.c
# udpcast/files/patch-rateGovernor.c
# udpcast/files/patch-libbb_udpcast.h
# udpcast/Makefile
# udpcast/distinfo
# udpcast/pkg-descr
#
echo c - udpcast
mkdir -p udpcast > /dev/null 2>&1
echo c - udpcast/files
mkdir -p udpcast/files > /dev/null 2>&1
echo x - udpcast/files/patch-participants.h
sed 's/^X//' >udpcast/files/patch-participants.h << '5a9b1dd8c93e8fcb433bf8162d75a451'
X--- participants.h.orig 2005-12-22 23:59:18.000000000 +0100
X+++ participants.h 2009-02-05 12:18:19.000000000 +0100
X@@ -3,6 +3,10 @@
X
X #define MAX_CLIENTS 1024
X
X+#include <sys/types.h>
X+#include <sys/socket.h>
X+
X+
X typedef struct participantsDb *participantsDb_t;
X
X #define isParticipantValid udpc_isParticipantValid
5a9b1dd8c93e8fcb433bf8162d75a451
echo x - udpcast/files/patch-socklib.c
sed 's/^X//' >udpcast/files/patch-socklib.c << '0e382f446cdfc1b826448e8cbb3799ad'
X--- socklib.c.orig 2008-09-18 22:43:15.000000000 +0200
X+++ socklib.c 2009-02-10 10:01:40.000000000 +0100
X@@ -18,6 +18,7 @@
X #endif
X
X #ifdef HAVE_NET_IF_H
X+# include <sys/socket.h>
X # include <net/if.h>
X #endif
X
X@@ -66,6 +67,8 @@
X # define DEBUG 0
X #endif
X
X+#undef SIOCGIFINDEX
X+
X #ifdef LOSSTEST
X /**
X * Packet loss/swap testing...
X@@ -353,7 +356,7 @@
X
X int setTtl(int sock, int ttl) {
X /* set the socket to broadcast */
X- return setsockopt(sock, SOL_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(int));
X+ return setsockopt(sock, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(int));
X }
X
X #ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX
X@@ -422,7 +425,7 @@
X
X
X int setMcastDestination(int sock, net_if_t *net_if, struct sockaddr_in *addr) {
X-#ifdef WINDOWS
X+#if defined(WINDOWS) || defined(__FreeBSD__)
X int r;
X struct sockaddr_in interface_addr;
X struct in_addr if_addr;
X@@ -720,7 +723,7 @@
X
X net_if->name = strdup(chosen->ifr_name);
X
X-#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX
X+#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX__TODO
X /* Index for multicast subscriptions */
X if(ioctl(s, SIOCGIFINDEX, chosen) < 0)
X udpc_fatal(-1, "Error getting index for %s: %s", net_if->name,
0e382f446cdfc1b826448e8cbb3799ad
echo x - udpcast/files/patch-udpr-negotiate.c
sed 's/^X//' >udpcast/files/patch-udpr-negotiate.c << 'd824e372e6bd23832b0df26295915c64'
X--- udpr-negotiate.c.orig 2007-05-25 12:01:59.000000000 +0200
X+++ udpr-negotiate.c 2009-02-06 08:18:02.000000000 +0100
X@@ -3,6 +3,10 @@
X #include <errno.h>
X #include <sys/stat.h>
X
X+#if (defined(__unix__) || defined(unix)) && !defined(USG)
X+#include <sys/param.h>
X+#endif
X+
X #include "log.h"
X #include "socklib.h"
X #include "udpcast.h"
X@@ -82,13 +86,13 @@
X if(disk_config->fileName != NULL) {
X int oflags = O_CREAT | O_WRONLY;
X if((disk_config->flags & FLAG_SYNC)) {
X- oflags |= O_SYNC;
X+ oflags |= O_FSYNC;
X } else if( !(disk_config->flags & FLAG_NOSYNC)) {
X struct stat buf;
X if(stat(disk_config->fileName, &buf) == 0) {
X /* If target is device, open it synchronously */
X if(S_ISCHR(buf.st_mode) || S_ISBLK(buf.st_mode))
X- oflags |= O_SYNC;
X+ oflags |= O_FSYNC;
X }
X }
X outFile = open(disk_config->fileName, oflags | O_BINARY, 0644);
d824e372e6bd23832b0df26295915c64
echo x - udpcast/files/patch-rateGovernor.c
sed 's/^X//' >udpcast/files/patch-rateGovernor.c << '77cf64e866dda2a812f30b81d77e838e'
X--- rateGovernor.c.orig 2008-09-20 09:07:29.000000000 +0200
X+++ rateGovernor.c 2009-02-09 08:20:17.000000000 +0100
X@@ -23,6 +23,25 @@
X #define DL_RATE_GOVERNOR
X #endif
X
X+
X+#ifdef __FreeBSD__
X+char *
X+strndup(const char *str, size_t n)
X+{
X+ size_t len;
X+ char *copy;
X+
X+ for (len = 0; len < n && str[len]; len++)
X+ continue;
X+
X+ if ((copy = malloc(len + 1)) == NULL)
X+ return (NULL);
X+ memcpy(copy, str, len);
X+ copy[len] = '\0';
X+ return (copy);
X+}
X+#endif
X+
X void *rgInitGovernor(struct net_config *cfg, struct rateGovernor_t *gov)
X {
X if(cfg->nrGovernors == MAX_GOVERNORS) {
77cf64e866dda2a812f30b81d77e838e
echo x - udpcast/files/patch-libbb_udpcast.h
sed 's/^X//' >udpcast/files/patch-libbb_udpcast.h << '606023adaed8ee6231bce2a6da9d7e25'
X--- libbb_udpcast.h.orig 2009-02-10 10:07:40.000000000 +0100
X+++ libbb_udpcast.h 2009-02-10 10:06:51.000000000 +0100
X@@ -24,6 +24,10 @@
X #include <malloc.h>
X #endif
X
X+#ifdef HAVE_STDLIB_H
X+ #include <stdlib.h>
X+#endif
X+
X #define xmalloc malloc
X
X #endif /* BB_VER */
606023adaed8ee6231bce2a6da9d7e25
echo x - udpcast/Makefile
sed 's/^X//' >udpcast/Makefile << '34e5ff9cf256dd5bc5f94576d52bc2d1'
X# New ports collection makefile for: udpcast
X# Date created: Mon Jul 19 19:10:56 UTC 2004
X# Whom: Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
X#
X# $FreeBSD: ports/mbone/udpcast/Makefile,v 1.6 2008/03/20 09:51:38 pav Exp $
X#
X
XPORTNAME= udpcast
XPORTVERSION= 0.${RELEASE_DATE}
XCATEGORIES= mbone sysutils
XMASTER_SITES= http://udpcast.linux.lu/download/
XDISTNAME= ${PORTNAME}-${RELEASE_DATE}
X
XMAINTAINER= ports at FreeBSD.org
XCOMMENT= A file transfer tool using ethernet's multicast
X
XUSE_GMAKE= yes
XUSE_PERL5_BUILD= yes
XWRKSRC= ${WRKDIR}/${PORTNAME}-${RELEASE_DATE}
X
XRELEASE_DATE= 20081213
X
XPROGRAM_SBIN_FILES= udp-receiver udp-sender
X
XPLIST_FILES= sbin/udp-receiver \
X sbin/udp-sender
XPORTDOCS= Changelog.txt cmd.html
X
XMAN1= udp-receiver.1 udp-sender.1
X
XGNU_CONFIGURE= yes
XCONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
X LIBS="-L${LOCALBASE}/lib"
X
X
Xdo-install:
X.ifndef(NOPORTDOCS)
X ${MKDIR} ${DOCSDIR}
X. for file in ${PORTDOCS}
X @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
X. endfor
X.endif
X.for file in ${PROGRAM_SBIN_FILES}
X @${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/sbin/
X.endfor
X.for file in ${MAN1}
X @${INSTALL_MAN} ${WRKSRC}/${file} ${MANPREFIX}/man/man1/
X.endfor
X
X.include <bsd.port.mk>
34e5ff9cf256dd5bc5f94576d52bc2d1
echo x - udpcast/distinfo
sed 's/^X//' >udpcast/distinfo << '58a5f3630ee3cd744a7519a322edebf6'
XMD5 (udpcast-20081213.tar.gz) = 23f3371cb60a1f66f6be12fa98d4d5ca
XSHA256 (udpcast-20081213.tar.gz) = 73adac6869e7653ad33a3b92498080a2a0398c60ac78c50a701057325f612d57
XSIZE (udpcast-20081213.tar.gz) = 160550
58a5f3630ee3cd744a7519a322edebf6
echo x - udpcast/pkg-descr
sed 's/^X//' >udpcast/pkg-descr << '9a5197915710de5c822a131313a6818c'
X[ excerpt taken from developer's www site ]
X
XUDPcast is a file transfer tool that can send data simultaneously
Xto many destinations on a LAN. This can for instance be used to
Xinstall entire classrooms of PC's at once. The advantage of UDPcast
Xover using other methods (nfs, ftp, whatever) is that UDPcast uses
XEthernet's multicast abilities: it won't take longer to install 15
Xmachines than it would to install just 2.
X
XWWW: http://udpcast.linux.lu/
9a5197915710de5c822a131313a6818c
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list