summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.11/configure-fix.patch (renamed from meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch)40
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-openssl.patch (renamed from meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-texinfo-euro.patch (renamed from meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.11.bb9
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.5.bb9
5 files changed, 28 insertions, 30 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.11/configure-fix.patch
index e6f9785a99..14f87e03d3 100644
--- a/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.11/configure-fix.patch
@@ -11,13 +11,13 @@ against 2.8.6
1107/02/2010 - qhe 1107/02/2010 - qhe
12 12
13--- 13---
14Index: gnutls-2.12.5/lib/configure.ac 14Index: gnutls-2.12.11/lib/configure.ac
15=================================================================== 15===================================================================
16--- gnutls-2.12.5.orig/lib/configure.ac 2011-05-11 00:05:33.000000000 -0700 16--- gnutls-2.12.11.orig/lib/configure.ac
17+++ gnutls-2.12.5/lib/configure.ac 2011-05-25 19:45:23.721180103 -0700 17+++ gnutls-2.12.11/lib/configure.ac
18@@ -96,8 +96,8 @@ 18@@ -126,8 +126,8 @@ lgl_INIT
19 dnl for pakchois 19 AC_CHECK_FUNCS(getrusage,,)
20 AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dlclose (0);]) 20 AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock (0);])
21 21
22-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS" 22-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
23-LIBGNUTLS_CFLAGS="-I${includedir}" 23-LIBGNUTLS_CFLAGS="-I${includedir}"
@@ -26,24 +26,22 @@ Index: gnutls-2.12.5/lib/configure.ac
26 AC_SUBST(LIBGNUTLS_LIBS) 26 AC_SUBST(LIBGNUTLS_LIBS)
27 AC_SUBST(LIBGNUTLS_CFLAGS) 27 AC_SUBST(LIBGNUTLS_CFLAGS)
28 28
29Index: gnutls-2.12.5/lib/gnutls.pc.in 29Index: gnutls-2.12.11/lib/gnutls.pc.in
30=================================================================== 30===================================================================
31--- gnutls-2.12.5.orig/lib/gnutls.pc.in 2011-04-23 08:00:07.000000000 -0700 31--- gnutls-2.12.11.orig/lib/gnutls.pc.in
32+++ gnutls-2.12.5/lib/gnutls.pc.in 2011-05-25 19:50:11.926102288 -0700 32+++ gnutls-2.12.11/lib/gnutls.pc.in
33@@ -19,7 +19,6 @@ 33@@ -20,6 +20,4 @@ Description: Transport Security Layer im
34 Description: Transport Security Layer implementation for the GNU system
35 URL: http://www.gnu.org/software/gnutls/ 34 URL: http://www.gnu.org/software/gnutls/
36 Version: @VERSION@ 35 Version: @VERSION@
37+Requires.private: libgcrypt, libtasn1
38 Libs: -L${libdir} -lgnutls 36 Libs: -L${libdir} -lgnutls
39-Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@ 37-Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@
40-@GNUTLS_REQUIRES_PRIVATE@ 38-@GNUTLS_REQUIRES_PRIVATE@
41 Cflags: -I${includedir} 39 Cflags: -I${includedir}
42Index: gnutls-2.12.5/libextra/configure.ac 40Index: gnutls-2.12.11/libextra/configure.ac
43=================================================================== 41===================================================================
44--- gnutls-2.12.5.orig/libextra/configure.ac 2011-05-11 00:05:31.000000000 -0700 42--- gnutls-2.12.11.orig/libextra/configure.ac
45+++ gnutls-2.12.5/libextra/configure.ac 2011-05-25 19:45:23.722186801 -0700 43+++ gnutls-2.12.11/libextra/configure.ac
46@@ -41,8 +41,8 @@ 44@@ -41,8 +41,8 @@ LIBGNUTLS_EXTRA_HOOKS
47 45
48 xgl_INIT 46 xgl_INIT
49 47
@@ -54,11 +52,11 @@ Index: gnutls-2.12.5/libextra/configure.ac
54 AC_SUBST(LIBGNUTLS_EXTRA_LIBS) 52 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
55 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) 53 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
56 54
57Index: gnutls-2.12.5/libextra/gnutls-extra.pc.in 55Index: gnutls-2.12.11/libextra/gnutls-extra.pc.in
58=================================================================== 56===================================================================
59--- gnutls-2.12.5.orig/libextra/gnutls-extra.pc.in 2011-04-07 17:30:45.000000000 -0700 57--- gnutls-2.12.11.orig/libextra/gnutls-extra.pc.in
60+++ gnutls-2.12.5/libextra/gnutls-extra.pc.in 2011-05-25 19:45:23.722186801 -0700 58+++ gnutls-2.12.11/libextra/gnutls-extra.pc.in
61@@ -22,5 +22,5 @@ 59@@ -22,5 +22,5 @@ URL: http://www.gnu.org/software/gnutls/
62 Requires: gnutls 60 Requires: gnutls
63 Version: @VERSION@ 61 Version: @VERSION@
64 Libs: -L${libdir} -lgnutls-extra 62 Libs: -L${libdir} -lgnutls-extra
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-openssl.patch
index ef70674881..ef70674881 100644
--- a/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-openssl.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-texinfo-euro.patch
index 10e377407a..10e377407a 100644
--- a/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-texinfo-euro.patch
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.11.bb b/meta/recipes-support/gnutls/gnutls_2.12.11.bb
new file mode 100644
index 0000000000..bd5ebb36ca
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_2.12.11.bb
@@ -0,0 +1,9 @@
1require gnutls.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://gnutls-openssl.patch \
6 file://configure-fix.patch"
7
8SRC_URI[md5sum] = "f08234b64a8025d6d5aa1307868b02ed"
9SRC_URI[sha256sum] = "00b58e1aafe99bbd0cb371e7f1df9cc58bf807301cf70a7eebedeee093991360"
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.5.bb b/meta/recipes-support/gnutls/gnutls_2.12.5.bb
deleted file mode 100644
index 9d3f5ab140..0000000000
--- a/meta/recipes-support/gnutls/gnutls_2.12.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require gnutls.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://gnutls-openssl.patch \
6 file://configure-fix.patch"
7
8SRC_URI[md5sum] = "2d0bd5ae11534074fcd78da6ea384e64"
9SRC_URI[sha256sum] = "bf263880f327ac34a561d8e66b5a729cbe33eea56728bfed3406ff2898448b60"