GNU bug report logs - #26898
[PATCH] gnu: reptry: Fix build.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26898 in the body.
You can then email your comments to 26898 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Mathieu Othacehe <m.othacehe <at> gmail.com>
Subject: [PATCH] gnu: reptry: Fix build.
Date: Fri, 12 May 2017 19:33:28 +0200

* gnu/packages/patches/reptyr-fix-gcc-7.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add new patch.
* gnu/packages/screen.scm (reptyr): Use patch.
---
 gnu/local.mk                                |  1 +
 gnu/packages/patches/reptyr-fix-gcc-7.patch | 35 +++++++++++++++++++++++++++++
 gnu/packages/screen.scm                     |  3 +++
 3 files changed, 39 insertions(+)
 create mode 100644 gnu/packages/patches/reptyr-fix-gcc-7.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1a3e2f3f0..d7f23966e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -938,6 +938,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/readline-link-ncurses.patch		\
   %D%/packages/patches/readline-6.2-CVE-2014-2524.patch		\
   %D%/packages/patches/readline-7.0-mingw.patch			\
+  %D%/packages/patches/reptyr-fix-gcc-7.patch			\
   %D%/packages/patches/ripperx-missing-file.patch		\
   %D%/packages/patches/rpcbind-CVE-2017-8779.patch		\
   %D%/packages/patches/rpm-CVE-2014-8118.patch			\
diff --git a/gnu/packages/patches/reptyr-fix-gcc-7.patch b/gnu/packages/patches/reptyr-fix-gcc-7.patch
new file mode 100644
index 000000000..9a2ce006c
--- /dev/null
+++ b/gnu/packages/patches/reptyr-fix-gcc-7.patch
@@ -0,0 +1,35 @@
+This patch allows reptyr to build with gcc 7. It is taken from reptyr mainline patches
+fa0d63f and b45fd92.
+
+Patch by Nelson Elhage <nelhage <at> nelhage.com>.
+
+diff --git a/attach.c b/attach.c
+index bd8ef8c..8d9cbf8 100644
+--- a/attach.c
++++ b/attach.c
+@@ -389,8 +389,11 @@ int setup_steal_socket(struct steal_pty_state *steal) {
+         return errno;
+ 
+     steal->addr_un.sun_family = AF_UNIX;
+-    snprintf(steal->addr_un.sun_path, sizeof(steal->addr_un.sun_path),
+-             "%s/reptyr.sock", steal->tmpdir);
++    if (snprintf(steal->addr_un.sun_path, sizeof(steal->addr_un.sun_path),
++                 "%s/reptyr.sock", steal->tmpdir) >= sizeof(steal->addr_un.sun_path)) {
++        error("tmpdir path too long!");
++        return ENAMETOOLONG;
++    }
+ 
+     if ((steal->sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
+         return errno;
+diff --git a/platform/linux/linux.h b/platform/linux/linux.h
+index 9e6b78a..3ec5a99 100644
+--- a/platform/linux/linux.h
++++ b/platform/linux/linux.h
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #include <asm/ptrace.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/user.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index 1bdfcd011..49584662b 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Eric Bavier <bavier <at> member.fsf.org>
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2016 Alex Griffin <a <at> ajgrf.com>
+;;; Copyright © 2017 Mathieu Othacehe <m.othacehe <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -155,6 +156,8 @@ window manager as well as the Tmux terminal multiplexer.")
        (method url-fetch)
        (uri (string-append "https://github.com/nelhage/reptyr/archive"
                            "/reptyr-" version ".tar.gz"))
+       ;; XXX: To be removed on next reptyr release.
+       (patches (search-patches "reptyr-fix-gcc-7.patch"))
        (sha256
         (base32
          "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7"))))
-- 
2.13.0

Message #8 received at 26898 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Mathieu Othacehe <m.othacehe <at> gmail.com>, 26898 <at> debbugs.gnu.org
Subject: Re: bug#26898: [PATCH] gnu: reptry: Fix build.
Date: Fri, 12 May 2017 19:55:25 +0200

[Message part 1 (text/plain, inline)]

Mathieu Othacehe <m.othacehe <at> gmail.com> writes:

> * gnu/packages/patches/reptyr-fix-gcc-7.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add new patch.
> * gnu/packages/screen.scm (reptyr): Use patch.

Thanks!

[...]

> diff --git a/gnu/packages/patches/reptyr-fix-gcc-7.patch b/gnu/packages/patches/reptyr-fix-gcc-7.patch
> new file mode 100644
> index 000000000..9a2ce006c
> --- /dev/null
> +++ b/gnu/packages/patches/reptyr-fix-gcc-7.patch
> @@ -0,0 +1,35 @@
> +This patch allows reptyr to build with gcc 7. It is taken from reptyr mainline patches
> +fa0d63f and b45fd92.

Can you add URLs to these commits as well? Apart from that LGTM!

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 26898 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26898 <at> debbugs.gnu.org
Subject: Re: bug#26898: [PATCH] gnu: reptry: Fix build.
Date: Fri, 12 May 2017 20:21:30 +0200

Hi Marius,

>
> Can you add URLs to these commits as well? Apart from that LGTM!

Done, pushed as 2088513214cc6d03bcb303a951d2df14ec6b57b5.

Thanks for the review !

Mathieu

Message #16 received at 26898-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26898-done <at> debbugs.gnu.org
Subject: Re: bug#26898: [PATCH] gnu: reptry: Fix build.
Date: Fri, 12 May 2017 21:09:57 +0200

> Done, pushed as 2088513214cc6d03bcb303a951d2df14ec6b57b5.

And closing bug :p

Mathieu

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.