From patchwork Thu Jan 10 18:03:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 712 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 A99F616A54; Thu, 10 Jan 2019 18:08:25 +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=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1DF0616A50 for ; Thu, 10 Jan 2019 18:08:25 +0000 (GMT) Received: from localhost ([127.0.0.1]:39632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gheki-0006ZY-By for patchwork@mira.cbaines.net; Thu, 10 Jan 2019 13:08:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghegV-0003KX-TN for guix-patches@gnu.org; Thu, 10 Jan 2019 13:04:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghegU-0008OI-Q8 for guix-patches@gnu.org; Thu, 10 Jan 2019 13:04:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghegU-0008Nu-MO for guix-patches@gnu.org; Thu, 10 Jan 2019 13:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ghegU-0007ED-Ay for guix-patches@gnu.org; Thu, 10 Jan 2019 13:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34036] [PATCH] gnu: irssi: Update to 1.1.2 [fixes CVE-2019-5882]. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Jan 2019 18:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34036 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34036@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154714343527768 (code B ref -1); Thu, 10 Jan 2019 18:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jan 2019 18:03:55 +0000 Received: from localhost ([127.0.0.1]:54158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ghegN-0007Do-55 for submit@debbugs.gnu.org; Thu, 10 Jan 2019 13:03:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ghegJ-0007Da-Rc for submit@debbugs.gnu.org; Thu, 10 Jan 2019 13:03:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:33573) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ghegE-00086M-Il for submit@debbugs.gnu.org; Thu, 10 Jan 2019 13:03:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghegD-0002vP-78 for guix-patches@gnu.org; Thu, 10 Jan 2019 13:03:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gheg8-00081L-Ie for guix-patches@gnu.org; Thu, 10 Jan 2019 13:03:43 -0500 Received: from mout01.posteo.de ([185.67.36.65]:55533) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gheg7-0007u7-7k for guix-patches@gnu.org; Thu, 10 Jan 2019 13:03:40 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id E35CE160060 for ; Thu, 10 Jan 2019 19:03:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1547143404; bh=HVsWTWASPzDMVabvNGbaHb9dil2W6SNymPfl3sDXP2o=; h=From:To:Cc:Subject:Date:From; b=EUM3fboZRH1lM/H2a4ymiZzm6rrxQAoEzMcAabf5MKq7geTSC6QILqUJuFiWYeuQS OIH7IVQYwCFacPXlOVoiDlDFtjAhQVzj4XaR8u3Jzbxd7Mh4C0irxnW0JZtL5DfWKc r9vH/Ay7gl2PkgbaCWvYF3oCYj+02IX4lGV+ZYfnzfwgrut12bAflTUQ3+z4G+379x FXRbNSh6EawQCJ9Gu9vjj8beLdX19uUK8oIETDVWubXit/ZBTb71ZmIb3p47p+K7al 0bla6ee+bHf7iJCAVT8DkDiKMjIHIAIzyjBRH9K1/Ga5pH/sQdrwAt5Hi12qkrS/tT 0AINKLLkhf3vg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 43bDPk4nt8z6tm9; Thu, 10 Jan 2019 19:03:22 +0100 (CET) From: Kei Kebreau Date: Thu, 10 Jan 2019 13:03:20 -0500 Message-Id: <20190110180320.26004-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kei Kebreau Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/irc.scm (irssi): Update to 1.1.2. [source]: Use 'git-fetch'. [arguments]: Add 'patch-scripts' phase. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/irc.scm | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index ba31d36b9..1e491db0a 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -25,6 +25,7 @@ (define-module (gnu packages irc) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -126,19 +127,34 @@ irssi, but graphical.") (define-public irssi (package (name "irssi") - (version "1.1.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/irssi/irssi/" - "releases/download/" version "/irssi-" - version ".tar.xz")) - (sha256 - (base32 - "1gx1flfh4a09nb3b5pvf0ygnbl7rry3l4gph8wij29dsl7khfj3q")))) + (version "1.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/irssi/irssi.git") + (commit version))) + (sha256 + (base32 + "0kypqcm0hcxsqifbkq4fzrhvmqh6s6h65d0b8kq5w6fwjqj37z3z")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-scripts + (lambda _ + (substitute* "autogen.sh" + ;; git is not available in the build environment. + (("git log > ChangeLog") + ;; Don't let autogen.sh run by setting an environment variable + ;; that is checked later in the script. + "NOCONFIGURE=t")) + (substitute* "utils/irssi-version.sh" + (("^DATE=`GIT_DIR=\\$1/\\.git git.*$") "") + ;; This is the date of the release of Irssi version 1.1.2. + (("^VERSION_DATE=`.*`") "VERSION_DATE=20190109") + (("^VERSION_TIME=.*$") "VERSION_TIME=0")) + #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -154,7 +170,10 @@ irssi, but graphical.") ("openssl" ,openssl) ("perl" ,perl))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (home-page "https://irssi.org/") (synopsis "Terminal-based IRC client") (description