diff options
Diffstat (limited to 'net/spread4/files')
-rw-r--r-- | net/spread4/files/patch-Makefile.in | 96 | ||||
-rw-r--r-- | net/spread4/files/patch-auth-ip.c | 13 | ||||
-rw-r--r-- | net/spread4/files/patch-auth-pword.c | 13 | ||||
-rw-r--r-- | net/spread4/files/patch-spread.c | 40 | ||||
-rw-r--r-- | net/spread4/files/spread.sh | 36 |
5 files changed, 0 insertions, 198 deletions
diff --git a/net/spread4/files/patch-Makefile.in b/net/spread4/files/patch-Makefile.in deleted file mode 100644 index bf659c926b1c..000000000000 --- a/net/spread4/files/patch-Makefile.in +++ /dev/null @@ -1,96 +0,0 @@ ---- Makefile.in.orig Sat Sep 28 08:38:59 2002 -+++ Makefile.in Wed Nov 6 07:41:33 2002 -@@ -25,7 +25,7 @@ - #Rules: major -- inc for incompatible change - # : minor -- inc for bugfix or forward compatible change - --LIBVERSION=1.0 -+LIBVERSION=1 - - PATHS= - -@@ -34,7 +34,7 @@ - CFLAGS=@CFLAGS@ - CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ - LDFLAGS=@LDFLAGS@ --LIBS=@LIBS@ -+LIBS=-L. @LIBS@ - THLDFLAGS=@THLDFLAGS@ - THLIBS=@THLIBS@ - AR=@AR@ -@@ -51,8 +51,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 +125,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 +147,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 +160,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) -@@ -234,11 +242,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 4c49b4278833..000000000000 --- a/net/spread4/files/patch-auth-ip.c +++ /dev/null @@ -1,13 +0,0 @@ ---- auth-ip.c Sun Sep 22 12:56:52 2002 -+++ auth-ip.c Wed Nov 6 02:39:28 2002 -@@ -94,8 +94,8 @@ - if (NULL != (fp = fopen("./spread.access_ip", "r")) ) - Alarm( PRINT, "ip_init: using file: ./spread.access_ip\n"); - if (fp == NULL) -- if (NULL != (fp = fopen("/etc/spread.access_ip", "r")) ) -- Alarm( PRINT, "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: " SPREAD_ETCDIR "/spread.access_ip\n"); - if (fp == NULL) - { - Alarm( PRINT, "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 09a8e44cf372..000000000000 --- a/net/spread4/files/patch-auth-pword.c +++ /dev/null @@ -1,13 +0,0 @@ ---- auth-pword.c Sun Sep 22 12:56:52 2002 -+++ auth-pword.c Wed Nov 6 02:40:23 2002 -@@ -122,8 +122,8 @@ - if (NULL != (fp = fopen("./spread.access_pword", "r")) ) - Alarm( PRINT, "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"); -+ if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_pword", "r")) ) -+ Alarm( PRINT, "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); - diff --git a/net/spread4/files/patch-spread.c b/net/spread4/files/patch-spread.c deleted file mode 100644 index 1ab2708b1f90..000000000000 --- a/net/spread4/files/patch-spread.c +++ /dev/null @@ -1,40 +0,0 @@ ---- spread.c Sun Nov 10 00:17:59 2002 -+++ spread.c Sun Nov 10 00:18:42 2002 -@@ -65,6 +65,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 +145,8 @@ - - #endif /* ARCH_PC_WIN95 */ - -+ writepidfile(); -+ - /* initialize each valid authentication protocol */ - null_init(); - ip_init(); -@@ -193,6 +196,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 b/net/spread4/files/spread.sh deleted file mode 100644 index ebeb5adf697f..000000000000 --- a/net/spread4/files/spread.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -if ! prefix=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the prefix" >&2 - exit 1 -fi -spread=${prefix}/sbin/spread -pidfile=/var/run/spread.pid -out=/var/log/spread.out -daemon=/usr/sbin/daemon - -case "$1" in -start) - if [ -x ${spread} ]; then - echo -n ' spread' - ${daemon} -c ${spread} >${out} 2>&1 <&- - fi - ;; -stop) - if [ -f ${pidfile} ]; then - kill `cat ${pidfile}` - echo -n ' spread' - rm ${pidfile} - else - echo ' spread: not running' - fi - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac - -exit 0 |