13 files changed, 38 insertions, 145 deletions

diff --git a/net/spserver/files/patch-event_msgqueue.c b/net/spserver/files/patch-event_msgqueue.c
deleted file mode 100644
index 713015e5e03f..000000000000
--- a/net/spserver/files/patch-event_msgqueue.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- spserver/event_msgqueue.c.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/event_msgqueue.c	Thu Aug 23 07:33:03 2007
-@@ -15,7 +15,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- 
--#include "config.h"
-+//#include "config.h"
- #include "event_msgqueue.h"
- 
- struct circqueue {
diff --git a/net/spserver/files/patch-spbuffer.cpp b/net/spserver/files/patch-spbuffer.cpp
deleted file mode 100644
index 8bf17cb569c4..000000000000
--- a/net/spserver/files/patch-spbuffer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- spserver/spbuffer.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/spbuffer.cpp	Thu Aug 23 07:33:08 2007
-@@ -12,7 +12,7 @@
- 
- #include "spbuffer.hpp"
- 
--#include "config.h"
-+//#include "config.h"
- #include "event.h"
- 
- SP_Buffer :: SP_Buffer()
diff --git a/net/spserver/files/patch-spdispatcher.cpp b/net/spserver/files/patch-spdispatcher.cpp
index 8eb416c3dd0f..aaa2f034fa56 100644
--- a/net/spserver/files/patch-spdispatcher.cpp
+++ b/net/spserver/files/patch-spdispatcher.cpp
@@ -1,20 +1,11 @@
---- spserver/spdispatcher.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/spdispatcher.cpp	Thu Aug 23 07:33:12 2007
-@@ -23,7 +23,7 @@
- #include "spiochannel.hpp"
- #include "spioutils.hpp"
- 
--#include "config.h"
-+//#include "config.h"
- #include "event_msgqueue.h"
- 
- SP_Dispatcher :: SP_Dispatcher( SP_CompletionHandler * completionHandler, int maxThreads )
-@@ -95,7 +95,7 @@
+--- spserver/spdispatcher.cpp.orig	2008-04-19 20:33:45.000000000 +0800
++++ spserver/spdispatcher.cpp	2008-05-16 09:40:51.000000000 +0800
+@@ -96,7 +96,7 @@
  	ret = pthread_create( &thread, &attr, reinterpret_cast<void*(*)(void*)>(eventLoop), this );
  	pthread_attr_destroy( &attr );
  	if( 0 == ret ) {
--		syslog( LOG_NOTICE, "Thread #%ld has been created for dispatcher", thread );
-+		syslog( LOG_NOTICE, "Thread #%ld has been created for dispatcher", (long) thread );
+-		sp_syslog( LOG_NOTICE, "Thread #%ld has been created for dispatcher", thread );
++		sp_syslog( LOG_NOTICE, "Thread #%ld has been created for dispatcher", (long)thread );
  	} else {
  		mIsRunning = 0;
- 		syslog( LOG_WARNING, "Unable to create a thread for dispatcher, %s",
+ 		sp_syslog( LOG_WARNING, "Unable to create a thread for dispatcher, %s",
diff --git a/net/spserver/files/patch-speventcb.cpp b/net/spserver/files/patch-speventcb.cpp
index e7d6612806b3..72fbaac4c379 100644
--- a/net/spserver/files/patch-speventcb.cpp
+++ b/net/spserver/files/patch-speventcb.cpp
@@ -1,18 +1,9 @@
---- spserver/speventcb.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/speventcb.cpp	Thu Aug 23 07:33:14 2007
-@@ -26,7 +26,7 @@
- #include "spiochannel.hpp"
- #include "spioutils.hpp"
- 
--#include "config.h"   // from libevent, for event.h
-+//#include "config.h"   // from libevent, for event.h
- #include "event_msgqueue.h"
- #include "event.h"
- 
-@@ -396,7 +396,7 @@
+--- spserver/speventcb.cpp.orig	2008-05-16 09:41:38.000000000 +0800
++++ spserver/speventcb.cpp	2008-05-16 09:41:59.000000000 +0800
+@@ -394,7 +394,7 @@
  		char buffer[ 16 ] = { 0 };
  		session->getInBuffer()->take( buffer, sizeof( buffer ) );
- 		syslog( LOG_WARNING, "session(%d.%d) status is %d, ignore [%s...] (%dB)",
+ 		sp_syslog( LOG_WARNING, "session(%d.%d) status is %d, ignore [%s...] (%dB)",
 -			sid.mKey, sid.mSeq, session->getStatus(), buffer, session->getInBuffer()->getSize() );
 +			sid.mKey, sid.mSeq, session->getStatus(), buffer, (int)session->getInBuffer()->getSize() );
  		session->getInBuffer()->reset();
diff --git a/net/spserver/files/patch-spexecutor.cpp b/net/spserver/files/patch-spexecutor.cpp
index cf993c1a1479..c02f37046370 100644
--- a/net/spserver/files/patch-spexecutor.cpp
+++ b/net/spserver/files/patch-spexecutor.cpp
@@ -1,20 +1,11 @@
---- spserver/spexecutor.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/spexecutor.cpp	Thu Aug 23 07:33:20 2007
-@@ -14,7 +14,7 @@
- #include "spexecutor.hpp"
- #include "spthreadpool.hpp"
- 
--#include "config.h"
-+//#include "config.h"
- #include "event_msgqueue.h"
- 
- SP_Task :: ~SP_Task()
-@@ -67,7 +67,7 @@
+--- spserver/spexecutor.cpp.orig	2008-05-16 09:42:34.000000000 +0800
++++ spserver/spexecutor.cpp	2008-05-16 09:42:57.000000000 +0800
+@@ -64,7 +64,7 @@
  	int ret = pthread_create( &thread, &attr, reinterpret_cast<void*(*)(void*)>(eventLoop), this );
  	pthread_attr_destroy( &attr );
  	if( 0 == ret ) {
--		syslog( LOG_NOTICE, "[ex@%s] Thread #%ld has been created for executor", tag, thread );
-+		syslog( LOG_NOTICE, "[ex@%s] Thread #%ld has been created for executor", tag, (long)thread );
+-		sp_syslog( LOG_NOTICE, "[ex@%s] Thread #%ld has been created for executor", tag, thread );
++		sp_syslog( LOG_NOTICE, "[ex@%s] Thread #%ld has been created for executor", tag, (long)thread );
  	} else {
- 		syslog( LOG_WARNING, "[ex@%s] Unable to create a thread for executor", tag );
+ 		sp_syslog( LOG_WARNING, "[ex@%s] Unable to create a thread for executor", tag );
  	}
diff --git a/net/spserver/files/patch-spiochannel.cpp b/net/spserver/files/patch-spiochannel.cpp
deleted file mode 100644
index 31cf68e77ca6..000000000000
--- a/net/spserver/files/patch-spiochannel.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- spserver/spiochannel.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/spiochannel.cpp	Thu Aug 23 07:33:24 2007
-@@ -16,7 +16,7 @@
- #include "spbuffer.hpp"
- #include "spmsgblock.hpp"
- 
--#include "config.h"
-+//#include "config.h"
- #include "event.h"
- 
- //---------------------------------------------------------
diff --git a/net/spserver/files/patch-spioutils.cpp b/net/spserver/files/patch-spioutils.cpp
deleted file mode 100644
index b57fba3e6858..000000000000
--- a/net/spserver/files/patch-spioutils.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- spserver/spioutils.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/spioutils.cpp	Thu Aug 23 07:33:27 2007
-@@ -3,6 +3,7 @@
-  * For license terms, see the file COPYING along with this library.
-  */
- 
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netinet/tcp.h>
diff --git a/net/spserver/files/patch-splfserver.cpp b/net/spserver/files/patch-splfserver.cpp
deleted file mode 100644
index ab21c910b897..000000000000
--- a/net/spserver/files/patch-splfserver.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- spserver/splfserver.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/splfserver.cpp	Thu Aug 23 07:33:35 2007
-@@ -18,7 +18,7 @@
- #include "sputils.hpp"
- #include "spioutils.hpp"
- 
--#include "config.h"
-+//#include "config.h"
- #include "event_msgqueue.h"
- 
- SP_LFServer :: SP_LFServer( const char * bindIP, int port, SP_HandlerFactory * handlerFactory )
diff --git a/net/spserver/files/patch-spporting.hpp b/net/spserver/files/patch-spporting.hpp
new file mode 100644
index 000000000000..c2bac7b5a4a9
--- /dev/null
+++ b/net/spserver/files/patch-spporting.hpp
@@ -0,0 +1,16 @@
+--- spserver/spporting.hpp.orig	2008-04-19 20:33:45.000000000 +0800
++++ spserver/spporting.hpp	2008-05-16 09:50:37.000000000 +0800
+@@ -12,11 +12,13 @@
+ 
+ #else
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netinet/tcp.h>
+ #include <syslog.h>
++#include <sys/uio.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+ 
diff --git a/net/spserver/files/patch-spserver.cpp b/net/spserver/files/patch-spserver.cpp
index 51549fcab59d..18740bc6a870 100644
--- a/net/spserver/files/patch-spserver.cpp
+++ b/net/spserver/files/patch-spserver.cpp
@@ -1,20 +1,11 @@
---- spserver/spserver.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/spserver.cpp	Thu Aug 23 07:33:42 2007
-@@ -22,7 +22,7 @@
- #include "spiochannel.hpp"
- #include "spioutils.hpp"
- 
--#include "config.h"
-+//#include "config.h"
- #include "event_msgqueue.h"
- 
- SP_Server :: SP_Server( const char * bindIP, int port,
-@@ -106,7 +106,7 @@
+--- spserver/spserver.cpp.orig	2008-05-16 09:43:34.000000000 +0800
++++ spserver/spserver.cpp	2008-05-16 09:43:50.000000000 +0800
+@@ -103,7 +103,7 @@
  	ret = pthread_create( &thread, &attr, reinterpret_cast<void*(*)(void*)>(eventLoop), this );
  	pthread_attr_destroy( &attr );
  	if( 0 == ret ) {
--		syslog( LOG_NOTICE, "Thread #%ld has been created to listen on port [%d]", thread, mPort );
-+		syslog( LOG_NOTICE, "Thread #%ld has been created to listen on port [%d]", (long)thread, mPort );
+-		sp_syslog( LOG_NOTICE, "Thread #%ld has been created to listen on port [%d]", thread, mPort );
++		sp_syslog( LOG_NOTICE, "Thread #%ld has been created to listen on port [%d]", (long)thread, mPort );
  	} else {
  		mIsRunning = 0;
- 		syslog( LOG_WARNING, "Unable to create a thread for TCP server on port [%d], %s",
+ 		sp_syslog( LOG_WARNING, "Unable to create a thread for TCP server on port [%d], %s",
diff --git a/net/spserver/files/patch-spsession.cpp b/net/spserver/files/patch-spsession.cpp
deleted file mode 100644
index c626e21d7947..000000000000
--- a/net/spserver/files/patch-spsession.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- spserver/spsession.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/spsession.cpp	Thu Aug 23 07:33:45 2007
-@@ -16,7 +16,7 @@
- #include "sprequest.hpp"
- #include "spiochannel.hpp"
- 
--#include "config.h"
-+//#include "config.h"
- #include "event.h"
- 
- //-------------------------------------------------------------------
diff --git a/net/spserver/files/patch-spthreadpool.cpp b/net/spserver/files/patch-spthreadpool.cpp
deleted file mode 100644
index 11bb30795cf0..000000000000
--- a/net/spserver/files/patch-spthreadpool.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- spserver/spthreadpool.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/spthreadpool.cpp	Thu Aug 23 07:33:50 2007
-@@ -120,7 +120,7 @@
- 
- 		if( 0 == pthread_create( &( thread->mId ), &attr, wrapperFunc, thread ) ) {
- 			mTotal++;
--			syslog( LOG_NOTICE, "[tp@%s] create thread#%ld\n", mTag, thread->mId );
-+			syslog( LOG_NOTICE, "[tp@%s] create thread#%ld\n", mTag, (long)thread->mId );
- 		} else {
- 			ret = -1;
- 			syslog( LOG_WARNING, "[tp@%s] cannot create thread\n", mTag );
diff --git a/net/spserver/files/patch-teststress.cpp b/net/spserver/files/patch-teststress.cpp
deleted file mode 100644
index a19345759570..000000000000
--- a/net/spserver/files/patch-teststress.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- spserver/teststress.cpp.orig	Wed Aug 22 22:04:05 2007
-+++ spserver/teststress.cpp	Thu Aug 23 07:34:03 2007
-@@ -18,7 +18,7 @@
- /* For inet_ntoa. */
- #include <arpa/inet.h>
- 
--#include "config.h"
-+//#include "config.h"
- #include "event.h"
- 
- static const char * gHost = "127.0.0.1";