summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-24 16:23:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-01 18:34:35 +0100
commit057512f2a9f7d4a6df9c9924788fabc23dc188a3 (patch)
tree17d9753ad920963eec3fae1a91cc3feaedfb4da6 /meta
parentf236b1e5f69ab96c6cea585e972ec8699a4d1bf5 (diff)
downloadpoky-057512f2a9f7d4a6df9c9924788fabc23dc188a3.tar.gz
gnutls: update to 2.12.5
(From OE-Core rev: ad52eacebdc413aa351de078ee878182a9c71e16) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch66
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch67
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch (renamed from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch (renamed from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc6
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.10.4.bb10
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.5.bb9
7 files changed, 79 insertions, 79 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
deleted file mode 100644
index 2ce3f55670..0000000000
--- a/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1Upstream-Status: Inappropriate [distribution]
2
3rebased from original configure_madness.patch
4
5libtasn1 provides an .pc file in upstream,
6and a libgcrypt.pc is added in libgcrypt recipe,
7so use Requires.private for these two.
8
9against 2.8.6
10
1107/02/2010 - qhe
12
13---
14diff --git a/lib/configure.ac b/lib/configure.ac
15index 80d3375..1a486f7 100644
16--- a/lib/configure.ac
17+++ b/lib/configure.ac
18@@ -81,8 +81,8 @@ fi
19
20 lgl_INIT
21
22-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
23-LIBGNUTLS_CFLAGS="-I${includedir}"
24+LIBGNUTLS_LIBS="-lgnutls $LIBS"
25+LIBGNUTLS_CFLAGS=""
26 AC_SUBST(LIBGNUTLS_LIBS)
27 AC_SUBST(LIBGNUTLS_CFLAGS)
28
29diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
30index 3b01c17..de31469 100644
31--- a/lib/gnutls.pc.in
32+++ b/lib/gnutls.pc.in
33@@ -20,6 +20,6 @@ Name: GnuTLS
34 Description: Transport Security Layer implementation for the GNU system
35 URL: http://www.gnu.org/software/gnutls/
36 Version: @VERSION@
37+Requires.private: libgcrypt, libtasn1
38 Libs: -L${libdir} -lgnutls
39-Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@
40 Cflags: -I${includedir}
41diff --git a/libextra/configure.ac b/libextra/configure.ac
42index c08e73f..3313886 100644
43--- a/libextra/configure.ac
44+++ b/libextra/configure.ac
45@@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS
46
47 xgl_INIT
48
49-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
50-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
51+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
52+LIBGNUTLS_EXTRA_CFLAGS=""
53 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
54 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
55
56diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in
57index 9e7b8f6..e228ec9 100644
58--- a/libextra/gnutls-extra.pc.in
59+++ b/libextra/gnutls-extra.pc.in
60@@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/
61 Requires: gnutls
62 Version: @VERSION@
63 Libs: -L${libdir} -lgnutls-extra
64-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
65+Libs.private: -llzo2
66 Cflags: -I${includedir}
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
new file mode 100644
index 0000000000..e6f9785a99
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
@@ -0,0 +1,67 @@
1Upstream-Status: Inappropriate [distribution]
2
3rebased from original configure_madness.patch
4
5libtasn1 provides an .pc file in upstream,
6and a libgcrypt.pc is added in libgcrypt recipe,
7so use Requires.private for these two.
8
9against 2.8.6
10
1107/02/2010 - qhe
12
13---
14Index: gnutls-2.12.5/lib/configure.ac
15===================================================================
16--- gnutls-2.12.5.orig/lib/configure.ac 2011-05-11 00:05:33.000000000 -0700
17+++ gnutls-2.12.5/lib/configure.ac 2011-05-25 19:45:23.721180103 -0700
18@@ -96,8 +96,8 @@
19 dnl for pakchois
20 AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dlclose (0);])
21
22-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
23-LIBGNUTLS_CFLAGS="-I${includedir}"
24+LIBGNUTLS_LIBS="-lgnutls $LIBS"
25+LIBGNUTLS_CFLAGS=""
26 AC_SUBST(LIBGNUTLS_LIBS)
27 AC_SUBST(LIBGNUTLS_CFLAGS)
28
29Index: gnutls-2.12.5/lib/gnutls.pc.in
30===================================================================
31--- gnutls-2.12.5.orig/lib/gnutls.pc.in 2011-04-23 08:00:07.000000000 -0700
32+++ gnutls-2.12.5/lib/gnutls.pc.in 2011-05-25 19:50:11.926102288 -0700
33@@ -19,7 +19,6 @@
34 Description: Transport Security Layer implementation for the GNU system
35 URL: http://www.gnu.org/software/gnutls/
36 Version: @VERSION@
37+Requires.private: libgcrypt, libtasn1
38 Libs: -L${libdir} -lgnutls
39-Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@
40-@GNUTLS_REQUIRES_PRIVATE@
41 Cflags: -I${includedir}
42Index: gnutls-2.12.5/libextra/configure.ac
43===================================================================
44--- gnutls-2.12.5.orig/libextra/configure.ac 2011-05-11 00:05:31.000000000 -0700
45+++ gnutls-2.12.5/libextra/configure.ac 2011-05-25 19:45:23.722186801 -0700
46@@ -41,8 +41,8 @@
47
48 xgl_INIT
49
50-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
51-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
52+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
53+LIBGNUTLS_EXTRA_CFLAGS=""
54 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
55 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
56
57Index: gnutls-2.12.5/libextra/gnutls-extra.pc.in
58===================================================================
59--- gnutls-2.12.5.orig/libextra/gnutls-extra.pc.in 2011-04-07 17:30:45.000000000 -0700
60+++ gnutls-2.12.5/libextra/gnutls-extra.pc.in 2011-05-25 19:45:23.722186801 -0700
61@@ -22,5 +22,5 @@
62 Requires: gnutls
63 Version: @VERSION@
64 Libs: -L${libdir} -lgnutls-extra
65-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
66+Libs.private: -llzo2
67 Cflags: -I${includedir}
diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch
index ef70674881..ef70674881 100644
--- a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch
index 10e377407a..10e377407a 100644
--- a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index fd77af4c84..9f8d81b3bb 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -21,9 +21,9 @@ inherit autotools binconfig pkgconfig gettext
21 21
22EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ 22EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
23 --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \ 23 --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
24 --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \ 24 --with-libgcrypt --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
25 --with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile" 25 --with-lzo --disable-guile \
26 26 "
27do_configure_prepend() { 27do_configure_prepend() {
28 for dir in . lib libextra; do 28 for dir in . lib libextra; do
29 rm ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 29 rm ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4
diff --git a/meta/recipes-support/gnutls/gnutls_2.10.4.bb b/meta/recipes-support/gnutls/gnutls_2.10.4.bb
deleted file mode 100644
index cc2fa27894..0000000000
--- a/meta/recipes-support/gnutls/gnutls_2.10.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require gnutls.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://gnutls-openssl.patch \
6 file://gnutls-texinfo-euro.patch \
7 file://configure-fix.patch"
8
9SRC_URI[md5sum] = "4e1517084018a8b1fdc96daabea40528"
10SRC_URI[sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.5.bb b/meta/recipes-support/gnutls/gnutls_2.12.5.bb
new file mode 100644
index 0000000000..b27a06506a
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_2.12.5.bb
@@ -0,0 +1,9 @@
1require gnutls.inc
2
3PR = "r0"
4
5SRC_URI += "file://gnutls-openssl.patch \
6 file://configure-fix.patch"
7
8SRC_URI[md5sum] = "2d0bd5ae11534074fcd78da6ea384e64"
9SRC_URI[sha256sum] = "bf263880f327ac34a561d8e66b5a729cbe33eea56728bfed3406ff2898448b60"