diff options
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/archivers/gnutar/implausible.patch | 20 |
2 files changed, 7 insertions, 26 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index a49b4de52b0..a74b60d9517 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "gnutar-1.22"; - + name = "gnutar-1.23"; + src = fetchurl { - url = "mirror://gnu/tar/tar-1.22.tar.bz2"; - sha256 = "0kdaadflxa6wznbbrp0xlxk9926hrr4yg7wr6m98ygvs35zvdvrw"; + url = "mirror://gnu/tar/tar-1.23.tar.bz2"; + sha256 = "0dmyxsh0171m6nv8aw74dps1l4b1r7pkqkly9kcv3yv2vdr86cn9"; }; - - patches = [./implausible.patch]; meta = { homepage = http://www.gnu.org/software/tar/; @@ -30,5 +28,8 @@ stdenv.mkDerivation rec { ''; license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/archivers/gnutar/implausible.patch b/pkgs/tools/archivers/gnutar/implausible.patch deleted file mode 100644 index a3522c74350..00000000000 --- a/pkgs/tools/archivers/gnutar/implausible.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc tar-1.16.1-orig/src/extract.c tar-1.16.1/src/extract.c -*** tar-1.16.1-orig/src/extract.c 2006-12-07 14:26:00.000000000 +0100 ---- tar-1.16.1/src/extract.c 2007-05-24 11:39:47.000000000 +0200 -*************** -*** 194,200 **** - static void - check_time (char const *file_name, struct timespec t) - { -! if (t.tv_sec <= 0) - WARN ((0, 0, _("%s: implausibly old time stamp %s"), - file_name, tartime (t, true))); - else if (timespec_cmp (volume_start_time, t) < 0) ---- 194,200 ---- - static void - check_time (char const *file_name, struct timespec t) - { -! if (0 /* t.tv_sec <= 0 */) - WARN ((0, 0, _("%s: implausibly old time stamp %s"), - file_name, tartime (t, true))); - else if (timespec_cmp (volume_start_time, t) < 0) |