From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 23 19:21:26 2017 Received: (at submit) by debbugs.gnu.org; 23 Mar 2017 23:21:26 +0000 Received: from localhost ([127.0.0.1]:41515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crC2k-000510-Hi for submit@debbugs.gnu.org; Thu, 23 Mar 2017 19:21:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crC2g-00050j-BI for submit@debbugs.gnu.org; Thu, 23 Mar 2017 19:21:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crC2Z-0004bN-My for submit@debbugs.gnu.org; Thu, 23 Mar 2017 19:21:13 -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.0 required=5.0 tests=BAYES_40,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:51611) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1crC2Z-0004bJ-J2 for submit@debbugs.gnu.org; Thu, 23 Mar 2017 19:21:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crC2X-0005jO-Lx for guix-patches@gnu.org; Thu, 23 Mar 2017 19:21:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crC2T-0004Zl-8B for guix-patches@gnu.org; Thu, 23 Mar 2017 19:21:09 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39817) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1crC2S-0004Ze-Eg for guix-patches@gnu.org; Thu, 23 Mar 2017 19:21:05 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9C25320907; Thu, 23 Mar 2017 19:21:03 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Thu, 23 Mar 2017 19:21:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc:x-sasl-enc; s=fm1; bh=uDor/YgvPVx3cIGpQvoDVCvcY9C/Yh VJIDBM5kSelxA=; b=f6gVp0Z2WT1FcTm96yHaxCpPDBCdE/sqP+B44sYCxh4WZ5 +kJMnZeE3fC0cyEWREae9ksuLzmM+XNsaq3/Zg0TA+LJANWLf2HKTBSTlhEjvfKZ hh5xT4Hx6u2JwcBWqPHS5985lDOLGaJRwZPdap0vDiMGJ0MpfVGKsoQlaVUM1vWN cBh1bQezN0NuCcbZCKyyyBwzRMMyGF7Q/yPU79ljBPmVUtOY9lV9gBXDLnhk4jS7 ygMWK9AwNzAPUi/bhrmr3/UuQo2+n8wZFqOMnhOkbTUW9rIQdV7HYaPw3HTtUwak gtRiJv3o5pi9Xq2TU9BnaYtONVhKq8f3PNdeKnUA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=uDor/Y gvPVx3cIGpQvoDVCvcY9C/YhVJIDBM5kSelxA=; b=QVcuXlCU3azyJ+XLpYra2e jv8eSTmPUwdjJdvquExjMbvz4hVf4Uzq0CDXsPYhuunTbBHafL9fgy/AlQEOGpSS XYXXSIrbhL9RJERPhVJY28Jrn/yCLYhdZyS7IeWs9psm9+PX9xD2y26JkYAbBkmt u3Z1Z4gRk/E2GD3g1FCrDOKXZa8IuT9jz3CfiEtNmjLp7BAtmHDfjbdSFKbrLDnE YKOx6eqL5uikRb9jh89za0hsjoNRnXtisVyZqxphN4tvgffDMVcAZNGafo7kPFp6 YJ8J+xTsQIKvLrMcGwz3tIeobe24yUHZUZtNjrRlziH8gcoWxvnTn0BkmKRGSAFQ == X-ME-Sender: X-Sasl-enc: D3ayYXy3R9rhULbkIukrwKT31bB5iEh9+7wYcYwqDjim 1490311263 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 2E769242B6; Thu, 23 Mar 2017 19:21:03 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH core-updates] gnu: devil: Update to 1.8.0. Date: Fri, 24 Mar 2017 00:20:56 +0100 Message-Id: <20170323232056.31759-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.12.1 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.4 (----) X-Debbugs-Envelope-To: submit Cc: Marius Bakke 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.3 (----) * gnu/packages/patches/devil-CVE-2009-3994.patch, gnu/packages/patches/devil-fix-libpng.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/image.scm (devil): Update to 1.8.0. [source]: Remove patches and snippet. [build-system]: Change to CMAKE-BUILD-SYSTEM. [arguments]: Disable tests. Remove #:configure-flags and add a 'change-directory' phase. Remove 'fix-tests' phase. [inputs]: Change LIBJPEG to LIBJPEG-TURBO. --- gnu/local.mk | 2 -- gnu/packages/image.scm | 34 +++++++----------------- gnu/packages/patches/devil-CVE-2009-3994.patch | 24 ----------------- gnu/packages/patches/devil-fix-libpng.patch | 36 -------------------------- 4 files changed, 9 insertions(+), 87 deletions(-) delete mode 100644 gnu/packages/patches/devil-CVE-2009-3994.patch delete mode 100644 gnu/packages/patches/devil-fix-libpng.patch diff --git a/gnu/local.mk b/gnu/local.mk index c9e3131c0..6df3e5846 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -526,8 +526,6 @@ dist_patch_DATA = \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ - %D%/packages/patches/devil-CVE-2009-3994.patch \ - %D%/packages/patches/devil-fix-libpng.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/doc++-include-directives.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 51c465a0c..51b09680a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -860,44 +860,28 @@ and XMP metadata of images in various formats.") (define-public devil (package (name "devil") - (version "1.7.8") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/openil/" "DevIL-" version ".tar.gz")) (sha256 (base32 - "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8")) - ;; Backported from upstream: - ;; https://github.com/DentonW/DevIL/commit/724194d7a9a91221a564579f64bdd6f0abd64219.patch - (patches (search-patches "devil-fix-libpng.patch" - "devil-CVE-2009-3994.patch")) - (modules '((guix build utils))) - (snippet - ;; Fix old lcms include directives and lib flags. - '(substitute* '("configure" "src-IL/src/il_profiles.c") - (("-llcms") "-llcms2") - (("lcms/lcms\\.h") "lcms2/lcms2.h") - (("lcms\\.h") "lcms2.h"))))) - (build-system gnu-build-system) + "02dpzvi493r09c9hfjnk54nladl3qw55iqkkg18g12fxwwz9fx80")))) + (build-system cmake-build-system) (arguments - '(#:configure-flags '("--enable-ILUT=yes") ; build utility library + '(;; XXX: Not supported in the released CMakeLists.txt. + ;; Enable this for > 1.8.0. + #:tests? #f #:phases (modify-phases %standard-phases - (add-before 'check 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - ;; Fix hard-coded /bin/bash reference. - (substitute* '("test/Makefile") - (("TESTS_ENVIRONMENT = /bin/bash") - (string-append "TESTS_ENVIRONMENT = " - (assoc-ref inputs "bash") - "/bin/bash"))) - #t))))) + (add-before 'configure 'change-directory + (lambda _ (chdir "DevIL") #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("lcms" ,lcms) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libmng" ,libmng) ("libpng" ,libpng) ("libtiff" ,libtiff) diff --git a/gnu/packages/patches/devil-CVE-2009-3994.patch b/gnu/packages/patches/devil-CVE-2009-3994.patch deleted file mode 100644 index e009a95c4..000000000 --- a/gnu/packages/patches/devil-CVE-2009-3994.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix CVE-2009-3994 (buffer overflow in GetUID() allows remote DOS or -arbitrary code execution via crafted DICOM file). - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3994 - -Copied from Fedora -https://pkgs.fedoraproject.org/cgit/rpms/DevIL.git/tree/DevIL-1.7.8-CVE-2009-3994.patch?id=9c656a75393d6c455aef9f4968fbbee9c53f4fdb - -diff -up devil-1.7.8/src-IL/src/il_dicom.c~ devil-1.7.8/src-IL/src/il_dicom.c ---- devil-1.7.8/src-IL/src/il_dicom.c~ 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8/src-IL/src/il_dicom.c 2009-12-03 12:07:45.000000000 +0100 -@@ -427,9 +427,11 @@ ILboolean GetUID(ILubyte *UID) - return IL_FALSE; - - ValLen = GetLittleUShort(); -+ if (ValLen > 64) -+ return IL_FALSE; - if (iread(UID, ValLen, 1) != 1) - return IL_FALSE; -- UID[64] = 0; // Just to make sure that our string is terminated. -+ UID[ValLen] = 0; // Just to make sure that our string is terminated. - - return IL_TRUE; - } diff --git a/gnu/packages/patches/devil-fix-libpng.patch b/gnu/packages/patches/devil-fix-libpng.patch deleted file mode 100644 index a8e90333a..000000000 --- a/gnu/packages/patches/devil-fix-libpng.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 724194d7a9a91221a564579f64bdd6f0abd64219 Mon Sep 17 00:00:00 2001 -From: Noah Mayr -Date: Sun, 1 Mar 2015 10:10:56 +0100 -Subject: [PATCH] Fixed deprecated libpng API usage. - ---- - src-IL/src/il_icon.c | 2 +- - src-IL/src/il_png.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src-IL/src/il_icon.c b/src-IL/src/il_icon.c -index 2ccb1a3..fd9475d 100644 ---- a/src-IL/src/il_icon.c -+++ b/src-IL/src/il_icon.c -@@ -525,7 +525,7 @@ ILboolean ico_readpng_get_image(ICOIMAGE *Icon, ILdouble display_exponent) - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(ico_png_ptr); -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); - } - - // Expand RGB images with transparency to full alpha channels -diff --git a/src-IL/src/il_png.c b/src-IL/src/il_png.c -index da9517d..2866508 100644 ---- a/src-IL/src/il_png.c -+++ b/src-IL/src/il_png.c -@@ -277,7 +277,7 @@ ILboolean readpng_get_image(ILdouble display_exponent) - - // Expand low-bit-depth grayscale images to 8 bits - if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // Expand RGB images with transparency to full alpha channels -- 2.12.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 24 12:15:09 2017 Received: (at control) by debbugs.gnu.org; 24 Mar 2017 16:15:09 +0000 Received: from localhost ([127.0.0.1]:42635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crRrp-0003QL-CY for submit@debbugs.gnu.org; Fri, 24 Mar 2017 12:15:09 -0400 Received: from mail.aswsp.com ([193.34.35.150]:49935) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crR7w-0000TO-MR for control@debbugs.gnu.org; Fri, 24 Mar 2017 11:27:45 -0400 Received: from arch_pc (46.218.109.88) by smtp.aswsp.com (193.34.32.148) with Microsoft SMTP Server (TLS) id 14.2.342.3; Fri, 24 Mar 2017 16:27:42 +0100 Date: Fri, 24 Mar 2017 16:27:41 +0100 Message-ID: <878tnu1yqa.fsf@parrot.com> To: From: Mathieu Othacehe Subject: control message for bug #26230 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [46.218.109.88] X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-Mailman-Approved-At: Fri, 24 Mar 2017 12:15:07 -0400 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.0 (/) close 26230 From unknown Tue Jun 17 01:49:21 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: Did not alter fixed versions and reopened. Date: Fri, 24 Mar 2017 19:23:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # Did not alter fixed versions and reopened. thanks # This fakemail brought to you by your local debbugs # administrator From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 02 12:32:37 2017 Received: (at control) by debbugs.gnu.org; 2 Jun 2017 16:32:37 +0000 Received: from localhost ([127.0.0.1]:51812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dGpV7-0000kA-MQ for submit@debbugs.gnu.org; Fri, 02 Jun 2017 12:32:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dGpV6-0000ju-B2 for control@debbugs.gnu.org; Fri, 02 Jun 2017 12:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGpUy-0004X3-Oi for control@debbugs.gnu.org; Fri, 02 Jun 2017 12:32:31 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGpUy-0004Wq-LJ for control@debbugs.gnu.org; Fri, 02 Jun 2017 12:32:28 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:37684 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dGpUx-0007va-Re for control@debbugs.gnu.org; Fri, 02 Jun 2017 12:32:28 -0400 Date: Fri, 02 Jun 2017 18:32:25 +0200 Message-Id: <87poem4ag6.fsf@gnu.org> To: control@debbugs.gnu.org From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: control message for bug #26230 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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: -5.0 (-----) X-Debbugs-Envelope-To: control 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: -5.0 (-----) tags 26230 fixed close 26230 From unknown Tue Jun 17 01:49:21 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 01 Jul 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator