update to latest upstream version

5 files changed, 48 insertions, 26 deletions

diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index e1e1c9497..9470d8fb2 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cxxtools
-PKG_VERSION:=		2.0
+PKG_VERSION:=		2.1.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		763ef672a577fa8b93c37239ee0f3d59
+PKG_MD5SUM:=		2026a2bb23b966f13893167b4dbc5d70
 PKG_DESCR:=		a collection of general-purpose C++ classes (libraries)
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libiconv
@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		libiconv
 PKG_URL:=		http://www.tntnet.org/
 PKG_SITES:=		http://www.tntnet.org/download/
 PKG_NEED_CXX:=		1
+PKG_CXX:=		CXXTOOLS
 
 PKG_ARCH_DEPENDS:=	!arm !avr32
 
@@ -30,7 +31,7 @@ TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
 TARGET_CXXFLAGS+=	-fno-builtin -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E
-TARGET_LDFLAGS+=	-luClibc++ -liconv -lm -nodefaultlibs -shared
+TARGET_LDFLAGS+=	-luClibc++ -liconv -lm -lc -nodefaultlibs -shared
 else
 TARGET_LDFLAGS+=	-liconv -shared
 endif
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 4875fb449..dc6e8596f 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tntnet
-PKG_VERSION:=		2.0
+PKG_VERSION:=		2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8f7185eeed23e7ae6a9be314e2fc0d36
+PKG_MD5SUM:=		a9c85aa6d624f7f88c48374f28730242
 PKG_DESCR:=		small C++ application server
 PKG_SECTION:=		www
 PKG_DEPENDS:=		cxxtools zlib libiconv libpthread
@@ -46,7 +46,22 @@ CONFIGURE_ARGS+=	--without-epoll \
 			--without-sendfile
 CONFIGURE_ENV+= 	CXXFLAGS='${TARGET_CXXFLAGS}' \
 			ac_cv_path_cxxtools_config=${STAGING_TARGET_DIR}/usr/bin
+
+ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
+TARGET_CXXFLAGS+=	-fno-builtin -nostdinc++ \
+			-I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E
+TARGET_LDFLAGS+=	-luClibc++ -lm -lc -ldl -nodefaultlibs -shared
+else
 TARGET_LDFLAGS+=	-ldl
+endif
+
+ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
+# add workaround because libtool tries to link libstdc++
+post-configure:
+		${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
+			${WRKBUILD}/libtool
+endif
+
 
 tntnet-install:
 	${INSTALL_DIR} ${IDIR_TNTNET}/www
diff --git a/package/tntnet/files/tntnet.init b/package/tntnet/files/tntnet.init
new file mode 100644
index 000000000..e7e2e19c7
--- /dev/null
+++ b/package/tntnet/files/tntnet.init
@@ -0,0 +1,26 @@
+#!/bin/sh
+#PKG tntnet
+#INIT 90
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${tntnet:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/bin/tntnet /etc/tntnet/tntnet.conf
+  	;;
+stop)
+	kill $(pgrep -f /usr/bin/tntnet)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "usage: $0 {start | stop | restart}"
+	;;
+esac
+exit $?
diff --git a/package/tntnet/files/tntnet.postinst b/package/tntnet/files/tntnet.postinst
index 9d462f8d3..8a86ea6b0 100644
--- a/package/tntnet/files/tntnet.postinst
+++ b/package/tntnet/files/tntnet.postinst
@@ -1,6 +1,6 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf tntnet
+add_rcconf tntnet tntnet NO
 gid=$(get_next_gid)
 add_group tntnet $gid
 add_user tntnet $(get_next_uid) $gid /www
diff --git a/package/tntnet/patches/patch-framework_common_gnutls_cpp b/package/tntnet/patches/patch-framework_common_gnutls_cpp
deleted file mode 100644
index 02e89c2d0..000000000
--- a/package/tntnet/patches/patch-framework_common_gnutls_cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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);