summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-08 13:14:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-09 08:51:13 +0100
commit77d00c58bb85e2b7c3dee3d8549d8d31d74f4b45 (patch)
treefef68ca5573b603b477e5b8191f2b534207ac5ab /meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch
parent1abffd2ac8ee6af5ec02d5fc373130a6e22f4313 (diff)
downloadpoky-77d00c58bb85e2b7c3dee3d8549d8d31d74f4b45.tar.gz
gnutls: upgrade to 2.12.23
Importantly, this fixes CVE-2013-1619. Upstream doesn't use GNU as a host, so update the SRC_URI. remove-gets.patch isn't required anymore, obsolete_automake_macros.patch is merged upstream, and gnutls_fix_for_automake_1.12.1.patch doesn't seem to be needed. It was merged and reverted upstream, and my build without it succeeded. (From OE-Core rev: 9a6395076984350b1dd7005453f97233bbb43132) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch')
-rw-r--r--meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch
deleted file mode 100644
index 564017878f..0000000000
--- a/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Upstream-Status: Submitted [https://savannah.gnu.org/support/index.php?108219]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd gnutls-2.12.21/configure.ac gnutls-2.12.21/configure.ac
5--- gnutls-2.12.21/configure.ac 2013-01-03 07:52:42.182740682 +0200
6+++ gnutls-2.12.21/configure.ac 2013-01-03 07:53:41.662739378 +0200
7@@ -29,7 +29,7 @@
8 AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override])
9 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
10 m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 AC_MSG_RESULT([***
15 *** Checking for compilation programs...
16diff -Nurd gnutls-2.12.21/lib/configure.ac gnutls-2.12.21/lib/configure.ac
17--- gnutls-2.12.21/lib/configure.ac 2013-01-03 07:52:42.182740682 +0200
18+++ gnutls-2.12.21/lib/configure.ac 2013-01-03 08:07:38.150721027 +0200
19@@ -29,7 +29,7 @@
20 AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
21 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
22 m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
23-AM_CONFIG_HEADER(config.h)
24+AC_CONFIG_HEADERS(config.h)
25
26 AC_PROG_CC
27 lgl_EARLY
28diff -Nurd gnutls-2.12.21/libextra/configure.ac gnutls-2.12.21/libextra/configure.ac
29--- gnutls-2.12.21/libextra/configure.ac 2013-01-03 07:52:42.182740682 +0200
30+++ gnutls-2.12.21/libextra/configure.ac 2013-01-03 08:10:56.654716669 +0200
31@@ -29,7 +29,7 @@
32 AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
33 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
34 m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
35-AM_CONFIG_HEADER(config.h)
36+AC_CONFIG_HEADERS(config.h)
37
38 AC_PROG_CC
39 xgl_EARLY