summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/cxxtools/Makefile7
-rw-r--r--package/cxxtools/patches/patch-ltmain_sh11
-rw-r--r--package/cxxtools/patches/patch-src_hdstream_cpp11
-rw-r--r--package/libvirt/Makefile8
-rw-r--r--package/libvirt/patches/patch-configure38
-rw-r--r--package/libvirt/patches/patch-libvirt_pc9
-rw-r--r--package/libvirt/patches/patch-src_storage_storage_backend_c11
-rw-r--r--package/tntnet/Makefile32
-rw-r--r--package/tntnet/patches/patch-framework_common_gnutls_cpp20
9 files changed, 53 insertions, 94 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/libvirt/Makefile b/package/libvirt/Makefile
index 138f4c13b..8e4329bb8 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libvirt
-PKG_VERSION:= 0.8.7
+PKG_VERSION:= 0.9.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 596bafb53bb6c079a0703f1726cb2305
+PKG_MD5SUM:= b74df374b524d00a22a6c89cfc23099f
PKG_DESCR:= virtualization API
PKG_SECTION:= libs
-PKG_DEPENDS:= libxml2 libgnutls python2 libpcap
PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted udev
+PKG_DEPENDS:= libxml2 libgnutls python2 libpcap
PKG_URL:= http://www.libvirt.org/
PKG_SITES:= ftp://libvirt.org/libvirt/
@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-TARGET_CFLAGS+= -std=c99
+CONFIGURE_ENV+= gl_cv_warn__fstack_protector_all=no
CONFIGURE_ARGS+= --without-xen \
--without-uml \
--without-esx \
diff --git a/package/libvirt/patches/patch-configure b/package/libvirt/patches/patch-configure
deleted file mode 100644
index 87eb324fc..000000000
--- a/package/libvirt/patches/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- libvirt-0.8.7.orig/configure 2011-01-04 03:22:44.000000000 +0100
-+++ libvirt-0.8.7/configure 2011-01-12 18:43:03.000000000 +0100
-@@ -36745,7 +36745,7 @@ $as_echo "$as_me: Found python in enviro
-
- # Find any Python interpreter.
- if test -z "$PYTHON"; then
-- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
-+ for ac_prog in python python2 python3 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -36920,25 +36920,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6;
- if test -x "$PYTHON_CONFIG"
- then
- PYTHON_INCLUDES=`$PYTHON_CONFIG --includes`
-- else
-- if test -r $PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=-I$PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION
-- else
-- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=-I$prefix/include/python$PYTHON_VERSION
-- else
-- if test -r /usr/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=-I/usr/include/python$PYTHON_VERSION
-- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&5
--$as_echo "$as_me: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&6;}
-- with_python=no
-- fi
-- fi
-- fi
-+ echo "DEBUG: $PYTHON_CONFIG"
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python interpreter, disabling bindings" >&5
diff --git a/package/libvirt/patches/patch-libvirt_pc b/package/libvirt/patches/patch-libvirt_pc
deleted file mode 100644
index a46fcce14..000000000
--- a/package/libvirt/patches/patch-libvirt_pc
+++ /dev/null
@@ -1,9 +0,0 @@
---- libvirt-0.8.7.orig/libvirt.pc 2011-01-04 03:23:23.000000000 +0100
-+++ libvirt-0.8.7/libvirt.pc 2011-01-12 18:31:53.000000000 +0100
-@@ -7,5 +7,5 @@ Name: libvirt
- Version: 0.8.7
- Description: libvirt library
- Requires:
--Libs: -L${libdir} -lvirt -ldl
-+Libs: -L${libdir} -lvirt -lintl
- Cflags: -I${includedir}
diff --git a/package/libvirt/patches/patch-src_storage_storage_backend_c b/package/libvirt/patches/patch-src_storage_storage_backend_c
deleted file mode 100644
index 7a1713e7b..000000000
--- a/package/libvirt/patches/patch-src_storage_storage_backend_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libvirt-0.8.7.orig/src/storage/storage_backend.c 2010-12-22 09:54:05.000000000 +0100
-+++ libvirt-0.8.7/src/storage/storage_backend.c 2011-01-12 18:30:49.000000000 +0100
-@@ -131,7 +131,7 @@ virStorageBackendCopyToFD(virStorageVolD
- goto cleanup;
- }
-
-- bzero(&zerobuf, sizeof(zerobuf));
-+ memset(&zerobuf, 0, sizeof(zerobuf));
-
- if (VIR_ALLOC_N(buf, bytes) < 0) {
- ret = -errno;
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 14:19:08 +0000