diff mbox series

[bug#34036] gnu: irssi: Update to 1.1.2 [fixes CVE-2019-5882].

Message ID 20190110180320.26004-1-kkebreau@posteo.net
State Accepted
Headers show
Series [bug#34036] gnu: irssi: Update to 1.1.2 [fixes CVE-2019-5882]. | expand

Checks

Context Check Description
cbaines/package builds pending In Cuirass
cbaines/applying patch fail Apply failed

Commit Message

Kei Kebreau Jan. 10, 2019, 6:03 p.m. UTC 
* 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(-)

Comments

Leo Famulari Jan. 10, 2019, 8:05 p.m. UTC | #1 
On Thu, Jan 10, 2019 at 01:03:20PM -0500, Kei Kebreau wrote:
> * 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.

Thanks!

But why switch to git-fetch when they offer a tarball? All else being
equal, we should stick to tarballs when they are offered by upstream.

Specifically, let's use this one:

https://github.com/irssi/irssi/releases/download/1.1.2/irssi-1.1.2.tar.xz
Leo Famulari Jan. 10, 2019, 9:15 p.m. UTC | #2 
On Thu, Jan 10, 2019 at 04:08:19PM -0500, Kei Kebreau wrote:
> Oh, it's not an auto-generated tarball! In that case I've attached the
> much simpler update patch.

Thanks :) Please push!
Kei Kebreau Jan. 10, 2019, 9:33 p.m. UTC | #3 
Leo Famulari <leo@famulari.name> writes:

> On Thu, Jan 10, 2019 at 04:08:19PM -0500, Kei Kebreau wrote:
>> Oh, it's not an auto-generated tarball! In that case I've attached the
>> much simpler update patch.
>
> Thanks :) Please push!

Pushed! Thanks for the review.
diff mbox series

Patch

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