gnutls: move to latest stable branch 2.10.2 -> 2.10.4

* MJ : removed upstream applied parallel-build.patch from gnutls-2.10.2
  dir and 2.10.4 SRC_URI
* MJ: PR reset

Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/gnutls/gnutls-2.10.2/parallel-build.patch b/recipes/gnutls/gnutls-2.10.2/parallel-build.patch
deleted file mode 100644 (file)
index d170c4f..0000000
--- a/recipes/gnutls/gnutls-2.10.2/parallel-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream: http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=23f761290ca6f905f062d2de217acb012e5a38b2
-
-diff --git a/guile/src/Makefile.am.orig b/guile/src/Makefile.am
-index e8e81b1..2ee1297 100644
---- a/guile/src/Makefile.am.orig
-+++ b/guile/src/Makefile.am
-@@ -122,7 +122,7 @@ extra-smob-types.i.c: $(srcdir)/make-smob-types.scm
- snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-              $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS)
- 
--.c.x:
-+.c.x: $(BUILT_SOURCES)
-       $(guile_snarf) -o $@ $< $(snarfcppopts)
- 
- # Target used by doc/Makefile, to create all built sources necessary

diff --git a/recipes/gnutls/gnutls-2.10.2/gettextize-with-gettext-0.18.patch b/recipes/gnutls/gnutls-2.10.4/gettextize-with-gettext-0.18.patch
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gettextize-with-gettext-0.18.patch
rename to recipes/gnutls/gnutls-2.10.4/gettextize-with-gettext-0.18.patch

diff --git a/recipes/gnutls/gnutls-2.10.2/gnutls-openssl.patch b/recipes/gnutls/gnutls-2.10.4/gnutls-openssl.patch
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gnutls-openssl.patch
rename to recipes/gnutls/gnutls-2.10.4/gnutls-openssl.patch

diff --git a/recipes/gnutls/gnutls-2.10.2/gnutls-replace-siginterrupt.patch b/recipes/gnutls/gnutls-2.10.4/gnutls-replace-siginterrupt.patch
similarity index 100%
rename from recipes/gnutls/gnutls-2.10.2/gnutls-replace-siginterrupt.patch
rename to recipes/gnutls/gnutls-2.10.4/gnutls-replace-siginterrupt.patch

diff --git a/recipes/gnutls/gnutls_2.10.2.bb b/recipes/gnutls/gnutls_2.10.4.bb
similarity index 68%
rename from recipes/gnutls/gnutls_2.10.2.bb
rename to recipes/gnutls/gnutls_2.10.4.bb
index 8af70ec..88de152 100644 (file)
--- a/recipes/gnutls/gnutls_2.10.2.bb
+++ b/recipes/gnutls/gnutls_2.10.4.bb
@@ -1,6 +1,6 @@
 require gnutls.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 LICENSE_${PN}-extra = "GPLv3"
 
@@ -9,7 +9,6 @@ EXTRA_OECONF += " --without-libgcrypt-prefix "
 SRC_URI += "file://gettextize-with-gettext-0.18.patch \
             file://gnutls-openssl.patch \
             file://gnutls-replace-siginterrupt.patch \
-            file://parallel-build.patch \
            "
 
 do_configure_prepend() {
@@ -24,5 +23,5 @@ do_configure_prepend() {
 
 }
 
-SRC_URI[gnutls.md5sum] = "777823f5746ab80cd6f7f7b5fcb2f91b"
-SRC_URI[gnutls.sha256sum] = "e82e7a3fc69b02cc06c291a1652789d73e45bc0732e139817838248f814f8724"
+SRC_URI[gnutls.md5sum] = "4e1517084018a8b1fdc96daabea40528"
+SRC_URI[gnutls.sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"