summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-03-24 07:35:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-29 10:40:55 +0000
commit841ec528ec04e64bd09ff10f8d9ad2d6e3aac05d (patch)
tree7a703492c423daeb46f63f28c49093d30e450f7e
parent741b8d764c69a8a28beea3ba0df26bfad57a45d4 (diff)
downloadpoky-841ec528ec04e64bd09ff10f8d9ad2d6e3aac05d.tar.gz
coreutils: update to upstream version 8.21
remove-gets.patch removed as issue is fixed upstream. (From OE-Core rev: c2fd59028a57356cff8d165edb71c45c3b05cc67) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch23
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch (renamed from meta/recipes-core/coreutils/coreutils-8.14/coreutils-build-with-acl.patch)0
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch22
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.21/remove-usr-local-lib-from-m4.patch (renamed from meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch)0
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.21.bb (renamed from meta/recipes-core/coreutils/coreutils_8.14.bb)11
5 files changed, 28 insertions, 28 deletions
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 @@
1use gets iff its defined. eglibc 2.16 removed gets
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending
5
6Index: coreutils-8.14/lib/stdio.in.h
7===================================================================
8--- coreutils-8.14.orig/lib/stdio.in.h 2011-09-24 04:20:48.000000000 -0700
9+++ coreutils-8.14/lib/stdio.in.h 2012-07-03 10:36:19.886296576 -0700
10@@ -713,11 +713,13 @@
11 _GL_CXXALIAS_SYS (gets, char *, (char *s));
12 # undef gets
13 # endif
14+# if defined gets
15 _GL_CXXALIASWARN (gets);
16 /* It is very rare that the developer ever has full control of stdin,
17 so any use of gets warrants an unconditional warning. Assume it is
18 always declared, since it is required by C89. */
19 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
20+# endif
21 #endif
22
23
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
index 8273d78eb3..8273d78eb3 100644
--- 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
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 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk
5--- coreutils-8.21/man/local.mk 2013-02-05 16:01:21.000000000 +0200
6+++ coreutils-8.21/man/local.mk 2013-03-23 09:12:53.360470192 +0200
7@@ -19,11 +19,11 @@
8 EXTRA_DIST += man/help2man man/dummy-man
9
10 ## Graceful degradation for systems lacking perl.
11-if HAVE_PERL
12-run_help2man = $(PERL) -- $(srcdir)/man/help2man
13-else
14+#if HAVE_PERL
15+#run_help2man = $(PERL) -- $(srcdir)/man/help2man
16+#else
17 run_help2man = $(SHELL) $(srcdir)/man/dummy-man
18-endif
19+#endif
20
21 man1_MANS = @man1_MANS@
22 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
index 2ef8a548ac..2ef8a548ac 100644
--- 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
diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/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/"
6BUGTRACKER = "http://debbugs.gnu.org/coreutils" 6BUGTRACKER = "http://debbugs.gnu.org/coreutils"
7LICENSE = "GPLv3+" 7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ 8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
9 file://src/ls.c;beginline=5;endline=16;md5=2e9acd8818fe6db4c2981d20ca632553" 9 file://src/ls.c;beginline=5;endline=16;md5=38b79785ca88537b75871782a2a3c6b8"
10PR = "r5" 10PR = "r0"
11DEPENDS = "gmp libcap" 11DEPENDS = "gmp libcap"
12DEPENDS_class-native = "" 12DEPENDS_class-native = ""
13 13
@@ -15,11 +15,12 @@ inherit autotools gettext
15 15
16SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ 16SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
17 file://remove-usr-local-lib-from-m4.patch \ 17 file://remove-usr-local-lib-from-m4.patch \
18 file://remove-gets.patch \
19 file://coreutils-build-with-acl.patch \ 18 file://coreutils-build-with-acl.patch \
19 file://dummy_help2man.patch \
20 " 20 "
21SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a" 21
22SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d" 22SRC_URI[md5sum] = "065ba41828644eca5dd8163446de5d64"
23SRC_URI[sha256sum] = "adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18"
23 24
24EXTRA_OECONF = "--disable-acl" 25EXTRA_OECONF = "--disable-acl"
25EXTRA_OECONF_class-native = "--disable-acl --without-gmp" 26EXTRA_OECONF_class-native = "--disable-acl --without-gmp"