From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 4 21:30:17 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8589C16A41F for ; Tue, 4 Oct 2005 21:30:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF56343D58 for ; Tue, 4 Oct 2005 21:30:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j94LUGZn052409 for ; Tue, 4 Oct 2005 21:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j94LUGWT052408; Tue, 4 Oct 2005 21:30:16 GMT (envelope-from gnats) Resent-Date: Tue, 4 Oct 2005 21:30:16 GMT Resent-Message-Id: <200510042130.j94LUGWT052408@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Mikkelson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43C4016A41F for ; Tue, 4 Oct 2005 21:23:40 +0000 (GMT) (envelope-from cmikk@tig.oss.uswest.net) Received: from tig.oss.uswest.net (tig.oss.uswest.net [204.147.85.37]) by mx1.FreeBSD.org (Postfix) with ESMTP id E07B743D49 for ; Tue, 4 Oct 2005 21:23:39 +0000 (GMT) (envelope-from cmikk@tig.oss.uswest.net) Received: from tig.oss.uswest.net (localhost [127.0.0.1]) by tig.oss.uswest.net (8.13.3/8.13.3) with ESMTP id j94LNcUt076689 for ; Tue, 4 Oct 2005 21:23:38 GMT (envelope-from cmikk@tig.oss.uswest.net) Received: (from cmikk@localhost) by tig.oss.uswest.net (8.13.3/8.13.3/Submit) id j94LNcxX076688; Tue, 4 Oct 2005 16:23:38 -0500 (CDT) (envelope-from cmikk) Message-Id: <200510042123.j94LNcxX076688@tig.oss.uswest.net> Date: Tue, 4 Oct 2005 16:23:38 -0500 (CDT) From: Chris Mikkelson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/86901: [patch] Update port net/spread to version 3.17.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Chris Mikkelson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2005 21:30:17 -0000 >Number: 86901 >Category: ports >Synopsis: [patch] Update port net/spread to version 3.17.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 04 21:30:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Chris Mikkelson >Release: FreeBSD 4.11-STABLE i386 >Organization: Qwest >Environment: System: FreeBSD tig.oss.uswest.net 4.11-STABLE FreeBSD 4.11-STABLE #0: Thu Jul 28 16:29:19 CDT 2005 root@tig.oss.uswest.net:/usr/obj/usr/src/sys/TIG i386 >Description: Patch to update the net/spread port to upstream version 3.17.3. >How-To-Repeat: >Fix: --- Makefile.orig Tue Oct 4 16:10:23 2005 +++ Makefile Tue Oct 4 14:59:13 2005 @@ -6,7 +6,7 @@ # PORTNAME= spread -PORTVERSION= 3.17.2 +PORTVERSION= 3.17.3 CATEGORIES= net perl5 MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} @@ -14,7 +14,7 @@ MAINTAINER= joshua@roughtrade.net COMMENT= The Spread Group Communication System, a network toolkit -WRKSRC= ${WRKDIR}/${PORTNAME}_src-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} USE_REINPLACE= yes GNU_CONFIGURE= yes --- distinfo.orig Tue Oct 4 14:54:07 2005 +++ distinfo Tue Oct 4 15:47:12 2005 @@ -1,2 +1,2 @@ -MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1 -SIZE (spread-src-3.17.2.tar.gz) = 289180 +MD5 (spread-src-3.17.3.tar.gz) = 2eec25b5adc96fd840aa251e44325f9f +SIZE (spread-src-3.17.3.tar.gz) = 299975 --- orig-files/patch-Makefile.in Tue Oct 4 14:53:43 2005 +++ files/patch-Makefile.in Tue Oct 4 14:52:54 2005 @@ -1,5 +1,5 @@ ---- Makefile.in Thu Nov 13 08:42:54 2003 -+++ Makefile.in Thu Jul 15 21:42:27 2004 +--- Makefile.in Thu Sep 23 12:12:52 2004 ++++ Makefile.in Tue Oct 4 14:49:56 2005 @@ -26,7 +26,7 @@ #Rules: major -- inc for incompatible change # : minor -- inc for bugfix or forward compatible change @@ -30,7 +30,7 @@ LIBSP_OBJS= alarm.o events.o memory.o sp.o -@@ -124,8 +126,11 @@ +@@ -127,8 +129,11 @@ $(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.$(LIBVERSION).dylib libspread.dylib) @@ -44,7 +44,7 @@ install-libspread.so: libspread.so $(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION) -@@ -143,8 +148,11 @@ +@@ -146,8 +151,11 @@ $(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.$(LIBVERSION).dylib libtspread.dylib) @@ -58,31 +58,31 @@ install-libtspread.so: libtspread.so $(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION) -@@ -153,17 +161,17 @@ +@@ -156,11 +164,11 @@ spread$(EXEEXT): $(SPREADOBJS) $(LD) -o $@ $(SPREADOBJS) $(LDFLAGS) $(LIBS) -spuser$(EXEEXT): libspread.a user.o - $(LD) -o $@ user.o $(LDFLAGS) libspread.a $(LIBS) -+spuser$(EXEEXT): libspread.so user.o ++spuser$(EXEEXT): libspread.a user.o + $(LD) -o $@ user.o $(LDFLAGS) -lspread $(LIBS) --spflooder$(EXEEXT): libspread.a flooder.o + spflooder$(EXEEXT): libspread.a flooder.o - $(LD) -o $@ flooder.o $(LDFLAGS) libspread.a $(LIBS) -+spflooder$(EXEEXT): libspread.so flooder.o + $(LD) -o $@ flooder.o $(LDFLAGS) -lspread $(LIBS) - spmonitor$(EXEEXT): $(MONITOROBJS) - $(LD) -o $@ $(MONITOROBJS) $(LDFLAGS) $(LIBS) + spmonitor$(EXEEXT): $(MONITOR_OBJS) + $(LD) -o $@ $(MONITOR_OBJS) $(LDFLAGS) $(LIBS) +@@ -169,7 +177,7 @@ + $(LD) $(THLDFLAGS) -o $@ $(TMONITOR_OBJS) $(LDFLAGS) $(LIBS) $(THLIBS) --sptuser$(EXEEXT): user.to libtspread.a + sptuser$(EXEEXT): user.to libtspread.a - $(LD) $(THLDFLAGS) -o $@ user.to libtspread.a $(LDFLAGS) $(LIBS) $(THLIBS) -+sptuser$(EXEEXT): user.to libtspread.so -+ $(LD) $(THLDFLAGS) -o $@ user.to -ltspread $(LDFLAGS) $(LIBS) $(THLIBS) ++ $(LD) $(THLDFLAGS) -o $@ user.to -lspread $(LDFLAGS) $(LIBS) $(THLIBS) spsimple_user$(EXEEXT): simple_user.o libspread.a $(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS) -@@ -192,7 +200,7 @@ +@@ -198,7 +206,7 @@ fi clean: @@ -91,7 +91,7 @@ rm -f config.cache config.log docs/*.out core rm -rf autom4te.cache -@@ -248,11 +256,6 @@ +@@ -254,11 +262,6 @@ done if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ --- orig-files/patch-configuration.c Tue Oct 4 14:53:43 2005 +++ files/patch-configuration.c Tue Oct 4 14:53:01 2005 @@ -1,6 +1,6 @@ ---- configuration.c Sun Sep 22 12:56:52 2002 -+++ configuration.c Tue Aug 5 21:24:19 2003 -@@ -128,9 +128,6 @@ +--- configuration.c Mon Sep 27 00:15:48 2004 ++++ configuration.c Tue Oct 4 14:40:51 2005 +@@ -130,9 +130,6 @@ if (NULL != (yyin = fopen(file_name,"r")) ) Alarm( PRINT, "Conf_init: using file: %s\n", file_name); --- orig-files/patch-sp.c Tue Oct 4 14:53:43 2005 +++ files/patch-sp.c Tue Oct 4 14:52:46 2005 @@ -1,11 +1,11 @@ ---- sp.c Tue Aug 5 21:35:28 2003 -+++ sp.c Tue Aug 5 21:24:19 2003 -@@ -551,7 +551,7 @@ - Alarm( SESSION, "SP_connect: set sndbuf/rcvbuf to %d\n", 1024*(i-5) ); +--- sp.c Tue Oct 5 09:08:10 2004 ++++ sp.c Tue Oct 4 14:44:27 2005 +@@ -591,7 +591,7 @@ + set_large_socket_buffers(s); unix_addr.sun_family = AF_UNIX; - sprintf( unix_addr.sun_path, "/tmp/%d", port ); + sprintf( unix_addr.sun_path, "%s/spread.sock", _PATH_SPREAD_PIDDIR ); - while( ((ret = connect( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr) )) == -1) - && ((sock_errno == EINTR) || (sock_errno == EAGAIN) || (sock_errno == EWOULDBLOCK)) ) - { + ret = connect_nointr_timeout( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr), &time_out); + #endif /* !ARCH_PC_WIN95 */ + } >Release-Note: >Audit-Trail: >Unformatted: