summaryrefslogtreecommitdiff
path: root/net/spread
diff options
context:
space:
mode:
Diffstat (limited to 'net/spread')
-rw-r--r--net/spread/Makefile11
-rw-r--r--net/spread/distinfo13
-rw-r--r--net/spread/patches/patch-ba14
-rw-r--r--net/spread/patches/patch-bb14
-rw-r--r--net/spread/patches/patch-bd20
-rw-r--r--net/spread/patches/patch-bf24
6 files changed, 38 insertions, 58 deletions
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 5d6c1f7935f..5f51e3764f1 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/01/24 21:24:09 recht Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/30 11:54:12 recht Exp $
#
-DISTNAME= spread-src-3.17.1
+DISTNAME= spread-src-3.17.3
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/
@@ -17,9 +16,7 @@ USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --includedir=${PREFIX}/include/spread
-MAKE_FLAGS= LD="${CC}"
-
-DIST_SUBDIR= ${PKGNAME_NOREV}
+MAKE_FLAGS= LD=${CC:Q}
SPREAD_USER= spread
SPREAD_GROUP= spread
@@ -33,7 +30,7 @@ BUILD_DEFS+= SPREAD_USER SPREAD_GROUP
INCLUDEDIR= ${PREFIX}/include/spread
DOCSDIR= ${PREFIX}/share/doc/spread
EXAMPLEDIR= ${PREFIX}/share/examples/spread
-RUNTIME_DIR= /var/run/spread
+RUNTIME_DIR= ${VARBASE}/run/spread
RCD_SCRIPTS= spread
PKG_GROUPS= ${SPREAD_USER}
diff --git a/net/spread/distinfo b/net/spread/distinfo
index 5124c19951c..3865e1a9826 100644
--- a/net/spread/distinfo
+++ b/net/spread/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2003/11/05 08:22:12 agc Exp $
+$NetBSD: distinfo,v 1.7 2004/10/30 11:54:12 recht Exp $
-SHA1 (spread-3.17.1/spread-src-3.17.1.tar.gz) = c87a78392ff42d24d1ab088de8fda99703252068
-Size (spread-3.17.1/spread-src-3.17.1.tar.gz) = 581845 bytes
-SHA1 (patch-ba) = 90f2896dc62627772a05c06add99c59a55e91c88
-SHA1 (patch-bb) = efd9b08d775542622ce35265e2b72d655b5ca00f
-SHA1 (patch-bd) = 5d09d5e182cb2bf52f6366ff02e4f73dcd067e5e
-SHA1 (patch-bf) = 6b5bf8086d6366ac9b52e7351c0c062f236e8c7d
+SHA1 (spread-src-3.17.3.tar.gz) = a3085dd225264a4223eff3346b6b5de64ac2dfc6
+Size (spread-src-3.17.3.tar.gz) = 299975 bytes
+SHA1 (patch-ba) = 795938504e97da34e83e9e66b8b81ff894cbb5b4
+SHA1 (patch-bb) = 6b2e9ef29802c6f60776d7be4046087f96b8ffcb
+SHA1 (patch-bd) = d39aed08e98e81bca572a429c511ffb400b020c3
diff --git a/net/spread/patches/patch-ba b/net/spread/patches/patch-ba
index 276053caf26..4733b8fa6ea 100644
--- a/net/spread/patches/patch-ba
+++ b/net/spread/patches/patch-ba
@@ -1,13 +1,15 @@
-$NetBSD: patch-ba,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
+$NetBSD: patch-ba,v 1.2 2004/10/30 11:54:12 recht Exp $
---- auth-ip.c.orig 2003-02-18 20:54:23.000000000 +0100
-+++ auth-ip.c 2003-02-18 20:54:50.000000000 +0100
-@@ -94,7 +94,7 @@
+--- auth-ip.c.orig Fri Oct 29 20:13:28 2004
++++ auth-ip.c Fri Oct 29 20:17:10 2004
+@@ -94,8 +94,8 @@
if (NULL != (fp = fopen("./spread.access_ip", "r")) )
- Alarm( PRINT, "ip_init: using file: ./spread.access_ip\n");
+ Alarmp( SPLOG_INFO, ACM, "ip_init: using file: ./spread.access_ip\n");
if (fp == NULL)
- if (NULL != (fp = fopen("/etc/spread.access_ip", "r")) )
+- Alarmp( SPLOG_INFO, ACM, "ip_init: using file: /etc/spread.access_ip\n");
+ if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_ip", "r")) )
- Alarm( PRINT, "ip_init: using file: /etc/spread.access_ip\n");
++ Alarmp( SPLOG_INFO, ACM, "ip_init: using file: " SPREAD_ETCDIR "/spread.access_ip\n");
if (fp == NULL)
{
+ Alarmp( SPLOG_ERROR, ACM, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n");
diff --git a/net/spread/patches/patch-bb b/net/spread/patches/patch-bb
index 8139bf8ef45..2f767759a2e 100644
--- a/net/spread/patches/patch-bb
+++ b/net/spread/patches/patch-bb
@@ -1,15 +1,15 @@
-$NetBSD: patch-bb,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
+$NetBSD: patch-bb,v 1.2 2004/10/30 11:54:12 recht Exp $
---- auth-pword.c.orig 2003-02-18 20:55:48.000000000 +0100
-+++ auth-pword.c 2003-02-18 20:56:20.000000000 +0100
+--- auth-pword.c.orig Fri Oct 29 20:14:58 2004
++++ auth-pword.c Fri Oct 29 20:15:57 2004
@@ -122,8 +122,8 @@
if (NULL != (fp = fopen("./spread.access_pword", "r")) )
- Alarm( PRINT, "pword_init: using file: ./spread.access_pword\n");
+ Alarmp( SPLOG_INFO,ACM, "pword_init: using file: ./spread.access_pword\n");
if (fp == NULL)
- if (NULL != (fp = fopen("/etc/spread.access_pword", "r")) )
-- Alarm( PRINT, "pword_init: using file: /etc/spread.access_pword\n");
+- Alarmp( SPLOG_INFO, ACM, "pword_init: using file: /etc/spread.access_pword\n");
+ if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_pword", "r")) )
-+ Alarm( PRINT, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n");
++ Alarmp( SPLOG_INFO, ACM, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n");
if (fp == NULL)
- Alarm( EXIT, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name);
+ Alarmp( SPLOG_FATAL, ACM, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name);
diff --git a/net/spread/patches/patch-bd b/net/spread/patches/patch-bd
index 66d7fe4db49..0b39e271414 100644
--- a/net/spread/patches/patch-bd
+++ b/net/spread/patches/patch-bd
@@ -1,16 +1,22 @@
-$NetBSD: patch-bd,v 1.3 2003/08/09 13:07:43 recht Exp $
+$NetBSD: patch-bd,v 1.4 2004/10/30 11:54:12 recht Exp $
---- 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
+--- Makefile.in.orig Thu Sep 23 19:12:52 2004
++++ Makefile.in Fri Oct 29 20:22:53 2004
+@@ -252,14 +252,14 @@
+ do \
+ $(INSTALL) -m 644 docs/SP_$$page.3.out $(DESTDIR)$(mandir)/$(mansubdir)3/SP_$$page.3; \
+ done
+- if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
+- $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
+- fi
- if [ ! -f $(DESTDIR)$(sysconfdir)/spread.conf ]; then \
- $(INSTALL) -m 644 $(srcdir)/sample.spread.conf $(DESTDIR)$(sysconfdir)/spread.conf; \
- else \
- echo "$(DESTDIR)$(sysconfdir)/spread.conf already exists, install will not overwrite"; \
- fi
++# if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
++# $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
++# fi
+# if [ ! -f $(DESTDIR)$(sysconfdir)/spread.conf ]; then \
+# $(INSTALL) -m 644 $(srcdir)/sample.spread.conf $(DESTDIR)$(sysconfdir)/spread.conf; \
+# else \
diff --git a/net/spread/patches/patch-bf b/net/spread/patches/patch-bf
deleted file mode 100644
index 78cb2ec1309..00000000000
--- a/net/spread/patches/patch-bf
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2003/08/13 19:46:24 recht Exp $
-
---- network.c.orig 2002-09-22 04:56:52.000000000 +0200
-+++ network.c 2003-08-13 21:34:39.000000000 +0200
-@@ -90,6 +90,7 @@
- proc dummy_proc;
- int32u interface_addr;
- int i;
-+ bool bcast_bound = FALSE;
-
- Cn = Conf();
- My = Conf_my();
-@@ -125,8 +126,10 @@
- interface_addr = 0;
- else {
- interface_addr = My.ifc[i].ip;
-- if (Bcast_needed)
-+ if (Bcast_needed && !bcast_bound) {
- Bcast_channel[Num_bcast_channels++] = DL_init_channel( RECV_CHANNEL, My.port, Bcast_address, Bcast_address );
-+ bcast_bound = TRUE;
-+ }
- }
- Bcast_channel[Num_bcast_channels++] = DL_init_channel( RECV_CHANNEL, My.port, Bcast_address, interface_addr );
- Token_channel[Num_token_channels++] = DL_init_channel( RECV_CHANNEL, My.port+1, 0, interface_addr );