mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

gnutls: Update to 2.12.11

Browse Source 
(From OE-Core rev: c30c193d79437261ea4e2184f200c33cfd554e9e)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2011-10-04 17:52:16 -07:00
committed by Richard Purdie
parent d98b5e1265
commit fba22e80f0
5 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch → meta/recipes-support/gnutls/gnutls-2.12.11/configure-fix.patch
+19 -21
View File
@@ -11,13 +11,13 @@ against 2.8.6
07/02/2010 - qhe 07/02/2010 - qhe
--- ---
Index: gnutls-2.12.5/lib/configure.ac Index: gnutls-2.12.11/lib/configure.ac
=================================================================== ===================================================================
--- gnutls-2.12.5.orig/lib/configure.ac 2011-05-11 00:05:33.000000000 -0700 --- gnutls-2.12.11.orig/lib/configure.ac
+++ gnutls-2.12.5/lib/configure.ac 2011-05-25 19:45:23.721180103 -0700 +++ gnutls-2.12.11/lib/configure.ac
@@ -96,8 +96,8 @@ @@ -126,8 +126,8 @@ lgl_INIT
dnl for pakchois AC_CHECK_FUNCS(getrusage,,)
AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dlclose (0);]) AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock (0);])
-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS" -LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
-LIBGNUTLS_CFLAGS="-I${includedir}" -LIBGNUTLS_CFLAGS="-I${includedir}"
@@ -26,24 +26,22 @@ Index: gnutls-2.12.5/lib/configure.ac
AC_SUBST(LIBGNUTLS_LIBS) AC_SUBST(LIBGNUTLS_LIBS)
AC_SUBST(LIBGNUTLS_CFLAGS) AC_SUBST(LIBGNUTLS_CFLAGS)
Index: gnutls-2.12.5/lib/gnutls.pc.in Index: gnutls-2.12.11/lib/gnutls.pc.in
=================================================================== ===================================================================
--- gnutls-2.12.5.orig/lib/gnutls.pc.in 2011-04-23 08:00:07.000000000 -0700 --- gnutls-2.12.11.orig/lib/gnutls.pc.in
+++ gnutls-2.12.5/lib/gnutls.pc.in 2011-05-25 19:50:11.926102288 -0700 +++ gnutls-2.12.11/lib/gnutls.pc.in
@@ -19,7 +19,6 @@ @@ -20,6 +20,4 @@ Description: Transport Security Layer im
Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnu.org/software/gnutls/ URL: http://www.gnu.org/software/gnutls/
Version: @VERSION@ Version: @VERSION@
+Requires.private: libgcrypt, libtasn1
Libs: -L${libdir} -lgnutls Libs: -L${libdir} -lgnutls
-Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@ -Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@
-@GNUTLS_REQUIRES_PRIVATE@ -@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir} Cflags: -I${includedir}
Index: gnutls-2.12.5/libextra/configure.ac Index: gnutls-2.12.11/libextra/configure.ac
=================================================================== ===================================================================
--- gnutls-2.12.5.orig/libextra/configure.ac 2011-05-11 00:05:31.000000000 -0700 --- gnutls-2.12.11.orig/libextra/configure.ac
+++ gnutls-2.12.5/libextra/configure.ac 2011-05-25 19:45:23.722186801 -0700 +++ gnutls-2.12.11/libextra/configure.ac
@@ -41,8 +41,8 @@ @@ -41,8 +41,8 @@ LIBGNUTLS_EXTRA_HOOKS
xgl_INIT xgl_INIT
@@ -54,11 +52,11 @@ Index: gnutls-2.12.5/libextra/configure.ac
AC_SUBST(LIBGNUTLS_EXTRA_LIBS) AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
Index: gnutls-2.12.5/libextra/gnutls-extra.pc.in Index: gnutls-2.12.11/libextra/gnutls-extra.pc.in
=================================================================== ===================================================================
--- gnutls-2.12.5.orig/libextra/gnutls-extra.pc.in 2011-04-07 17:30:45.000000000 -0700 --- gnutls-2.12.11.orig/libextra/gnutls-extra.pc.in
+++ gnutls-2.12.5/libextra/gnutls-extra.pc.in 2011-05-25 19:45:23.722186801 -0700 +++ gnutls-2.12.11/libextra/gnutls-extra.pc.in
@@ -22,5 +22,5 @@ @@ -22,5 +22,5 @@ URL: http://www.gnu.org/software/gnutls/
Requires: gnutls Requires: gnutls
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgnutls-extra Libs: -L${libdir} -lgnutls-extra
meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch → meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-openssl.patch
View File
meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch → meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-texinfo-euro.patch
View File
meta/recipes-support/gnutls/gnutls_2.12.11.bb
+9
View File
@@ -0,0 +1,9 @@
require gnutls.inc
PR = "${INC_PR}.0"
SRC_URI += "file://gnutls-openssl.patch \
file://configure-fix.patch"
SRC_URI[md5sum] = "f08234b64a8025d6d5aa1307868b02ed"
SRC_URI[sha256sum] = "00b58e1aafe99bbd0cb371e7f1df9cc58bf807301cf70a7eebedeee093991360"
meta/recipes-support/gnutls/gnutls_2.12.5.bb
-9
View File
@@ -1,9 +0,0 @@
require gnutls.inc
PR = "${INC_PR}.0"
SRC_URI += "file://gnutls-openssl.patch \
file://configure-fix.patch"
SRC_URI[md5sum] = "2d0bd5ae11534074fcd78da6ea384e64"
SRC_URI[sha256sum] = "bf263880f327ac34a561d8e66b5a729cbe33eea56728bfed3406ff2898448b60"