FreeBSD Bugzilla – Attachment 91066 Details for
Bug 128358
[Update]net/spread:update to 4.0.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 18.37 KB, created by
wenheping
on 2008-10-25 03:40:02 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
wenheping
Created:
2008-10-25 03:40:02 UTC
Size:
18.37 KB
patch
obsolete
>diff -curN spread/Makefile spread.new/Makefile >--- spread/Makefile 2008-06-19 07:51:55.000000000 +0800 >+++ spread.new/Makefile 2008-10-25 13:55:38.000000000 +0800 >@@ -6,7 +6,7 @@ > # > > PORTNAME= spread >-PORTVERSION= 3.17.4 >+PORTVERSION= 4.0.0 > CATEGORIES= net perl5 > MASTER_SITES= http://www.edu-linux.org/down/ > DISTNAME= ${PORTNAME}-src-${PORTVERSION} >@@ -15,71 +15,70 @@ > COMMENT= The Spread Group Communication System, a network toolkit > > GNU_CONFIGURE= yes >-USE_PERL5= yes >+USE_GMAKE= yes > USE_RC_SUBR= spread.sh > USE_LDCONFIG= yes >+ALL_TARGET= all > >-MAKE_ARGS+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} > RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} > WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} > > PKGMESSAGE= ${WRKSRC}/license.txt >-PORTDOCS= Readme.txt LICENSE >-HEADERFILES= sp_func.h sp_func.h sp_events.h >+ >+DOCFILES= DynamicConfiguration.txt Flush_or_SpreadAPI.txt \ >+ MultithreadedClients.txt Short_Buffer_Handling.txt \ >+ TODO PORTING > MAN1= spflooder.1 spmonitor.1 spread.1 sptuser.1 spuser.1 >-MAN3= libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 \ >- SP_error.3 SP_join.3 SP_leave.3 \ >- SP_multicast.3 SP_multigroup_multicast.3 \ >+MAN3= SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 \ >+ SP_error.3 SP_get_memb_info.3 SP_get_vs_set_members.3 \ >+ SP_get_vs_sets_info.3 SP_join.3 SP_kill.3 \ >+ SP_leave.3 SP_multicast.3 SP_multigroup_multicast.3 \ > SP_multigroup_scat_multicast.3 SP_poll.3 SP_receive.3 \ >- SP_scat_multicast.3 SP_scat_receive.3 >+ SP_scat_get_memb_info.3 SP_scat_get_vs_set_members.3 \ >+ SP_scat_get_vs_sets_info.3 SP_scat_multicast.3 \ >+ SP_scat_receive.3 SP_version.3 libspread.3 > > .include <bsd.port.pre.mk> > >-# bsd.port.mk doesn't allow us to use GNU_CONFIGURE and PERL_CONFIGURE together. >-PERL_CONFIGURE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ >- INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" >- >-_MANPAGES+= ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3 >- >-post-configure: >- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ >- ${WRKSRC}/docs/${PORTNAME}.1 ${WRKSRC}/docs/spmonitor.1 >- >-post-build: >- @cd ${WRKSRC}/perl/Spread && \ >- ${SETENV} ${CONFIGURE_ENV} ${PERL5} ./Makefile.PL ${PERL_CONFIGURE_ARGS} >- @cd ${WRKSRC}/perl/Spread && \ >- ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile >- @cd ${WRKSRC}/perl/Spread && ${MAKE} >+post-extract: >+ @${REINPLACE_CMD} -e 's|INSTALLSUBDIRS=daemon docs|INSTALLSUBDIRS=daemon|' \ >+ ${WRKSRC}/Makefile.in > > pre-install: > ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL > > post-install: >-.for f in ${HEADERFILES} >- ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include >-.endfor >- ${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \ >+ ${INSTALL_DATA} ${WRKSRC}/docs/sample.spread.conf \ > ${PREFIX}/etc/spread.conf.sample >+ ${INSTALL_DATA} ${WRKSRC}/docs/sample.spread.access_ip \ >+ ${PREFIX}/etc/spread.access_ip.sample >+ > .if !exists(${PREFIX}/etc/${PORTNAME}.conf) >- ${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \ >+ ${INSTALL_DATA} ${WRKSRC}/docs/sample.spread.conf \ > ${PREFIX}/etc/${PORTNAME}.conf > .endif >- ${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \ >- ${PREFIX}/etc/spread.access_ip.sample >+ > .if !exists(${PREFIX}/etc/spread.access_ip) >- ${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \ >+ ${INSTALL_DATA} ${WRKSRC}/docs/sample.spread.access_ip \ > ${PREFIX}/etc/spread.access_ip > .endif >- (cd ${WRKSRC}/perl/Spread && ${MAKE} install) >- ${MKDIR} ${EXAMPLESDIR} >- ${INSTALL_DATA} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR} >+ > .if !defined(NOPORTDOCS) > ${MKDIR} ${DOCSDIR} >- ${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR} >- ${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE >+.for f in ${DOCFILES} >+ ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR} >+.endfor > .endif >+ >+.for f in ${MAN1} >+ ${INSTALL_MAN} ${WRKSRC}/docs/${f} ${LOCALBASE}/man/man1/ >+.endfor >+ >+.for f in ${MAN3} >+ ${INSTALL_MAN} ${WRKSRC}/docs/${f} ${LOCALBASE}/man/man3/ >+.endfor >+ > @${CAT} ${PKGMESSAGE} >- @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL >+ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL > > .include <bsd.port.post.mk> >diff -curN spread/distinfo spread.new/distinfo >--- spread/distinfo 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/distinfo 2008-10-25 08:31:47.000000000 +0800 >@@ -1,3 +1,3 @@ >-MD5 (spread-src-3.17.4.tar.gz) = c32e9978b3a216f7955b5c43e955c966 >-SHA256 (spread-src-3.17.4.tar.gz) = 7ed2219c5aa64be40f1819577fc9393daa4ca297185fca38d9f4f3292906f324 >-SIZE (spread-src-3.17.4.tar.gz) = 308271 >+MD5 (spread-src-4.0.0.tar.gz) = 8f7a8400ae3f7d50fc11f9c03017b058 >+SHA256 (spread-src-4.0.0.tar.gz) = a213e382a1d8957f46abb89e838802569bb57bcb5066fef54dd89560b413f6df >+SIZE (spread-src-4.0.0.tar.gz) = 609001 >diff -curN spread/files/patch-Makefile.in spread.new/files/patch-Makefile.in >--- spread/files/patch-Makefile.in 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/files/patch-Makefile.in 1970-01-01 08:00:00.000000000 +0800 >@@ -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 -curN spread/files/patch-auth-ip.c spread.new/files/patch-auth-ip.c >--- spread/files/patch-auth-ip.c 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/files/patch-auth-ip.c 1970-01-01 08:00:00.000000000 +0800 >@@ -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 -curN spread/files/patch-auth-pword.c spread.new/files/patch-auth-pword.c >--- spread/files/patch-auth-pword.c 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/files/patch-auth-pword.c 1970-01-01 08:00:00.000000000 +0800 >@@ -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 -curN spread/files/patch-configuration.c spread.new/files/patch-configuration.c >--- spread/files/patch-configuration.c 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/files/patch-configuration.c 1970-01-01 08:00:00.000000000 +0800 >@@ -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 -curN spread/files/patch-docs-sample.spread.conf spread.new/files/patch-docs-sample.spread.conf >--- spread/files/patch-docs-sample.spread.conf 1970-01-01 08:00:00.000000000 +0800 >+++ spread.new/files/patch-docs-sample.spread.conf 2008-10-24 06:24:34.000000000 +0800 >@@ -0,0 +1,18 @@ >+--- docs/sample.spread.conf.orig 2008-10-24 06:06:33.000000000 +0800 >++++ docs/sample.spread.conf 2008-10-24 06:07:28.000000000 +0800 >+@@ -63,6 +63,7 @@ >+ # "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]". >+@@ -75,6 +76,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 -curN spread/files/patch-perl::Spread::Spread.pm spread.new/files/patch-perl::Spread::Spread.pm >--- spread/files/patch-perl::Spread::Spread.pm 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/files/patch-perl::Spread::Spread.pm 1970-01-01 08:00:00.000000000 +0800 >@@ -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 -curN spread/files/patch-sample.spread.conf spread.new/files/patch-sample.spread.conf >--- spread/files/patch-sample.spread.conf 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/files/patch-sample.spread.conf 1970-01-01 08:00:00.000000000 +0800 >@@ -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 -curN spread/files/patch-session.c spread.new/files/patch-session.c >--- spread/files/patch-session.c 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/files/patch-session.c 1970-01-01 08:00:00.000000000 +0800 >@@ -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 -curN spread/files/patch-sp.c spread.new/files/patch-sp.c >--- spread/files/patch-sp.c 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/files/patch-sp.c 1970-01-01 08:00:00.000000000 +0800 >@@ -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 -curN spread/files/patch-spread.c spread.new/files/patch-spread.c >--- spread/files/patch-spread.c 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/files/patch-spread.c 1970-01-01 08:00:00.000000000 +0800 >@@ -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 -curN spread/pkg-plist spread.new/pkg-plist >--- spread/pkg-plist 2008-06-11 16:50:25.000000000 +0800 >+++ spread.new/pkg-plist 2008-10-25 12:49:59.000000000 +0800 >@@ -1,3 +1,4 @@ >+bin/flush_user > bin/spflooder > bin/spmonitor > bin/sptuser >@@ -8,21 +9,24 @@ > @unexec if cmp -s %D/etc/spread.conf.sample %D/etc/spread.conf; then rm -f %D/etc/spread.conf; fi > etc/spread.conf.sample > @exec if [ ! -f %D/etc/spread.conf ] ; then cp -p %D/%F %B/spread.conf; fi >+include/fl.h > include/sp.h > include/sp_events.h > include/sp_func.h > lib/libspread.a >+lib/libspread-core.a >+lib/libtspread-core.a > lib/libspread.so >-lib/libspread.so.1 >-lib/libtspread.a >-lib/libtspread.so >-lib/libtspread.so.1 >-%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm >-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist >-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs >-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so >-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix >+lib/libspread.so.2.0 >+lib/libspread-core.so >+lib/libspread-core.so.2.0 >+lib/libtspread-core.so >+lib/libtspread-core.so.2.0 > sbin/spread >-%%EXAMPLESDIR%%/test.pl >-@dirrm %%EXAMPLESDIR%% >-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread >+%%PORTDOCS%%%%DOCSDIR%%/DynamicConfiguration.txt >+%%PORTDOCS%%%%DOCSDIR%%/Flush_or_SpreadAPI.txt >+%%PORTDOCS%%%%DOCSDIR%%/MultithreadedClients.txt >+%%PORTDOCS%%%%DOCSDIR%%/Short_Buffer_Handling.txt >+%%PORTDOCS%%%%DOCSDIR%%/TODO >+%%PORTDOCS%%%%DOCSDIR%%/PORTING >+%%PORTDOCS%%@dirrm %%DOCSDIR%%
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=91066">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 128358
: 91066