[oe-commits] Chen Qi : tar: remove an erroneous patch

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dylan
Commit: 5c585a7a8c856802b79effc7f47ba3e44d7a489c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5c585a7a8c856802b79effc7f47ba3e44d7a489c

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Wed Jul 17 13:41:44 2013 +0800

tar: remove an erroneous patch

This removed patch is a workaround for gcc-4.5 manifests buffer
overflow with app-arch/tar-1.{22,23}, according to the information
from https://bugs.gentoo.org/show_bug.cgi?id=317139.

The problem with that patch is that it's only setting the magic
field of the header while the original statement sets both the magic
and the version field of the header. Because of this, all tar balls
created by the tar package in OE will be treated as old V7 format
tar balls.

As a negative effect of this behaviour, the tar package in OE cannot
handle device files correctly. This in turn leads to the udev cache
failure in images like core-image-lsb-sdk.

[YOCTO #4815]

(From OE-Core master rev: 32210f73c7e9f24951306f462b25e66e1d11a6b8)

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../tar-1.26/tar-1.26-fortifysourcessigabrt.patch  |   36 --------------------
 meta/recipes-extended/tar/tar_1.26.bb              |    1 -
 2 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch b/meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch
deleted file mode 100644
index 6aef096..0000000
--- a/meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-port fedora patch for fortify sources sigabort. See 
-https://qa.mandriva.com/show_bug.cgi?id=61419 for details.
-
-Upstream-Status: Pending
-
-Signed-off-by: Christopher Larson <chris_larson at mentor.com>
-Signed-off-by: Fahad Usman <fahad_usman at mentor.com>
-
----
- src/create.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- tar-1.26.orig/src/create.c
-+++ tar-1.26/src/create.c
-@@ -562,8 +562,8 @@ write_gnu_long_link (struct tar_stat_inf
-   GNAME_TO_CHARS (tmpname, header->header.gname);
-   free (tmpname);
-
--  strcpy (header->buffer + offsetof (struct posix_header, magic),
--	  OLDGNU_MAGIC);
-+  strncpy (header->buffer + offsetof (struct posix_header, magic),
-+	  OLDGNU_MAGIC, sizeof(header->header.magic));
-   header->header.typeflag = type;
-   finish_header (st, header, -1);
-
-@@ -900,8 +900,8 @@ start_header (struct tar_stat_info *st)
-     case OLDGNU_FORMAT:
-     case GNU_FORMAT:   /*FIXME?*/
-       /* Overwrite header->header.magic and header.version in one blow.  */
--      strcpy (header->buffer + offsetof (struct posix_header, magic),
--	      OLDGNU_MAGIC);
-+      strncpy (header->buffer + offsetof (struct posix_header, magic),
-+	      OLDGNU_MAGIC, sizeof(header->header.magic));
-       break;
-
-     case POSIX_FORMAT:
diff --git a/meta/recipes-extended/tar/tar_1.26.bb b/meta/recipes-extended/tar/tar_1.26.bb
index d45c2b1..8b774e6 100644
--- a/meta/recipes-extended/tar/tar_1.26.bb
+++ b/meta/recipes-extended/tar/tar_1.26.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 PR = "r5"
 
 SRC_URI += "file://remove-gets.patch \
-           file://tar-1.26-fortifysourcessigabrt.patch\
            "
 
 SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519"