Add spserver,

it's a tcp server framework library written in C++ based on libevent.

15 files changed, 210 insertions, 0 deletions

diff --git a/net/Makefile b/net/Makefile
index 76d9521bf7c2..f678a751028f 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -820,6 +820,7 @@
     SUBDIR += spoofer
     SUBDIR += spread
     SUBDIR += spread-j
+    SUBDIR += spserver
     SUBDIR += ss5
     SUBDIR += ssldump
     SUBDIR += ssltunnel-client
diff --git a/net/spserver/Makefile b/net/spserver/Makefile
new file mode 100644
index 000000000000..406bf503e47d
--- /dev/null
+++ b/net/spserver/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	spserver
+# Date created:				18 June 2007
+# Whom:					vanilla@
+#
+# $FreeBSD$
+#
+
+PORTNAME=	spserver
+PORTVERSION=	0.4
+CATEGORIES=	net
+MASTER_SITES=	http://spserver.googlecode.com/files/
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+
+MAINTAINER=	vanilla@FreeBSD.org
+COMMENT=	A TCP server framework library written in C++ based on libevent
+
+LIB_DEPENDS=	event-1.3b.1:${PORTSDIR}/devel/libevent
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_LDCONFIG=	yes
+USE_GMAKE=	yes
+
+post-patch:
+	${SED} -i -E 's,%PREFIX%,${PREFIX},g' ${WRKSRC}/Makefile
+
+do-install:
+	@${MKDIR} ${PREFIX}/include/spserver
+	@${INSTALL} ${WRKSRC}/*.hpp ${PREFIX}/include/spserver
+	@${INSTALL} ${WRKSRC}/libspserver.so ${PREFIX}/lib/libspserver.so.1
+	@${LN} -s ${PREFIX}/lib/libspserver.so.1 ${PREFIX}/lib/libspserver.so
+
+.include <bsd.port.mk>
diff --git a/net/spserver/distinfo b/net/spserver/distinfo
new file mode 100644
index 000000000000..37246bfc2dd5
--- /dev/null
+++ b/net/spserver/distinfo
@@ -0,0 +1,3 @@
+MD5 (spserver-0.4.src.tar.gz) = 6de027a6b9390c681beea9f0bffe7f9a
+SHA256 (spserver-0.4.src.tar.gz) = d87fd682aac6c5ea1b4bb7953f90d1d536e856580dd256fe0c14730eba2b3069
+SIZE (spserver-0.4.src.tar.gz) = 36345
diff --git a/net/spserver/files/patch-Makefile b/net/spserver/files/patch-Makefile
new file mode 100644
index 000000000000..033e4358d717
--- /dev/null
+++ b/net/spserver/files/patch-Makefile
@@ -0,0 +1,17 @@
+--- Makefile.orig	Mon Jun 18 12:27:34 2007
++++ Makefile	Mon Jun 18 12:28:01 2007
+@@ -15,11 +15,11 @@
+ 	version = 0.4
+ endif
+ 
+-LIBEVENT_INCL = -I../libevent/
+-LIBEVENT_LIB  = -L../libevent -levent
++LIBEVENT_INCL = -I%PREFIX%/include
++LIBEVENT_LIB  = -L%PREFIX%/lib -levent
+ 
+ CFLAGS  += $(LIBEVENT_INCL)
+-LDFLAGS += $(LIBEVENT_LIB) -lpthread -lresolv
++LDFLAGS += $(LIBEVENT_LIB) -lpthread
+ 
+ #--------------------------------------------------------------------
+ 
diff --git a/net/spserver/files/patch-event_msgqueue.c b/net/spserver/files/patch-event_msgqueue.c
new file mode 100644
index 000000000000..a3e654738b01
--- /dev/null
+++ b/net/spserver/files/patch-event_msgqueue.c
@@ -0,0 +1,11 @@
+--- event_msgqueue.c.orig	Mon Jun 18 12:30:00 2007
++++ event_msgqueue.c	Mon Jun 18 12:30:06 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
new file mode 100644
index 000000000000..4fe7815cdb93
--- /dev/null
+++ b/net/spserver/files/patch-spbuffer.cpp
@@ -0,0 +1,11 @@
+--- spbuffer.cpp.orig	Mon Jun 18 12:39:28 2007
++++ spbuffer.cpp	Mon Jun 18 12:39:34 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-speventcb.cpp b/net/spserver/files/patch-speventcb.cpp
new file mode 100644
index 000000000000..a0023bc95f9a
--- /dev/null
+++ b/net/spserver/files/patch-speventcb.cpp
@@ -0,0 +1,29 @@
+--- speventcb.cpp.orig	Mon Jun 18 12:41:11 2007
++++ speventcb.cpp	Mon Jun 18 12:42:31 2007
+@@ -14,6 +14,8 @@
+ #include <stdlib.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <sys/uio.h>
++#include <unistd.h>
+ 
+ #include "speventcb.hpp"
+ #include "spsession.hpp"
+@@ -26,7 +28,7 @@
+ #include "sprequest.hpp"
+ #include "spmsgblock.hpp"
+ 
+-#include "config.h"
++//#include "config.h"
+ #include "event_msgqueue.h"
+ #include "event.h"
+ 
+@@ -341,7 +343,7 @@
+ 		char buffer[ 16 ] = { 0 };
+ 		session->getInBuffer()->take( buffer, sizeof( buffer ) );
+ 		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
new file mode 100644
index 000000000000..660ffac95c58
--- /dev/null
+++ b/net/spserver/files/patch-spexecutor.cpp
@@ -0,0 +1,20 @@
+--- spexecutor.cpp.orig	Mon Jun 11 15:20:34 2007
++++ spexecutor.cpp	Mon Jun 18 12:44:56 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()
+@@ -83,7 +83,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 );
+ 	} else {
+ 		syslog( LOG_WARNING, "[ex@%s] Unable to create a thread for executor", tag );
+ 	}
diff --git a/net/spserver/files/patch-spserver.cpp b/net/spserver/files/patch-spserver.cpp
new file mode 100644
index 000000000000..6bf4e45eaf6b
--- /dev/null
+++ b/net/spserver/files/patch-spserver.cpp
@@ -0,0 +1,20 @@
+--- spserver.cpp.orig	Mon Jun 18 12:42:58 2007
++++ spserver.cpp	Mon Jun 18 12:43:52 2007
+@@ -19,7 +19,7 @@
+ #include "spsession.hpp"
+ #include "spexecutor.hpp"
+ 
+-#include "config.h"
++//#include "config.h"
+ #include "event_msgqueue.h"
+ 
+ SP_Server :: SP_Server( const char * bindIP, int port,
+@@ -94,7 +94,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 );
+ 	} else {
+ 		mIsRunning = 0;
+ 		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
new file mode 100644
index 000000000000..72519fdb61fa
--- /dev/null
+++ b/net/spserver/files/patch-spsession.cpp
@@ -0,0 +1,11 @@
+--- spsession.cpp.orig	Mon Jun 18 12:40:32 2007
++++ spsession.cpp	Mon Jun 18 12:40:40 2007
+@@ -15,7 +15,7 @@
+ #include "sputils.hpp"
+ #include "sprequest.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
new file mode 100644
index 000000000000..c493a6441e8e
--- /dev/null
+++ b/net/spserver/files/patch-spthreadpool.cpp
@@ -0,0 +1,11 @@
+--- spthreadpool.cpp.orig	Mon Jun 18 12:38:42 2007
++++ spthreadpool.cpp	Mon Jun 18 12:39:00 2007
+@@ -119,7 +119,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-testhttpmsg.cpp b/net/spserver/files/patch-testhttpmsg.cpp
new file mode 100644
index 000000000000..462e2a39a3b6
--- /dev/null
+++ b/net/spserver/files/patch-testhttpmsg.cpp
@@ -0,0 +1,11 @@
+--- testhttpmsg.cpp.orig	Mon Jun 18 12:46:36 2007
++++ testhttpmsg.cpp	Mon Jun 18 12:47:00 2007
+@@ -76,7 +76,7 @@
+ 		//printf( "%d, %d\n", i, parsedLen );
+ 	}
+ 
+-	printf( "source length : %d, parsed length : %d\n", strlen( source ), parsedLen );
++	printf( "source length : %d, parsed length : %d\n", (int)strlen( source ), parsedLen );
+ 
+ 	printf( "parse complete : %s\n", parser.isCompleted() ? "Yes" : "No" );
+ 
diff --git a/net/spserver/files/patch-teststress.cpp b/net/spserver/files/patch-teststress.cpp
new file mode 100644
index 000000000000..ec0c8bf3e62e
--- /dev/null
+++ b/net/spserver/files/patch-teststress.cpp
@@ -0,0 +1,11 @@
+--- teststress.cpp.orig	Mon Jun 18 12:45:59 2007
++++ teststress.cpp	Mon Jun 18 12:46:06 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";
diff --git a/net/spserver/pkg-descr b/net/spserver/pkg-descr
new file mode 100644
index 000000000000..65ec082d1a20
--- /dev/null
+++ b/net/spserver/pkg-descr
@@ -0,0 +1,5 @@
+spserver is a TCP server framework library written in C++ based on libevent.
+
+spserver is an implementation of Half-Sync/Half-Async pattern.
+
+WWW: http://code.google.com/p/spserver/
diff --git a/net/spserver/pkg-plist b/net/spserver/pkg-plist
new file mode 100644
index 000000000000..2cdbd16d57e1
--- /dev/null
+++ b/net/spserver/pkg-plist
@@ -0,0 +1,17 @@
+include/spserver/spbuffer.hpp
+include/spserver/speventcb.hpp
+include/spserver/spexecutor.hpp
+include/spserver/sphandler.hpp
+include/spserver/sphttp.hpp
+include/spserver/sphttpmsg.hpp
+include/spserver/spmsgblock.hpp
+include/spserver/spmsgdecoder.hpp
+include/spserver/sprequest.hpp
+include/spserver/spresponse.hpp
+include/spserver/spserver.hpp
+include/spserver/spsession.hpp
+include/spserver/spthreadpool.hpp
+include/spserver/sputils.hpp
+lib/libspserver.so
+lib/libspserver.so.1
+@dirrm include/spserver