From patchwork Sun Dec 30 23:18:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Vong X-Patchwork-Id: 607 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F0BD1169DD; Sun, 30 Dec 2018 23:19:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 4A82B169DA for ; Sun, 30 Dec 2018 23:19:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:47091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkMO-0000R2-Sk for patchwork@mira.cbaines.net; Sun, 30 Dec 2018 18:19:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkMM-0000Qj-Rz for guix-patches@gnu.org; Sun, 30 Dec 2018 18:19:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdkMI-0002YH-Q7 for guix-patches@gnu.org; Sun, 30 Dec 2018 18:19:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdkMI-0002Y0-Ko for guix-patches@gnu.org; Sun, 30 Dec 2018 18:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gdkMI-0002mq-BK for guix-patches@gnu.org; Sun, 30 Dec 2018 18:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33933] [PATCH 1/4] gnu: libextractor: Update to 1.8. References: <87pntihaht.fsf@gmail.com> In-Reply-To: <87pntihaht.fsf@gmail.com> Resent-From: Alex Vong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Dec 2018 23:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33933 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: security To: 33933@debbugs.gnu.org Received: via spool by 33933-submit@debbugs.gnu.org id=B33933.154621192010679 (code B ref 33933); Sun, 30 Dec 2018 23:19:02 +0000 Received: (at 33933) by debbugs.gnu.org; 30 Dec 2018 23:18:40 +0000 Received: from localhost ([127.0.0.1]:42681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkLw-0002mB-03 for submit@debbugs.gnu.org; Sun, 30 Dec 2018 18:18:40 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38311) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkLu-0002ly-DN for 33933@debbugs.gnu.org; Sun, 30 Dec 2018 18:18:38 -0500 Received: by mail-pg1-f193.google.com with SMTP id g189so12127806pgc.5 for <33933@debbugs.gnu.org>; Sun, 30 Dec 2018 15:18:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:user-agent:mime-version; bh=s0Dpias8FCYwUc5CGi9Jl+yKyzY1/fJ5WqvXwPUEDCo=; b=qWQIT3BgNXa3irlc87RJjRgtNS++Wmc+ZeipMzIjLUwEpofscS2NHDRrA2mwP+YRyo F4b7eub27L4rmz5mD68HZUMPO2Lo2Lv1JwV8Me1huDyDe1cJ17K6edirUwEVa8uCY0G4 0kBNro5j7FqYh4w4eSdZkCOG+SjtJGy3+AaQ+BRpN8eklL/pcMGzFCvXddWi1fx3n8yZ imZPUyz+yOXHKs09sVJbpkBn3SNTRTeHdGZJZ6UZzQvIg8rC+0pEh7db5eRTZfWk+BWE 2C4HeUXuxCESAeB8kD550M6LF/YAo50HIhzuCjb+3G1xGh3bM3nvRvFQfx3vnjknJCj6 ZrWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:user-agent :mime-version; bh=s0Dpias8FCYwUc5CGi9Jl+yKyzY1/fJ5WqvXwPUEDCo=; b=ie9J17Age7kK2D59JbNKsJ6lWPz3t7gZl/2Vy4sCLJ6zMLfhX/fNGckHoqsqTX4Pmc NxBPEktpBvZjhr5Oonam3/+SilfDOHPn2/Vh9xoGTai+uTcuUjjgk6khX4qK9UACKLzA FHKNzNOtYLAHhdB1x61haCr5LoAxQ6tU+Oo1Mlh3Ff6FEKHlkNC3QcTdriT7nLdmllH+ AgC/DGZAUkbo4IW4Zl7slIMMMKu/Qzz+h8BCuLdnoYpadvZcfi6D6vah+VZNByJlssDI OcXQQtchzZpBT49cu2wGGwUbdeoSVLTSOhoVVhkjjuyfNMHoXzxEabWPUfpCzrFrTMAn ZXQA== X-Gm-Message-State: AA+aEWZpB+hKHjAuocuhYIFqCf3+FsATmxGq+VytWeBnLcGX0+zTlObi V4O2LbHN8EPwxVP8kziswnA= X-Google-Smtp-Source: AFSGD/WORS9JOsyzjrva+EiAs1QA3xD3SK8lv7yuKypvtLsd4SiG5FGaTPwXUCEPEUsMjeexIRo2LQ== X-Received: by 2002:a62:9fd9:: with SMTP id v86mr35979477pfk.191.1546211912707; Sun, 30 Dec 2018 15:18:32 -0800 (PST) Received: from debian (n058152176116.netvigator.com. [58.152.176.116]) by smtp.gmail.com with ESMTPSA id e9sm59160714pff.5.2018.12.30.15.18.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 30 Dec 2018 15:18:32 -0800 (PST) From: Alex Vong Date: Mon, 31 Dec 2018 07:18:28 +0800 Message-ID: <87lg46had7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alexvong1995@gmail.com Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 8cb16fb98e444bdbed44f73038aa74d2a4a306f1 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 31 Dec 2018 06:48:50 +0800 Subject: [PATCH 1/4] gnu: libextractor: Update to 1.8. * gnu/packages/gnunet.scm (libextractor): Update to 1.8. --- gnu/packages/gnunet.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index d1dc8fd58..4a6952076 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016, 2017, 2018 Nils Gillmann ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,14 +68,14 @@ (define-public libextractor (package (name "libextractor") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libextractor/libextractor-" version ".tar.gz")) (sha256 (base32 - "13wf6vj7mkv6gw8h183cnk7m24ir0gyf198pyb2148ng4klgv9p0")))) + "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2")))) (build-system gnu-build-system) ;; WARNING: Checks require /dev/shm to be in the build chroot, especially ;; not to be a symbolic link to /run/shm. -- 2.20.1 From patchwork Sun Dec 30 23:18:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Vong X-Patchwork-Id: 608 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AC92D169DD; Sun, 30 Dec 2018 23:20:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id EA16C169DA for ; Sun, 30 Dec 2018 23:20:11 +0000 (GMT) Received: from localhost ([127.0.0.1]:47106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkNP-0000rC-Fv for patchwork@mira.cbaines.net; Sun, 30 Dec 2018 18:20:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkNL-0000mv-P4 for guix-patches@gnu.org; Sun, 30 Dec 2018 18:20:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdkNH-0005Av-Gf for guix-patches@gnu.org; Sun, 30 Dec 2018 18:20:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54156) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdkNH-00059e-7i for guix-patches@gnu.org; Sun, 30 Dec 2018 18:20:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gdkNG-0002op-V6 for guix-patches@gnu.org; Sun, 30 Dec 2018 18:20:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33933] [PATCH 2/4] gnu: libextractor: Fix CVE-2018-{20430, 20431}. References: <87pntihaht.fsf@gmail.com> In-Reply-To: <87pntihaht.fsf@gmail.com> Resent-From: Alex Vong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Dec 2018 23:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33933 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: security To: 33933@debbugs.gnu.org Received: via spool by 33933-submit@debbugs.gnu.org id=B33933.154621194710748 (code B ref 33933); Sun, 30 Dec 2018 23:20:02 +0000 Received: (at 33933) by debbugs.gnu.org; 30 Dec 2018 23:19:07 +0000 Received: from localhost ([127.0.0.1]:42684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkMN-0002nH-Af for submit@debbugs.gnu.org; Sun, 30 Dec 2018 18:19:07 -0500 Received: from mail-pl1-f171.google.com ([209.85.214.171]:46420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkMI-0002mb-IX for 33933@debbugs.gnu.org; Sun, 30 Dec 2018 18:19:03 -0500 Received: by mail-pl1-f171.google.com with SMTP id t13so12073375ply.13 for <33933@debbugs.gnu.org>; Sun, 30 Dec 2018 15:19:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:user-agent:mime-version; bh=Yztnnr9sJItxw4BQ756zaCdPsj2ML0N9W1SM/warf/M=; b=ML3ztDHGJbWNATw6F3zhzggL9nHZpIkqG9OkEddP9wyukJQemg+bqsoAcK/hZmtSMD ve56tC1r5UQgIb2k4yqoKjieFr8WDwaIYrxHWP3qX3MrtNowZX9KT9oyESSKbBBFt0a3 4xyqv+Fjik7sJGU8OJ7JmiVX3SKxci0KoViE+h8+rd540ortLcWTdM6nDw+bNtG0N2wb KX+ORaecMMeTuGqIW7vWJ35ThjMnMV0iB2byt8PhlTWyx7Kc0uGUb3bpiXIEI9V6ikZo iZqrHLMDWPtsfsLFxsww0ghjkVcuAuYUbWY4zxX8nJWQO0R6nvoU6RkFhMBGSsm9frln JFIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:user-agent :mime-version; bh=Yztnnr9sJItxw4BQ756zaCdPsj2ML0N9W1SM/warf/M=; b=cM15OURCk5LzPBMMgGiYsZ+dzDDcwChqZnMKrpgRfXNTbDP9gUY+uJlqtKo0LnEP25 C/227WNWxBm94zbKrxPddQHquEOJoC1ZE4UE/0uoSgaIm0+cfHkm/qOOyuLn9i2i4Ky6 yskF4yVm/Fqzf4p3e3gTMS+8nrvjiVQ7vpEZ/0VS/ZRCmrMxazhHFHhjc6nk1hnkxDll 0+rDILQm6fz0Z+vyEyn/jmdK5J/XNB2UUaBrlqHPpDUNXm+SGDoP2H6f31AYNVRZVZUw 1o2sB63GOW8k3KLSdjfsIsYFYdUUmsnlmjUgtQ90ZqrkrTz53iAWRvcrP0SXj9IMk0W5 b87g== X-Gm-Message-State: AJcUukeZd4jvAB7InNv5H9i7AXsha+23UnP1nriv9VMIxpXZWmW9bc8+ u8RQxvk3OYbie0PcGHkk5Iw= X-Google-Smtp-Source: ALg8bN6i+hmNeCb/Ryl2JExC5s/xMQ4Sne02EOdfkZGbsvgbHeUtMigCmFUkjNohpS9Bim05NHjYyA== X-Received: by 2002:a17:902:7848:: with SMTP id e8mr36183891pln.100.1546211936473; Sun, 30 Dec 2018 15:18:56 -0800 (PST) Received: from debian (n058152176116.netvigator.com. [58.152.176.116]) by smtp.gmail.com with ESMTPSA id 125sm85265210pfx.159.2018.12.30.15.18.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 30 Dec 2018 15:18:55 -0800 (PST) From: Alex Vong Date: Mon, 31 Dec 2018 07:18:52 +0800 Message-ID: <87h8euhacj.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alexvong1995@gmail.com Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From a155ee678aefe73eb8e209e7a6d4ace8afabcf92 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 31 Dec 2018 06:50:48 +0800 Subject: [PATCH 2/4] gnu: libextractor: Fix CVE-2018-{20430,20431}. * gnu/packages/patches/libextractor-CVE-2018-20430.patch, gnu/packages/patches/libextractor-CVE-2018-20431.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/gnunet.scm (libextractor)[source]: Use them. --- gnu/local.mk | 2 + gnu/packages/gnunet.scm | 2 + .../patches/libextractor-CVE-2018-20430.patch | 60 +++++++++++++++++++ .../patches/libextractor-CVE-2018-20431.patch | 53 ++++++++++++++++ 4 files changed, 117 insertions(+) create mode 100644 gnu/packages/patches/libextractor-CVE-2018-20430.patch create mode 100644 gnu/packages/patches/libextractor-CVE-2018-20431.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0bb020335..75634b741 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -888,6 +888,8 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ + %D%/packages/patches/libextractor-CVE-2018-20430.patch \ + %D%/packages/patches/libextractor-CVE-2018-20431.patch \ %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgit2-oom-test.patch \ diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 4a6952076..d9e903734 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -73,6 +73,8 @@ (method url-fetch) (uri (string-append "mirror://gnu/libextractor/libextractor-" version ".tar.gz")) + (patches (search-patches "libextractor-CVE-2018-20430.patch" + "libextractor-CVE-2018-20431.patch")) (sha256 (base32 "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2")))) diff --git a/gnu/packages/patches/libextractor-CVE-2018-20430.patch b/gnu/packages/patches/libextractor-CVE-2018-20430.patch new file mode 100644 index 000000000..570cd7c00 --- /dev/null +++ b/gnu/packages/patches/libextractor-CVE-2018-20430.patch @@ -0,0 +1,60 @@ +Fix CVE-2018-20430: + +https://gnunet.org/bugs/view.php?id=5493 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20430 +https://security-tracker.debian.org/tracker/CVE-2018-20430 + +Patch copied from upstream source repository: + +https://gnunet.org/git/libextractor.git/commit/?id=b405d707b36e0654900cba78e89f49779efea110 + +From b405d707b36e0654900cba78e89f49779efea110 Mon Sep 17 00:00:00 2001 +From: Christian Grothoff +Date: Thu, 20 Dec 2018 22:47:53 +0100 +Subject: [PATCH] fix #5493 (out of bounds read) + +--- + src/common/convert.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/common/convert.c b/src/common/convert.c +index c0edf21..2be2108 100644 +--- a/src/common/convert.c ++++ b/src/common/convert.c +@@ -36,8 +36,8 @@ + * string is returned. + */ + char * +-EXTRACTOR_common_convert_to_utf8 (const char *input, +- size_t len, ++EXTRACTOR_common_convert_to_utf8 (const char *input, ++ size_t len, + const char *charset) + { + #if HAVE_ICONV +@@ -52,7 +52,7 @@ EXTRACTOR_common_convert_to_utf8 (const char *input, + i = input; + cd = iconv_open ("UTF-8", charset); + if (cd == (iconv_t) - 1) +- return strdup (i); ++ return strndup (i, len); + if (len > 1024 * 1024) + { + iconv_close (cd); +@@ -67,11 +67,11 @@ EXTRACTOR_common_convert_to_utf8 (const char *input, + } + itmp = tmp; + finSize = tmpSize; +- if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == SIZE_MAX) ++ if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == ((size_t) -1)) + { + iconv_close (cd); + free (tmp); +- return strdup (i); ++ return strndup (i, len); + } + ret = malloc (tmpSize - finSize + 1); + if (ret == NULL) +-- +2.20.1 + diff --git a/gnu/packages/patches/libextractor-CVE-2018-20431.patch b/gnu/packages/patches/libextractor-CVE-2018-20431.patch new file mode 100644 index 000000000..855c5ba64 --- /dev/null +++ b/gnu/packages/patches/libextractor-CVE-2018-20431.patch @@ -0,0 +1,53 @@ +Fix CVE-2018-20431: + +https://gnunet.org/bugs/view.php?id=5494 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20431 +https://security-tracker.debian.org/tracker/CVE-2018-20431 + +Patch copied from upstream source repository: + +https://gnunet.org/git/libextractor.git/commit/?id=489c4a540bb2c4744471441425b8932b97a153e7 + +To apply the patch to libextractor 1.8 release tarball, +hunk #1 which patches ChangeLog is removed. + +From 489c4a540bb2c4744471441425b8932b97a153e7 Mon Sep 17 00:00:00 2001 +From: Christian Grothoff +Date: Thu, 20 Dec 2018 23:02:28 +0100 +Subject: [PATCH] fix #5494 + +--- + ChangeLog | 3 ++- + src/plugins/ole2_extractor.c | 9 +++++++-- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c +index 53fa1b9..a48b726 100644 +--- a/src/plugins/ole2_extractor.c ++++ b/src/plugins/ole2_extractor.c +@@ -173,7 +173,7 @@ struct ProcContext + EXTRACTOR_MetaDataProcessor proc; + + /** +- * Closure for 'proc'. ++ * Closure for @e proc. + */ + void *proc_cls; + +@@ -213,7 +213,12 @@ process_metadata (gpointer key, + + if (G_VALUE_TYPE(gval) == G_TYPE_STRING) + { +- contents = strdup (g_value_get_string (gval)); ++ const char *gvals; ++ ++ gvals = g_value_get_string (gval); ++ if (NULL == gvals) ++ return; ++ contents = strdup (gvals); + } + else + { +-- +2.20.1 + -- 2.20.1 From patchwork Sun Dec 30 23:19:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Vong X-Patchwork-Id: 609 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8AD26169DD; Sun, 30 Dec 2018 23:20:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 2E6D0169DA for ; Sun, 30 Dec 2018 23:20:20 +0000 (GMT) Received: from localhost ([127.0.0.1]:47110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkNX-00011F-Ot for patchwork@mira.cbaines.net; Sun, 30 Dec 2018 18:20:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkNN-0000of-Ie for guix-patches@gnu.org; Sun, 30 Dec 2018 18:20:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdkNJ-0005GN-Df for guix-patches@gnu.org; Sun, 30 Dec 2018 18:20:09 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39397) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdkNJ-0005Fp-5b for guix-patches@gnu.org; Sun, 30 Dec 2018 18:20:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gdkNH-0002ox-QB for guix-patches@gnu.org; Sun, 30 Dec 2018 18:20:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33933] [PATCH 3/4] gnu: libmicrohttpd: Update to 0.9.62. References: <87pntihaht.fsf@gmail.com> In-Reply-To: <87pntihaht.fsf@gmail.com> Resent-From: Alex Vong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Dec 2018 23:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33933 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: security To: 33933@debbugs.gnu.org Received: via spool by 33933-submit@debbugs.gnu.org id=B33933.154621197710796 (code B ref 33933); Sun, 30 Dec 2018 23:20:03 +0000 Received: (at 33933) by debbugs.gnu.org; 30 Dec 2018 23:19:37 +0000 Received: from localhost ([127.0.0.1]:42687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkMq-0002o4-U0 for submit@debbugs.gnu.org; Sun, 30 Dec 2018 18:19:37 -0500 Received: from mail-pf1-f173.google.com ([209.85.210.173]:42437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkMp-0002no-Mn for 33933@debbugs.gnu.org; Sun, 30 Dec 2018 18:19:36 -0500 Received: by mail-pf1-f173.google.com with SMTP id 64so12607013pfr.9 for <33933@debbugs.gnu.org>; Sun, 30 Dec 2018 15:19:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:user-agent:mime-version; bh=g4fRYpUp6kM1/Wlf0T9DjcvetoJ3b69ri34a4goN0/c=; b=dgya1mhzaLpwhTbInyHONEDRhy6TIi90iuw0TV3t+6/9/uApCUEjezDQ1w1YczRE/s wP7L4tSJVAhdVdywzDIMqVAIhLKA3c/RZfxj5Vm3efvYHOasC9rwLFECSt+Cq1hC930o 9BZWM3PAGT7gEbbds2KvL3Zk0dXESHoAbbTH6HKjeLFME67DpF/53BiImhPuFcf4go7U /CnfcHciLVho0Aj5TOSv1ezBzJ8uHbwF2nmtrc0Dr8LfZobFEntUbQfP8tHhFWPmt42S qgvzz2MMQUr0MrqJhyy4ndr96i8TMcx2fLsEfNxW1xCQXMNYGO0nUSgmWzJSdBips6p6 +EhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:user-agent :mime-version; bh=g4fRYpUp6kM1/Wlf0T9DjcvetoJ3b69ri34a4goN0/c=; b=BAKnvs5bg3YbDj9AZGaCPSM1K49ybSrn+WcOc7t3XzAvjvxlB16w3LSh6Yh8XS0JdZ N1Kxdjtr4k7xUMwgfp+hmVj5qd7btlgmIChcGI3fIUxRLED0nBtwqzQXGwlXtDa6wDYm x5201soUqEj4MNFL8qrpyU8TBQEQMVyybrzidVTRfxDv1AN6K9T9mRVWDrDpgBbacGC5 GYKkme6FN91OnjWx2WElH6VOPirdi6fGf1TFugTDFWcI1BVjCP5DTN3WJWCEWEPpHp3q arHOMUO/6sqfNcYjNYz3NYLing9/b0FL1PYHgfkWmpFlN9lCHLQlc1L5+g+z3SuQjX2Q oFUg== X-Gm-Message-State: AA+aEWZS/NQtsVctlL8k7zV/uTM/EucwnCvToXIYtbjIBIW8NwFTHqFb eAwrHTiwLQImU22DzYHLSRtiaRnB X-Google-Smtp-Source: AFSGD/U6QLqjtNvH2RdVPQXvSpTXGPYgIvnJkEvrfmZWA+IpL0UaVGLvjfk18XDhOAh5r/R3fh/OFQ== X-Received: by 2002:a62:8add:: with SMTP id o90mr35941651pfk.210.1546211970201; Sun, 30 Dec 2018 15:19:30 -0800 (PST) Received: from debian (n058152176116.netvigator.com. [58.152.176.116]) by smtp.gmail.com with ESMTPSA id h69sm55679414pge.4.2018.12.30.15.19.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 30 Dec 2018 15:19:29 -0800 (PST) From: Alex Vong Date: Mon, 31 Dec 2018 07:19:25 +0800 Message-ID: <87d0pihabm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alexvong1995@gmail.com Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From c5b57304b0ec12d44ffb749befd00fb0e4d92c0f Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 31 Dec 2018 06:54:04 +0800 Subject: [PATCH 3/4] gnu: libmicrohttpd: Update to 0.9.62. * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.62. --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index d9e903734..79584fcf0 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -148,14 +148,14 @@ tool to extract metadata from a file and print the results.") (define-public libmicrohttpd (package (name "libmicrohttpd") - (version "0.9.59") + (version "0.9.62") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-" version ".tar.gz")) (sha256 (base32 - "0g4jgnv43yddr9yxrqg11632rip0lg5c53gmy5wy3c0i1dywv74v")))) + "0jfvi1fb4im3a3m8qishbmzx3zch993c0mhvl2k92l1zf1yhjgmx")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- 2.20.1 From patchwork Sun Dec 30 23:19:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Vong X-Patchwork-Id: 610 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 27D10169DD; Sun, 30 Dec 2018 23:21:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 7DE82169DA for ; Sun, 30 Dec 2018 23:21:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:47119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkOK-00018a-Va for patchwork@mira.cbaines.net; Sun, 30 Dec 2018 18:21:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdkOI-00018O-FV for guix-patches@gnu.org; Sun, 30 Dec 2018 18:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdkOE-0007Dy-Es for guix-patches@gnu.org; Sun, 30 Dec 2018 18:21:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:34627) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdkOE-0007Do-Aj for guix-patches@gnu.org; Sun, 30 Dec 2018 18:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gdkOE-0002r4-4g for guix-patches@gnu.org; Sun, 30 Dec 2018 18:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33933] [PATCH 4/4] gnu: guile-gnunet: Update to 0.0-1.d12167a. References: <87pntihaht.fsf@gmail.com> In-Reply-To: <87pntihaht.fsf@gmail.com> Resent-From: Alex Vong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Dec 2018 23:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33933 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: security To: 33933@debbugs.gnu.org Received: via spool by 33933-submit@debbugs.gnu.org id=B33933.154621200710880 (code B ref 33933); Sun, 30 Dec 2018 23:21:02 +0000 Received: (at 33933) by debbugs.gnu.org; 30 Dec 2018 23:20:07 +0000 Received: from localhost ([127.0.0.1]:42690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkNL-0002pQ-7n for submit@debbugs.gnu.org; Sun, 30 Dec 2018 18:20:07 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:37482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gdkNH-0002oW-GP for 33933@debbugs.gnu.org; Sun, 30 Dec 2018 18:20:05 -0500 Received: by mail-pg1-f196.google.com with SMTP id c25so12134703pgb.4 for <33933@debbugs.gnu.org>; Sun, 30 Dec 2018 15:20:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:user-agent:mime-version; bh=R7pTKUBc1zc46+5qElfAIjmINUEkzuwvyapEUctHq6Y=; b=JTK6iHBMY7Upl66Lufvg2OU0eTGGD68/jffrBvEogIKFxScEWqVDgXOk8sz4V13SuV DOzkZZwh/qna0agFbDF8DACTGdDu7YvIlFqawGOBOAoi3+ZN2rSWQJ6Q9/FbueO/6u9C LXWgwJSMJhhVlIRHVFvgcoN+4aGmKr6iyyneSl9qfUt9LJQwfDoMbzCGwYKyVBb9HRf6 iERk9J5SDLp9BiP7/tRWwUQ0uEHL9jJiXo0aFQTuaVDQYViKYXf0nfI/TwxhyTlzrBV/ k/F0HUfaOmRK6h5oDJbg65hwJjZZfT28uC3piQJ7DZzgUC888q0EkahJwny3rFg2EA97 m1qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:user-agent :mime-version; bh=R7pTKUBc1zc46+5qElfAIjmINUEkzuwvyapEUctHq6Y=; b=ctowHQ89csQI87nfvTPSUVWC+e2zkoU5gEmOsW1j1gqnku15RKEpr0JcY8nGvaZZNQ 1i/IFrX4GPspdSxN+TaR+JkFO8SjG8zATohgov58tYt9EybVVyYdItADa3Yy4/DXakCS aZ9yd+eIjI+cs7c3a/twzVdYCIbq/OA47/BbsM1hC5rl8KqyXd/D6BwRCNPvvwa6WNil zSowqwZ2kx9SKb9dy4QQcfwFzVGBi1YMTLzSYLf7w3BKQWi/sFV/ZJjaki2eEceAzRRt 0XWsPtGUXU09ohnGm5S9PdCQ9BFSlnpdfWl7TbI8BHJIELdzgJKIt1vgMdjqRrBvCSu3 xRQw== X-Gm-Message-State: AA+aEWY4LNAqmsmw4lOq3pk2Io9XzmF6l/+1vi1H0N7ES2S7zN/Mw2Xh KAnnD67rbUkvMnMTfSa+BF98F9Oo X-Google-Smtp-Source: AFSGD/U9EGZU9qjKnEUBKhY7BA+kFrPBh3UOGsJZXqcRzOnUZo1mLXAfGEj7LIj6jayG7ugOyNKnNw== X-Received: by 2002:a62:345:: with SMTP id 66mr36092649pfd.189.1546211997996; Sun, 30 Dec 2018 15:19:57 -0800 (PST) Received: from debian (n058152176116.netvigator.com. [58.152.176.116]) by smtp.gmail.com with ESMTPSA id s37sm63600098pgm.19.2018.12.30.15.19.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 30 Dec 2018 15:19:57 -0800 (PST) From: Alex Vong Date: Mon, 31 Dec 2018 07:19:53 +0800 Message-ID: <878t06haau.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alexvong1995@gmail.com Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 8009339b00ce374fadea36e964d0fcbcb85ed044 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 31 Dec 2018 07:00:39 +0800 Subject: [PATCH 4/4] gnu: guile-gnunet: Update to 0.0-1.d12167a. * gnu/packages/gnunet.scm (guile-gnunet): Update to 0.0-1.d12167a. [version]: Use git-version. [source]: Use git-file-name. --- gnu/packages/gnunet.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 79584fcf0..b00c8848a 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -310,19 +310,20 @@ kinds of basic applications for the foundation of a GNU internet.") (home-page "https://gnunet.org/"))) (define-public guile-gnunet ;GSoC 2015! - (let ((commit "383eac2aab175d8d9ea5315c2f1c8a5055c76a52")) + (let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602") + (revision "1")) (package (name "guile-gnunet") - (version (string-append "0.0." (string-take commit 7))) + (version (git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://git.savannah.gnu.org/git/guix/gnunet.git/") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (git-file-name name version) (sha256 (base32 - "0k6mn28isjlxrnvbnblab3nh2xqx1b7san8k98kc35ap9lq0iz8w")))) + "0nqc18jh9j30y4l6yh6j35byfg6qalq7yr3frv9rk10qa041c2sv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf-wrapper) -- 2.20.1