diff options
author | Radu Moisan <radu.moisan@intel.com> | 2013-07-10 12:24:12 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-13 18:23:32 +0100 |
commit | 5d17796c2440f691da28afe0e2e27a0f7bf8bf12 (patch) | |
tree | a5451353a0bdbab0135b137963a74b99d1d9a9bb /meta/recipes-extended/diffutils | |
parent | 5f863410d79aad9e9e368294ff37288bf36f4403 (diff) | |
download | poky-5d17796c2440f691da28afe0e2e27a0f7bf8bf12.tar.gz |
diffutils: Upgrade to v3.3
(From OE-Core rev: 071c9bbf3103b73ea898442b284fa42f2b3b4268)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/diffutils')
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch | 14 | ||||
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch | 22 | ||||
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils.inc | 4 | ||||
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils_2.8.1.bb | 7 | ||||
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils_3.3.bb (renamed from meta/recipes-extended/diffutils/diffutils_3.2.bb) | 12 |
5 files changed, 8 insertions, 51 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch b/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch deleted file mode 100644 index f47cc79366..0000000000 --- a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd diffutils-3.2/configure.ac diffutils-3.2/configure.ac | ||
5 | --- diffutils-3.2/configure.ac 2011-08-11 18:17:54.000000000 +0300 | ||
6 | +++ diffutils-3.2/configure.ac 2013-02-08 08:13:28.271427213 +0200 | ||
7 | @@ -33,7 +33,6 @@ | ||
8 | |||
9 | AC_PROG_AWK | ||
10 | AC_PROG_CC | ||
11 | -AM_PROG_CC_STDC | ||
12 | AM_MISSING_PROG([HELP2MAN], [help2man]) | ||
13 | AC_PROG_RANLIB | ||
14 | gl_EARLY | ||
diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch b/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch deleted file mode 100644 index 58ed62dfc1..0000000000 --- a/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | check for gets before using it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | Upstream-Status: Pending | ||
5 | Index: diffutils-3.2/lib/stdio.in.h | ||
6 | =================================================================== | ||
7 | --- diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.000000000 -0700 | ||
8 | +++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700 | ||
9 | @@ -693,11 +693,13 @@ | ||
10 | _GL_CXXALIAS_SYS (gets, char *, (char *s)); | ||
11 | # undef gets | ||
12 | # endif | ||
13 | +# if defined gets | ||
14 | _GL_CXXALIASWARN (gets); | ||
15 | /* It is very rare that the developer ever has full control of stdin, | ||
16 | so any use of gets warrants an unconditional warning. Assume it is | ||
17 | always declared, since it is required by C89. */ | ||
18 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
19 | +# endif | ||
20 | #endif | ||
21 | |||
22 | |||
diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc index c90a3c96fd..c2ca417d80 100644 --- a/meta/recipes-extended/diffutils/diffutils.inc +++ b/meta/recipes-extended/diffutils/diffutils.inc | |||
@@ -4,10 +4,6 @@ sdiff, and cmp utilities. These programs are usually \ | |||
4 | used for creating patch files." | 4 | used for creating patch files." |
5 | SECTION = "base" | 5 | SECTION = "base" |
6 | 6 | ||
7 | INC_PR = "r7" | ||
8 | |||
9 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz" | ||
10 | |||
11 | inherit autotools update-alternatives gettext | 7 | inherit autotools update-alternatives gettext |
12 | 8 | ||
13 | # diffutils assumes non-glibc compilation with uclibc and | 9 | # diffutils assumes non-glibc compilation with uclibc and |
diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb index da6719d81f..bf425bbb35 100644 --- a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb +++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb | |||
@@ -3,13 +3,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
3 | 3 | ||
4 | require diffutils.inc | 4 | require diffutils.inc |
5 | 5 | ||
6 | PR = "${INC_PR}.0" | 6 | PR = "r7.0" |
7 | 7 | ||
8 | SRC_URI += "file://diffutils_fix_for_automake-1.12.patch" | 8 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \ |
9 | file://diffutils_fix_for_automake-1.12.patch" | ||
9 | 10 | ||
10 | SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428" | 11 | SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428" |
11 | SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a" | 12 | SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a" |
12 | 13 | ||
13 | do_configure_prepend () { | 14 | do_configure_prepend () { |
14 | chmod u+w ${S}/po/Makefile.in.in | 15 | chmod u+w ${S}/po/Makefile.in.in |
15 | } \ No newline at end of file | 16 | } |
diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.3.bb index ef400efd1c..7a95c1ab43 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.2.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.3.bb | |||
@@ -3,6 +3,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
3 | 3 | ||
4 | require diffutils.inc | 4 | require diffutils.inc |
5 | 5 | ||
6 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz" | ||
7 | |||
6 | do_configure_prepend () { | 8 | do_configure_prepend () { |
7 | # Need to remove gettext macros with weird mix of versions | 9 | # Need to remove gettext macros with weird mix of versions |
8 | for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do | 10 | for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do |
@@ -10,11 +12,5 @@ do_configure_prepend () { | |||
10 | done | 12 | done |
11 | } | 13 | } |
12 | 14 | ||
13 | PR = "${INC_PR}.1" | 15 | SRC_URI[md5sum] = "99180208ec2a82ce71f55b0d7389f1b3" |
14 | 16 | SRC_URI[sha256sum] = "a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c" | |
15 | SRC_URI += "file://remove-gets.patch \ | ||
16 | file://obsolete_automake_macros.patch \ | ||
17 | " | ||
18 | |||
19 | SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc" | ||
20 | SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3" | ||