5 files changed, 57 insertions, 51 deletions
diff --git a/meta/packages/gnutls/gnutls-1.6.3/configure_madness.patch b/meta/packages/gnutls/gnutls-1.6.3/configure_madness.patch
deleted file mode 100644
index 5aea59cc4..000000000
--- a/meta/packages/gnutls/gnutls-1.6.3/configure_madness.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: gnutls-1.6.3/configure.in
-===================================================================
---- gnutls-1.6.3.orig/configure.in	2008-02-29 09:58:12.000000000 +0000
-+++ gnutls-1.6.3/configure.in	2008-02-29 09:58:15.000000000 +0000
-@@ -574,13 +574,13 @@
- 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 $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
--LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
-+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
-+LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS"
- AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
- AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
- export ac_full
-Index: gnutls-1.6.3/lib/gnutls.pc.in
-===================================================================
---- gnutls-1.6.3.orig/lib/gnutls.pc.in	2008-02-29 09:58:23.000000000 +0000
-+++ gnutls-1.6.3/lib/gnutls.pc.in	2008-02-29 09:58:49.000000000 +0000
-@@ -18,6 +18,7 @@
- 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}
-Index: gnutls-1.6.3/libextra/gnutls-extra.pc.in
-===================================================================
---- gnutls-1.6.3.orig/libextra/gnutls-extra.pc.in	2008-02-29 09:59:02.000000000 +0000
-+++ gnutls-1.6.3/libextra/gnutls-extra.pc.in	2008-02-29 09:59:31.000000000 +0000
-@@ -18,7 +18,8 @@
- 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}
diff --git a/meta/packages/gnutls/gnutls-2.2.2/configure_madness.patch b/meta/packages/gnutls/gnutls-2.2.2/configure_madness.patch
new file mode 100644
index 000000000..475dc3f31
--- /dev/null
+++ b/meta/packages/gnutls/gnutls-2.2.2/configure_madness.patch
@@ -0,0 +1,57 @@
+---
+ configure.in                |    8 ++++----
+ lib/gnutls.pc.in            |    3 ++-
+ libextra/gnutls-extra.pc.in |    3 ++-
+ 3 files changed, 8 insertions(+), 6 deletions(-)
+
+--- gnutls-2.2.2.orig/configure.in
++++ gnutls-2.2.2/configure.in
+@@ -698,17 +698,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 $LTLIBOPENCDK $LZO_LIBS $LIBGNUTLS_LIBS"
+-LIBGNUTLS_EXTRA_CFLAGS="$INCOPENCDK -I${includedir}"
++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LTLIBOPENCDK $LZO_LIBS $LIBGNUTLS_LIBS"
++LIBGNUTLS_EXTRA_CFLAGS="$INCOPENCDK"
+ AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
+ AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
+ export ac_full
+ 
+ AM_CFLAGS="${AM_CFLAGS} ${LIBGCRYPT_CFLAGS}"
+--- gnutls-2.2.2.orig/lib/gnutls.pc.in
++++ gnutls-2.2.2/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.2.2.orig/libextra/gnutls-extra.pc.in
++++ gnutls-2.2.2/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}
diff --git a/meta/packages/gnutls/gnutls-1.6.3/gnutls-openssl.patch b/meta/packages/gnutls/gnutls-2.2.2/gnutls-openssl.patch
index e2c189592..e2c189592 100644
--- a/meta/packages/gnutls/gnutls-1.6.3/gnutls-openssl.patch
+++ b/meta/packages/gnutls/gnutls-2.2.2/gnutls-openssl.patch
diff --git a/meta/packages/gnutls/gnutls-1.6.3/gnutls-texinfo-euro.patch b/meta/packages/gnutls/gnutls-2.2.2/gnutls-texinfo-euro.patch
index e2a276242..e2a276242 100644
--- a/meta/packages/gnutls/gnutls-1.6.3/gnutls-texinfo-euro.patch
+++ b/meta/packages/gnutls/gnutls-2.2.2/gnutls-texinfo-euro.patch
diff --git a/meta/packages/gnutls/gnutls_1.6.3.bb b/meta/packages/gnutls/gnutls_2.2.2.bb
index 64ad6dbe6..3313a456a 100644
--- a/meta/packages/gnutls/gnutls_1.6.3.bb
+++ b/meta/packages/gnutls/gnutls_2.2.2.bb
@@ -5,5 +5,3 @@ SRC_URI += "\
 	file://gnutls-texinfo-euro.patch;patch=1 \
 	file://configure_madness.patch;patch=1 \
 	"
-
-PR = "r7"