diff options
author | Ross Burton <ross.burton@intel.com> | 2013-05-08 13:14:45 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-09 10:53:55 +0100 |
commit | d00bac952f2475a6e09794a604848e4593af3007 (patch) | |
tree | dba6d8c32a367b0e395ad3e7b3e68649023e1f8a /meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch | |
parent | a27d06dbc49e5fe6c55e572bf15b38d46be7478c (diff) | |
download | poky-d00bac952f2475a6e09794a604848e4593af3007.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 master rev: 9a6395076984350b1dd7005453f97233bbb43132)
(From OE-Core rev: abf0d8d471c90670e76610c91469b139bcc7ea82)
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/gnutls_fix_for_automake_1.12.1.patch')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch b/meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch deleted file mode 100644 index c742e6c9fe..0000000000 --- a/meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Avoids these kind of warnings: | ||
4 | Warning: 'libgnutls.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' | ||
5 | |||
6 | Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
7 | Date: 2012/07/09 | ||
8 | Index: gnutls-2.12.19/configure.ac | ||
9 | =================================================================== | ||
10 | --- gnutls-2.12.19.orig/configure.ac | ||
11 | +++ gnutls-2.12.19/configure.ac | ||
12 | @@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4]) | ||
13 | |||
14 | AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override]) | ||
15 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
16 | +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 | ||
17 | AM_CONFIG_HEADER(config.h) | ||
18 | |||
19 | AC_MSG_RESULT([*** | ||
20 | Index: gnutls-2.12.19/lib/configure.ac | ||
21 | =================================================================== | ||
22 | --- gnutls-2.12.19.orig/lib/configure.ac | ||
23 | +++ gnutls-2.12.19/lib/configure.ac | ||
24 | @@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4]) | ||
25 | |||
26 | AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) | ||
27 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
28 | +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 | ||
29 | AM_CONFIG_HEADER(config.h) | ||
30 | |||
31 | AC_PROG_CC | ||
32 | Index: gnutls-2.12.19/libextra/configure.ac | ||
33 | =================================================================== | ||
34 | --- gnutls-2.12.19.orig/libextra/configure.ac | ||
35 | +++ gnutls-2.12.19/libextra/configure.ac | ||
36 | @@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4]) | ||
37 | |||
38 | AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) | ||
39 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
40 | +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 | ||
41 | AM_CONFIG_HEADER(config.h) | ||
42 | |||
43 | AC_PROG_CC | ||