From unknown Tue Jun 24 17:27:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27347] [PATCH] gnu: Move contents of zip module into compression module. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jun 2017 19:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 27347 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 27347@debbugs.gnu.org Cc: Arun Isaac X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149729447627071 (code B ref -1); Mon, 12 Jun 2017 19:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jun 2017 19:07:56 +0000 Received: from localhost ([127.0.0.1]:43990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKUgo-00072Q-H2 for submit@debbugs.gnu.org; Mon, 12 Jun 2017 15:07:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgj-00072A-8b for submit@debbugs.gnu.org; Mon, 12 Jun 2017 15:07:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgY-0004pj-NS for submit@debbugs.gnu.org; Mon, 12 Jun 2017 15:07:40 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:49884) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgY-0004pf-Jc for submit@debbugs.gnu.org; Mon, 12 Jun 2017 15:07:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgT-00060r-Gc for guix-patches@gnu.org; Mon, 12 Jun 2017 15:07:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgO-0004nG-Po for guix-patches@gnu.org; Mon, 12 Jun 2017 15:07:29 -0400 Received: from o114.p9.mailjet.com ([87.253.234.114]:59117) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgO-0004n1-4s for guix-patches@gnu.org; Mon, 12 Jun 2017 15:07:24 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:x-csa-complaints: x-mj-mid:content-type:content-transfer-encoding; bh=yKB06n+ISiADqazLfbVvmYcusqY=; b=sUXItTRki1utwqiLh9igajmglTD9kpuorawNBlKijBFuMv72vvxXMc2Ca 1rtUdF/PA8VhOpK1DlBkR0KT3s0lQwR8ahAb//AJXdpbI2lHj5vinLCsQCyh uxNZsCrjyu3x9X7zKI1qX1nRGmshyME1QlcsH43jtKegWXjiyay1X0= Message-Id: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> MIME-Version: 1.0 From: Arun Isaac Date: Tue, 13 Jun 2017 00:37:02 +0530 X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp0D9RX23jR-uPlStESrXI1AAFgUc Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to... * gnu/packages/compression.scm: ...here. * gnu/packages/zip.scm: Delete file. * gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file. * gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compressi= on, docbook, documentation, fonts, fpga, game-development, games, gl, gnome, gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice, markup, maths, mc, monitoring, music, php, pretty-print, python, scheme, smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml, zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.sc= m: Adapt module import. --- gnu/local.mk | 1 - gnu/packages/audio.scm | 1 - gnu/packages/avr.scm | 4 +- gnu/packages/bioinformatics.scm | 1 - gnu/packages/busybox.scm | 4 +- gnu/packages/cdrom.scm | 1 - gnu/packages/ci.scm | 1 - gnu/packages/compression.scm | 150 +++++++++++++++++++++++++++++++- gnu/packages/docbook.scm | 3 +- gnu/packages/documentation.scm | 3 +- gnu/packages/fonts.scm | 3 +- gnu/packages/fpga.scm | 1 - gnu/packages/game-development.scm | 1 - gnu/packages/games.scm | 1 - gnu/packages/gl.scm | 1 - gnu/packages/gnome.scm | 1 - gnu/packages/gnuzilla.scm | 1 - gnu/packages/graphics.scm | 3 +- gnu/packages/guile.scm | 1 - gnu/packages/haskell.scm | 1 - gnu/packages/image.scm | 1 - gnu/packages/java.scm | 1 - gnu/packages/kodi.scm | 3 +- gnu/packages/ldc.scm | 3 +- gnu/packages/libreoffice.scm | 3 +- gnu/packages/markup.scm | 4 +- gnu/packages/maths.scm | 1 - gnu/packages/mc.scm | 2 +- gnu/packages/monitoring.scm | 3 +- gnu/packages/music.scm | 1 - gnu/packages/php.scm | 1 - gnu/packages/pretty-print.scm | 2 +- gnu/packages/python.scm | 1 - gnu/packages/scheme.scm | 1 - gnu/packages/smalltalk.scm | 4 +- gnu/packages/statistics.scm | 1 - gnu/packages/synergy.scm | 1 - gnu/packages/tex.scm | 1 - gnu/packages/textutils.scm | 4 +- gnu/packages/video.scm | 3 +- gnu/packages/web-browsers.scm | 1 - gnu/packages/xml.scm | 1 - gnu/packages/zip.scm | 177 --------------------------------= ------ guix/build-system/ant.scm | 2 +- guix/build-system/font.scm | 2 +- guix/download.scm | 2 +- guix/packages.scm | 2 +- 47 files changed, 174 insertions(+), 237 deletions(-) delete mode 100644 gnu/packages/zip.scm diff --git a/gnu/local.mk b/gnu/local.mk index 892d1ee26..ac7425d7f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -416,7 +416,6 @@ GNU_SYSTEM_MODULES =3D \ %D%/packages/xorg.scm \ %D%/packages/xfce.scm \ %D%/packages/zile.scm \ - %D%/packages/zip.scm \ \ %D%/services.scm \ %D%/services/admin.scm \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index dc668ce13..3e4b998b1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -79,7 +79,6 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) =20 (define-public alsa-modular-synth diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 916f7983f..aaa042804 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -27,11 +27,11 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) #:use-module (gnu packages flashing-tools) #:use-module (gnu packages gcc) - #:use-module (gnu packages vim) - #:use-module (gnu packages zip)) + #:use-module (gnu packages vim)) =20 (define-public avr-binutils (package diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatic= s.scm index b47f13693..b18da56ed 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -96,7 +96,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) =20 (define-public r-ape diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 988154eed..096e26ca0 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -24,8 +24,8 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages admin) - #:use-module (gnu packages perl) - #:use-module (gnu packages zip)) + #:use-module (gnu packages compression) + #:use-module (gnu packages perl)) =20 (define-public busybox (package diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 15329b310..704e8ad36 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -37,7 +37,6 @@ #:use-module (gnu packages audio) #:use-module (gnu packages bison) #:use-module (gnu packages compression) - #:use-module (gnu packages zip) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index c26d02f17..e2cb712bf 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -39,7 +39,6 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) - #:use-module (gnu packages zip) #:use-module (guix build-system gnu)) =20 (define-public hydra diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3742ff586..4a8d4fbe9 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -54,7 +54,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) - #:use-module (gnu packages zip) #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:select (last))) =20 @@ -1337,3 +1336,152 @@ as is the decompression of data compressed in thi= s manner. Data compressed by other implementations will only be decompressed by two threads: one perf= orming the actual decompression, the other input and output.") (license (package-license zstd)))) + +(define-public zip + (package + (name "zip") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/infozip" + "/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz")= ) + (sha256 + (base32 + "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h")))) + (build-system gnu-build-system) + (inputs `(("bzip2" ,bzip2))) + (arguments + `(#:tests? #f ; no test target + #:make-flags (let ((out (assoc-ref %outputs "out"))) + (list "-f" "unix/Makefile" + (string-append "prefix=3D" out) + (string-append "MANDIR=3D" out "/share/man/m= an1"))) + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (zero? (apply system* "make" "generic_gcc" make-flags)))) + (delete 'configure)))) + (home-page "http://www.info-zip.org/Zip.html") + (synopsis "Compression and file packing utility") + (description + "Zip is a compression and file packaging/archive utility. Zip is u= seful +for packaging a set of files for distribution, for archiving files, and = for +saving disk space by temporarily compressing unused files or directories= . +Zip puts one or more compressed files into a single ZIP archive, along w= ith +information about the files (name, path, date, time of last modification= , +protection, and check information to verify file integrity). An entire +directory structure can be packed into a ZIP archive with a single comma= nd. + +Zip has one compression method (deflation) and can also store files with= out +compression. Zip automatically chooses the better of the two for each f= ile. +Compression ratios of 2:1 to 3:1 are common for text files.") + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")))= ) + +(define-public unzip + (package (inherit zip) + (name "unzip") + (version "6.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/infozip" + "/UnZip%206.x%20%28latest%29/UnZip%206.0/unzi= p60.tar.gz")) + (sha256 + (base32 + "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83")) + (patches (search-patches "unzip-CVE-2014-8139.patch" + "unzip-CVE-2014-8140.patch" + "unzip-CVE-2014-8141.patch" + "unzip-CVE-2014-9636.patch" + "unzip-CVE-2015-7696.patch" + "unzip-CVE-2015-7697.patch" + "unzip-allow-greater-hostver-values.patc= h" + "unzip-initialize-symlink-flag.patch" + "unzip-remove-build-date.patch" + "unzip-attribs-overflow.patch" + "unzip-overflow-on-invalid-input.patch" + "unzip-format-secure.patch" + "unzip-overflow-long-fsize.patch")))) + (build-system gnu-build-system) + ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_= STDIO + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (zero? (apply system* "make" + `("-j" ,(number->string + (parallel-job-count)) + ,@make-flags + "generic_gcc")))))) + #:make-flags (list "-f" "unix/Makefile" + (string-append "prefix=3D" %output) + (string-append "MANDIR=3D" %output "/share/man= /man1")))) + (home-page "http://www.info-zip.org/UnZip.html") + (synopsis "Decompression and file extraction utility") + (description + "UnZip is an extraction utility for archives compressed in .zip for= mat, +also called \"zipfiles\". + +UnZip lists, tests, or extracts files from a .zip archive. The default +behaviour (with no options) is to extract into the current directory, an= d +subdirectories below it, all files from the specified zipfile. UnZip +recreates the stored directory structure by default.") + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")))= ) + +(define-public zziplib + (package + (name "zziplib") + (version "0.13.62") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/zziplib/zziplib13/" + version "/zziplib-" + version ".tar.bz2")) + (sha256 + (base32 + "0nsjqxw017hiyp524p9316283jlf5piixc1091gkimhz38zh7f51")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib))) + (native-inputs `(("perl" ,perl) ; for the documentation + ("pkg-config" ,pkg-config) + ;; for the documentation; Python 3 not supported, + ;; http://forums.gentoo.org/viewtopic-t-863161-star= t-0.html + ("python" ,python-2) + ("zip" ,zip))) ; to create test files + (arguments + `(#:parallel-tests? #f)) ; since test files are created on the fly + (home-page "http://zziplib.sourceforge.net/") + (synopsis "Library for accessing zip files") + (description + "ZZipLib is a library based on zlib for accessing zip files.") + (license license:lgpl2.0+))) + +(define-public perl-zip + (package + (name "perl-zip") + (version "1.59") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/A/AD/ADAMK/Archive-Zip-" + version ".tar.gz")) + (sha256 + (base32 + "0m31qlppg65vh32pwxkwjby02q70abx49d2yk6vfd4585fqb27cx")))) + (build-system perl-build-system) + (synopsis "Provides an interface to ZIP archive files") + (description "The Archive::Zip module allows a Perl program to creat= e, +manipulate, read, and write Zip archive files.") + (home-page "http://search.cpan.org/~adamk/Archive-Zip-1.30/") + (license license:perl-license))) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 067ad1c3b..7a309b0bc 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -31,8 +31,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system trivial) - #:use-module (guix build-system python) - #:autoload (gnu packages zip) (unzip)) + #:use-module (guix build-system python)) =20 (define-public docbook-xml (package diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.= scm index ba8eea393..5d3d6f170 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -37,8 +37,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages perl) - #:use-module (gnu packages xml) - #:autoload (gnu packages zip) (unzip)) + #:use-module (gnu packages xml)) =20 (define-public asciidoc (package diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 59e60dc29..025f9c2aa 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -53,8 +53,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) =20 (define-public font-inconsolata (package diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 0b98e2db0..c371b1981 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -35,7 +35,6 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) - #:use-module (gnu packages zip) #:use-module (gnu packages perl) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gperf) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-develo= pment.scm index 5253d0c91..2a780b447 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -50,7 +50,6 @@ #:use-module (gnu packages qt) #:use-module (gnu packages video) #:use-module (gnu packages compression) - #:use-module (gnu packages zip) #:use-module (gnu packages gl) #:use-module (gnu packages linux) #:use-module (gnu packages xorg) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9bbf5d022..9bcf8721a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -110,7 +110,6 @@ #:use-module (gnu packages compression) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages linux) - #:use-module (gnu packages zip) #:use-module (gnu packages xiph) #:use-module (gnu packages curl) #:use-module (gnu packages lua) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 745780930..08f6187f8 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix download) #:use-module (guix build utils) #:use-module (guix build-system gnu) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1080ddfeb..3aedfb5b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -129,7 +129,6 @@ #:use-module (gnu packages readline) #:use-module (gnu packages fonts) #:use-module (gnu packages qemu) - #:use-module (gnu packages zip) #:use-module (gnu packages speech) #:use-module (srfi srfi-1)) =20 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 8d03f0e00..5ecb58bcf 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip) #:use-module (gnu packages readline)) =20 (define-public mozjs diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4fa403324..6c813e8a3 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -62,8 +62,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages video) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) =20 (define-public blender (package diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b57f4c3b6..68bba06ce 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -62,7 +62,6 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0bafdf6f6..72ae20d93 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -46,7 +46,6 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix download) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index abac17d6d..72669ea6d 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -55,7 +55,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9a129b8d9..7688ca740 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages kerberos) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (gnu packages texinfo) #:use-module ((srfi srfi-1) #:select (fold alist-delete)) #:use-module (srfi srfi-11) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 061d5f1b2..c8a65af79 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -68,8 +68,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages assembly) - #:use-module (gnu packages zip)) + #:use-module (gnu packages assembly)) =20 (define-public crossguid (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4")) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 59036a531..7f9dde746 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -35,8 +35,7 @@ #:use-module (gnu packages libedit) #:use-module (gnu packages llvm) #:use-module (gnu packages python) - #:use-module (gnu packages textutils) - #:use-module (gnu packages zip)) + #:use-module (gnu packages textutils)) =20 (define-public rdmd (package diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 809e28e27..bdbf3f850 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -65,8 +65,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) =20 (define-public ixion (package diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index cd883b23e..4afe8c3c0 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -26,10 +26,10 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system cmake) + #:use-module (gnu packages compression) #:use-module (gnu packages perl) #:use-module (gnu packages python) - #:use-module (gnu packages web) - #:use-module (gnu packages zip)) + #:use-module (gnu packages web)) =20 (define-public hoedown (package diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0a43ad465..8ad395639 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -96,7 +96,6 @@ #:use-module (gnu packages tls) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) =20 (define-public aris diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index bae12439f..0770304a2 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -31,7 +31,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages check) #:use-module (gnu packages perl) - #:use-module (gnu packages zip)) + #:use-module (gnu packages compression)) =20 (define-public mc (package diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index ac80a6bb9..c136265c5 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -27,8 +27,7 @@ #:use-module (gnu packages gd) #:use-module (gnu packages image) #:use-module (gnu packages mail) - #:use-module (gnu packages perl) - #:use-module (gnu packages zip)) + #:use-module (gnu packages perl)) =20 (define-public nagios (package diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 186dc276b..b40bbb002 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -105,7 +105,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xiph) - #:use-module (gnu packages zip) #:use-module ((srfi srfi-1) #:select (last))) =20 (define-public aria-maestosa diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index b6f64bc0e..7d569eef3 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.sc= m index a11c34330..8cee89dd4 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -37,7 +37,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages zip)) + #:use-module (gnu packages compression)) =20 (define-public a2ps (package diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 03e6bb656..f567a4bf9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -109,7 +109,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip) #:use-module (gnu packages tcl) #:use-module (gnu packages bdw-gc) #:use-module (guix packages) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index eacfd733d..bcb715327 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -59,7 +59,6 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages tls) #:use-module (gnu packages gl) - #:use-module (gnu packages zip) #:use-module (ice-9 match)) =20 (define (mit-scheme-source-directory system version) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 675ca0ce5..f4a50ded2 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -36,8 +37,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) =20 (define-public smalltalk (package diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ae44bfb01..cb2dbca75 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) =20 =20 diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index b971cbe3a..1627d8443 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -28,7 +28,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-26)) =20 (define-public synergy diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 7839e16b2..879eb0142 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -56,7 +56,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip) #:autoload (gnu packages texinfo) (texinfo) #:use-module (ice-9 ftw) #:use-module (srfi srfi-1)) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7bc2fc47f..152d08059 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -38,14 +38,14 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages compression) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) - #:use-module (gnu packages slang) - #:use-module (gnu packages zip)) + #:use-module (gnu packages slang)) =20 (define-public recode (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1dcb0aa8e..7112e53bc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -106,8 +106,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages assembly) - #:use-module (gnu packages zip)) + #:use-module (gnu packages assembly)) =20 (define-public aalib (package diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.sc= m index a10b1367e..146f3a1fa 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -39,7 +39,6 @@ #:use-module (gnu packages image) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9635413b8..4f9e15a98 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -40,7 +40,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages web) - #:use-module (gnu packages zip) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm deleted file mode 100644 index 8feb4fea2..000000000 --- a/gnu/packages/zip.scm +++ /dev/null @@ -1,177 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2013 Andreas Enge -;;; Copyright =C2=A9 2014, 2015 Mark H Weaver -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (a= t -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages zip) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (gnu packages) - #:use-module (gnu packages compression) - #:use-module (gnu packages perl) - #:use-module (guix build-system perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python)) - -(define-public zip - (package - (name "zip") - (version "3.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/infozip/Zip%203.x%20%28l= atest%29/3.0/zip30.tar.gz")) - (sha256 - (base32 - "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h")))) - (build-system gnu-build-system) - (inputs `(("bzip2" ,bzip2))) - (arguments - `(#:tests? #f ; no test target - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "-f" "unix/Makefile" - (string-append "prefix=3D" out) - (string-append "MANDIR=3D" out "/share/man/m= an1"))) - #:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (zero? (apply system* "make" "generic_gcc" make-flag= s)))) - (delete 'configure)))) - (home-page "http://www.info-zip.org/Zip.html") - (synopsis "Compression and file packing utility") - (description - "Zip is a compression and file packaging/archive utility. Zip is u= seful -for packaging a set of files for distribution, for archiving files, and = for -saving disk space by temporarily compressing unused files or directories= . -Zip puts one or more compressed files into a single ZIP archive, along w= ith -information about the files (name, path, date, time of last modification= , -protection, and check information to verify file integrity). An entire -directory structure can be packed into a ZIP archive with a single comma= nd. - -Zip has one compression method (deflation) and can also store files with= out -compression. Zip automatically chooses the better of the two for each f= ile. -Compression ratios of 2:1 to 3:1 are common for text files.") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")))) - -(define-public unzip - (package (inherit zip) - (name "unzip") - (version "6.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/infozip/UnZip%206.x%20%2= 8latest%29/UnZip%206.0/unzip60.tar.gz")) - (sha256 - (base32 - "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83")) - (patches (search-patches "unzip-CVE-2014-8139.patch" - "unzip-CVE-2014-8140.patch" - "unzip-CVE-2014-8141.patch" - "unzip-CVE-2014-9636.patch" - "unzip-CVE-2015-7696.patch" - "unzip-CVE-2015-7697.patch" - "unzip-allow-greater-hostver-values.patch= " - "unzip-initialize-symlink-flag.patch" - "unzip-remove-build-date.patch" - "unzip-attribs-overflow.patch" - "unzip-overflow-on-invalid-input.patch" - "unzip-format-secure.patch" - "unzip-overflow-long-fsize.patch")))) - (build-system gnu-build-system) - ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_= STDIO - (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key make-flags #:allow-other-keys= ) - (zero? (apply system* "make" - `("-j" ,(number->string - (parallel-job-count)= ) - ,@make-flags - "generic_gcc")))))) - #:make-flags (list "-f" "unix/Makefile" - (string-append "prefix=3D" %output) - (string-append "MANDIR=3D" %output "/share/man= /man1")))) - (home-page "http://www.info-zip.org/UnZip.html") - (synopsis "Decompression and file extraction utility") - (description - "UnZip is an extraction utility for archives compressed in .zip for= mat, -also called \"zipfiles\". - -UnZip lists, tests, or extracts files from a .zip archive. The default -behaviour (with no options) is to extract into the current directory, an= d -subdirectories below it, all files from the specified zipfile. UnZip -recreates the stored directory structure by default.") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")))) - -(define-public zziplib - (package - (name "zziplib") - (version "0.13.62") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/zziplib/zziplib13/" - version "/zziplib-" - version ".tar.bz2")) - (sha256 - (base32 - "0nsjqxw017hiyp524p9316283jlf5piixc1091gkimhz38zh7f51")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib))) - (native-inputs `(("perl" ,perl) ; for the documentation - ("pkg-config" ,pkg-config) - ("python" ,python-2) ; for the documentation; Pytho= n 3 not supported, - ; http://forums.gentoo.org/viewt= opic-t-863161-start-0.html - ("zip" ,zip))) ; to create test files - (arguments - `(#:parallel-tests? #f)) ; since test files are created on the fly - (home-page "http://zziplib.sourceforge.net/") - (synopsis "Library for accessing zip files") - (description - "ZZipLib is a library based on zlib for accessing zip files.") - (license license:lgpl2.0+))) - - -(define-public perl-zip - (package - (name "perl-zip") - (version "1.59") - (source=20 - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/A/AD/ADAMK/Archive-Zip-"=20 - version ".tar.gz")) - (sha256 - (base32 - "0m31qlppg65vh32pwxkwjby02q70abx49d2yk6vfd4585fqb27cx")))) - (build-system perl-build-system) - (synopsis "Provides an interface to ZIP archive files") - (description "The Archive::Zip module allows a Perl program to creat= e, -manipulate, read, and write Zip archive files.") - (home-page "http://search.cpan.org/~adamk/Archive-Zip-1.30/") - (license license:perl-license))) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 228b4e60d..e0870a605 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -58,7 +58,7 @@ (define (default-zip) "Return the default ZIP package." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((zip-mod (resolve-interface '(gnu packages zip)))) + (let ((zip-mod (resolve-interface '(gnu packages compression)))) (module-ref zip-mod 'zip))) =20 (define* (lower name diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index f448c302c..f75789c1c 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -56,7 +56,7 @@ '()) ,@inputs ,(list "tar" (module-ref (resolve-interface '(gnu pac= kages base)) 'tar)) - ,(list "unzip" (module-ref (resolve-interface '(gnu p= ackages zip)) 'unzip)) + ,(list "unzip" (module-ref (resolve-interface '(gnu p= ackages compression)) 'unzip)) ,@(let ((compression (resolve-interface '(gnu package= s compression)))) (map (match-lambda ((name package) diff --git a/guix/download.scm b/guix/download.scm index bed1f502c..c1da51547 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -528,7 +528,7 @@ own. This helper makes it easier to deal with \"zip = bombs\"." (_ (basename url)))) (define unzip - (module-ref (resolve-interface '(gnu packages zip)) 'unzip)) + (module-ref (resolve-interface '(gnu packages compression)) 'unzip)) =20 (mlet %store-monad ((drv (url-fetch url hash-algo hash (string-append "zipbomb-" diff --git a/guix/packages.scm b/guix/packages.scm index f4967f98f..2e02b7356 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -401,7 +401,7 @@ object." ("bzip2" ,(ref '(gnu packages compression) 'bzip2)) ("gzip" ,(ref '(gnu packages compression) 'gzip)) ("lzip" ,(ref '(gnu packages compression) 'lzip)) - ("unzip" ,(ref '(gnu packages zip) 'unzip)) + ("unzip" ,(ref '(gnu packages compression) 'unzip)) ("patch" ,(ref '(gnu packages base) 'patch)) ("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales))))) =20 --=20 2.12.2 From unknown Tue Jun 24 17:27:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27347] [PATCH] gnu: Move contents of zip module into compression module. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jun 2017 08:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27347 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Cc: 27347@debbugs.gnu.org Received: via spool by 27347-submit@debbugs.gnu.org id=B27347.149760219012668 (code B ref 27347); Fri, 16 Jun 2017 08:37:01 +0000 Received: (at 27347) by debbugs.gnu.org; 16 Jun 2017 08:36:30 +0000 Received: from localhost ([127.0.0.1]:50183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLmk1-0003IF-N3 for submit@debbugs.gnu.org; Fri, 16 Jun 2017 04:36:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLmjx-0003Hx-0n for 27347@debbugs.gnu.org; Fri, 16 Jun 2017 04:36:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLmjn-0005px-Nf for 27347@debbugs.gnu.org; Fri, 16 Jun 2017 04:36:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:38288) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLmjn-0005pr-KA; Fri, 16 Jun 2017 04:36:15 -0400 Received: from [193.50.110.101] (port=55114 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dLmjm-0008Ha-IK; Fri, 16 Jun 2017 04:36:14 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> Date: Fri, 16 Jun 2017 10:36:12 +0200 In-Reply-To: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> (Arun Isaac's message of "Tue, 13 Jun 2017 00:37:02 +0530") Message-ID: <878tksib2b.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -3.4 (---) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.4 (---) Arun Isaac skribis: > * gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to... > * gnu/packages/compression.scm: ...here. > * gnu/packages/zip.scm: Delete file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file. > * gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compression, > docbook, documentation, fonts, fpga, game-development, games, gl, gnome, > gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice, > markup, maths, mc, monitoring, music, php, pretty-print, python, scheme, > smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml, > zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.scm: > Adapt module import. LGTM. Sorry for taking so long! Thank you, Ludo'. From unknown Tue Jun 24 17:27:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27347] [PATCH] gnu: Move contents of zip module into compression module. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jun 2017 22:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27347 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac , 27347@debbugs.gnu.org Received: via spool by 27347-submit@debbugs.gnu.org id=B27347.149765373332649 (code B ref 27347); Fri, 16 Jun 2017 22:56:01 +0000 Received: (at 27347) by debbugs.gnu.org; 16 Jun 2017 22:55:33 +0000 Received: from localhost ([127.0.0.1]:51808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dM09M-0008UX-OM for submit@debbugs.gnu.org; Fri, 16 Jun 2017 18:55:32 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:57059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dM09H-0008UK-UR for 27347@debbugs.gnu.org; Fri, 16 Jun 2017 18:55:31 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 39BBE2066F; Fri, 16 Jun 2017 18:55:27 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Fri, 16 Jun 2017 18:55:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=c6JQbT8sO+JYR5DCBslCiP2Xs/9NwOqxf0ZQLN8Kc o0=; b=vCinkgggcQcIRdRi/+TctrmKMRd3UKyuTQfz76LeETIGL/J2/2UKNfUg2 ZDir76vqlx1vkF1NQaUmWz4QC5HxYQPDcrY4HVnGMwQN42cP7S3OYNAt0WzlCIOb 7TjoWahj7hhT2AlHNdTBO5x7k87ZKJ+opRKjp89/fhbroSxZwM7S6Oz5BNBANgBc qnysBMoSTNnaV8+RTP+plaYQR/rxEqVqIy7WoS9aeg5+Ym2oMDC/X8UhvNFjxFHv lFOrox7loMgQnNqVSyjR51lYERvnbj7m7x1Y40bhQffR8vHf3UHkBihnKYaBiQP7 MwXAZtFB7tfCcpEFCJhjBhTjy6bhQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=c6JQbT8sO+JYR5DCBs lCiP2Xs/9NwOqxf0ZQLN8Kco0=; b=TVg5aF8XjfkYDS51SexumozDi8G5CsACXQ PuatxeIDzyd5wkgOlrAWK5UHB5T2hrxGnNVEaRw6URapOHoaHzpt19+pOduJx3TJ KFwxxCs6I4xpk1vUO4OykXffNOE87M3TmJCC0Y3Xf1rOgevz30scjRFgolWI16vC CBPh98SomqMJwupNWx4G+FdvKhXktPFeAb+1CZ2litdOdsiohvC87ZYC/b/GOQWZ 8mBWpdy7kk5x5yZXq+CDh9CP5nmMQdsPF0UMlPp0jogz0s0ptZCcXz1gt0+PyN6q a3dZ67au+cQwSfzSu/FAIlqIOzvOzOV0ep/FrmPdbsPxabAOjcnA== X-ME-Sender: X-Sasl-enc: UZPEKqAJ5UwUhNvnx/8ohZg2vOdtGfjYXynhocWJ5X0H 1497653726 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id BE7F17E865; Fri, 16 Jun 2017 18:55:26 -0400 (EDT) From: Marius Bakke In-Reply-To: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> References: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> User-Agent: Notmuch/0.24.2 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sat, 17 Jun 2017 00:55:24 +0200 Message-ID: <87mv97h7ab.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Arun Isaac writes: > * gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to... > * gnu/packages/compression.scm: ...here. > * gnu/packages/zip.scm: Delete file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file. > * gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compression, > docbook, documentation, fonts, fpga, game-development, games, gl, gnome, > gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice, > markup, maths, mc, monitoring, music, php, pretty-print, python, scheme, > smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml, > zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.scm: > Adapt module import. 'zip.scm' is also in POTFILES.in. I don't know what to do about existing translations, maybe search and replace file name and line number? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAllEYd0ACgkQoqBt8qM6 VPpK4gf/a3hGvYOFJXdWr3yAybRNWrzioyPKI1zizt+/QNEP6tt70Z2LxRFphs6V jO/HG8AmYgPLXzRLB++fXyDWgxfSxby29+6jWFc4bkJAR++ZAVQ2eZXln6rt2F6o mKgvmmXljzoYSf1TdRJj5gqiJsliz3oDUMAZQ3kU4ZlbrP1nZi5CIMvAz0zLWmf/ Tqd9r71mPPuarnZmVTy4q+5tU5AchDxIO9Lk1226FAP1CxS5N1vLCxA6Q4jQTmxJ 7/5N+P8Ce0wX0Vu/6+o7BoGSE0QDPSPhIHA/0F6AaM7x6S0h+xTwPzVNzIQ9ApCW b4e1xDUGlylDmHZ9THV3R649aJreuw== =xj3j -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Jun 24 17:27:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27347] [PATCH] gnu: Move contents of zip module into compression module. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Jun 2017 12:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27347 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: Arun Isaac , 27347@debbugs.gnu.org Received: via spool by 27347-submit@debbugs.gnu.org id=B27347.14977020563832 (code B ref 27347); Sat, 17 Jun 2017 12:21:02 +0000 Received: (at 27347) by debbugs.gnu.org; 17 Jun 2017 12:20:56 +0000 Received: from localhost ([127.0.0.1]:52192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMCil-0000zk-OU for submit@debbugs.gnu.org; Sat, 17 Jun 2017 08:20:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMCif-0000zH-L8 for 27347@debbugs.gnu.org; Sat, 17 Jun 2017 08:20:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dMCiW-0002OZ-MV for 27347@debbugs.gnu.org; Sat, 17 Jun 2017 08:20:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:41201) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dMCiW-0002OT-Iq; Sat, 17 Jun 2017 08:20:40 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:45812 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dMCiV-0004Ev-Q8; Sat, 17 Jun 2017 08:20:40 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> <87mv97h7ab.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 29 Prairial an 225 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Sat, 17 Jun 2017 14:20:37 +0200 In-Reply-To: <87mv97h7ab.fsf@fastmail.com> (Marius Bakke's message of "Sat, 17 Jun 2017 00:55:24 +0200") Message-ID: <87zid6byay.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -3.4 (---) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.4 (---) Marius Bakke skribis: > Arun Isaac writes: > >> * gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to... >> * gnu/packages/compression.scm: ...here. >> * gnu/packages/zip.scm: Delete file. >> * gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file. >> * gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compress= ion, >> docbook, documentation, fonts, fpga, game-development, games, gl, gnome, >> gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice, >> markup, maths, mc, monitoring, music, php, pretty-print, python, scheme, >> smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml, >> zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.s= cm: >> Adapt module import. > > 'zip.scm' is also in POTFILES.in. Oh right, make sure to update it as well, Arun. > I don't know what to do about existing translations, maybe search and > replace file name and line number? The file names and line numbers that appear in .po files are just comments; what matters is the strings themselves. So nothing to do! Ludo=E2=80=99. From unknown Tue Jun 24 17:27:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#27347] [PATCH] gnu: Move contents of zip module into compression module. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Jun 2017 15:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27347 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Marius Bakke , 27347@debbugs.gnu.org Received: via spool by 27347-submit@debbugs.gnu.org id=B27347.149771445823355 (code B ref 27347); Sat, 17 Jun 2017 15:48:02 +0000 Received: (at 27347) by debbugs.gnu.org; 17 Jun 2017 15:47:38 +0000 Received: from localhost ([127.0.0.1]:53567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMFwo-00064d-8m for submit@debbugs.gnu.org; Sat, 17 Jun 2017 11:47:38 -0400 Received: from o108.p9.mailjet.com ([87.253.234.108]:45927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMFwm-00064T-0C for 27347@debbugs.gnu.org; Sat, 17 Jun 2017 11:47:36 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=8+hjwO0SET/4h2/PIdbX9vI3kPU=; b=qavFgEjypgUKl3dx3ZriWmGQ/lqK2dqndL3tvhaSxwPtnh5TLkFBdkcZ6 SBSnhRdUYm7uuN41Hp56hpg7jJgX43DqS8Vt4iXTH1dSnzVTdKav1QRHHogS lXKfWeFb/6EFF4nUcKnQnwEscP83gopaF6y4v8xFscYYsQgIALRFpQ= Message-Id: MIME-Version: 1.0 From: Arun Isaac Date: Sat, 17 Jun 2017 21:17:23 +0530 In-reply-to: <87zid6byay.fsf@gnu.org> References: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> <87mv97h7ab.fsf@fastmail.com> <87zid6byay.fsf@gnu.org> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEUALeQLnCcAAAAAAAAAAAPLDUMAAAACwQwAAAAAAAW9WABZRU8WKCLFQyLZS62slV_vunfdswAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.0 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > Sorry for taking so long! That's ok. I took two or three weeks to get this patch ready... :-P > Oh right, make sure to update it as well, Arun. I also have to incorporate CVE fixing patches for zziplib that Leo Famulari added last week. I'll make both changes and push on Monday. = From unknown Tue Jun 24 17:27:03 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Arun Isaac Subject: bug#27347: closed (Re: [bug#27347] [PATCH] gnu: Move contents of zip module into compression module.) Message-ID: References: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> X-Gnu-PR-Message: they-closed 27347 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 27347@debbugs.gnu.org Date: Tue, 20 Jun 2017 13:00:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1497963603-30508-1" This is a multi-part message in MIME format... ------------=_1497963603-30508-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #27347: [PATCH] gnu: Move contents of zip module into compression module. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 27347@debbugs.gnu.org. --=20 27347: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D27347 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1497963603-30508-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 27347-done) by debbugs.gnu.org; 20 Jun 2017 12:59:28 +0000 Received: from localhost ([127.0.0.1]:56987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNIki-0007ut-Jk for submit@debbugs.gnu.org; Tue, 20 Jun 2017 08:59:28 -0400 Received: from o159.p9.mailjet.com ([87.253.234.159]:47064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNIkg-0007uk-Uo for 27347-done@debbugs.gnu.org; Tue, 20 Jun 2017 08:59:27 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=T6zbn8Sy0kTlgDVB8yov2zMopNk=; b=WerGQwQBvVruqd0nD/1ApvMMiqWIgQSLslIuZxS89xIX2Ba0a1DCmy4as ebBPVNuZzvxFKAElew5jMGQZJGDaMXg/A7ER/x7uHQVZZZMn3JTp6vEwBiHA fhUgyjIQ6cCgAvyszPfRBJL5HcYsXVfJKJH+9PERYlbsTLIvEqTo/s= Message-Id: MIME-Version: 1.0 From: Arun Isaac To: Ludovic =?iso-8859-1?q?Court=E8s?= Subject: Re: [bug#27347] [PATCH] gnu: Move contents of zip module into compression module. Date: Tue, 20 Jun 2017 18:29:04 +0530 In-reply-to: <87zid6byay.fsf@gnu.org> References: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> <87mv97h7ab.fsf@fastmail.com> <87zid6byay.fsf@gnu.org> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEAALsrsh9UAAAAAAAAAAAPL5ogAAAACwQwAAAAAAAW9WABZSRwtPuQdp_LvSL6fvTmO0QPtFAAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.0 (-) X-Debbugs-Envelope-To: 27347-done Cc: Marius Bakke , 27347-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Pushed! Hope I got everything right! = ------------=_1497963603-30508-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 Jun 2017 19:07:56 +0000 Received: from localhost ([127.0.0.1]:43990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKUgo-00072Q-H2 for submit@debbugs.gnu.org; Mon, 12 Jun 2017 15:07:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgj-00072A-8b for submit@debbugs.gnu.org; Mon, 12 Jun 2017 15:07:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgY-0004pj-NS for submit@debbugs.gnu.org; Mon, 12 Jun 2017 15:07:40 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:49884) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgY-0004pf-Jc for submit@debbugs.gnu.org; Mon, 12 Jun 2017 15:07:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgT-00060r-Gc for guix-patches@gnu.org; Mon, 12 Jun 2017 15:07:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgO-0004nG-Po for guix-patches@gnu.org; Mon, 12 Jun 2017 15:07:29 -0400 Received: from o114.p9.mailjet.com ([87.253.234.114]:59117) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@bnc3.mailjet.com>) id 1dKUgO-0004n1-4s for guix-patches@gnu.org; Mon, 12 Jun 2017 15:07:24 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:x-csa-complaints: x-mj-mid:content-type:content-transfer-encoding; bh=yKB06n+ISiADqazLfbVvmYcusqY=; b=sUXItTRki1utwqiLh9igajmglTD9kpuorawNBlKijBFuMv72vvxXMc2Ca 1rtUdF/PA8VhOpK1DlBkR0KT3s0lQwR8ahAb//AJXdpbI2lHj5vinLCsQCyh uxNZsCrjyu3x9X7zKI1qX1nRGmshyME1QlcsH43jtKegWXjiyay1X0= Message-Id: <50b2cc24.AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp@mailjet.com> MIME-Version: 1.0 From: Arun Isaac To: guix-patches@gnu.org Subject: [PATCH] gnu: Move contents of zip module into compression module. Date: Tue, 13 Jun 2017 00:37:02 +0530 X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEUALQHBwcAAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZPuZp0D9RX23jR-uPlStESrXI1AAFgUc Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to... * gnu/packages/compression.scm: ...here. * gnu/packages/zip.scm: Delete file. * gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file. * gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compressi= on, docbook, documentation, fonts, fpga, game-development, games, gl, gnome, gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice, markup, maths, mc, monitoring, music, php, pretty-print, python, scheme, smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml, zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.sc= m: Adapt module import. --- gnu/local.mk | 1 - gnu/packages/audio.scm | 1 - gnu/packages/avr.scm | 4 +- gnu/packages/bioinformatics.scm | 1 - gnu/packages/busybox.scm | 4 +- gnu/packages/cdrom.scm | 1 - gnu/packages/ci.scm | 1 - gnu/packages/compression.scm | 150 +++++++++++++++++++++++++++++++- gnu/packages/docbook.scm | 3 +- gnu/packages/documentation.scm | 3 +- gnu/packages/fonts.scm | 3 +- gnu/packages/fpga.scm | 1 - gnu/packages/game-development.scm | 1 - gnu/packages/games.scm | 1 - gnu/packages/gl.scm | 1 - gnu/packages/gnome.scm | 1 - gnu/packages/gnuzilla.scm | 1 - gnu/packages/graphics.scm | 3 +- gnu/packages/guile.scm | 1 - gnu/packages/haskell.scm | 1 - gnu/packages/image.scm | 1 - gnu/packages/java.scm | 1 - gnu/packages/kodi.scm | 3 +- gnu/packages/ldc.scm | 3 +- gnu/packages/libreoffice.scm | 3 +- gnu/packages/markup.scm | 4 +- gnu/packages/maths.scm | 1 - gnu/packages/mc.scm | 2 +- gnu/packages/monitoring.scm | 3 +- gnu/packages/music.scm | 1 - gnu/packages/php.scm | 1 - gnu/packages/pretty-print.scm | 2 +- gnu/packages/python.scm | 1 - gnu/packages/scheme.scm | 1 - gnu/packages/smalltalk.scm | 4 +- gnu/packages/statistics.scm | 1 - gnu/packages/synergy.scm | 1 - gnu/packages/tex.scm | 1 - gnu/packages/textutils.scm | 4 +- gnu/packages/video.scm | 3 +- gnu/packages/web-browsers.scm | 1 - gnu/packages/xml.scm | 1 - gnu/packages/zip.scm | 177 --------------------------------= ------ guix/build-system/ant.scm | 2 +- guix/build-system/font.scm | 2 +- guix/download.scm | 2 +- guix/packages.scm | 2 +- 47 files changed, 174 insertions(+), 237 deletions(-) delete mode 100644 gnu/packages/zip.scm diff --git a/gnu/local.mk b/gnu/local.mk index 892d1ee26..ac7425d7f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -416,7 +416,6 @@ GNU_SYSTEM_MODULES =3D \ %D%/packages/xorg.scm \ %D%/packages/xfce.scm \ %D%/packages/zile.scm \ - %D%/packages/zip.scm \ \ %D%/services.scm \ %D%/services/admin.scm \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index dc668ce13..3e4b998b1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -79,7 +79,6 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) =20 (define-public alsa-modular-synth diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 916f7983f..aaa042804 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -27,11 +27,11 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) #:use-module (gnu packages flashing-tools) #:use-module (gnu packages gcc) - #:use-module (gnu packages vim) - #:use-module (gnu packages zip)) + #:use-module (gnu packages vim)) =20 (define-public avr-binutils (package diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatic= s.scm index b47f13693..b18da56ed 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -96,7 +96,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) =20 (define-public r-ape diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 988154eed..096e26ca0 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -24,8 +24,8 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages admin) - #:use-module (gnu packages perl) - #:use-module (gnu packages zip)) + #:use-module (gnu packages compression) + #:use-module (gnu packages perl)) =20 (define-public busybox (package diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 15329b310..704e8ad36 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -37,7 +37,6 @@ #:use-module (gnu packages audio) #:use-module (gnu packages bison) #:use-module (gnu packages compression) - #:use-module (gnu packages zip) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index c26d02f17..e2cb712bf 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -39,7 +39,6 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) - #:use-module (gnu packages zip) #:use-module (guix build-system gnu)) =20 (define-public hydra diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3742ff586..4a8d4fbe9 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -54,7 +54,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) - #:use-module (gnu packages zip) #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:select (last))) =20 @@ -1337,3 +1336,152 @@ as is the decompression of data compressed in thi= s manner. Data compressed by other implementations will only be decompressed by two threads: one perf= orming the actual decompression, the other input and output.") (license (package-license zstd)))) + +(define-public zip + (package + (name "zip") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/infozip" + "/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz")= ) + (sha256 + (base32 + "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h")))) + (build-system gnu-build-system) + (inputs `(("bzip2" ,bzip2))) + (arguments + `(#:tests? #f ; no test target + #:make-flags (let ((out (assoc-ref %outputs "out"))) + (list "-f" "unix/Makefile" + (string-append "prefix=3D" out) + (string-append "MANDIR=3D" out "/share/man/m= an1"))) + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (zero? (apply system* "make" "generic_gcc" make-flags)))) + (delete 'configure)))) + (home-page "http://www.info-zip.org/Zip.html") + (synopsis "Compression and file packing utility") + (description + "Zip is a compression and file packaging/archive utility. Zip is u= seful +for packaging a set of files for distribution, for archiving files, and = for +saving disk space by temporarily compressing unused files or directories= . +Zip puts one or more compressed files into a single ZIP archive, along w= ith +information about the files (name, path, date, time of last modification= , +protection, and check information to verify file integrity). An entire +directory structure can be packed into a ZIP archive with a single comma= nd. + +Zip has one compression method (deflation) and can also store files with= out +compression. Zip automatically chooses the better of the two for each f= ile. +Compression ratios of 2:1 to 3:1 are common for text files.") + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")))= ) + +(define-public unzip + (package (inherit zip) + (name "unzip") + (version "6.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/infozip" + "/UnZip%206.x%20%28latest%29/UnZip%206.0/unzi= p60.tar.gz")) + (sha256 + (base32 + "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83")) + (patches (search-patches "unzip-CVE-2014-8139.patch" + "unzip-CVE-2014-8140.patch" + "unzip-CVE-2014-8141.patch" + "unzip-CVE-2014-9636.patch" + "unzip-CVE-2015-7696.patch" + "unzip-CVE-2015-7697.patch" + "unzip-allow-greater-hostver-values.patc= h" + "unzip-initialize-symlink-flag.patch" + "unzip-remove-build-date.patch" + "unzip-attribs-overflow.patch" + "unzip-overflow-on-invalid-input.patch" + "unzip-format-secure.patch" + "unzip-overflow-long-fsize.patch")))) + (build-system gnu-build-system) + ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_= STDIO + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (zero? (apply system* "make" + `("-j" ,(number->string + (parallel-job-count)) + ,@make-flags + "generic_gcc")))))) + #:make-flags (list "-f" "unix/Makefile" + (string-append "prefix=3D" %output) + (string-append "MANDIR=3D" %output "/share/man= /man1")))) + (home-page "http://www.info-zip.org/UnZip.html") + (synopsis "Decompression and file extraction utility") + (description + "UnZip is an extraction utility for archives compressed in .zip for= mat, +also called \"zipfiles\". + +UnZip lists, tests, or extracts files from a .zip archive. The default +behaviour (with no options) is to extract into the current directory, an= d +subdirectories below it, all files from the specified zipfile. UnZip +recreates the stored directory structure by default.") + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")))= ) + +(define-public zziplib + (package + (name "zziplib") + (version "0.13.62") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/zziplib/zziplib13/" + version "/zziplib-" + version ".tar.bz2")) + (sha256 + (base32 + "0nsjqxw017hiyp524p9316283jlf5piixc1091gkimhz38zh7f51")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib))) + (native-inputs `(("perl" ,perl) ; for the documentation + ("pkg-config" ,pkg-config) + ;; for the documentation; Python 3 not supported, + ;; http://forums.gentoo.org/viewtopic-t-863161-star= t-0.html + ("python" ,python-2) + ("zip" ,zip))) ; to create test files + (arguments + `(#:parallel-tests? #f)) ; since test files are created on the fly + (home-page "http://zziplib.sourceforge.net/") + (synopsis "Library for accessing zip files") + (description + "ZZipLib is a library based on zlib for accessing zip files.") + (license license:lgpl2.0+))) + +(define-public perl-zip + (package + (name "perl-zip") + (version "1.59") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/A/AD/ADAMK/Archive-Zip-" + version ".tar.gz")) + (sha256 + (base32 + "0m31qlppg65vh32pwxkwjby02q70abx49d2yk6vfd4585fqb27cx")))) + (build-system perl-build-system) + (synopsis "Provides an interface to ZIP archive files") + (description "The Archive::Zip module allows a Perl program to creat= e, +manipulate, read, and write Zip archive files.") + (home-page "http://search.cpan.org/~adamk/Archive-Zip-1.30/") + (license license:perl-license))) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 067ad1c3b..7a309b0bc 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -31,8 +31,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system trivial) - #:use-module (guix build-system python) - #:autoload (gnu packages zip) (unzip)) + #:use-module (guix build-system python)) =20 (define-public docbook-xml (package diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.= scm index ba8eea393..5d3d6f170 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -37,8 +37,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages perl) - #:use-module (gnu packages xml) - #:autoload (gnu packages zip) (unzip)) + #:use-module (gnu packages xml)) =20 (define-public asciidoc (package diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 59e60dc29..025f9c2aa 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -53,8 +53,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) =20 (define-public font-inconsolata (package diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 0b98e2db0..c371b1981 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -35,7 +35,6 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) - #:use-module (gnu packages zip) #:use-module (gnu packages perl) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gperf) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-develo= pment.scm index 5253d0c91..2a780b447 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -50,7 +50,6 @@ #:use-module (gnu packages qt) #:use-module (gnu packages video) #:use-module (gnu packages compression) - #:use-module (gnu packages zip) #:use-module (gnu packages gl) #:use-module (gnu packages linux) #:use-module (gnu packages xorg) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9bbf5d022..9bcf8721a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -110,7 +110,6 @@ #:use-module (gnu packages compression) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages linux) - #:use-module (gnu packages zip) #:use-module (gnu packages xiph) #:use-module (gnu packages curl) #:use-module (gnu packages lua) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 745780930..08f6187f8 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix download) #:use-module (guix build utils) #:use-module (guix build-system gnu) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1080ddfeb..3aedfb5b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -129,7 +129,6 @@ #:use-module (gnu packages readline) #:use-module (gnu packages fonts) #:use-module (gnu packages qemu) - #:use-module (gnu packages zip) #:use-module (gnu packages speech) #:use-module (srfi srfi-1)) =20 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 8d03f0e00..5ecb58bcf 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip) #:use-module (gnu packages readline)) =20 (define-public mozjs diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4fa403324..6c813e8a3 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -62,8 +62,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages video) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) =20 (define-public blender (package diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b57f4c3b6..68bba06ce 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -62,7 +62,6 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0bafdf6f6..72ae20d93 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -46,7 +46,6 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix download) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index abac17d6d..72669ea6d 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -55,7 +55,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9a129b8d9..7688ca740 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages kerberos) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (gnu packages texinfo) #:use-module ((srfi srfi-1) #:select (fold alist-delete)) #:use-module (srfi srfi-11) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 061d5f1b2..c8a65af79 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -68,8 +68,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages assembly) - #:use-module (gnu packages zip)) + #:use-module (gnu packages assembly)) =20 (define-public crossguid (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4")) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 59036a531..7f9dde746 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -35,8 +35,7 @@ #:use-module (gnu packages libedit) #:use-module (gnu packages llvm) #:use-module (gnu packages python) - #:use-module (gnu packages textutils) - #:use-module (gnu packages zip)) + #:use-module (gnu packages textutils)) =20 (define-public rdmd (package diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 809e28e27..bdbf3f850 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -65,8 +65,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) =20 (define-public ixion (package diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index cd883b23e..4afe8c3c0 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -26,10 +26,10 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system cmake) + #:use-module (gnu packages compression) #:use-module (gnu packages perl) #:use-module (gnu packages python) - #:use-module (gnu packages web) - #:use-module (gnu packages zip)) + #:use-module (gnu packages web)) =20 (define-public hoedown (package diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0a43ad465..8ad395639 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -96,7 +96,6 @@ #:use-module (gnu packages tls) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) =20 (define-public aris diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index bae12439f..0770304a2 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -31,7 +31,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages check) #:use-module (gnu packages perl) - #:use-module (gnu packages zip)) + #:use-module (gnu packages compression)) =20 (define-public mc (package diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index ac80a6bb9..c136265c5 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -27,8 +27,7 @@ #:use-module (gnu packages gd) #:use-module (gnu packages image) #:use-module (gnu packages mail) - #:use-module (gnu packages perl) - #:use-module (gnu packages zip)) + #:use-module (gnu packages perl)) =20 (define-public nagios (package diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 186dc276b..b40bbb002 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -105,7 +105,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xiph) - #:use-module (gnu packages zip) #:use-module ((srfi srfi-1) #:select (last))) =20 (define-public aria-maestosa diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index b6f64bc0e..7d569eef3 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.sc= m index a11c34330..8cee89dd4 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -37,7 +37,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages zip)) + #:use-module (gnu packages compression)) =20 (define-public a2ps (package diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 03e6bb656..f567a4bf9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -109,7 +109,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip) #:use-module (gnu packages tcl) #:use-module (gnu packages bdw-gc) #:use-module (guix packages) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index eacfd733d..bcb715327 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -59,7 +59,6 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages tls) #:use-module (gnu packages gl) - #:use-module (gnu packages zip) #:use-module (ice-9 match)) =20 (define (mit-scheme-source-directory system version) diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 675ca0ce5..f4a50ded2 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -36,8 +37,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages xorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages xorg)) =20 (define-public smalltalk (package diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ae44bfb01..cb2dbca75 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) =20 =20 diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index b971cbe3a..1627d8443 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -28,7 +28,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (srfi srfi-26)) =20 (define-public synergy diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 7839e16b2..879eb0142 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -56,7 +56,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip) #:autoload (gnu packages texinfo) (texinfo) #:use-module (ice-9 ftw) #:use-module (srfi srfi-1)) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7bc2fc47f..152d08059 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -38,14 +38,14 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages compression) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) - #:use-module (gnu packages slang) - #:use-module (gnu packages zip)) + #:use-module (gnu packages slang)) =20 (define-public recode (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1dcb0aa8e..7112e53bc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -106,8 +106,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages assembly) - #:use-module (gnu packages zip)) + #:use-module (gnu packages assembly)) =20 (define-public aalib (package diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.sc= m index a10b1367e..146f3a1fa 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -39,7 +39,6 @@ #:use-module (gnu packages image) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) - #:use-module (gnu packages zip) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9635413b8..4f9e15a98 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -40,7 +40,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages tls) #:use-module (gnu packages web) - #:use-module (gnu packages zip) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm deleted file mode 100644 index 8feb4fea2..000000000 --- a/gnu/packages/zip.scm +++ /dev/null @@ -1,177 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2013 Andreas Enge -;;; Copyright =C2=A9 2014, 2015 Mark H Weaver -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (a= t -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages zip) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (gnu packages) - #:use-module (gnu packages compression) - #:use-module (gnu packages perl) - #:use-module (guix build-system perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python)) - -(define-public zip - (package - (name "zip") - (version "3.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/infozip/Zip%203.x%20%28l= atest%29/3.0/zip30.tar.gz")) - (sha256 - (base32 - "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h")))) - (build-system gnu-build-system) - (inputs `(("bzip2" ,bzip2))) - (arguments - `(#:tests? #f ; no test target - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "-f" "unix/Makefile" - (string-append "prefix=3D" out) - (string-append "MANDIR=3D" out "/share/man/m= an1"))) - #:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (zero? (apply system* "make" "generic_gcc" make-flag= s)))) - (delete 'configure)))) - (home-page "http://www.info-zip.org/Zip.html") - (synopsis "Compression and file packing utility") - (description - "Zip is a compression and file packaging/archive utility. Zip is u= seful -for packaging a set of files for distribution, for archiving files, and = for -saving disk space by temporarily compressing unused files or directories= . -Zip puts one or more compressed files into a single ZIP archive, along w= ith -information about the files (name, path, date, time of last modification= , -protection, and check information to verify file integrity). An entire -directory structure can be packed into a ZIP archive with a single comma= nd. - -Zip has one compression method (deflation) and can also store files with= out -compression. Zip automatically chooses the better of the two for each f= ile. -Compression ratios of 2:1 to 3:1 are common for text files.") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")))) - -(define-public unzip - (package (inherit zip) - (name "unzip") - (version "6.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/infozip/UnZip%206.x%20%2= 8latest%29/UnZip%206.0/unzip60.tar.gz")) - (sha256 - (base32 - "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83")) - (patches (search-patches "unzip-CVE-2014-8139.patch" - "unzip-CVE-2014-8140.patch" - "unzip-CVE-2014-8141.patch" - "unzip-CVE-2014-9636.patch" - "unzip-CVE-2015-7696.patch" - "unzip-CVE-2015-7697.patch" - "unzip-allow-greater-hostver-values.patch= " - "unzip-initialize-symlink-flag.patch" - "unzip-remove-build-date.patch" - "unzip-attribs-overflow.patch" - "unzip-overflow-on-invalid-input.patch" - "unzip-format-secure.patch" - "unzip-overflow-long-fsize.patch")))) - (build-system gnu-build-system) - ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_= STDIO - (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key make-flags #:allow-other-keys= ) - (zero? (apply system* "make" - `("-j" ,(number->string - (parallel-job-count)= ) - ,@make-flags - "generic_gcc")))))) - #:make-flags (list "-f" "unix/Makefile" - (string-append "prefix=3D" %output) - (string-append "MANDIR=3D" %output "/share/man= /man1")))) - (home-page "http://www.info-zip.org/UnZip.html") - (synopsis "Decompression and file extraction utility") - (description - "UnZip is an extraction utility for archives compressed in .zip for= mat, -also called \"zipfiles\". - -UnZip lists, tests, or extracts files from a .zip archive. The default -behaviour (with no options) is to extract into the current directory, an= d -subdirectories below it, all files from the specified zipfile. UnZip -recreates the stored directory structure by default.") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")))) - -(define-public zziplib - (package - (name "zziplib") - (version "0.13.62") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/zziplib/zziplib13/" - version "/zziplib-" - version ".tar.bz2")) - (sha256 - (base32 - "0nsjqxw017hiyp524p9316283jlf5piixc1091gkimhz38zh7f51")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib))) - (native-inputs `(("perl" ,perl) ; for the documentation - ("pkg-config" ,pkg-config) - ("python" ,python-2) ; for the documentation; Pytho= n 3 not supported, - ; http://forums.gentoo.org/viewt= opic-t-863161-start-0.html - ("zip" ,zip))) ; to create test files - (arguments - `(#:parallel-tests? #f)) ; since test files are created on the fly - (home-page "http://zziplib.sourceforge.net/") - (synopsis "Library for accessing zip files") - (description - "ZZipLib is a library based on zlib for accessing zip files.") - (license license:lgpl2.0+))) - - -(define-public perl-zip - (package - (name "perl-zip") - (version "1.59") - (source=20 - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/A/AD/ADAMK/Archive-Zip-"=20 - version ".tar.gz")) - (sha256 - (base32 - "0m31qlppg65vh32pwxkwjby02q70abx49d2yk6vfd4585fqb27cx")))) - (build-system perl-build-system) - (synopsis "Provides an interface to ZIP archive files") - (description "The Archive::Zip module allows a Perl program to creat= e, -manipulate, read, and write Zip archive files.") - (home-page "http://search.cpan.org/~adamk/Archive-Zip-1.30/") - (license license:perl-license))) diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 228b4e60d..e0870a605 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -58,7 +58,7 @@ (define (default-zip) "Return the default ZIP package." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((zip-mod (resolve-interface '(gnu packages zip)))) + (let ((zip-mod (resolve-interface '(gnu packages compression)))) (module-ref zip-mod 'zip))) =20 (define* (lower name diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index f448c302c..f75789c1c 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -56,7 +56,7 @@ '()) ,@inputs ,(list "tar" (module-ref (resolve-interface '(gnu pac= kages base)) 'tar)) - ,(list "unzip" (module-ref (resolve-interface '(gnu p= ackages zip)) 'unzip)) + ,(list "unzip" (module-ref (resolve-interface '(gnu p= ackages compression)) 'unzip)) ,@(let ((compression (resolve-interface '(gnu package= s compression)))) (map (match-lambda ((name package) diff --git a/guix/download.scm b/guix/download.scm index bed1f502c..c1da51547 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -528,7 +528,7 @@ own. This helper makes it easier to deal with \"zip = bombs\"." (_ (basename url)))) (define unzip - (module-ref (resolve-interface '(gnu packages zip)) 'unzip)) + (module-ref (resolve-interface '(gnu packages compression)) 'unzip)) =20 (mlet %store-monad ((drv (url-fetch url hash-algo hash (string-append "zipbomb-" diff --git a/guix/packages.scm b/guix/packages.scm index f4967f98f..2e02b7356 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -401,7 +401,7 @@ object." ("bzip2" ,(ref '(gnu packages compression) 'bzip2)) ("gzip" ,(ref '(gnu packages compression) 'gzip)) ("lzip" ,(ref '(gnu packages compression) 'lzip)) - ("unzip" ,(ref '(gnu packages zip) 'unzip)) + ("unzip" ,(ref '(gnu packages compression) 'unzip)) ("patch" ,(ref '(gnu packages base) 'patch)) ("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales))))) =20 --=20 2.12.2 ------------=_1497963603-30508-1--