diff --git a/app-arch/tar/patches/tar-1.27.1.patchset b/app-arch/tar/patches/tar-1.27.1.patchset index 12d248294..0af126885 100644 --- a/app-arch/tar/patches/tar-1.27.1.patchset +++ b/app-arch/tar/patches/tar-1.27.1.patchset @@ -1,13 +1,8 @@ -From 5601acb5afe236cc83a2577a5fb36ef478944bab Mon Sep 17 00:00:00 2001 +From 25395e3fa0b01a898b6e6ae456c8eef3c66849f1 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Thu, 20 Mar 2014 14:52:58 +0100 -Subject: [PATCH] Patches from tar-1.26 +Subject: Patches from tar-1.26 ---- - src/common.h | 2 ++ - src/extract.c | 41 +++++++++++++++++++++++++++++++++++++++++ - src/tar.c | 7 +++++++ - 3 files changed, 50 insertions(+) diff --git a/src/common.h b/src/common.h index 42fd539..633ca19 100644 @@ -121,5 +116,32 @@ index 4f5017d..2dd5200 100644 owner_option = -1; owner_name_option = NULL; group_option = -1; group_name_option = NULL; -- -Jonathan +1.8.3.4 + + +From 6f729d50ba6ca87c6cd33d87462884d90d4504c0 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 28 Mar 2014 21:44:58 +0100 +Subject: gcc2 build fix. + + +diff --git a/lib/wordsplit.h b/lib/wordsplit.h +index b48e3cd..d286ffb 100644 +--- a/lib/wordsplit.h ++++ b/lib/wordsplit.h +@@ -33,10 +33,8 @@ struct wordsplit + const char *ws_comment; + const char *ws_escape; + void (*ws_alloc_die) (struct wordsplit * wsp); +- void (*ws_error) (const char *, ...) +- __attribute__ ((__format__ (__printf__, 1, 2))); +- void (*ws_debug) (const char *, ...) +- __attribute__ ((__format__ (__printf__, 1, 2))); ++ void (*ws_error) (const char *, ...); ++ void (*ws_debug) (const char *, ...); + + const char **ws_env; + const char *(*ws_getvar) (const char *, size_t, void *); +-- +1.8.3.4 diff --git a/app-arch/tar/tar-1.27.1.recipe b/app-arch/tar/tar-1.27.1.recipe index 3f42192c5..77263a76e 100644 --- a/app-arch/tar/tar-1.27.1.recipe +++ b/app-arch/tar/tar-1.27.1.recipe @@ -5,7 +5,7 @@ various other kinds of manipulation. For example, you can use Tar on \ previously created archives to extract files, to store additional files, or to \ update or list files which were already stored. Initially, tar archives were used to store files conveniently on magnetic \ -tape. The name "Tar" comes from this use; it stands for tape archiver. Despite \ +tape. The name \"Tar\" comes from this use; it stands for tape archiver. Despite \ the utility's name, Tar can direct its output to available devices, files, or \ other programs (using pipes), it can even access remote devices or files (as \ archives). @@ -19,7 +19,7 @@ CHECKSUM_MD5="490e074dd7e71f553df8357a7ef9bdcf" CHECKSUM_RMD160="a99ccfd874ac72c1e0feec2d86423c3e5bcd19fb" CHECKSUM_SHA512="f14a0a58e574db3aeec0914621aff2f0518b8d8acce81106b8219b36b3fed47349d6cb802c51a836a5e6889529337434d83b3c50cd7fc1801b9b3944eecc695b" REVISION="2" -ARCHITECTURES="?x86_gcc2 ?x86 x86_64" +ARCHITECTURES="x86_gcc2 ?x86 x86_64" PATCHES="tar-1.27.1.patchset"