diff options
Diffstat (limited to 'net/spread4/files')
-rw-r--r-- | net/spread4/files/patch-Makefile.in | 105 | ||||
-rw-r--r-- | net/spread4/files/patch-auth-ip.c | 17 | ||||
-rw-r--r-- | net/spread4/files/patch-auth-pword.c | 17 | ||||
-rw-r--r-- | net/spread4/files/patch-configuration.c | 12 | ||||
-rw-r--r-- | net/spread4/files/patch-docs::spmonitor.1 | 18 | ||||
-rw-r--r-- | net/spread4/files/patch-docs::spread.1 | 18 | ||||
-rw-r--r-- | net/spread4/files/patch-perl::Spread::Spread.pm | 13 | ||||
-rw-r--r-- | net/spread4/files/patch-sample.spread.conf | 20 | ||||
-rw-r--r-- | net/spread4/files/patch-session.c | 11 | ||||
-rw-r--r-- | net/spread4/files/patch-sp.c | 11 | ||||
-rw-r--r-- | net/spread4/files/patch-spread.c | 52 | ||||
-rw-r--r-- | net/spread4/files/spread.sh.in | 34 |
12 files changed, 0 insertions, 328 deletions
diff --git a/net/spread4/files/patch-Makefile.in b/net/spread4/files/patch-Makefile.in deleted file mode 100644 index 382a7bafe925..000000000000 --- a/net/spread4/files/patch-Makefile.in +++ /dev/null @@ -1,105 +0,0 @@ ---- 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 - --LIBVERSION=1.0 -+LIBVERSION=1 - - PATHS= - -@@ -35,7 +35,7 @@ - CFLAGS=@CFLAGS@ - CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ - LDFLAGS=@LDFLAGS@ --LIBS=@LIBS@ -+LIBS=-L. @LIBS@ - THLDFLAGS=@THLDFLAGS@ - THLIBS=@THLIBS@ - AR=@AR@ -@@ -52,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 - -@@ -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) - --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) -@@ -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) - --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) -@@ -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.a user.o -+ $(LD) -o $@ user.o $(LDFLAGS) -lspread $(LIBS) - - spflooder$(EXEEXT): libspread.a flooder.o -- $(LD) -o $@ flooder.o $(LDFLAGS) libspread.a $(LIBS) -+ $(LD) -o $@ flooder.o $(LDFLAGS) -lspread $(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 -- $(LD) $(THLDFLAGS) -o $@ user.to libtspread.a $(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) -@@ -198,7 +206,7 @@ - fi - - clean: -- rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user -+ rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user *.so.$(LIBVERSION) - rm -f config.cache config.log docs/*.out core - rm -rf autom4te.cache - -@@ -254,11 +262,6 @@ - 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 - - uninstallall: uninstall diff --git a/net/spread4/files/patch-auth-ip.c b/net/spread4/files/patch-auth-ip.c deleted file mode 100644 index 6a28acdab04a..000000000000 --- a/net/spread4/files/patch-auth-ip.c +++ /dev/null @@ -1,17 +0,0 @@ ---- auth-ip.c Fri Mar 5 11:32:46 2004 -+++ auth-ip.c Thu Jul 15 21:38:09 2004 -@@ -90,12 +90,9 @@ - /* load spread.access_ip file */ - if (NULL != (fp = fopen(file_name,"r")) ) - Alarmp( SPLOG_INFO, ACM, "ip_init: using file: %s\n", file_name); -- if (fp == NULL) -- if (NULL != (fp = fopen("./spread.access_ip", "r")) ) -- 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")) ) -+ 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/spread4/files/patch-auth-pword.c b/net/spread4/files/patch-auth-pword.c deleted file mode 100644 index 3ff9f6426920..000000000000 --- a/net/spread4/files/patch-auth-pword.c +++ /dev/null @@ -1,17 +0,0 @@ ---- auth-pword.c Fri Mar 5 11:32:46 2004 -+++ auth-pword.c Thu Jul 15 21:40:16 2004 -@@ -118,12 +118,9 @@ - /* load spread.access_ip file */ - if (NULL != (fp = fopen(file_name,"r")) ) - Alarmp( SPLOG_INFO, ACM, "pword_init: using file: %s\n", file_name); -- if (fp == NULL) -- if (NULL != (fp = fopen("./spread.access_pword", "r")) ) -- Alarmp( SPLOG_INFO,ACM, "pword_init: using file: ./spread.access_pword\n"); - if (fp == NULL) -- if (NULL != (fp = fopen("/etc/spread.access_pword", "r")) ) -- Alarmp( SPLOG_INFO, ACM, "pword_init: using file: /etc/spread.access_pword\n"); -+ if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_pword", "r")) ) -+ Alarmp( SPLOG_INFO, ACM, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n"); - if (fp == NULL) - 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/spread4/files/patch-configuration.c b/net/spread4/files/patch-configuration.c deleted file mode 100644 index c925a9bfa812..000000000000 --- a/net/spread4/files/patch-configuration.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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); -- if (yyin == NULL) -- if (NULL != (yyin = fopen("./spread.conf", "r")) ) -- Alarm( PRINT, "Conf_init: using file: ./spread.conf\n"); - if (yyin == NULL) - if (NULL != (yyin = fopen(configfile_location, "r")) ) - Alarm( PRINT, "Conf_init: using file: %s\n", configfile_location); diff --git a/net/spread4/files/patch-docs::spmonitor.1 b/net/spread4/files/patch-docs::spmonitor.1 deleted file mode 100644 index 982d5bb32913..000000000000 --- a/net/spread4/files/patch-docs::spmonitor.1 +++ /dev/null @@ -1,18 +0,0 @@ ---- docs/spmonitor.1 Thu Dec 13 02:01:49 2001 -+++ docs/spmonitor.1 Mon Dec 8 00:00:34 2003 -@@ -27,13 +27,11 @@ - Use an alternate configuration file - .I config-file - instead of --.IR ./spread.conf . -+.IR /etc/spread.conf . - .SH FILES --.I ./spread.conf -+.I /etc/spread.conf - .RS - The default config file location. --.I /etc/spread.conf --is also searched if a local file is not found. - .SH BUGS - The spmonitor works by sending UDP packets to the Spread daemon, so if network - losses occur, commands or status reports can be lost. It can also lose reports diff --git a/net/spread4/files/patch-docs::spread.1 b/net/spread4/files/patch-docs::spread.1 deleted file mode 100644 index 6dca20e2b73d..000000000000 --- a/net/spread4/files/patch-docs::spread.1 +++ /dev/null @@ -1,18 +0,0 @@ ---- docs/spread.1 Thu Dec 13 02:03:19 2001 -+++ docs/spread.1 Mon Dec 8 00:00:20 2003 -@@ -20,13 +20,11 @@ - Use an alternate configuration file - .I config-file - instead of --.IR ./spread.conf . -+.IR /etc/spread.conf . - .SH FILES --.I ./spread.conf -+.I /etc/spread.conf - .RS - The default config file location. --.I /etc/spread.conf --is also searched if a local file is not found. - .SH DIAGNOSTICS - The daemon will output some startup information to stdout - and any severe errors will also be output to stdout. Redirecting diff --git a/net/spread4/files/patch-perl::Spread::Spread.pm b/net/spread4/files/patch-perl::Spread::Spread.pm deleted file mode 100644 index a753b18f6b45..000000000000 --- a/net/spread4/files/patch-perl::Spread::Spread.pm +++ /dev/null @@ -1,13 +0,0 @@ ---- perl/Spread/Spread.pm Mon Dec 8 21:12:18 2003 -+++ perl/Spread/Spread.pm Mon Dec 8 21:15:44 2003 -@@ -177,8 +177,8 @@ - - # Connect - my($mailbox, $private_group) = Spread::connect( -- spread_name => '4444@host.domain.com', -- private_name => 'mrcool', -+ { spread_name => '4803@host.domain.com', -+ private_name => 'mrcool', } - ); - - # Join and leave groups diff --git a/net/spread4/files/patch-sample.spread.conf b/net/spread4/files/patch-sample.spread.conf deleted file mode 100644 index 1926dea8116c..000000000000 --- a/net/spread4/files/patch-sample.spread.conf +++ /dev/null @@ -1,20 +0,0 @@ ---- sample.spread.conf Mon Dec 8 01:26:39 2003 -+++ sample.spread.conf Mon Dec 8 01:26:53 2003 -@@ -50,7 +50,7 @@ - # cause the daemons to log to "spreadlog_machine1.mydomain.com.log" and - # "spreadlog_machine2.mydomain.com.log" respectively. - --#EventLogFile = testlog.out -+EventLogFile = /var/log/spread.log - - #Set whether to add a timestamp in front of all logged events or not. - # Default is no timestamps. Default format is "[%a %d %b %Y %H:%M:%S]". -@@ -62,7 +62,7 @@ - - #EventTimeStamp - # or --#EventTimeStamp = "[%a %d %b %Y %H:%M:%S]" -+EventTimeStamp = "[%a %d %b %Y %H:%M:%S]" - - #Set whether to allow dangerous monitor commands - # like "partition, flow_control, or kill" diff --git a/net/spread4/files/patch-session.c b/net/spread4/files/patch-session.c deleted file mode 100644 index c33d5523da84..000000000000 --- a/net/spread4/files/patch-session.c +++ /dev/null @@ -1,11 +0,0 @@ ---- session.c Tue Aug 5 21:35:52 2003 -+++ session.c Tue Aug 5 21:31:30 2003 -@@ -406,7 +406,7 @@ - Alarm( EXIT, "Sess_init: UNIX sock error\n" ); - - unix_addr.sun_family = AF_UNIX; -- sprintf( name, "/tmp/%d",My.port ); -+ sprintf( name, "%s/spread.sock", _PATH_SPREAD_PIDDIR ); - strcpy( unix_addr.sun_path, name ); - unlink( name ); - diff --git a/net/spread4/files/patch-sp.c b/net/spread4/files/patch-sp.c deleted file mode 100644 index fc0df37e5496..000000000000 --- a/net/spread4/files/patch-sp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 ); - ret = connect_nointr_timeout( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr), &time_out); - #endif /* !ARCH_PC_WIN95 */ - } diff --git a/net/spread4/files/patch-spread.c b/net/spread4/files/patch-spread.c deleted file mode 100644 index 0de2385206a1..000000000000 --- a/net/spread4/files/patch-spread.c +++ /dev/null @@ -1,52 +0,0 @@ ---- spread.c Thu Jun 19 00:31:23 2003 -+++ spread.c Mon Dec 8 20:55:41 2003 -@@ -48,6 +48,8 @@ - #include <pwd.h> - #include <unistd.h> - #include <sys/types.h> -+#include <errno.h> -+#include <stdlib.h> - #endif - - #ifdef ARCH_PC_WIN95 -@@ -65,6 +67,7 @@ - - static void Invalid_privilege_decrease(char *user, char *group); - static void Usage(int argc, char *argv[]); -+static void writepidfile(); - - /* auth-null.c: */ - void null_init(void); -@@ -144,6 +147,11 @@ - - #endif /* ARCH_PC_WIN95 */ - -+ if (daemon(0,0) == -1) -+ Alarm( EXIT, "Spread: couldn't daemonise: %d", strerror(errno) ); -+ -+ writepidfile(); -+ - /* initialize each valid authentication protocol */ - null_init(); - ip_init(); -@@ -193,6 +201,20 @@ - E_handle_events(); - - return 0; -+} -+ -+static void -+writepidfile() -+{ -+ char pidbuf[11]; -+ int pidfd; -+ -+ if ((pidfd = open(_PATH_SPREAD_PIDDIR "/spread.pid", O_RDWR | O_CREAT, 0644)) == -1) -+ Alarm( EXIT, "Spread: couldn't open pidfile for writing" ); -+ -+ snprintf(pidbuf, sizeof(pidbuf), "%ld\n", (long)getpid()); -+ write(pidfd, pidbuf, strlen(pidbuf)); -+ close(pidfd); - } - - static void Print_help(void) diff --git a/net/spread4/files/spread.sh.in b/net/spread4/files/spread.sh.in deleted file mode 100644 index fc9fd9e85755..000000000000 --- a/net/spread4/files/spread.sh.in +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: spread -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable spread: -# -#spread_enable="YES" -# -# See spread(1) for flags -# - -. %%RC_SUBR%% - -name=spread -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/spread" -command_args="" -pidfile=/var/run/${name}.pid -required_files=%%PREFIX%%/etc/${name}.conf - -# set defaults - -spread_enable=${spread_enable:-"NO"} -spread_flags=${spread_flags:-""} - -load_rc_config ${name} -run_rc_command "$1" |