diff options
Diffstat (limited to 'package')
30 files changed, 392 insertions, 734 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile index d189d8704..3888c84dc 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.21.4 +PKG_VERSION:= 7.22.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 571a39f70c4c18521cbba5a60f2416c5 +PKG_MD5SUM:= e8c36126d21c893f085aca233906b5cc PKG_DESCR:= a client-side URL transfer tool PKG_SECTION:= www PKG_DEPENDS:= libcurl diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure index 8522ba6c5..b930df6e4 100644 --- a/package/curl/patches/patch-configure +++ b/package/curl/patches/patch-configure @@ -1,6 +1,6 @@ ---- curl-7.21.4.orig/configure 2011-01-30 19:07:52.000000000 +0100 -+++ curl-7.21.4/configure 2011-03-04 18:42:33.000000000 +0100 -@@ -19799,15 +19799,6 @@ fi +--- curl-7.22.0.orig/configure 2011-09-12 22:22:04.000000000 +0200 ++++ curl-7.22.0/configure 2011-10-15 03:05:05.000000000 +0200 +@@ -20641,14 +20641,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -12,7 +12,14 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 -$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} - fi -- fi - fi + # + +@@ -21230,7 +21222,6 @@ $as_echo "$as_me: WARNING: $tst_warns" > + + fi + +-fi + + diff --git a/package/curl/patches/patch-include_curl_curlbuild_h b/package/curl/patches/patch-include_curl_curlbuild_h deleted file mode 100644 index f1ff6a245..000000000 --- a/package/curl/patches/patch-include_curl_curlbuild_h +++ /dev/null @@ -1,581 +0,0 @@ ---- curl-7.21.4.orig/include/curl/curlbuild.h 2011-02-17 13:20:43.000000000 +0100 -+++ curl-7.21.4/include/curl/curlbuild.h 2011-03-04 18:43:20.000000000 +0100 -@@ -1,3 +1,4 @@ -+/* include/curl/curlbuild.h. Generated from curlbuild.h.in by configure. */ - #ifndef __CURL_CURLBUILD_H - #define __CURL_CURLBUILD_H - /*************************************************************************** -@@ -7,7 +8,7 @@ - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. -+ * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms -@@ -30,20 +31,6 @@ - * NOTE 1: - * ------- - * -- * See file include/curl/curlbuild.h.in, run configure, and forget -- * that this file exists it is only used for non-configure systems. -- * But you can keep reading if you want ;-) -- * -- */ -- --/* ================================================================ */ --/* NOTES FOR NON-CONFIGURE SYSTEMS */ --/* ================================================================ */ -- --/* -- * NOTE 1: -- * ------- -- * - * Nothing in this file is intended to be modified or adjusted by the - * curl library user nor by the curl library builder. - * -@@ -51,57 +38,20 @@ - * or fixed in this file, then, report it on the libcurl development - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/ - * -- * Try to keep one section per platform, compiler and architecture, -- * otherwise, if an existing section is reused for a different one and -- * later on the original is adjusted, probably the piggybacking one can -- * be adversely changed. -- * -- * In order to differentiate between platforms/compilers/architectures -- * use only compiler built in predefined preprocessor symbols. -- * - * This header file shall only export symbols which are 'curl' or 'CURL' - * prefixed, otherwise public name space would be polluted. - * - * NOTE 2: - * ------- - * -- * For any given platform/compiler curl_off_t must be typedef'ed to a -- * 64-bit wide signed integral data type. The width of this data type -- * must remain constant and independent of any possible large file -- * support settings. -- * -- * As an exception to the above, curl_off_t shall be typedef'ed to a -- * 32-bit wide signed integral data type if there is no 64-bit type. -- * -- * As a general rule, curl_off_t shall not be mapped to off_t. This -- * rule shall only be violated if off_t is the only 64-bit data type -- * available and the size of off_t is independent of large file support -- * settings. Keep your build on the safe side avoiding an off_t gating. -- * If you have a 64-bit off_t then take for sure that another 64-bit -- * data type exists, dig deeper and you will find it. -- * -- * NOTE 3: -- * ------- -- * -- * Right now you might be staring at file include/curl/curlbuild.h.dist or -+ * Right now you might be staring at file include/curl/curlbuild.h.in or - * at file include/curl/curlbuild.h, this is due to the following reason: -- * file include/curl/curlbuild.h.dist is renamed to include/curl/curlbuild.h -- * when the libcurl source code distribution archive file is created. -- * -- * File include/curl/curlbuild.h.dist is not included in the distribution -- * archive. File include/curl/curlbuild.h is not present in the git tree. -- * -- * The distributed include/curl/curlbuild.h file is only intended to be used -- * on systems which can not run the also distributed configure script. - * - * On systems capable of running the configure script, the configure process - * will overwrite the distributed include/curl/curlbuild.h file with one that - * is suitable and specific to the library being configured and built, which - * is generated from the include/curl/curlbuild.h.in template file. - * -- * If you check out from git on a non-configure platform, you must run the -- * appropriate buildconf* script to set up curlbuild.h and other local files. -- * - */ - - /* ================================================================ */ -@@ -159,425 +109,83 @@ - #endif - - /* ================================================================ */ --/* EXTERNAL INTERFACE SETTINGS FOR NON-CONFIGURE SYSTEMS ONLY */ -+/* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ - /* ================================================================ */ - --#if defined(__DJGPP__) || defined(__GO32__) --# if defined(__DJGPP__) && (__DJGPP__ > 1) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__SALFORDC__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__BORLANDC__) --# if (__BORLANDC__ < 0x520) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__TURBOC__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__WATCOMC__) --# if defined(__386__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__POCC__) --# if (__POCC__ < 280) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# elif defined(_MSC_VER) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__LCC__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__SYMBIAN32__) --# if defined(__EABI__) /* Treat all ARM compilers equally */ --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(__CW32__) --# pragma longlong on --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(__VC32__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL -+/* Configure process defines this to 1 when it finds out that system */ -+/* header file ws2tcpip.h must be included by the external interface. */ -+/* #undef CURL_PULL_WS2TCPIP_H */ -+#ifdef CURL_PULL_WS2TCPIP_H -+# ifndef WIN32_LEAN_AND_MEAN -+# define WIN32_LEAN_AND_MEAN - # endif --# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__MWERKS__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(_WIN32_WCE) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -- --#elif defined(__MINGW32__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+# include <windows.h> -+# include <winsock2.h> -+# include <ws2tcpip.h> -+#endif - --#elif defined(__VMS) --# if defined(__VAX) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+/* Configure process defines this to 1 when it finds out that system */ -+/* header file sys/types.h must be included by the external interface. */ -+#define CURL_PULL_SYS_TYPES_H 1 -+#ifdef CURL_PULL_SYS_TYPES_H -+# include <sys/types.h> -+#endif - --#elif defined(__OS400__) --# if defined(__ILEC400__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 --# define CURL_PULL_SYS_TYPES_H 1 --# define CURL_PULL_SYS_SOCKET_H 1 --# endif -+/* Configure process defines this to 1 when it finds out that system */ -+/* header file stdint.h must be included by the external interface. */ -+#define CURL_PULL_STDINT_H 1 -+#ifdef CURL_PULL_STDINT_H -+# include <stdint.h> -+#endif - --#elif defined(__MVS__) --# if defined(__IBMC__) || defined(__IBMCPP__) --# if defined(_ILP32) --# define CURL_SIZEOF_LONG 4 --# elif defined(_LP64) --# define CURL_SIZEOF_LONG 8 --# endif --# if defined(_LONG_LONG) --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(_LP64) --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# else --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 --# define CURL_PULL_SYS_TYPES_H 1 --# define CURL_PULL_SYS_SOCKET_H 1 --# endif -+/* Configure process defines this to 1 when it finds out that system */ -+/* header file inttypes.h must be included by the external interface. */ -+#define CURL_PULL_INTTYPES_H 1 -+#ifdef CURL_PULL_INTTYPES_H -+# include <inttypes.h> -+#endif - --#elif defined(__370__) --# if defined(__IBMC__) || defined(__IBMCPP__) --# if defined(_ILP32) --# define CURL_SIZEOF_LONG 4 --# elif defined(_LP64) --# define CURL_SIZEOF_LONG 8 --# endif --# if defined(_LONG_LONG) --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(_LP64) --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# else --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 --# define CURL_PULL_SYS_TYPES_H 1 --# define CURL_PULL_SYS_SOCKET_H 1 --# endif -+/* Configure process defines this to 1 when it finds out that system */ -+/* header file sys/socket.h must be included by the external interface. */ -+#define CURL_PULL_SYS_SOCKET_H 1 -+#ifdef CURL_PULL_SYS_SOCKET_H -+# include <sys/socket.h> -+#endif - --#elif defined(TPF) --# define CURL_SIZEOF_LONG 8 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+/* The size of `long', as computed by sizeof. */ -+#define CURL_SIZEOF_LONG 4 - --/* ===================================== */ --/* KEEP MSVC THE PENULTIMATE ENTRY */ --/* ===================================== */ -+/* Integral data type used for curl_socklen_t. */ -+#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t - --#elif defined(_MSC_VER) --# if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T __int64 --# define CURL_FORMAT_CURL_OFF_T "I64d" --# define CURL_FORMAT_CURL_OFF_TU "I64u" --# define CURL_FORMAT_OFF_T "%I64d" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T i64 --# define CURL_SUFFIX_CURL_OFF_TU ui64 --# else --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 4 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T int --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -+/* The size of `curl_socklen_t', as computed by sizeof. */ -+#define CURL_SIZEOF_CURL_SOCKLEN_T 4 - --/* ===================================== */ --/* KEEP GENERIC GCC THE LAST ENTRY */ --/* ===================================== */ -+/* Data type definition of curl_socklen_t. */ -+typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; - --#elif defined(__GNUC__) --# if defined(__i386__) || defined(__ppc__) --# define CURL_SIZEOF_LONG 4 --# define CURL_TYPEOF_CURL_OFF_T long long --# define CURL_FORMAT_CURL_OFF_T "lld" --# define CURL_FORMAT_CURL_OFF_TU "llu" --# define CURL_FORMAT_OFF_T "%lld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T LL --# define CURL_SUFFIX_CURL_OFF_TU ULL --# elif defined(__x86_64__) || defined(__ppc64__) --# define CURL_SIZEOF_LONG 8 --# define CURL_TYPEOF_CURL_OFF_T long --# define CURL_FORMAT_CURL_OFF_T "ld" --# define CURL_FORMAT_CURL_OFF_TU "lu" --# define CURL_FORMAT_OFF_T "%ld" --# define CURL_SIZEOF_CURL_OFF_T 8 --# define CURL_SUFFIX_CURL_OFF_T L --# define CURL_SUFFIX_CURL_OFF_TU UL --# endif --# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t --# define CURL_SIZEOF_CURL_SOCKLEN_T 4 --# define CURL_PULL_SYS_TYPES_H 1 --# define CURL_PULL_SYS_SOCKET_H 1 -+/* Signed integral data type used for curl_off_t. */ -+#define CURL_TYPEOF_CURL_OFF_T int64_t - --#else --# error "Unknown non-configure build target!" -- Error Compilation_aborted_Unknown_non_configure_build_target --#endif -+/* Data type definition of curl_off_t. */ -+typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; - --/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file */ --/* sys/types.h is required here to properly make type definitions below. */ --#ifdef CURL_PULL_SYS_TYPES_H --# include <sys/types.h> --#endif -+/* curl_off_t formatting string directive without "%" conversion specifier. */ -+#define CURL_FORMAT_CURL_OFF_T "lld" - --/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file */ --/* sys/socket.h is required here to properly make type definitions below. */ --#ifdef CURL_PULL_SYS_SOCKET_H --# include <sys/socket.h> --#endif -+/* unsigned curl_off_t formatting string without "%" conversion specifier. */ -+#define CURL_FORMAT_CURL_OFF_TU "llu" - --/* Data type definition of curl_socklen_t. */ -+/* curl_off_t formatting string directive with "%" conversion specifier. */ -+#define CURL_FORMAT_OFF_T "%lld" - --#ifdef CURL_TYPEOF_CURL_SOCKLEN_T -- typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; --#endif -+/* The size of `curl_off_t', as computed by sizeof. */ -+#define CURL_SIZEOF_CURL_OFF_T 8 - --/* Data type definition of curl_off_t. */ -+/* curl_off_t constant suffix. */ -+#define CURL_SUFFIX_CURL_OFF_T LL - --#ifdef CURL_TYPEOF_CURL_OFF_T -- typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; --#endif -+/* unsigned curl_off_t constant suffix. */ -+#define CURL_SUFFIX_CURL_OFF_TU ULL - - #endif /* __CURL_CURLBUILD_H */ diff --git a/package/curl/patches/patch-lib_Makefile_in b/package/curl/patches/patch-lib_Makefile_in deleted file mode 100644 index 65cc0f8b9..000000000 --- a/package/curl/patches/patch-lib_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- curl-7.21.4.orig/lib/Makefile.in 2011-02-02 13:22:52.000000000 +0100 -+++ curl-7.21.4/lib/Makefile.in 2011-03-04 18:46:09.000000000 +0100 -@@ -412,7 +412,7 @@ CLEANFILES = $(DSP) $(VCPROJ) - lib_LTLIBRARIES = libcurl.la - - # This might hold -Werror --libcurl_la_CFLAGS = $(CFLAGS) @CURL_CFLAG_EXTRAS@ -+libcurl_la_CFLAGS = @CURL_CFLAG_EXTRAS@ - @USE_EMBEDDED_ARES_FALSE@INCLUDES = -I$(top_builddir)/include/curl \ - @USE_EMBEDDED_ARES_FALSE@ -I$(top_builddir)/include \ - @USE_EMBEDDED_ARES_FALSE@ -I$(top_srcdir)/include \ diff --git a/package/curl/patches/patch-ltmain_sh b/package/curl/patches/patch-ltmain_sh index b1eef4628..5b2293c22 100644 --- a/package/curl/patches/patch-ltmain_sh +++ b/package/curl/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- curl-7.21.0.orig/ltmain.sh 2010-05-27 21:20:16.000000000 +0200 -+++ curl-7.21.0/ltmain.sh 2011-01-14 12:07:25.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +--- curl-7.22.0.orig/ltmain.sh 2011-09-12 22:21:51.000000000 +0200 ++++ curl-7.22.0/ltmain.sh 2011-10-15 03:03:37.000000000 +0200 +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -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) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" 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/dnsmasq/Makefile b/package/dnsmasq/Makefile index 39dd371a5..f8dfccda0 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.57 +PKG_VERSION:= 2.58 PKG_RELEASE:= 1 -PKG_MD5SUM:= d10faeb409717eae94718d7716ca63a4 +PKG_MD5SUM:= 14c5c81debb324adc261db971730f4c6 PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= dns PKG_URL:= http://thekelleys.org.uk/dnsmasq/ diff --git a/package/git/Makefile b/package/git/Makefile index 5c7b91d88..ad415a8fd 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 1.7.4.1 +PKG_VERSION:= 1.7.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1276aa1366bd3c670e9c51f1bff12f36 +PKG_MD5SUM:= 5d645884e688921e773186783b65ce33 PKG_DESCR:= fast version control system PKG_SECTION:= scm PKG_BUILDDEP:= openssl curl expat PKG_DEPENDS:= libopenssl libcurl libexpat libpthread PKG_URL:= http://git-scm.com/ -PKG_SITES:= http://kernel.org/pub/software/scm/git/ +PKG_SITES:= http://git-core.googlecode.com/files/ include $(TOPDIR)/mk/package.mk diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 9a39ffe60..040fbcb96 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables -PKG_VERSION:= 1.4.10 +PKG_VERSION:= 1.4.12.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= f382fe693f0b59d87bd47bea65eca198 +PKG_MD5SUM:= b08a1195ec2c1ebeaf072db3c55fdf43 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack @@ -20,6 +20,7 @@ PKG_URL:= http://www.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ PKG_SUBPKGS:= IPTABLES IP6TABLES IPTABLES_DEV +PKGSC_IPTABLES_DEV:= devel DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -30,7 +31,7 @@ include ${TOPDIR}/mk/package.mk #include ${LINUX_DIR}/.config $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,IPTABLES_DEV,iptables-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,IPTABLES_DEV,iptables-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKGSC_IPTABLES_DEV})) $(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS6},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --enable-devel diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index 138f4c13b..6d3b65d19 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -4,13 +4,14 @@ 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 libreadline +PKG_DEPENDS+= libintl PKG_URL:= http://www.libvirt.org/ PKG_SITES:= ftp://libvirt.org/libvirt/ @@ -21,7 +22,9 @@ 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 +include ${TOPDIR}/mk/python.mk + +CONFIGURE_ENV+= gl_cv_warn__fstack_protector_all=no CONFIGURE_ARGS+= --without-xen \ --without-uml \ --without-esx \ @@ -36,8 +39,11 @@ post-install: ${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/lib ${IDIR_LIBVIRT}/usr/bin ${INSTALL_DIR} ${IDIR_LIBVIRT}/etc/libvirt ${IDIR_LIBVIRT}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/bin/virsh ${IDIR_LIBVIRT}/usr/bin - ${CP} ${WRKINST}/usr/lib/libvirt.so* ${IDIR_LIBVIRT}/usr/lib + ${CP} ${WRKINST}/usr/lib/libvirt*.so* ${IDIR_LIBVIRT}/usr/lib ${CP} ${WRKINST}/etc/libvirt/* ${IDIR_LIBVIRT}/etc/libvirt ${INSTALL_BIN} ${WRKINST}/usr/sbin/libvirtd ${IDIR_LIBVIRT}/usr/sbin + ${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ + ${IDIR_LIBVIRT}/usr/lib/python$(PYTHON_VERSION)/site-packages include ${TOPDIR}/mk/pkg-bottom.mk 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/libxml2/Makefile b/package/libxml2/Makefile index 8bfe1bb20..cae954797 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -14,20 +14,30 @@ PKG_BUILDDEP:= zlib PKG_URL:= http://www.xmlsoft.org/ PKG_SITES:= http://xmlsoft.org/sources/ -PKG_SUBPKGS:= LIBXML2 LIBXML2_DEV +PKG_SUBPKGS:= LIBXML2 LIBXML2_DEV LIBXML2_PYTHON PKGSD_LIBXML2_DEV:= XML parser headers PKGSC_LIBXML2_DEV:= devel +PKGSD_LIBXML2_PYTHON:= XML python bindings +PKGSC_LIBXML2_PYTHON:= libs include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBXML2_DEV,libxml2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_DEV},${PKGSC_LIBXML2_DEV})) +$(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_PYTHON},${PKGSC_LIBXML2_PYTHON})) + +include $(TOPDIR)/mk/python.mk TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +ifeq ($(ADK_PACKAGE_LIBXML2_PYTHON),y) +CONFIGURE_ARGS+= --with-python=${STAGING_DIR}/usr +else +CONFIGURE_ARGS+= --without-python +endif CONFIGURE_ARGS+= --without-c14n \ - --without-catalog \ --without-debug \ --without-docbook \ + --with-catalog \ --with-html \ --without-ftp \ --without-http \ @@ -37,7 +47,6 @@ CONFIGURE_ARGS+= --without-c14n \ --with-output \ --without-pattern \ --without-push \ - --without-python \ --with-reader \ --without-readline \ --without-regexps \ @@ -66,4 +75,9 @@ libxml2-dev-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/xml2-config \ ${IDIR_LIBXML2_DEV}/usr/bin +libxml2-python-install: + $(INSTALL_DIR) $(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ + $(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxml2/patches/patch-configure b/package/libxml2/patches/patch-configure new file mode 100644 index 000000000..f5a2ba355 --- /dev/null +++ b/package/libxml2/patches/patch-configure @@ -0,0 +1,33 @@ +--- libxml2-2.7.8.orig/configure 2010-11-04 18:28:14.000000000 +0100 ++++ libxml2-2.7.8/configure 2011-10-15 15:07:16.000000000 +0200 +@@ -13423,17 +13423,17 @@ case ${host} in + esac + + +- ++set -x + PYTHON_VERSION= + PYTHON_INCLUDES= + PYTHON_SITE_PACKAGES= + PYTHON_TESTS= + pythondir= + if test "$with_python" != "no" ; then +- if test -x "$with_python/bin/python" ++ if test -x "$with_python/bin/hostpython" + then +- echo Found python in $with_python/bin/python +- PYTHON="$with_python/bin/python" ++ echo Found python in $with_python/bin/hostpython ++ PYTHON="$with_python/bin/hostpython" + else + if test -x "$with_python/python.exe" + then +@@ -13558,7 +13558,7 @@ else + PYTHON_SUBDIR= + fi + +- ++set +x + + + WITH_MODULES=0 diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 0eca41056..a96473372 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 5.8p2 +PKG_VERSION:= 5.9p1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0541579adf9d55abb15ef927048d372e +PKG_MD5SUM:= afe17eee7e98d3b8550cc349834a85d0 PKG_DESCR:= OpenSSH PKG_SECTION:= net/security -PKG_DEPENDS:= zlib libopenssl libpthread PKG_BUILDDEP:= zlib openssl +PKG_DEPENDS:= zlib libopenssl libpthread PKG_URL:= http://www.openssh.com/ PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ PKG_MULTI:= 1 diff --git a/package/openssl/Makefile b/package/openssl/Makefile index fac054ca5..22a411a16 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 1.0.0d +PKG_VERSION:= 1.0.0e PKG_RELEASE:= 1 -PKG_MD5SUM:= 40b6ea380cc8a5bf9734c2f8bf7e701e +PKG_MD5SUM:= 7040b89c4c58c7a1016c0dfa6e821c86 PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries PKG_SECTION:= libs PKG_DEPENDS:= zlib diff --git a/package/pycurl/Makefile b/package/pycurl/Makefile new file mode 100644 index 000000000..a0325ad11 --- /dev/null +++ b/package/pycurl/Makefile @@ -0,0 +1,44 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pycurl +PKG_VERSION:= 7.19.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 919d58fe37e69fe87ce4534d8b6a1c7b +PKG_DESCR:= Python module for fetching of files +PKG_SECTION:= misc +PKG_BUILDDEP:= python2 curl +PKG_DEPENDS:= python2 libcurl +PKG_URL:= http://pycurl.sourceforge.net/ +PKG_SITES:= http://pycurl.sourceforge.net/download/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PYCURL,pycurl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +TARGET_CFLAGS+= -fPIC +MAKE_ENV+= LDSHARED="$(TARGET_CC) -shared" + +include $(TOPDIR)/mk/python.mk + +#do-configure: + # native build for urlgrabber package +# (cd $(WRKBUILD); env CC=$(CC_FOR_BUILD) CFLAGS="$(CFLAGS_FOR_BUILD)" python ./setup.py build) +# (cd $(WRKBUILD); enc CC=$(CC_FOR_BUILD) CFLAGS="$(CFLAGS_FOR_BUILD)" python ./setup.py install --prefix="$(STAGING_DIR)/usr") + +do-build: + (cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py --curl-config="$(STAGING_DIR)/usr/bin/curl-config" build) + (cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr") + +do-install: + $(INSTALL_DIR) $(IDIR_PYCURL)/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ + $(IDIR_PYCURL)/usr/lib/python$(PYTHON_VERSION)/site-packages + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pycurl/patches/patch-setup_py b/package/pycurl/patches/patch-setup_py new file mode 100644 index 000000000..26280ec36 --- /dev/null +++ b/package/pycurl/patches/patch-setup_py @@ -0,0 +1,12 @@ +--- pycurl-7.19.0.orig/setup.py 2008-09-09 19:40:34.000000000 +0200 ++++ pycurl-7.19.0/setup.py 2011-10-14 17:59:41.000000000 +0200 +@@ -115,9 +115,6 @@ else: + define_macros.append(('HAVE_CURL_SSL', 1)) + if not libraries: + libraries.append("curl") +- # Add extra compile flag for MacOS X +- if sys.platform[:-1] == "darwin": +- extra_link_args.append("-flat_namespace") + + + ############################################################################### diff --git a/package/python2/Makefile b/package/python2/Makefile index 53e770f2d..2aed3ed49 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -46,9 +46,10 @@ post-extract: $(CP) ./files/setup.py ${WRKBUILD}/setup.py $(CP) ./files/posixmodule.c ${WRKBUILD}/Modules/posixmodule.c $(CP) ./files/python-config.in ${WRKBUILD}/Misc/python-config.in + $(CP) ./files/build_scripts.py ${WRKBUILD}/Lib/distutils/command/build_scripts.py (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ OPT="$(CFLAGS_FOR_BUILD)" \ - ./configure --without-cxx-main --without-threads \ + ./configure --without-cxx-main --with-threads \ --prefix=$(STAGING_HOST_DIR)/usr \ ); $(MAKE) -C ${WRKBUILD} python Parser/pgen @@ -62,6 +63,7 @@ post-extract: pre-configure: $(SED) "s#@@CPU_ARCH@@#$(CPU_ARCH)#" ${WRKBUILD}/configure + $(SED) "s#@@STAGING_DIR@@#$(STAGING_DIR)#" ${WRKBUILD}/setup.py post-install: ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/bin ${IDIR_PYTHON2}/usr/lib diff --git a/package/python2/files/build_scripts.py b/package/python2/files/build_scripts.py new file mode 100644 index 000000000..fe81a5341 --- /dev/null +++ b/package/python2/files/build_scripts.py @@ -0,0 +1,99 @@ +"""distutils.command.build_scripts + +Implements the Distutils 'build_scripts' command.""" + +__revision__ = "$Id: build_scripts.py 77704 2010-01-23 09:23:15Z tarek.ziade $" + +import os, re +from stat import ST_MODE +from distutils.core import Command +from distutils.dep_util import newer +from distutils.util import convert_path +from distutils import log + +# check if Python is called on the first line with this expression +first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$') + +class build_scripts (Command): + + description = "\"build\" scripts (copy and fixup #! line)" + + user_options = [ + ('build-dir=', 'd', "directory to \"build\" (copy) to"), + ('force', 'f', "forcibly build everything (ignore file timestamps"), + ('executable=', 'e', "specify final destination interpreter path"), + ] + + boolean_options = ['force'] + + + def initialize_options (self): + self.build_dir = None + self.scripts = None + self.force = None + self.executable = None + self.outfiles = None + + def finalize_options (self): + self.set_undefined_options('build', + ('build_scripts', 'build_dir'), + ('force', 'force'), + ('executable', 'executable')) + self.scripts = self.distribution.scripts + + def get_source_files(self): + return self.scripts + + def run (self): + if not self.scripts: + return + self.copy_scripts() + + + def copy_scripts (self): + """Copy each script listed in 'self.scripts'; if it's marked as a + Python script in the Unix way (first line matches 'first_line_re', + ie. starts with "\#!" and contains "python"), then adjust the first + line to refer to the current Python interpreter as we copy. + """ + _sysconfig = __import__('sysconfig') + self.mkpath(self.build_dir) + outfiles = [] + for script in self.scripts: + adjust = 0 + script = convert_path(script) + outfile = os.path.join(self.build_dir, os.path.basename(script)) + outfiles.append(outfile) + + if not self.force and not newer(script, outfile): + log.debug("not copying %s (up-to-date)", script) + continue + + # Always open the file, but ignore failures in dry-run mode -- + # that way, we'll get accurate feedback if we can read the + # script. + try: + f = open(script, "r") + except IOError: + if not self.dry_run: + raise + f = None + if f: + f.close() + self.copy_file(script, outfile) + + if os.name == 'posix': + for file in outfiles: + if self.dry_run: + log.info("changing mode of %s", file) + else: + oldmode = os.stat(file)[ST_MODE] & 07777 + newmode = (oldmode | 0555) & 07777 + if newmode != oldmode: + log.info("changing mode of %s from %o to %o", + file, oldmode, newmode) + os.chmod(file, newmode) + + # copy_scripts () + +# class build_scripts diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in index d3737ae3e..694518173 100644 --- a/package/python2/patches/patch-Makefile_pre_in +++ b/package/python2/patches/patch-Makefile_pre_in @@ -1,6 +1,6 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in --- Python-2.7.1.orig/Makefile.pre.in 2010-10-14 13:37:30.000000000 +0200 -+++ Python-2.7.1/Makefile.pre.in 2011-01-20 22:13:22.464906869 +0100 ++++ Python-2.7.1/Makefile.pre.in 2011-10-15 16:09:58.000000000 +0200 @@ -59,7 +59,7 @@ MAKESETUP= $(srcdir)/Modules/makese # Compiler options OPT= @OPT@ @@ -35,7 +35,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in build_all_use_profile: $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use" -@@ -398,14 +400,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA +@@ -398,14 +400,13 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) platform: $(BUILDPYTHON) @@ -48,12 +48,11 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in @case $$MAKEFLAGS in \ - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ esac # Build static library -@@ -538,7 +540,7 @@ Modules/python.o: $(srcdir)/Modules/pyth +@@ -538,7 +539,7 @@ Modules/python.o: $(srcdir)/Modules/pyth $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -@$(INSTALL) -d Include @@ -62,7 +61,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in $(PGEN): $(PGENOBJS) $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -702,7 +704,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho +@@ -702,7 +703,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho TESTOPTS= -l $(EXTRATESTOPTS) TESTPROG= $(srcdir)/Lib/test/regrtest.py @@ -71,7 +70,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in test: all platform -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -@@ -725,7 +727,7 @@ testuniversal: all platform +@@ -725,7 +726,7 @@ testuniversal: all platform -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) $(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) @@ -80,7 +79,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in # Like testall, but with a single pass only -@@ -920,26 +922,26 @@ libinstall: build_all $(srcdir)/Lib/$(PL +@@ -920,26 +921,26 @@ libinstall: build_all $(srcdir)/Lib/$(PL done; \ done $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt @@ -114,7 +113,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): -@@ -1044,7 +1046,8 @@ libainstall: all python-config +@@ -1044,7 +1045,8 @@ libainstall: all python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -124,7 +123,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ -@@ -1082,7 +1085,7 @@ frameworkinstallstructure: $(LDLIBRARY) +@@ -1082,7 +1084,7 @@ frameworkinstallstructure: $(LDLIBRARY) fi; \ done $(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers @@ -133,7 +132,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers -@@ -1117,7 +1120,7 @@ frameworkinstallextras: +@@ -1117,7 +1119,7 @@ frameworkinstallextras: # This installs a few of the useful scripts in Tools/scripts scriptsinstall: SRCDIR=$(srcdir) $(RUNSHARED) \ @@ -142,7 +141,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --root=/$(DESTDIR) -@@ -1139,7 +1142,7 @@ config.status: $(srcdir)/configure +@@ -1139,7 +1141,7 @@ config.status: $(srcdir)/configure # Run reindent on the library reindent: @@ -151,7 +150,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in # Rerun configure with the same options as it was run last time, # provided the config.status script exists -@@ -1242,7 +1245,7 @@ funny: +@@ -1242,7 +1244,7 @@ funny: # Perform some verification checks on any modified files. patchcheck: diff --git a/package/python2/patches/patch-configure b/package/python2/patches/patch-configure index 5f31d2fdb..e47d860fd 100644 --- a/package/python2/patches/patch-configure +++ b/package/python2/patches/patch-configure @@ -1,5 +1,5 @@ --- Python-2.7.1.orig/configure 2010-11-01 02:47:19.000000000 +0100 -+++ Python-2.7.1/configure 2011-10-06 18:21:02.848792210 +0200 ++++ Python-2.7.1/configure 2011-10-14 17:36:48.000000000 +0200 @@ -2972,12 +2972,12 @@ fi $as_echo_n "checking MACHDEP... " >&6; } if test -z "$MACHDEP" @@ -20,7 +20,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking machine type as reported by uname -m" >&5 $as_echo_n "checking machine type as reported by uname -m... " >&6; } -ac_sys_machine=`uname -m` -+ac_sys_machine=@@CPU_ARCH@@ ++ac_sys_machine=x86_64 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_sys_machine" >&5 $as_echo "$ac_sys_machine" >&6; } diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py index 7da78c43c..fb91da1d3 100644 --- a/package/python2/patches/patch-setup_py +++ b/package/python2/patches/patch-setup_py @@ -89,8 +89,8 @@ diff -Nur Python-2.7.orig/setup.py Python-2.7/setup.py - '/lib', '/usr/lib', - ] - inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ lib_dirs = self.compiler.library_dirs -+ inc_dirs = self.compiler.include_dirs ++ lib_dirs = self.compiler.library_dirs + ['@@STAGING_DIR@@/usr/lib'] ++ inc_dirs = self.compiler.include_dirs + ['@@STAGING_DIR@@/usr/include'] exts = [] missing = [] 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); diff --git a/package/urlgrabber/Makefile b/package/urlgrabber/Makefile new file mode 100644 index 000000000..13df6f985 --- /dev/null +++ b/package/urlgrabber/Makefile @@ -0,0 +1,36 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= urlgrabber +PKG_VERSION:= 3.9.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 00c8359bf71062d0946bacea521f80b4 +PKG_DESCR:= Python module for fetching of files +PKG_SECTION:= misc +PKG_BUILDDEP:= pycurl +PKG_DEPENDS:= pycurl +PKG_URL:= http://urlgrabber.baseurl.org/ +PKG_SITES:= http://urlgrabber.baseurl.org/download/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,URLGRABBER,urlgrabber,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +include $(TOPDIR)/mk/python.mk + +do-build: + (cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build) + (cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr") + +do-install: + $(INSTALL_DIR) $(IDIR_URLGRABBER)/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ + $(IDIR_URLGRABBER)/usr/lib/python$(PYTHON_VERSION)/site-packages + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/virtinst/Makefile b/package/virtinst/Makefile new file mode 100644 index 000000000..4c2414920 --- /dev/null +++ b/package/virtinst/Makefile @@ -0,0 +1,38 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= virtinst +PKG_VERSION:= 0.600.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d8f6a61d7edbc78129a8b5df2807ad46 +PKG_DESCR:= virtual machine installer +PKG_SECTION:= misc +PKG_BUILDDEP:= python2 urlgrabber libxml2 libxslt +PKG_DEPENDS:= python2 urlgrabber libxml2-python libxslt +PKG_URL:= http://virt-manager.org/ +PKG_SITES:= http://virt-manager.org/download/sources/virtinst/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,VIRTINST,virtinst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +include $(TOPDIR)/mk/python.mk + +do-build: + (cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build) + (cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr") + +do-install: + $(INSTALL_DIR) $(IDIR_VIRTINST)/usr/bin + $(INSTALL_DIR) $(IDIR_VIRTINST)/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(WRKINST)/usr/bin/virt-* $(IDIR_VIRTINST)/usr/bin + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ + $(IDIR_VIRTINST)/usr/lib/python$(PYTHON_VERSION)/site-packages + +include ${TOPDIR}/mk/pkg-bottom.mk |