Update to 3.17.1

The NetBSD project now has the permission to download the archive from
the official Spread site and to mirror it, so remove the restrictions.

changes:
*) Fix memory corruption and crash with groups of large size.
*) Correct make install so it installs header files.
*) Fix syntax error in build.xml file for Java/Ant.
*) Cleanup prototypes to remove compiler warnings.
*) Fix parser to correctly recognize upper, lower, and mixed case command options.
*) During make install, remove old symlinks.
*) Change setgroups call to be more portable. (fixes MacOSX)
*) Change name of r and s to sprecv and spsend, and add as make targets.
   They can be built by "make testprog" (not built by default).
*) Work on making long group names possible.
*) Increase listen backlog for accepting client connections.
*) Fix Win32 project files to have correct path to source files.
   (note CVS was always ok, but 3.17.0 release had incorrect path)
*) Fix bug where large groups overflow Mess_buf in groups.c.
*) Fix memory corruption bug when a message header is received in
   several separate packets in session.c. Thanks to Ryan Caudy for
   many, many hours tracking this down.
*) Change order of build in Makefile so binaries are built before
   documentation.
*) Fix Java bug where connection objects cannot be disconnected and
   then reconnected, but must be created anew. They can now be reused.
*) Fix compile error on AIX for struct if_info.
*) Fix security issue with buffer checks in the C library.
*) Fix obscure off-by-one buffer error with the parser.

9 files changed, 42 insertions, 229 deletions

diff --git a/net/spread/Makefile b/net/spread/Makefile
index c2817817118..3ffc76aeed9 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,46 +1,35 @@
-# $NetBSD: Makefile,v 1.6 2003/07/30 10:41:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/09 13:07:40 recht Exp $
 #
 
-DISTNAME=	${BASENAME}-src-${VER}
-PKGNAME=	${BASENAME}-${VER}
-PKGREVISION=	1
+DISTNAME=	spread-src-3.17.1
+PKGNAME=	${DISTNAME:S/-src//}
 WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=
+MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
 
 MAINTAINER=	marc@informatik.uni-bremen.de
 HOMEPAGE=	http://www.spread.org/
 COMMENT=	Group communication system providing a number of messaging services
 
-INTERACTIVE_STAGE=	fetch
-
-_FETCH_MESSAGE= \
-	${ECHO} '======================================================='; \
-	${ECHO} 'Distfile has to be manually fetched from'; \
-	${ECHO} '   http://www.cnds.jhu.edu/download/download_spread.cgi'; \
-	${ECHO} '======================================================='
-
-BASENAME=	spread
-VER=		3.17.0
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
-
-BUILD_DEPENDS+=        perl-[0-9]*:../../lang/perl5:build
-LDFLAGS	+=	-lutil
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/spread
+MAKE_FLAGS=	LD="${CC}"
 
 SPREAD_USER=	spread
 SPREAD_GROUP=	spread
 
 FILES_SUBST+=	SPREAD_USER=${SPREAD_USER}
 FILES_SUBST+=	SPREAD_GROUP=${SPREAD_GROUP}
+FILES_SUBST+=	RUNTIME_DIR=${RUNTIME_DIR}
 
 BUILD_DEFS+=	SPREAD_USER SPREAD_GROUP
 
 INCLUDEDIR=	${PREFIX}/include/spread
 DOCSDIR=	${PREFIX}/share/doc/spread
 EXAMPLEDIR=	${PREFIX}/share/examples/spread
-RUNDIR=		/var/run/spread
+RUNTIME_DIR=	/var/run/spread
 
 RCD_SCRIPTS=	spread
 PKG_GROUPS=	${SPREAD_USER}
@@ -48,8 +37,7 @@ PKG_USERS=	${SPREAD_USER}:${SPREAD_GROUP}
 CONF_FILES=	${EXAMPLEDIR}/spread.access_ip.sample ${PKG_SYSCONFBASE}/spread.access_ip
 CONF_FILES+=	${EXAMPLEDIR}/spread.conf.sample ${PKG_SYSCONFBASE}/spread.conf
 
-pre-install:
-	${INSTALL_DATA_DIR} ${INCLUDEDIR}
+OWN_DIRS_PERMS=	${RUNTIME_DIR} ${SPREAD_USER} ${SPREAD_GROUP} 0750
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCSDIR}
@@ -59,7 +47,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}/Readme.txt
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE
 	${INSTALL_DATA} ${WRKSRC}/Short_Buffer_Handling.txt ${DOCSDIR}/Short_Buffer_Handling.txt
-	${INSTALL} -d -o ${SPREAD_USER} -g ${SPREAD_GROUP} -m 0750 ${RUNDIR}
 
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/spread/PLIST b/net/spread/PLIST
index d3a22a98eca..23220f5f011 100644
--- a/net/spread/PLIST
+++ b/net/spread/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/22 23:37:14 mjl Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/08/09 13:07:41 recht Exp $
 bin/spflooder
 bin/spmonitor
 bin/sptuser
@@ -8,10 +8,10 @@ include/spread/sp_events.h
 include/spread/sp_func.h
 lib/libspread.a
 lib/libspread.so
-lib/libspread.so.1
+lib/libspread.so.1.0
 lib/libtspread.a
 lib/libtspread.so
-lib/libtspread.so.1
+lib/libtspread.so.1.0
 man/man1/spflooder.1
 man/man1/spmonitor.1
 man/man1/spread.1
@@ -40,4 +40,3 @@ share/examples/spread/spread.conf.sample
 @dirrm share/examples/spread
 @dirrm share/doc/spread
 @dirrm include/spread
-@unexec ${RMDIR} %D/var/run/spread 2>/dev/null || ${TRUE}
diff --git a/net/spread/buildlink2.mk b/net/spread/buildlink2.mk
index 55abec527b0..6973ebe9a87 100644
--- a/net/spread/buildlink2.mk
+++ b/net/spread/buildlink2.mk
@@ -1,22 +1,23 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:56:12 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/08/09 13:07:41 recht Exp $
+#
 
 .if !defined(SPREAD_BUILDLINK2_MK)
-SPREAD_BUILDLINK2_MK=		# defined
+SPREAD_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		spread
-BUILDLINK_DEPENDS.spread?=	spread>=3.17.0nb1
-BUILDLINK_PKGSRCDIR.spread?=	../../net/spread
+BUILDLINK_PACKAGES+=			spread
+BUILDLINK_DEPENDS.spread?=		spread>=3.17.1
+BUILDLINK_PKGSRCDIR.spread?=		../../net/spread
 
-EVAL_PREFIX+=			BUILDLINK_PREFIX.spread=spread
-BUILDLINK_PREFIX.spread_DEFAULT=${LOCALBASE}
+EVAL_PREFIX+=	BUILDLINK_PREFIX.spread=spread
+BUILDLINK_PREFIX.spread_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.spread+=	include/spread/sp.h
 BUILDLINK_FILES.spread+=	include/spread/sp_events.h
 BUILDLINK_FILES.spread+=	include/spread/sp_func.h
 BUILDLINK_FILES.spread+=	lib/libspread.*
 BUILDLINK_FILES.spread+=	lib/libtspread.*
 
-BUILDLINK_TARGETS+=		spread-buildlink
+BUILDLINK_TARGETS+=	spread-buildlink
 
 spread-buildlink: _BUILDLINK_USE
 
-.endif # SPREAD_BUILDLINK2_MK
+.endif	# SPREAD_BUILDLINK2_MK
diff --git a/net/spread/distinfo b/net/spread/distinfo
index 54c12398707..6d1f8cee27f 100644
--- a/net/spread/distinfo
+++ b/net/spread/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.2 2003/02/22 23:37:14 mjl Exp $
+$NetBSD: distinfo,v 1.3 2003/08/09 13:07:41 recht Exp $
 
-SHA1 (spread-src-3.17.0.tar.gz) = 1d9d431583ae8692e07f871ae0f4d8f1cb3e4b41
-Size (spread-src-3.17.0.tar.gz) = 285740 bytes
-SHA1 (patch-aa) = 1463ac26917c044476e206eed87338fa422869d5
+SHA1 (spread-src-3.17.1.tar.gz) = c316370aa565ec76e67ed3c6bcceba1702395f56
+Size (spread-src-3.17.1.tar.gz) = 290861 bytes
 SHA1 (patch-ba) = 90f2896dc62627772a05c06add99c59a55e91c88
 SHA1 (patch-bb) = efd9b08d775542622ce35265e2b72d655b5ca00f
-SHA1 (patch-bc) = d3b0e7e7841da86a8eae81eab691977c8d128743
-SHA1 (patch-bd) = 0972e0a683c53fa2ae3c16cd3cf468342ac4c4a2
-SHA1 (patch-be) = 43acfde2afea8485b6369bb96a104741d0735916
+SHA1 (patch-bd) = 5d09d5e182cb2bf52f6366ff02e4f73dcd067e5e
diff --git a/net/spread/files/spread.sh b/net/spread/files/spread.sh
index 80973c9b3b6..d00c3347ef2 100644
--- a/net/spread/files/spread.sh
+++ b/net/spread/files/spread.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: spread.sh,v 1.1 2003/02/22 23:37:14 mjl Exp $
+# $NetBSD: spread.sh,v 1.2 2003/08/09 13:07:42 recht Exp $
 #
 # PROVIDE: spread
 # REQUIRE: DAEMON
@@ -27,6 +27,17 @@ fi
 required_files="@PKG_SYSCONFDIR@/spread.conf"
 
 command_args="${log} </dev/null &"
+start_precmd="spread_precmd"
+
+spread_precmd()
+{
+        if [ ! -d @RUNTIME_DIR@ ]
+        then
+                @MKDIR@ @RUNTIME_DIR@
+                @CHMOD@ 0750 @RUNTIME_DIR@
+                @CHOWN@ @PKG_USERS@ @RUNTIME_DIR@
+        fi
+}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/net/spread/patches/patch-aa b/net/spread/patches/patch-aa
deleted file mode 100644
index d113a89a3f3..00000000000
--- a/net/spread/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/02/22 23:37:15 mjl Exp $
-
---- configure.orig	2003-02-19 09:56:29.000000000 +0100
-+++ configure	2003-02-19 09:55:41.000000000 +0100
-@@ -1250,9 +1250,9 @@
- 	{ echo "configure: error: *** 'ar' missing, please install or fix your \$PATH ***" 1>&2; exit 1; }
- fi
- 
--if test -z "$LD" ; then
-+# if test -z "$LD" ; then
- 	LD=$CC
--fi
-+# fi
- 
- 	
- # C Compiler features
-@@ -3956,6 +3956,7 @@
- G=`eval echo ${piddir}` ; G=`eval echo ${G}`
- H=`eval echo ${LIBSPSO}`; H=`eval echo ${H}`
- I=`eval echo ${LIBTSPSO}`; I=`eval echo ${I}`
-+J=`eval echo ${includedir}`; J=`eval echo ${J}`
- 
- echo ""
- echo "Spread has been configured with the following options:"
-@@ -3965,6 +3966,7 @@
- echo "                   User libraries: $E"
- echo "            Shared Spread LIbrary: $H"
- echo "Shared Thread-safe Spread LIbrary: $I"
-+echo "                     Header files: $J"
- echo "                     Manual pages: $F"
- echo "                         PID file: $G"
- echo "                   Manpage format: $MANTYPE"
diff --git a/net/spread/patches/patch-bc b/net/spread/patches/patch-bc
deleted file mode 100644
index 5d41a78516d..00000000000
--- a/net/spread/patches/patch-bc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
-
---- spread.c.orig	2003-02-18 20:57:01.000000000 +0100
-+++ spread.c	2003-02-18 20:59:32.000000000 +0100
-@@ -47,6 +47,7 @@
- #include <grp.h>
- #include <pwd.h>
- #include <unistd.h>
-+#include <util.h>
- #include <sys/types.h>
- #endif
- 
-@@ -144,6 +145,8 @@
- 
- #endif	/* ARCH_PC_WIN95 */
- 
-+        pidfile("spread");
-+
-         /* initialize each valid authentication protocol */
-         null_init();
-         ip_init();
diff --git a/net/spread/patches/patch-bd b/net/spread/patches/patch-bd
index f6caa0a7f58..66d7fe4db49 100644
--- a/net/spread/patches/patch-bd
+++ b/net/spread/patches/patch-bd
@@ -1,116 +1,8 @@
-$NetBSD: patch-bd,v 1.2 2003/02/22 23:37:15 mjl Exp $
+$NetBSD: patch-bd,v 1.3 2003/08/09 13:07:43 recht Exp $
 
---- Makefile.in.orig	2003-02-19 09:53:03.000000000 +0100
-+++ Makefile.in	2003-02-19 09:52:48.000000000 +0100
-@@ -5,6 +5,7 @@
- bindir=@bindir@
- sbindir=@sbindir@
- libdir=@libdir@
-+includedir=@includedir@
- mandir=@mandir@
- mansubdir=@mansubdir@
- sysconfdir=@sysconfdir@
-@@ -25,7 +26,7 @@
- #Rules: major  -- inc for incompatible change
- #     : minor  -- inc for bugfix or forward compatible change
- 
--LIBVERSION=1.0
-+LIBVERSION=1
- 
- PATHS= 
- 
-@@ -33,7 +34,7 @@
- LD=@LD@
- CFLAGS=@CFLAGS@
- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
--LDFLAGS=@LDFLAGS@
-+LDFLAGS=@LDFLAGS@ -L.
- LIBS=@LIBS@
- THLDFLAGS=@THLDFLAGS@
- THLIBS=@THLIBS@
-@@ -51,8 +52,10 @@
- PERL=@PERL@
- ENT=@ENT@
- EXEEXT=@EXEEXT@
-+SHLDSONAME=-Wl,-soname,libspread.so.$(LIBVERSION)
-+TSHLDSONAME=-Wl,-soname,libtspread.so.$(LIBVERSION)
- 
--TARGETS=spread$(EXEEXT) spuser$(EXEEXT) spflooder$(EXEEXT) spmonitor$(EXEEXT) sptuser${EXEEXT} @LIBSPSO@ @LIBTSPSO@
-+TARGETS=spread$(EXEEXT) spuser$(EXEEXT) spflooder$(EXEEXT) spmonitor$(EXEEXT) sptuser${EXEEXT} @LIBSPSO@ @LIBTSPSO@ libspread.a libtspread.a
- 
- LIBSP_OBJS= alarm.o events.o memory.o sp.o
- 
-@@ -123,8 +126,11 @@
- 	$(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib
- 	(cd $(DESTDIR)$(libdir); $(SOFTLINK) libspread.$(LIBVERSION).dylib libspread.dylib)
- 
--libspread.so:	$(LIBSP_SHOBJS)
--	$(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS)
-+libspread.so:	$@.$(LIBVERSION)
-+	$(SOFTLINK) $@.$(LIBVERSION) $@
-+
-+libspread.so.$(LIBVERSION):	$(LIBSP_SHOBJS)
-+	$(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDSONAME) $(SHLDFLAGS) $(SHLIBS)
- 
- install-libspread.so:	libspread.so
- 	$(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
-@@ -142,8 +148,11 @@
- 	$(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
- 	(cd $(DESTDIR)$(libdir); $(SOFTLINK) libtspread.$(LIBVERSION).dylib libtspread.dylib)
- 
--libtspread.so:	$(LIBTSP_SHOBJS)
--	$(SHLD) -o $@ $(LIBTSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
-+libtspread.so:	$@.$(LIBVERSION)
-+	$(SOFTLINK) $@.$(LIBVERSION) $@
-+
-+libtspread.so.$(LIBVERSION):	$(LIBTSP_SHOBJS)
-+	$(SHLD) -o $@ $(LIBTSP_SHOBJS) $(TSHLDSONAME) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
- 
- install-libtspread.so:	libtspread.so
- 	$(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
-@@ -152,17 +161,17 @@
- 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
-+	$(LD) -o $@ user.o $(LDFLAGS) -lspread $(LIBS)
- 
--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) 
- 
--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)
- 
- spsimple_user$(EXEEXT): simple_user.o libspread.a
- 	$(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS) 
-@@ -211,6 +220,7 @@
- install-files:
- 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sbindir)
-+	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(includedir)
- 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)
- 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
- 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)3
-@@ -222,6 +232,9 @@
- 	$(INSTALL) -m 0755 -s spread$(EXEEXT) $(DESTDIR)$(sbindir)/spread$(EXEEXT)
- 	$(INSTALL) -m 644 libspread.a $(DESTDIR)$(libdir)/libspread.a
- 	$(INSTALL) -m 644 libtspread.a $(DESTDIR)$(libdir)/libtspread.a
-+	$(INSTALL) -m 644 sp.h $(DESTDIR)$(includedir)/spread/sp.h
-+	$(INSTALL) -m 644 sp_func.h $(DESTDIR)$(includedir)/spread/sp_func.h
-+	$(INSTALL) -m 644 sp_events.h $(DESTDIR)$(includedir)/spread/sp_events.h
- 	$(INSTALL) -m 644 docs/spread.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/spread.1
- 	$(INSTALL) -m 644 docs/spuser.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/spuser.1
- 	$(INSTALL) -m 644 docs/sptuser.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sptuser.1
-@@ -235,11 +248,11 @@
+--- Makefile.in.orig	2003-06-17 21:00:10.000000000 +0200
++++ Makefile.in	2003-06-21 10:52:24.000000000 +0200
+@@ -248,11 +256,11 @@
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  		$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
  	fi
diff --git a/net/spread/patches/patch-be b/net/spread/patches/patch-be
deleted file mode 100644
index e0723c6eef9..00000000000
--- a/net/spread/patches/patch-be
+++ /dev/null
@@ -1,21 +0,0 @@
-+$NetBSD: patch-be,v 1.1 2003/02/22 23:37:15 mjl Exp $
-+
-+Index: sp_func.h
-+===================================================================
-+RCS file: /storage/cvsroot/spread/daemon/sp_func.h,v
-+retrieving revision 1.3
-+diff -u -u -r1.3 sp_func.h
-+--- sp_func.h	22 Sep 2002 02:56:52 -0000	1.3
-++++ sp_func.h	1 Oct 2002 15:43:22 -0000
-+@@ -90,9 +90,9 @@
-+ 			 scatter *scat_mess );
-+ 
-+ /* returns offset in memb. message of gid (group id), num_vs and vs_set */
-+-int SP_get_gid_offset_memb_mess();
-+-int SP_get_num_vs_offset_memb_mess();
-+-int SP_get_vs_set_offset_memb_mess();
-++int SP_get_gid_offset_memb_mess(void);
-++int SP_get_num_vs_offset_memb_mess(void);
-++int SP_get_vs_set_offset_memb_mess(void);
-+ 
-+ int	SP_poll( mailbox mbox );