sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Radu Moisan 2013-07-10 12:24:12 +00:00 committed by Richard Purdie
parent 5f863410d7
commit 5d17796c24
5 changed files with 8 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch
View File

@ -1,14 +0,0 @@
Upstream-Status: Backport
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd diffutils-3.2/configure.ac diffutils-3.2/configure.ac
--- diffutils-3.2/configure.ac 2011-08-11 18:17:54.000000000 +0300
+++ diffutils-3.2/configure.ac 2013-02-08 08:13:28.271427213 +0200
@@ -33,7 +33,6 @@
AC_PROG_AWK
AC_PROG_CC
-AM_PROG_CC_STDC
AM_MISSING_PROG([HELP2MAN], [help2man])
AC_PROG_RANLIB
gl_EARLY

22
meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch
View File

@ -1,22 +0,0 @@
check for gets before using it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: diffutils-3.2/lib/stdio.in.h
===================================================================
--- diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.000000000 -0700
+++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700
@@ -693,11 +693,13 @@
_GL_CXXALIAS_SYS (gets, char *, (char *s));
# undef gets
# endif
+# if defined gets
_GL_CXXALIASWARN (gets);
/* It is very rare that the developer ever has full control of stdin,
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+# endif
#endif

4
meta/recipes-extended/diffutils/diffutils.inc
View File

@ -4,10 +4,6 @@ sdiff, and cmp utilities. These programs are usually \
used for creating patch files."
SECTION = "base"
INC_PR = "r7"
SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
inherit autotools update-alternatives gettext
# diffutils assumes non-glibc compilation with uclibc and

7
meta/recipes-extended/diffutils/diffutils_2.8.1.bb
View File

@ -3,13 +3,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
require diffutils.inc
PR = "${INC_PR}.0"
PR = "r7.0"
SRC_URI += "file://diffutils_fix_for_automake-1.12.patch"
SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \
file://diffutils_fix_for_automake-1.12.patch"
SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428"
SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a"
do_configure_prepend () {
chmod u+w ${S}/po/Makefile.in.in
}
}

12
meta/recipes-extended/diffutils/diffutils_3.2.bb → meta/recipes-extended/diffutils/diffutils_3.3.bb
View File

@ -3,6 +3,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
require diffutils.inc
SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz"
do_configure_prepend () {
# Need to remove gettext macros with weird mix of versions
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 () {
done
}
PR = "${INC_PR}.1"
SRC_URI += "file://remove-gets.patch \
file://obsolete_automake_macros.patch \
"
SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc"
SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3"
SRC_URI[md5sum] = "99180208ec2a82ce71f55b0d7389f1b3"
SRC_URI[sha256sum] = "a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c"