From 424278c7bcccf0334ad4680ded30372616d2c9ab Mon Sep 17 00:00:00 2001
From: Qing He <qing.he@intel.com>
Date: Wed, 23 Jun 2010 15:07:39 +0800
Subject: gnutls: upgrade to version 2.8.6

from 2.4.2
add homepage and bugtracker
clarify licensing to GPL & LGPL for different sub packages

changes:
  - use EXTRA_OECONF to explicitly specify libgcrypt path
  - remove multiple aclocal.m4s and distributed libtool m4
    scripts to produce sanity environment, otherwise it may
    complain about libtool version mismatch at compilation
  - rebase configure_madness.patch to adapt new autotools
    scripts, change libgnutls.pc.in and libgnutls-extra.pc.in
    to fix pkg-config issues
  - rebase the other patches
  - remove duplicated inheritence
  - depends explictly on libgcrypt (>= 1.4.2), or configure
    fails
  - use standalone version of libtasn1, and add it as a build
    dependency on libatsn1
  - add --disable-rpath in EXTRA_OECONF to avoid the rpath
    pollution by --with-<pkg>-prefix=

Signed-off-by: Qing He <qing.he@intel.com>
---
 .../gnutls/gnutls-2.4.2/configure_madness.patch    | 57 ----------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 meta/packages/gnutls/gnutls-2.4.2/configure_madness.patch

(limited to 'meta/packages/gnutls/gnutls-2.4.2/configure_madness.patch')

diff --git a/meta/packages/gnutls/gnutls-2.4.2/configure_madness.patch b/meta/packages/gnutls/gnutls-2.4.2/configure_madness.patch
deleted file mode 100644
index 19b6b498b..000000000
--- a/meta/packages/gnutls/gnutls-2.4.2/configure_madness.patch
+++ /dev/null
@@ -1,57 +0,0 @@
----
- configure.in                |    8 ++++----
- lib/gnutls.pc.in            |    3 ++-
- libextra/gnutls-extra.pc.in |    3 ++-
- 3 files changed, 8 insertions(+), 6 deletions(-)
-
---- gnutls-2.4.0.orig/configure.in
-+++ gnutls-2.4.0/configure.in
-@@ -637,17 +637,17 @@ AC_MSG_RESULT([***
- *** Detecting options for shared libraries...
- ])
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
- 
--LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
--LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
-+LIBGNUTLS_LIBS="-lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
-+LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS"
- AC_SUBST(LIBGNUTLS_LIBS)
- AC_SUBST(LIBGNUTLS_CFLAGS)
- 
--LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
--LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
-+LIBGNUTLS_EXTRA_LIBS=" -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
-+LIBGNUTLS_EXTRA_CFLAGS=""
- AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
- AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
- export ac_full
- 
- AM_CFLAGS="${AM_CFLAGS} ${LIBGCRYPT_CFLAGS}"
---- gnutls-2.4.0.orig/lib/gnutls.pc.in
-+++ gnutls-2.4.0/lib/gnutls.pc.in
-@@ -16,8 +16,9 @@ libdir=@libdir@
- includedir=@includedir@
- 
- Name: GnuTLS
- Description: Transport Security Layer implementation for the GNU system
- Version: @VERSION@
-+Requires.private: libgcrypt
- Libs: -L${libdir} -lgnutls
--Libs.private: @LIBGNUTLS_LIBS@ 
-+Libs.private: -L${libdir} -lgnutls
- Cflags: -I${includedir}
---- gnutls-2.4.0.orig/libextra/gnutls-extra.pc.in
-+++ gnutls-2.4.0/libextra/gnutls-extra.pc.in
-@@ -16,9 +16,10 @@ libdir=@libdir@
- includedir=@includedir@
- 
- Name: GnuTLS-extra
- Description: Additional add-ons for GnuTLS licensed under GPL
- Requires: gnutls
-+Requires.private: gnutls
- Version: @VERSION@
- Libs: -L${libdir} -lgnutls-extra
--Libs.private: @LIBGNUTLS_EXTRA_LIBS@
-+Libs.private: -L${libdir} -lgnutls-extra
- Cflags: -I${includedir}
-- 
cgit v1.2.3