update to latest upstream version

5 files changed, 49 insertions, 32 deletions

diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 916bf8c94..8b4279f3e 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cxxtools
-PKG_VERSION:=		1.4.8
+PKG_VERSION:=		2.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		16ce92a83beb925fa5138fc9a52d55af
+PKG_MD5SUM:=		763ef672a577fa8b93c37239ee0f3d59
 PKG_DESCR:=		a collection of general-purpose C++ classes (libraries)
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libiconv
@@ -35,7 +35,8 @@ endif
 
 TARGET_CFLAGS+=		-fPIC
 TARGET_CXXFLAGS+=	-fPIC
-CONFIGURE_ARGS+=	--with-libiconv-prefix='${STAGING_TARGET_DIR}/usr'
+CONFIGURE_ARGS+=	--with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \
+			--disable-demos --disable-unittest
 
 cxxtools-install:
 	${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
diff --git a/package/cxxtools/patches/patch-ltmain_sh b/package/cxxtools/patches/patch-ltmain_sh
deleted file mode 100644
index e25e29b9e..000000000
--- a/package/cxxtools/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- cxxtools-1.4.8.orig/ltmain.sh	2007-08-14 20:05:31.000000000 +0200
-+++ cxxtools-1.4.8/ltmain.sh	2011-03-28 20:40:30.691818463 +0200
-@@ -1663,7 +1663,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
diff --git a/package/cxxtools/patches/patch-src_hdstream_cpp b/package/cxxtools/patches/patch-src_hdstream_cpp
deleted file mode 100644
index 796b9cdf1..000000000
--- a/package/cxxtools/patches/patch-src_hdstream_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cxxtools-1.4.8.orig/src/hdstream.cpp	2008-05-04 17:55:37.000000000 +0200
-+++ cxxtools-1.4.8/src/hdstream.cpp	2009-06-01 19:40:12.000000000 +0200
-@@ -20,6 +20,7 @@
-  */
- 
- #include "cxxtools/hdstream.h"
-+#include <cstdio>
- #include <iomanip>
- #include <cctype>
- 
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 71cb7f79e..7e9553b56 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tntnet
-PKG_VERSION:=		1.6.4
+PKG_VERSION:=		2.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e2c3c5075a890711a7569730493c0996
+PKG_MD5SUM:=		8f7185eeed23e7ae6a9be314e2fc0d36
 PKG_DESCR:=		small C++ application server
 PKG_SECTION:=		www
 PKG_DEPENDS:=		cxxtools zlib libiconv libpthread
@@ -15,20 +15,38 @@ PKG_URL:=		http://www.tntnet.org/
 PKG_SITES:=		http://www.tntnet.org/download/
 PKG_NEED_CXX:=		1
 
+PKG_CHOICES_TNTNET:=	WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
+PKGCD_WITHOUT_SSL:=	use no SSL
+PKGCD_WITH_OPENSSL:=	use OpenSSL for crypto
+PKGCS_WITH_OPENSSL:=	libopenssl
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCD_WITH_GNUTLS:=	use GnuTLS for crypto
+PKGCS_WITH_GNUTLS:=	libgnutls
+PKGCB_WITH_GNUTLS:=	gnutls
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,TNTNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ifeq (${ADK_PACKAGE_TNTNET_WITHOUT_SSL},y)
+CONFIGURE_ARGS+=	--with-ssl=no
+endif
+ifeq (${ADK_PACKAGE_TNTNET_WITH_OPENSSL},y)
+CONFIGURE_ARGS+=	--with-ssl=openssl
+endif
+ifeq (${ADK_PACKAGE_TNTNET_WITH_GNUTLS},y)
+CONFIGURE_ARGS+=	--with-ssl=gnutls
+endif
 
 CONFIGURE_ARGS+=	--without-epoll \
 			--without-sdk \
 			--without-cgi \
-			--without-sendfile \
-			--without-ssl
+			--without-sendfile
 CONFIGURE_ENV+= 	CXXFLAGS='${TARGET_CXXFLAGS}' \
 			ac_cv_path_cxxtools_config=${STAGING_TARGET_DIR}/usr/bin
 TARGET_LDFLAGS+=	-ldl
 
-post-install:
+tntnet-install:
 	${INSTALL_DIR} ${IDIR_TNTNET}/www
 	${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet
 	${INSTALL_DIR} ${IDIR_TNTNET}/usr/bin
@@ -40,7 +58,7 @@ post-install:
 	${CP} ${WRKINST}/usr/bin/tntnet ${IDIR_TNTNET}/usr/bin
 	${CP} ${WRKINST}/usr/lib/tntnet/tntnet.so* \
 		${IDIR_TNTNET}/usr/lib/tntnet
-	${CP} ${WRKINST}/usr/lib/libtntnet.so.* \
+	${CP} ${WRKINST}/usr/lib/libtntnet.so* \
 		${IDIR_TNTNET}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tntnet/patches/patch-framework_common_gnutls_cpp b/package/tntnet/patches/patch-framework_common_gnutls_cpp
new file mode 100644
index 000000000..02e89c2d0
--- /dev/null
+++ b/package/tntnet/patches/patch-framework_common_gnutls_cpp
@@ -0,0 +1,20 @@
+--- tntnet-2.0.orig/framework/common/gnutls.cpp	2010-03-14 12:26:36.000000000 +0100
++++ tntnet-2.0/framework/common/gnutls.cpp	2011-10-13 17:40:02.000000000 +0200
+@@ -364,7 +364,7 @@ namespace tnt
+           break;
+ 
+         if (ret == GNUTLS_E_AGAIN)
+-          throw cxxtools::net::Timeout();
++          throw cxxtools::IOTimeout();
+ 
+         if (ret < 0 && ret != GNUTLS_E_INTERRUPTED)
+           throw GnuTlsException("gnutls_record_recv", ret);
+@@ -403,7 +403,7 @@ namespace tnt
+           break;
+ 
+         if (ret == GNUTLS_E_AGAIN)
+-          throw cxxtools::net::Timeout();
++          throw cxxtools::IOTimeout();
+ 
+         if (ret != GNUTLS_E_INTERRUPTED)
+           throw GnuTlsException("gnutls_record_send", ret);