diff --git a/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch b/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch deleted file mode 100644 index 4f61c92b15..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch +++ /dev/null @@ -1,23 +0,0 @@ -use gets iff its defined. eglibc 2.16 removed gets - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: coreutils-8.14/lib/stdio.in.h -=================================================================== ---- coreutils-8.14.orig/lib/stdio.in.h 2011-09-24 04:20:48.000000000 -0700 -+++ coreutils-8.14/lib/stdio.in.h 2012-07-03 10:36:19.886296576 -0700 -@@ -713,11 +713,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 - - diff --git a/meta/recipes-core/coreutils/coreutils-8.14/coreutils-build-with-acl.patch b/meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch similarity index 100% rename from meta/recipes-core/coreutils/coreutils-8.14/coreutils-build-with-acl.patch rename to meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch new file mode 100644 index 0000000000..4757f52aa0 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch @@ -0,0 +1,22 @@ +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Marko Lindqvist +diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk +--- coreutils-8.21/man/local.mk 2013-02-05 16:01:21.000000000 +0200 ++++ coreutils-8.21/man/local.mk 2013-03-23 09:12:53.360470192 +0200 +@@ -19,11 +19,11 @@ + EXTRA_DIST += man/help2man man/dummy-man + + ## Graceful degradation for systems lacking perl. +-if HAVE_PERL +-run_help2man = $(PERL) -- $(srcdir)/man/help2man +-else ++#if HAVE_PERL ++#run_help2man = $(PERL) -- $(srcdir)/man/help2man ++#else + run_help2man = $(SHELL) $(srcdir)/man/dummy-man +-endif ++#endif + + man1_MANS = @man1_MANS@ + EXTRA_DIST += $(man1_MANS:.1=.x) diff --git a/meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.21/remove-usr-local-lib-from-m4.patch similarity index 100% rename from meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch rename to meta/recipes-core/coreutils/coreutils-8.21/remove-usr-local-lib-from-m4.patch diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.21.bb similarity index 91% rename from meta/recipes-core/coreutils/coreutils_8.14.bb rename to meta/recipes-core/coreutils/coreutils_8.21.bb index b82bbe4145..e789f59f0b 100644 --- a/meta/recipes-core/coreutils/coreutils_8.14.bb +++ b/meta/recipes-core/coreutils/coreutils_8.21.bb @@ -6,8 +6,8 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/" BUGTRACKER = "http://debbugs.gnu.org/coreutils" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://src/ls.c;beginline=5;endline=16;md5=2e9acd8818fe6db4c2981d20ca632553" -PR = "r5" + file://src/ls.c;beginline=5;endline=16;md5=38b79785ca88537b75871782a2a3c6b8" +PR = "r0" DEPENDS = "gmp libcap" DEPENDS_class-native = "" @@ -15,11 +15,12 @@ inherit autotools gettext SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ - file://remove-gets.patch \ file://coreutils-build-with-acl.patch \ + file://dummy_help2man.patch \ " -SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a" -SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d" + +SRC_URI[md5sum] = "065ba41828644eca5dd8163446de5d64" +SRC_URI[sha256sum] = "adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18" EXTRA_OECONF = "--disable-acl" EXTRA_OECONF_class-native = "--disable-acl --without-gmp"