From unknown Fri Jun 20 19:53:39 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26898: [PATCH] gnu: reptry: Fix build. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 May 2017 17:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26898 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26898@debbugs.gnu.org Cc: Mathieu Othacehe X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149461043927016 (code B ref -1); Fri, 12 May 2017 17:34:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 May 2017 17:33:59 +0000 Received: from localhost ([127.0.0.1]:41198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9ERt-00071Z-Os for submit@debbugs.gnu.org; Fri, 12 May 2017 13:33:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9ERp-00071K-P3 for submit@debbugs.gnu.org; Fri, 12 May 2017 13:33:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9ERj-0007Bz-0H for submit@debbugs.gnu.org; Fri, 12 May 2017 13:33:44 -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]:58099) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d9ERi-0007Ba-U3 for submit@debbugs.gnu.org; Fri, 12 May 2017 13:33:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9ERh-0007jA-Fw for guix-patches@gnu.org; Fri, 12 May 2017 13:33:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9ERe-00071t-3d for guix-patches@gnu.org; Fri, 12 May 2017 13:33:41 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:33232) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d9ERd-0006wv-Sp for guix-patches@gnu.org; Fri, 12 May 2017 13:33:38 -0400 Received: by mail-wr0-x22b.google.com with SMTP id w50so48139852wrc.0 for ; Fri, 12 May 2017 10:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NFLHjTzj3/F53LIoNyy558M7MSY3+3EpGikSRGo4EpU=; b=RoHx63ykfV3XQvbOAk3i22JDH8BMxMXjVz8WtoAOMIw/HMAGGnVdPRtWcVrJEngPRI VDNfYPfezbrQUi4ILEA4eEVrJdgbbkwSbL+4vr1+wen07ZyRxxZEZ4Kz3nVk8zqDN0q6 tPbnOUXAz+ZQLAkkNy82N+HQ/UnBl2H7xrKTCCsfdXaoI9kPKgigGJIN4jWOqZJ8+K6+ Kul6dfByQjf/w2IgdFktY2UOxVUP0WNnbtSq7jLMxf0pigl0VP5h872ze93LpPnu+3CV jLu+01mVBtcooW+r8QRk7rWhPsTnpbyuN47NQzZyIpCJ+UXo0IBoXorL5IMP99kNeInM tpUw== 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:mime-version :content-transfer-encoding; bh=NFLHjTzj3/F53LIoNyy558M7MSY3+3EpGikSRGo4EpU=; b=qz7li9K9+4ztfeKHydDjXLz7JWeuk7ctj2zlai8ylT7pxdxO9gS7jPyCCzXWkOlVxw czWG8hozFFS7Z6oqSOEBpTiZezhDanlmtYdXsVGy1PbqsG2vAVA2Ty/kYQwTzFhakHHf K+tuPSI/1eoX3T8EBSCzxWeTpwt6UYzfquAFbONxlJnHZP+waFCVZSpZcifc8pRvZvtI 6QiprPylxKmdFVOLlVV7dLWQGoplpwVXRNTU1lwBD5kqNsXNPtZylHEqdgZ6aVwrb6VZ R+s39RHwHF47ir28Q4R8CoHBI6D54FDF4HR7Tp5sUvFK9Kd6HNqzXVrRXAeHBUU9cvvm e9Eg== X-Gm-Message-State: AODbwcC2mhNxmCQhqxz44dLg/ftn3/EC2STGTHS/osgRF2giDFVZXVXq prDMfq7Ka+buGvYl X-Received: by 10.223.142.35 with SMTP id n32mr4559585wrb.131.1494610414905; Fri, 12 May 2017 10:33:34 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id p104sm4305523wrc.66.2017.05.12.10.33.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 May 2017 10:33:33 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 May 2017 19:33:28 +0200 Message-Id: <20170512173328.24467-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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.0 (----) 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: 1.0 (+) * 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 . + +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 + #include + #include ++#include + #include + #include + #include 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 ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Alex Griffin +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; 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 From unknown Fri Jun 20 19:53:39 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26898: [PATCH] gnu: reptry: Fix build. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 May 2017 17:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26898 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe , 26898@debbugs.gnu.org Received: via spool by 26898-submit@debbugs.gnu.org id=B26898.149461173228858 (code B ref 26898); Fri, 12 May 2017 17:56:02 +0000 Received: (at 26898) by debbugs.gnu.org; 12 May 2017 17:55:32 +0000 Received: from localhost ([127.0.0.1]:41214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Emp-0007VO-TZ for submit@debbugs.gnu.org; Fri, 12 May 2017 13:55:32 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:41045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Eml-0007VE-VE for 26898@debbugs.gnu.org; Fri, 12 May 2017 13:55:30 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2A20C209FD; Fri, 12 May 2017 13:55:27 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Fri, 12 May 2017 13:55:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=P0npUlgeVTa7FnNh0o5epghkORbFeD9W45um73AGh VA=; b=Sn/mwfDzTgsTIl6xvoJoOTQBvma2yopsmUmqFIGb9ZeGk/PGT1KBbG/+v PD/QNKFWKTesrKifDb2LhHhI0WytDJ+Ksy/58xVQ3jarZ0EwYMVewZ/7H1onV/Xc ezDEgq2SrhTSV7WvuiUIMnag1f0gcRXBAHSI2y3Jkiy60wsapqJfITo00+/pktCF nNtXsspQvgbtTlFju2QJk1r7WO17I1bdJ6JYP3hzNDrSsrG93TE8tpSxDTi+UI+v INCuJS7yGnE0+Q2BnmpgXiypNVnYxMRAWdncZMT5z8GBPiX3j0IlpvD8bIFFjR2o AHnnQcQH1krDm0DOv4Szto0UQcxuw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=P0npUlgeVTa7FnNh0o 5epghkORbFeD9W45um73AGhVA=; b=O6jdWycYoanwtAWnrSKzCpDh/oYO8UbSE2 hRmsI4qKsFWHkc8s645WrpRz6wQN4wubhAwTCbdaYk2vKP5ydXeF+1gDb3hV6r+g DhX+Rgwt9B95MoFJzv2Opph15cqNc+/A00cCdIeJB20FDz2H1R9mfJljVzZJ1Jfs Omz4IOAhK6O6FekInLm9YXC2/yVhvBXsMw5rYr9yIY2slNl3prb3qTs43NcSabPN fVr+bU2L1DqekzBmmFS+vRrMB5M/uo77TPIsvSHi07n2++BFf8zwuZ6hljAsutJ0 7sRXc7sKr3r69g2BohKKyE3Me94WTRWVEMZcvypldawgrMhaa/Gw== X-ME-Sender: X-Sasl-enc: TMZRfZ6mOsmMveUSB2bg5YmZazpEz7uAT29GFzik9CzE 1494611726 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id AC7A97E9F8; Fri, 12 May 2017 13:55:26 -0400 (EDT) From: Marius Bakke In-Reply-To: <20170512173328.24467-1-m.othacehe@gmail.com> References: <20170512173328.24467-1-m.othacehe@gmail.com> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Fri, 12 May 2017 19:55:25 +0200 Message-ID: <874lwqhsdu.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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.7 (/) --=-=-= Content-Type: text/plain Mathieu Othacehe 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! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkV9w0ACgkQoqBt8qM6 VPpd9gf/cUjz6CJfOikM9W2dEn1htHl6cITiFs+fgYbQ47E76Du74e96t40uK7Jt y8iZdO67/XwtSI84MDe9CuNgUqoIcz4YF1XMuLw2VFkUZxJnTmdq1v0FgGtp7GDl +gFevWzg0jIVQSmpAq5PmAvaL2LRejuJWsP3qSJvG40fb7eDScXpR1Sagf5dwYb5 6vChgi74fmv2pK45DPCPk+tLhs/bpkD/lZ/dFZoao8j3hYsAb2FdvErUDyFS5Te/ IQv985TPBIUj3mpA2qlFlvn4fEm7DLmxkG4T+Itej8z9Ah72OiUakS37F7abbnAA 6g583AlTpSI/yhhMbDRma8F5IFgElg== =ghoH -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 20 19:53:39 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26898: [PATCH] gnu: reptry: Fix build. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 May 2017 18:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26898 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 26898@debbugs.gnu.org Received: via spool by 26898-submit@debbugs.gnu.org id=B26898.149461329931188 (code B ref 26898); Fri, 12 May 2017 18:22:01 +0000 Received: (at 26898) by debbugs.gnu.org; 12 May 2017 18:21:39 +0000 Received: from localhost ([127.0.0.1]:41229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9FC6-00086y-Tb for submit@debbugs.gnu.org; Fri, 12 May 2017 14:21:39 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:35568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9FC5-00086m-Fz for 26898@debbugs.gnu.org; Fri, 12 May 2017 14:21:37 -0400 Received: by mail-wm0-f43.google.com with SMTP id b84so28649312wmh.0 for <26898@debbugs.gnu.org>; Fri, 12 May 2017 11:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=biMFF4CmNk0VjfRu0I/mVJzRAbiqm2UVJPdfBiJtW7A=; b=bhkmoWhnLuMr+Gx6n4ZlmatnO8MDA20QEVCy7PUHfx0AGAdOEn/TGWSgkzx9BJKcSF iY61ZtFWs3B8vzqk4rDy1Lv5Nv4HUYwYV2f4hFkqMJOHx7lRQbh6Ts/7O+sj+S9YqolF ipdR9vcgDTPci1EgGMVfVyDoJheQmxqfOcBYTlJzhPFSXkYUwurMO5CMBgzkECDM3JrL MRPT8vUZAlNSS8FP9BZZbPE1dYDuAXgpMN+bshuKk/aoSghLY/AXYIyrlqQhHyKQCJFP 0RHAGWoXi6sML5shD7+tNu7PcTwV0HKbnIugRaEtVcULjL0t8QRjWMQxpI2XqdYLS2S3 uZFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=biMFF4CmNk0VjfRu0I/mVJzRAbiqm2UVJPdfBiJtW7A=; b=aIRud6XkhghLpb66HdqU6qQzpS1JyP3/7CNpgvoJdjCgOsbwsqeqknmIXZs2VQb6ga +RCvSaSQu8XkuVLKkjVO41stpn6c7NkVrLceqLLPdsJg2KrN1vkDWPjC9Mcs/MObBGKA iBqw79Z7oQE+yWfs3zUa7NBYGxCHi/rIQtzbeobXHU5t8ApuSFRVFBbvR2gtvFnGVWRp 0FcR6T5JStrGTKg9H74S8QZ6ZYGWbFw7uJK6A/nNMnw4N1N3jQ0Tbpf0JR8ke5FRMKMl PYAPlEWMfriwrdH3DM2U/Ae+nu6YKMIgX6hAx/HQ9qCKv3wg4onDb2bEvhspdgopdeCJ eR4Q== X-Gm-Message-State: AODbwcBjD4N68+Lw5G8EeYrKZ0jcWxQKgYFJW/aSp52ol/7/pWawNwXp ESelgO/Ocgkmzw== X-Received: by 10.28.61.215 with SMTP id k206mr4095423wma.133.1494613291592; Fri, 12 May 2017 11:21:31 -0700 (PDT) Received: from cervin (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id c139sm2385405wmd.11.2017.05.12.11.21.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 May 2017 11:21:30 -0700 (PDT) References: <20170512173328.24467-1-m.othacehe@gmail.com> <874lwqhsdu.fsf@fastmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe In-reply-to: <874lwqhsdu.fsf@fastmail.com> Date: Fri, 12 May 2017 20:21:30 +0200 Message-ID: <87mvai7x79.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.5 (/) 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.5 (/) Hi Marius, > > Can you add URLs to these commits as well? Apart from that LGTM! Done, pushed as 2088513214cc6d03bcb303a951d2df14ec6b57b5. Thanks for the review ! Mathieu From unknown Fri Jun 20 19:53:39 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Mathieu Othacehe Subject: bug#26898: closed (Re: bug#26898: [PATCH] gnu: reptry: Fix build.) Message-ID: References: <87lgq199iy.fsf@gmail.com> <20170512173328.24467-1-m.othacehe@gmail.com> X-Gnu-PR-Message: they-closed 26898 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26898@debbugs.gnu.org Date: Fri, 12 May 2017 19:11:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1494616262-3042-1" This is a multi-part message in MIME format... ------------=_1494616262-3042-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26898: [PATCH] gnu: reptry: Fix build. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26898@debbugs.gnu.org. --=20 26898: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26898 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1494616262-3042-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26898-done) by debbugs.gnu.org; 12 May 2017 19:10:07 +0000 Received: from localhost ([127.0.0.1]:41245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Fx0-0000ly-Pw for submit@debbugs.gnu.org; Fri, 12 May 2017 15:10:06 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:34212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9Fwz-0000lR-93 for 26898-done@debbugs.gnu.org; Fri, 12 May 2017 15:10:05 -0400 Received: by mail-wr0-f194.google.com with SMTP id 6so8477686wrb.1 for <26898-done@debbugs.gnu.org>; Fri, 12 May 2017 12:10:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=gmvlX3e5et3zzRr+2aoOTiPusm3mfPjes/7s8I5G+xs=; b=n/KiNrF64NdLYkADu2q6+1xkroAYFIEM0Iq7XafrOd7i4/PFEi9FO/ZOIZR45nsgf2 Eufd/JaxwXPNgItCgUAd2ZwKLfjiTj7/tx6kMgNuOvQguHe+WtyRzD78qlTfxiu7RUIt um12Lya9JR9rhcbcj4AAZLVPZMN+V3s4uYogkWjksq/D/2jL7J6dDUxGr+F+v9KXzjMT GIuJneslH/MniWfugqab6U/2yeeAGVoNCI3F/JhGDp5+DUlFuIgAmFFY9f34VvbZ1JyB 06DEw6LvDVDOoYCwGtEV201usk9EIfswO+8WWEV62PupaSzcG2DvyA8OV47dQxgI9Y9D 4HJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=gmvlX3e5et3zzRr+2aoOTiPusm3mfPjes/7s8I5G+xs=; b=LuNUntaMtkp/sTe69/dF7OZ49I2ZHGCePsnTD5jM4BFVUMhbF67xKiN5wM8JCEE0Gs TQji5uxHoFIffSehAvceHlWqMH6uAeu9lvNmGA8R4K1zb/7zQK/qGf71Ymtt3ZPUaqrQ PIowHMnzQ7PWpOtYL3+IQcw0n5UeMK6sHf6ZR/wnBg4kOkpaprkLVt2ZsjC5PiSy4D61 1L+vxdA1HGlv/DOtsD/T2UAkc33lUwrM3fmHaxJx7opWXnbV9GfVEauq5j8TLLtO9SQ6 9EgCw6TEOKZAAaI8m2Oghvz+6G6dNtRaJUO89sl4dfVd6GBLXWsbyt+rgTwaN6bHoMjm nQNQ== X-Gm-Message-State: AODbwcAQKLVSyPi1bvfl1QYMB7VBBPFvUz8cHAQ10NZl6g46OsmK+4x8 3RkpyvrUhkzAPA== X-Received: by 10.223.163.80 with SMTP id d16mr4724201wrb.164.1494616199627; Fri, 12 May 2017 12:09:59 -0700 (PDT) Received: from cervin (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id r29sm3801358wra.18.2017.05.12.12.09.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 May 2017 12:09:58 -0700 (PDT) References: <20170512173328.24467-1-m.othacehe@gmail.com> <874lwqhsdu.fsf@fastmail.com> <87mvai7x79.fsf@gmail.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe To: Marius Bakke Subject: Re: bug#26898: [PATCH] gnu: reptry: Fix build. In-reply-to: <87mvai7x79.fsf@gmail.com> Date: Fri, 12 May 2017 21:09:57 +0200 Message-ID: <87lgq199iy.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 26898-done Cc: 26898-done@debbugs.gnu.org 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: -2.3 (--) > Done, pushed as 2088513214cc6d03bcb303a951d2df14ec6b57b5. And closing bug :p Mathieu ------------=_1494616262-3042-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 May 2017 17:33:59 +0000 Received: from localhost ([127.0.0.1]:41198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9ERt-00071Z-Os for submit@debbugs.gnu.org; Fri, 12 May 2017 13:33:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d9ERp-00071K-P3 for submit@debbugs.gnu.org; Fri, 12 May 2017 13:33:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9ERj-0007Bz-0H for submit@debbugs.gnu.org; Fri, 12 May 2017 13:33:44 -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]:58099) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d9ERi-0007Ba-U3 for submit@debbugs.gnu.org; Fri, 12 May 2017 13:33:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9ERh-0007jA-Fw for guix-patches@gnu.org; Fri, 12 May 2017 13:33:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9ERe-00071t-3d for guix-patches@gnu.org; Fri, 12 May 2017 13:33:41 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:33232) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d9ERd-0006wv-Sp for guix-patches@gnu.org; Fri, 12 May 2017 13:33:38 -0400 Received: by mail-wr0-x22b.google.com with SMTP id w50so48139852wrc.0 for ; Fri, 12 May 2017 10:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NFLHjTzj3/F53LIoNyy558M7MSY3+3EpGikSRGo4EpU=; b=RoHx63ykfV3XQvbOAk3i22JDH8BMxMXjVz8WtoAOMIw/HMAGGnVdPRtWcVrJEngPRI VDNfYPfezbrQUi4ILEA4eEVrJdgbbkwSbL+4vr1+wen07ZyRxxZEZ4Kz3nVk8zqDN0q6 tPbnOUXAz+ZQLAkkNy82N+HQ/UnBl2H7xrKTCCsfdXaoI9kPKgigGJIN4jWOqZJ8+K6+ Kul6dfByQjf/w2IgdFktY2UOxVUP0WNnbtSq7jLMxf0pigl0VP5h872ze93LpPnu+3CV jLu+01mVBtcooW+r8QRk7rWhPsTnpbyuN47NQzZyIpCJ+UXo0IBoXorL5IMP99kNeInM tpUw== 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:mime-version :content-transfer-encoding; bh=NFLHjTzj3/F53LIoNyy558M7MSY3+3EpGikSRGo4EpU=; b=qz7li9K9+4ztfeKHydDjXLz7JWeuk7ctj2zlai8ylT7pxdxO9gS7jPyCCzXWkOlVxw czWG8hozFFS7Z6oqSOEBpTiZezhDanlmtYdXsVGy1PbqsG2vAVA2Ty/kYQwTzFhakHHf K+tuPSI/1eoX3T8EBSCzxWeTpwt6UYzfquAFbONxlJnHZP+waFCVZSpZcifc8pRvZvtI 6QiprPylxKmdFVOLlVV7dLWQGoplpwVXRNTU1lwBD5kqNsXNPtZylHEqdgZ6aVwrb6VZ R+s39RHwHF47ir28Q4R8CoHBI6D54FDF4HR7Tp5sUvFK9Kd6HNqzXVrRXAeHBUU9cvvm e9Eg== X-Gm-Message-State: AODbwcC2mhNxmCQhqxz44dLg/ftn3/EC2STGTHS/osgRF2giDFVZXVXq prDMfq7Ka+buGvYl X-Received: by 10.223.142.35 with SMTP id n32mr4559585wrb.131.1494610414905; Fri, 12 May 2017 10:33:34 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id p104sm4305523wrc.66.2017.05.12.10.33.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 May 2017 10:33:33 -0700 (PDT) From: Mathieu Othacehe To: guix-patches@gnu.org Subject: [PATCH] gnu: reptry: Fix build. Date: Fri, 12 May 2017 19:33:28 +0200 Message-Id: <20170512173328.24467-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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.0 (----) X-Debbugs-Envelope-To: submit Cc: Mathieu Othacehe 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: 1.0 (+) * 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 . + +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 + #include + #include ++#include + #include + #include + #include 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 ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Alex Griffin +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; 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 ------------=_1494616262-3042-1--