From patchwork Sun Oct 28 12:40:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 47 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 35BED16754; Sun, 28 Oct 2018 12:44:44 +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=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id C7E9816753 for ; Sun, 28 Oct 2018 12:44:42 +0000 (GMT) Received: from localhost ([::1]:40026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkQs-0002rq-21 for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:44:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkON-0008Tq-1K for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOI-0004Wf-An for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOI-0004VU-5b for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOH-0007N5-VX for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 1/7] gnu: Add guile-newt. References: <20181028123511.21265-1-m.othacehe@gmail.com> In-Reply-To: <20181028123511.21265-1-m.othacehe@gmail.com> Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073047328210 (code B ref 33186); Sun, 28 Oct 2018 12:42:01 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:13 +0000 Received: from localhost ([127.0.0.1]:46776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNQ-0007Ko-Bu for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:13 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:41116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNN-0007K4-DW for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:07 -0400 Received: by mail-pg1-f194.google.com with SMTP id 23-v6so2570503pgc.8 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:05 -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=Hs9nwTIrS7SFX8HqO8oGk09AikAy2q1C9OnXKCWx2Xs=; b=XeGulEDgPDTs1S0cIJmnrBQPec8Obg8jmSpinckeXNrlbuwR8GdZ7C3aVCfube2hBJ SKTW3cFUMG1lwC8e0PNX+X90Cy26lnEomRuKMkD2cnhg9M59DCOv+/rJVSpBN3holgWZ FhufdvCssQDTLMhIZr1AfMoMcQGg1Y6rVCNcjQATxyk8oOxVDriIyk6OIBpHxEljrOLp upvejEIsqOlfg+mxPuXx3iKOwhHYLKumu6EY8KwLdXo9QwjWyTC+xPCIarhsPAXUzUe8 N2HsbNZx+ZT5ZP2ZLt2kGn5/g2RCczKCAc0yFGJ8ZAOEVP/KJPeWtNhl50arGuuOn6ew G23g== 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=Hs9nwTIrS7SFX8HqO8oGk09AikAy2q1C9OnXKCWx2Xs=; b=j/b7H6Hao3G5JGl8d1FX4lcTvpyauH0p5OPU9PgSuSsCpWcgD65C9ej6OpEaz08+lN U1emvBrS0aW0oYIl6KqM2X7p/FVxdmxDAPCBnovhKiq063wviPW8t3HZ2c4AnfunIlZz kZbfuKbax/QmGLFtLh+KFSknoxv3ao85mJ+h3AnqcjjuqMY0OoAILHlFGXBRQ4aciVAq 3yzNCb8+7XRfvbwgJdnW80hfv3vuYy3s/rlxlwkD2myX264WE54uTiODvvw9nMxESWwA e52S0sXfkHGXvXC98Ea2OVbRsCbyKPMwUFD+swLS+vnCyJcczmQZDcR4DdGFuYYHOEBq 0FJA== X-Gm-Message-State: AGRZ1gJQ1tF/JH2W78ugbnJjU8MPfS/FUbOGvtFtBRhuy9itsLWiEXPh vLINq4PD5kPdEFNBY7uRsWB2KHy9 X-Google-Smtp-Source: AJdET5eBNwVwORelMWyfEaoQL96DW71eqOMpgz1MXAomJdJm8GS69qrHn8F0Z2N8p3Tp1XPJrSOf1Q== X-Received: by 2002:a62:cac4:: with SMTP id y65-v6mr11025862pfk.27.1540730459091; Sun, 28 Oct 2018 05:40:59 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.40.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:40:58 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:37 +0900 Message-Id: <20181028124043.21773-2-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile.scm (guile-newt): New variable. --- gnu/packages/guile.scm | 43 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 9e3300337..ba7aa63ad 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 David Thompson -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2018 Mathieu Othacehe ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -68,6 +68,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages image) #:use-module (gnu packages version-control) + #:use-module (gnu packages slang) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages networking) @@ -2286,4 +2287,44 @@ using S-expressions.") tracker's SOAP service, such as @url{https://bugs.gnu.org}.") (license license:gpl3+))) +;; There has not been any release yet. +(define-public guile-newt + (let ((commit "596ad760bee1be419d71271732f0f30eaee55143") + (revision "0")) + (package + (name "guile-newt") + (version (string-append "0-" revision "." (string-take commit 9))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mothacehe/guile-newt") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "18qqbi0bc7vp2vlrhib3p3wwgn7wrlv5728dn0avirhw4fxxivnf")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + '("GUILE_AUTO_COMPILE=0") ; to prevent guild errors + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (inputs + `(("guile" ,guile-2.2) + ("newt" ,newt))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (synopsis "Guile bindings to Newt") + (description + "This package provides bindings for Newt, a programming library for +color text mode, widget based user interfaces. The bindings are written in pure +Scheme by using Guile’s foreign function interface.") + (home-page "https://gitlab.com/mothacehe/guile-newt") + (license license:gpl3+)))) + ;;; guile.scm ends here From patchwork Sun Oct 28 12:40:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 43 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 2951716754; Sun, 28 Oct 2018 12:42:16 +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 [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 0879216750 for ; Sun, 28 Oct 2018 12:42:12 +0000 (GMT) Received: from localhost ([::1]:40013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOR-000058-8L for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:42:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkON-0008UM-Jy for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOI-0004XG-LM for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42536) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOI-0004Wy-Fd for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOI-0007NC-DF for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 2/7] services: kmscon: Do not switch to vt at start. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073047328220 (code B ref 33186); Sun, 28 Oct 2018 12:42:02 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:13 +0000 Received: from localhost ([127.0.0.1]:46780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNV-0007Kx-6v for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:13 -0400 Received: from mail-pf1-f169.google.com ([209.85.210.169]:36101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNP-0007KW-E3 for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:07 -0400 Received: by mail-pf1-f169.google.com with SMTP id l81-v6so2674737pfg.3 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:07 -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:in-reply-to:references; bh=LK7VSm0YNnjFhvtni0XmObi0lPqXGsB9qZOgb7lGXUw=; b=hEbMNe4r1y7reKLyc1fG4o6EGpAYxvoYycbaiLfC7w54JKw7r6ccLFmE9P7SMcoIR3 9TzVmQDHRBZKkuW9nqWFWk/CBTlWaf/dYduDcyHAn7GVGFi1zVDIB8N6r1TibbzFGQRV XYAY0rt6XVnkgol5rhoAHOXyrEDZKuV8HE6hQhMV5wyZtaQKt43gN+FRHjUmWS1WREh0 NjU2ScmroA40e2IAAC7r9yyN4zrOvOSrKMuTpU6csXvBpEtjKNvPKujcQLGQwS6WrgEz vp3GcRk+W9RRhAowrKl6UY+cbdUVNrxDz7dTJNdl7aaz+1oYsxc9zYZjIZj9FXFUB8My EHEA== 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:in-reply-to :references; bh=LK7VSm0YNnjFhvtni0XmObi0lPqXGsB9qZOgb7lGXUw=; b=IoAG9v1L95xQNAKfIlXtjqD0STogK+ddISHVMTevOYSf1TauD0jF0r0Sktc7nzprLG SB2MtMP48mGeg2PDy4PtxVA6Y+QVyqs5+vZoLUH7GPXyrbNdlz12yGzdH3PeN3hsgXvM mO0U4x0z3AwsuBaLaoE7Od4gw3qvNiw9G2TJrqSi8ftOURHDp4gm87Nyp5Q+oZupqY1B rJlhB/TnLuPLTSBLRrWbQnOBwUPRU7fMH3/wGKdV/SPd/jPatCX5VLTAKWFxgqstcsjg QxaNBLSBaX3xnSibD9xchTbotxf4VELt9fBaEs652NXUHTkgsh5SqyuJld1BqkEKp8P3 LE9Q== X-Gm-Message-State: AGRZ1gLItHThNXpCiaVbsCLQzoDJVk1hPjoB+vl5t9NKmjDYRiAhjl6P uuv7eXaCkM53JbtmReCPR/7i9Z5B X-Google-Smtp-Source: AJdET5cIY7Dt6YXHGptjXVL3iYWJeQwS5kCia/myMH+ZITalLaJ/SRPfYZ1oaosKYDbVneRBjJ/aKQ== X-Received: by 2002:a63:ef53:: with SMTP id c19-v6mr10123827pgk.386.1540730461562; Sun, 28 Oct 2018 05:41:01 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:00 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:38 +0900 Message-Id: <20181028124043.21773-3-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/base.scm (kmscon-service-type): Add "--no-switchvt" to kmscon command to prevent a switch to virtual terminal every time a new kmscon service is spawned. --- gnu/services/base.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 47c7d8bb2..4c341309b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2057,6 +2057,7 @@ This service is not part of @var{%base-services}." #~(list #$(file-append kmscon "/bin/kmscon") "--login" "--vt" #$virtual-terminal + "--no-switchvt" #$@(if hardware-acceleration? '("--hwaccel") '()) "--" #$login-program #$@login-arguments)) From patchwork Sun Oct 28 12:40:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 46 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 D589416754; Sun, 28 Oct 2018 12:43:47 +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=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 6122616753 for ; Sun, 28 Oct 2018 12:43:47 +0000 (GMT) Received: from localhost ([::1]:40021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkPy-0002N4-NP for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:43:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkON-0008UU-Og for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOJ-0004YR-KN for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOJ-0004Y9-Dy for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOJ-0007NS-BU for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 3/7] services: kmscon: Add an auto-login option. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073047528245 (code B ref 33186); Sun, 28 Oct 2018 12:42:03 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:15 +0000 Received: from localhost ([127.0.0.1]:46784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNW-0007LP-Vz for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:15 -0400 Received: from mail-pl1-f179.google.com ([209.85.214.179]:42532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNS-0007Ka-L0 for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:13 -0400 Received: by mail-pl1-f179.google.com with SMTP id t6-v6so2505688plo.9 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:10 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=F2fEsxsTRNjhz6y3NSL0rFu6K1lidRCK6JUbn5zyL2Y=; b=Bh9fiIui2H4QeOcM9wAAMHxSPPp0fUerDJJIrFmzV3HG0t4vXA5UNzidW9Axd3bR53 LYsDyEA7rL9OPvHTW5wrgAKD0igU7BAWZSgZU/nkidFjL+Mwo3UtuUE+DPl3y8pgh4yn yiWyrYKyntznQ1PFycSUigbIl5DFjPglZ1X4PsvXX9OMsrgK0Vv5PKPG4YTwe7GhKC37 gHzO4qetD5sZwrkevLmE7rPma4xiUhPOHj2+dJ8O1g8usfQ8HTR72NVgVirw59TC/cwT ZUiIA+93cc9kkHYfC1cILxPuFf4t+WUpt8c1G10JImb5ccGrZeCF7twc+YdrjMP4d7nj t9qQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=F2fEsxsTRNjhz6y3NSL0rFu6K1lidRCK6JUbn5zyL2Y=; b=kgoXRmFwepjmtOGm9RQtHxbS3pGeobP5o3wCR7VdeU+YGSgULJ4kIFkfT3EbiM1zg/ KhogiqeCHsHQbSGp6LgvVUktQGy3jGPVhRSoAymX9tquMTXWvK5ECp3q8AqToyanLwiN ghiLX67q8Ivm5F6xJDw8xEUCk7lmhyAKYtXlwgZgVGG52On6sUCHR6hNf+r8nGjfVvam znKV4e1CVYlEFe+oy/9jH8xTkYrcSPZdm0wv4DGx5xAXQO/F0N2Ykk4UsxubHm8hlCLx OCXVZwAXO2rg6AopsjcPa3N7y02CJsEeNHiaEMf8gr2yLs4WHKQ7dCf9CMMBmC/gyzj9 fvXw== X-Gm-Message-State: AGRZ1gKKkno6UHvO/q87FkGsP1iHjJ+dhIebXjPxxfGOSm+6VnRKC59y hzeItyH+b2mC+hLLDEQMgjdsXSub X-Google-Smtp-Source: AJdET5efNtirkCTLr9DBLut8SaycolAcN4JKazOUYC5AptgW7khc+GSdT6X9a4nmUaf4Rwbo6zllMw== X-Received: by 2002:a17:902:8e8a:: with SMTP id bg10-v6mr10543745plb.214.1540730464527; Sun, 28 Oct 2018 05:41:04 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:04 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:39 +0900 Message-Id: <20181028124043.21773-4-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Add an auto-login option that behaves as the one of mingetty-service. * gnu/services/base.scm (kmscon-configuration)[auto-login]: New field. (kmscon-service-type): Pass it to kmscon command. * doc/guix.texi: Document it. --- doc/guix.texi | 6 +++++- gnu/services/base.scm | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 87579d414..c58d7909f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31,7 +31,7 @@ Copyright @copyright{} 2016, 2017, 2018 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* -Copyright @copyright{} 2017 Mathieu Othacehe@* +Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* @@ -10873,6 +10873,10 @@ A gexp denoting the name of the log-in program. The default log-in program is @item @code{login-arguments} (default: @code{'("-p")}) A list of arguments to pass to @command{login}. +@item @code{auto-login} (default: #f) +When passed a login name, as a string, the specified user will be logged +in automatically without prompting for their login name or password. + @item @code{hardware-acceleration?} (default: #f) Whether to use hardware acceleration. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 4c341309b..8a8df45a1 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2018 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -2040,6 +2041,8 @@ This service is not part of @var{%base-services}." (default (file-append shadow "/bin/login"))) (login-arguments kmscon-configuration-login-arguments (default '("-p"))) + (auto-login kmscon-configuration-auto-login + (default #f)) (hardware-acceleration? kmscon-configuration-hardware-acceleration? (default #f))) ; #t causes failure @@ -2051,6 +2054,7 @@ This service is not part of @var{%base-services}." (virtual-terminal (kmscon-configuration-virtual-terminal config)) (login-program (kmscon-configuration-login-program config)) (login-arguments (kmscon-configuration-login-arguments config)) + (auto-login (kmscon-configuration-auto-login config)) (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config))) (define kmscon-command @@ -2059,7 +2063,10 @@ This service is not part of @var{%base-services}." "--vt" #$virtual-terminal "--no-switchvt" #$@(if hardware-acceleration? '("--hwaccel") '()) - "--" #$login-program #$@login-arguments)) + "--" #$login-program #$@login-arguments + #$@(if auto-login + #~(#$auto-login) + #~()))) (shepherd-service (documentation "kmscon virtual terminal") From patchwork Sun Oct 28 12:40:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 48 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 AAA4C16754; Sun, 28 Oct 2018 12:44:45 +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 [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 4E41D16750 for ; Sun, 28 Oct 2018 12:44:45 +0000 (GMT) Received: from localhost ([::1]:40027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkQu-0002uK-Lx for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:44:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOO-0008Uj-1w for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOJ-0004Xn-33 for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42537) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOI-0004Xd-V1 for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOI-0007NJ-RU for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 4/7] gnu: glibc: Export supported locales. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073047528238 (code B ref 33186); Sun, 28 Oct 2018 12:42:02 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:15 +0000 Received: from localhost ([127.0.0.1]:46782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNW-0007LN-LT for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:14 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:38624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNU-0007Ki-Tt for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:13 -0400 Received: by mail-pl1-f195.google.com with SMTP id p7-v6so2516254plk.5 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:12 -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:in-reply-to:references; bh=2kBI6kxnOkPNh33n0r6obMDWStD6NWxzpP93dKqzNPI=; b=XWn8KJmwATsYyL6hy3lb1X2C9Is5oJtY/KU3dBEDCZUDMumKG8QzVhtovHPGDeoCky lyozueGenww3QSgYaLAA258qsvKCzXK4e7Hk4XgMbj+26P1U4RK/ulU62Dk/4kHuKHE7 tUnl8wXP/nYF7OKyIJKeiov6rh0v0NNj2GgV5sjA5arvC2I5PSnhSfMwhzpeEu9faVuM 5izyHgDVedbMjy5s3I88U3qcqbuMyTNmucS5sJm+MKi1miP5Tnp75HhLFvfifFRpIYZV oFQ9W9BjeOKS2vDYwgAh3bfzzRSM5lZ6QWYrBpcxw9LTVC4bqXIAjM2uMC8LMo81dbAh 181Q== 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:in-reply-to :references; bh=2kBI6kxnOkPNh33n0r6obMDWStD6NWxzpP93dKqzNPI=; b=p1wZcJuNRQezugLmXHXRmS3k1heNC1ksXne/+Ps4Bwc/97jwtIKVeIKrPagup6DtwK nY1aTIw1U3IYaEKBRNqJvwF4JOMQ1B3nci/08kKR+PDV+hr3pFLlyS0TVQI+0iEdxTbE HqWs7A/h/ZnYsHZhMmT1tTsHXqNTRsuHvJzJX3ZEsPRalNS2rSwcQLEhhPDugJIGzkxH uDneXdEFULR/sd3fZTWEzTkOLnlhVJvv2JSldHA75D0NvRglE1LtU7ExX4JFL0JZQlXD 183ocedFXoV+PdkKOIg/p03Jbv4V2aZGl7OUfti69tyubs4SllT8r9fS/BREEupqBKA4 Dofg== X-Gm-Message-State: AGRZ1gLH0uXGCCIiI3KjMLF7uE/+lLzF/dWCVMPArh1HRE60oJSg4j6D oSgKagjjtvcWOWGnA0nvSVuyE/8N X-Google-Smtp-Source: AJdET5c3lVaOcmpdZEdPdubutwssIoxdrCuoyprFpOo5NHwG4tW8MVz7B5YdK6C7SZwoaF+u4dUTxw== X-Received: by 2002:a17:902:25ab:: with SMTP id y40-v6mr6699307pla.327.1540730467060; Sun, 28 Oct 2018 05:41:07 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:06 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:40 +0900 Message-Id: <20181028124043.21773-5-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Debian and Archlinux (at least) force the installation of the localedata/SUPPORTED file of the glibc. This file lists all the supported locales of the glibc. * gnu/packages/patches/glibc-supported-locales.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (glibc/linux): Add the previous patch, (glibc-2.28): ditto. --- gnu/local.mk | 1 + gnu/packages/base.scm | 6 ++-- .../patches/glibc-supported-locales.patch | 31 +++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glibc-supported-locales.patch diff --git a/gnu/local.mk b/gnu/local.mk index 56c434d0a..0828f4358 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -754,6 +754,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-vectorized-strcspn-guards.patch \ %D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/glibc-2.27-git-fixes.patch \ + %D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4065af0ab..d278b36a5 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -594,7 +594,8 @@ store.") "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch")))) + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch")))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -888,7 +889,8 @@ GLIBC/HURD for a Hurd host" (patches (search-patches "glibc-allow-kernel-2.6.32.patch" "glibc-ldd-x86_64.patch" "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch")))))) + "glibc-versioned-locpath.patch" + "glibc-supported-locales.patch")))))) ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch new file mode 100644 index 000000000..f1c8a8887 --- /dev/null +++ b/gnu/packages/patches/glibc-supported-locales.patch @@ -0,0 +1,31 @@ +This patch is taken from debian's glibc package (generate-supported.mk). + +diff --git a/localedata/Makefile.old b/localedata/Makefile +index 34877c0..a61d9b9 100644 +--- a/localedata/Makefile.old ++++ b/localedata/Makefile +@@ -91,7 +91,8 @@ endif + # Files to install. + install-others := $(addprefix $(inst_i18ndir)/, \ + $(addsuffix .gz, $(charmaps)) \ +- $(locales)) ++ $(locales)) \ ++ $(inst_i18ndir)/SUPPORTED + + tests: $(objdir)/iconvdata/gconv-modules + +@@ -195,6 +196,14 @@ endif + + include SUPPORTED + ++$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force) ++ for locale in $(SUPPORTED-LOCALES); do \ ++ [ $$locale = true ] && continue; \ ++ echo $$locale | sed 's,/, ,' >> LOCALES; \ ++ done ++ $(make-target-directory) ++ $(INSTALL_DATA) LOCALES $@ ++ + INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) + + # Sometimes the whole collection of locale files should be installed. From patchwork Sun Oct 28 12:40:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 44 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 4308116754; Sun, 28 Oct 2018 12:43:15 +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 [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 913C616750 for ; Sun, 28 Oct 2018 12:43:14 +0000 (GMT) Received: from localhost ([::1]:40018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkPR-00024c-Sl for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:43:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOO-0008V5-Bg for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOK-0004Yv-0m for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42539) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOJ-0004Yp-SP for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOJ-0007NZ-Pj for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 5/7] gnu: terminals: Change libtsm and kmscon repositories. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073048128269 (code B ref 33186); Sun, 28 Oct 2018 12:42:03 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:21 +0000 Received: from localhost ([127.0.0.1]:46788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNc-0007Lr-BT for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:20 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:43273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNY-0007Ks-2d for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:16 -0400 Received: by mail-pf1-f193.google.com with SMTP id h4-v6so2654502pfi.10 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:15 -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:in-reply-to:references; bh=DImC8pVLQ3eS+nlTjcBt8WR5+yrNSzlQ/+V0j6Qmlis=; b=J31JnhpqemyQZgT+MBQ2lzXfkLhZwz4Im8ucJ2i1bPoY5b0Ae2bpU9Qhy9aj/RbV36 U8AdOXM4hb7spRyCfEvPtzxBXc+2/MFUfDn5Fpsxl4vzsmizALFQzRNdV+RFN1P6R6x+ CZVkV1B/3Eyz0eeQrtL5tFmCqCerskNCF/fWBB3rym04vr1ViMloOtEG0OBWKFDcne/y +KamWd8OkpWdod6/gO/CQZ4p+wBxEq9OrUQc3CvpNuI2CAHtlrvtF5o5eQp+EFjH1fBz QC8v109rwkhXA+0smrJSuE3bEOcsiYtu9zMxKRZWNLAEMVPNtPRWuoVugC0X4ZJ8tYEP KntA== 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:in-reply-to :references; bh=DImC8pVLQ3eS+nlTjcBt8WR5+yrNSzlQ/+V0j6Qmlis=; b=eFdHAnCixDJCIS8DsUhLGSeSSfXEs0pHmXlbePkUYQymqhB9X3muvYQoU/3msZBNvZ +y/YQ/kB3fFIjkLVS+zTQId6zOyMfNVGTxp7zs/wKbtZuToyLj/nHuoAXlzOW1tX5lAP CYTSbf9fqrKFe9IBSoquENeZ1T7f4c8ayZ2lOmdl+F5PtNbL9frmyVftNXyCVs+SLCdS A0WqqIk2P40duxwvR7EzfcZjTlRXM4mVuoHQkwMnzswQrLgcksfoJIKbw2YHQYrox6OS ViBhrR5PbtgyOnDMnjfIq9Sp4f3FWnvVZDkbYhB+TLn7dW5SeQzN8zx8DDwLdzimr/oc axFg== X-Gm-Message-State: AGRZ1gJDS46ubqiZTWdZVawQJqndjn3tY3RYnZwkANIXqOCLdYor6wue 5qPkCMXKfZsOIDZZtZrWt47jHARZ X-Google-Smtp-Source: AJdET5eVMYau7EpBOMC/GBLe5bec2oNn6nd+DS24eq6YlPke4C/PnG8/GH/paxZ0e4CRHklhnnDzCg== X-Received: by 2002:a63:c112:: with SMTP id w18-v6mr10323463pgf.429.1540730470004; Sun, 28 Oct 2018 05:41:10 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:09 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:41 +0900 Message-Id: <20181028124043.21773-6-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Those two packages (from the same author) are no longer maintained and do not even compile. Switch to a fork that is maintained even if it does not have any release yet. * gnu/packages/terminals.scm (libtsm)[origin]: Use "https://github.com/Aetf/libtsm" as new origin and switch to git-fetch method. (kmscon)[origin]: Use "https://github.com/Aetf/kmscon" as new origin and switch to git-fetch method. --- gnu/packages/terminals.scm | 176 ++++++++++++++++++++----------------- 1 file changed, 95 insertions(+), 81 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 5cdc08139..836cf131d 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -187,96 +187,110 @@ text-based approach to terminal recording.") (license license:gpl3))) (define-public libtsm - (package - (name "libtsm") - (version "3") - (source (origin - (method url-fetch) - (uri (string-append - "https://freedesktop.org/software/kmscon/releases/" - "libtsm-" version ".tar.xz")) - (sha256 - (base32 - "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("libxkbcommon" ,libxkbcommon))) - (synopsis "Xterm state machine library") - (description "TSM is a state machine for DEC VT100-VT520 compatible + (let ((commit "f70e37982f382b03c6939dac3d5f814450bda253") + (revision "1")) + (package + (name "libtsm") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/Aetf/" name)) + (commit commit))) + (sha256 + (base32 + "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DBUILD_TESTING=ON"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libxkbcommon" ,libxkbcommon) + ("check" ,check))) + (synopsis "Xterm state machine library") + (description "TSM is a state machine for DEC VT100-VT520 compatible terminal emulators. It tries to support all common standards while keeping compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.") - (home-page "https://www.freedesktop.org/wiki/Software/libtsm") - ;; Hash table implementation is lgpl2.1+ licensed. - ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license - ;; derived from ISC. - ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released - ;; under the bsd 2 license. - (license (list license:expat license:lgpl2.1+ license:isc license:bsd-2)))) + (home-page "https://www.freedesktop.org/wiki/Software/libtsm") + ;; Hash table implementation is lgpl2.1+ licensed. + ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license + ;; derived from ISC. + ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released + ;; under the bsd 2 license. + (license (list license:expat license:lgpl2.1+ license:isc license:bsd-2))))) (define-public kmscon - (package - (name "kmscon") - (version "8") - (source (origin - (method url-fetch) - (uri (string-append - "https://freedesktop.org/software/kmscon/releases/" - "kmscon-" version ".tar.xz")) - (sha256 - (base32 - "0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a")) - (modules '((guix build utils))) - (snippet - ;; Use elogind instead of systemd. - '(begin - (substitute* "configure" - (("libsystemd-daemon libsystemd-login") - "libelogind")) - (substitute* "src/uterm_systemd.c" - (("#include ") - "#include ") - ;; We don't have this header. - (("#include ") - "") - ;; Replace the call to 'sd_booted' by the truth value. - (("sd_booted\\(\\)") - "1")) - #t)))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("libxslt" ,libxslt) ;to build the man page - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("docbook-xsl" ,docbook-xsl))) - (inputs - `(("libdrm" ,libdrm) - ("libtsm" ,libtsm) - ("libxkbcommon" ,libxkbcommon) - ("logind" ,elogind) - ("mesa" ,mesa) - ("pango" ,pango) - ("udev" ,eudev))) - (synopsis "Linux KMS-based terminal emulator") - (description "Kmscon is a terminal emulator based on Linux's @dfn{kernel + (let ((commit "01dd0a231e2125a40ceba5f59fd945ff29bf2cdc") + (revision "1")) + (package + (name "kmscon") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/Aetf/" name)) + (commit commit))) + (sha256 + (base32 + "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87")) + (modules '((guix build utils))))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'autogen.sh + (lambda _ + (zero? (system* "sh" "autogen.sh")))) + ;; Use elogind instead of systemd. + (add-before 'configure 'remove-systemd + (lambda _ + (substitute* "configure" + (("libsystemd-daemon libsystemd-login") + "libelogind")) + (substitute* "src/uterm_systemd.c" + (("#include ") + "#include ") + ;; We don't have this header. + (("#include ") + "") + ;; Replace the call to 'sd_booted' by the truth value. + (("sd_booted\\(\\)") + "1"))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("libxslt" ,libxslt) ;to build the man page + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("docbook-xsl" ,docbook-xsl))) + (inputs + `(("libdrm" ,libdrm) + ("libtsm" ,libtsm) + ("libxkbcommon" ,libxkbcommon) + ("logind" ,elogind) + ("mesa" ,mesa) + ("pango" ,pango) + ("udev" ,eudev))) + (synopsis "Linux KMS-based terminal emulator") + (description "Kmscon is a terminal emulator based on Linux's @dfn{kernel mode setting} (KMS). It can replace the in-kernel virtual terminal (VT) implementation with a user-space console. Compared to the Linux console, kmscon provides enhanced features including XKB-compatible internationalized keyboard support, UTF-8 input/font support, hardware-accelerated rendering, multi-seat support, a replacement for @command{mingetty}, and more.") - (home-page "https://www.freedesktop.org/wiki/Software/kmscon") - ;; Hash table implementation is lgpl2.1+ licensed. - ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license - ;; derived from ISC. - ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released - ;; under the bsd 2 license. - ;; Unifont-Font is from http://unifoundry.com/unifont.html and licensed - ;; under the terms of the GNU GPL. - (license (list license:expat license:lgpl2.1+ license:bsd-2 - license:gpl2+)) - (supported-systems (filter (cut string-suffix? "-linux" <>) - %supported-systems)))) + (home-page "https://www.freedesktop.org/wiki/Software/kmscon") + ;; Hash table implementation is lgpl2.1+ licensed. + ;; The wcwidth implementation in external/wcwidth.{h,c} uses a license + ;; derived from ISC. + ;; UCS-4 to UTF-8 encoding is copied from "terminology" which is released + ;; under the bsd 2 license. + ;; Unifont-Font is from http://unifoundry.com/unifont.html and licensed + ;; under the terms of the GNU GPL. + (license (list license:expat license:lgpl2.1+ license:bsd-2 + license:gpl2+)) + (supported-systems (filter (cut string-suffix? "-linux" <>) + %supported-systems))))) (define-public libtermkey (package From patchwork Sun Oct 28 12:40:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 45 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 CAFCC16754; Sun, 28 Oct 2018 12:43:27 +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=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 8251616750 for ; Sun, 28 Oct 2018 12:43:27 +0000 (GMT) Received: from localhost ([::1]:40019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkPe-0002Bo-Pn for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:43:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOP-0008W4-F9 for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOK-0004Zl-Er for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42540) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOK-0004ZV-Ai for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOK-0007Nh-7x for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 6/7] gnu: slang: Use a correct location for terminfo dirs. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073048128275 (code B ref 33186); Sun, 28 Oct 2018 12:42:04 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:21 +0000 Received: from localhost ([127.0.0.1]:46791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNc-0007Lu-Sd for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:21 -0400 Received: from mail-pg1-f174.google.com ([209.85.215.174]:35143) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNa-0007Kw-D7 for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:18 -0400 Received: by mail-pg1-f174.google.com with SMTP id 32-v6so2585455pgu.2 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:18 -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:in-reply-to:references; bh=aEYXbVYwZYntcQezXe2U1ixyn/gw9YYUuarCldybdNo=; b=tdAdTuXxnrRUzoaQar2CjJN3w7JnHwWJ4lfl4/CF5zJWKneKUqHVAGX42TI4BMf/29 /MOJIrLk7SE/dwE8eraw3GED18m5MaxtncE9EViH70HDOL11kmuHhEmZZmDL/zkPTwo4 D5zMJK377TBdjpAA0gM7Wo18vMjicCOElY3mNYDJeoy6hRRXkeXoWoXhdD7DCvlsYSIp /4tegl1h2vOacXBO/5F3Qb0mkuMQpgTCoCCaEYiUjX5b5P6P2cIA/PEL5jOa5U08+f9C K3SfsbpeJVe8+6oyW4bk3m9u7y1eUYDUdnfdY6cxz6vkf6XEcMlYGi6eisDuuNlgUbq9 gMnw== 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:in-reply-to :references; bh=aEYXbVYwZYntcQezXe2U1ixyn/gw9YYUuarCldybdNo=; b=KwanTO+N+vUvHoufCsAvOIcArcv73h95ErIJdFXVaEPtewE3HtguhYvB2n2e8PIvGB 4OfqixRLKGymHwF7/xVr37XurhOfy8cuJgs9jKQ1pgYGTKvELvAExlCRydiBk7S+MdFF rsXTJFM3cOASxiSOeQtnuOcYMZjCvxwGvV6oBQ4DuDfi2Pdh6ZwscjFyPUvAutdLffPr JgMBbVxJOAVHP7RAXxEpl5wnUIRJ84hmgJX3gwEinD/rVi6cqUsuGKB0p684cGqLmxB9 XlU+FAXeHAQb5FR0fBwQuwVickIRMbv3eYMlSQc/a9mGZQLzLOGjvO+TR7zw0CB8/lEg deCw== X-Gm-Message-State: AGRZ1gLrbSUWQ1md5dk0sxbVPl5cZz187mbwbsYGZdzoDAPjIXglwHd4 DlLpj29OHAE4jTHu9HdcllOgiXZO X-Google-Smtp-Source: AJdET5dk8cuysUPfKvt7YI0xqCtBacHbdzcFR6JRjV7mwNGzePcQaZlXANEfBpAPEDgMDkepSZTZkQ== X-Received: by 2002:a63:7cf:: with SMTP id 198mr10262976pgh.129.1540730472578; Sun, 28 Oct 2018 05:41:12 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:12 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:42 +0900 Message-Id: <20181028124043.21773-7-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches As termcap is disabled and no terminfo directory is given, slang is not able to query terminal capabilities. Specifying a correct path for terminfo will automatically disable termcap support in the configuration. * gnu/packages/slang.scm (slang)[source]: Remove the snippet disabling termcap. [arguments]: Set MISC_TERMINFO_DIRS to a correct location. --- gnu/packages/slang.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm index 24eb5fa13..185d44191 100644 --- a/gnu/packages/slang.scm +++ b/gnu/packages/slang.scm @@ -50,13 +50,21 @@ '(begin (substitute* "src/Makefile.in" (("/bin/ln") "ln")) - (substitute* "configure" - (("-ltermcap") "")) #t)))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f - #:parallel-build? #f)) ; there's at least one race + #:parallel-build? #f ; there's at least one race + #:phases + (modify-phases %standard-phases + (add-before 'configure 'substitute-before-config + (lambda* (#:key inputs #:allow-other-keys) + (let ((ncurses (assoc-ref inputs "ncurses"))) + (substitute* "configure" + (("MISC_TERMINFO_DIRS=\"\"") + (string-append "MISC_TERMINFO_DIRS=" + "\"" ncurses "/share/terminfo" "\""))) + #t)))))) (inputs `(("readline" ,readline) ("zlib" ,zlib) From patchwork Sun Oct 28 12:40:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 49 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 EF38316754; Sun, 28 Oct 2018 12:44:56 +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,T_FRT_STOCK2,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 7D83016750 for ; Sun, 28 Oct 2018 12:44:56 +0000 (GMT) Received: from localhost ([::1]:40028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkR5-0002wp-NP for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:44:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOP-0008W2-EU for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOK-0004aB-TO for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42541) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOK-0004a3-Om for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOK-0007No-Lx for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 7/7] gnu: python-3.6: Disable congestion test. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073048628293 (code B ref 33186); Sun, 28 Oct 2018 12:42:04 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:26 +0000 Received: from localhost ([127.0.0.1]:46793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNi-0007MH-9d for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:26 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:39067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNc-0007Lc-OE for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:21 -0400 Received: by mail-pg1-f196.google.com with SMTP id r9-v6so2574841pgv.6 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:20 -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:in-reply-to:references; bh=jaRgsKEtsOGvff3jsdHVdXiEg5hRtsO6IGurGYIZocw=; b=IJ/VR3sPTZsIUfITx8scvvwpuQV/auOUxIhvIOg6W164es/23A8wPkYzl8oIPA/bV9 rC//5qj9xSTcRqbzrv0WoednEQAsCWCPXJKur5V/L1XOXg1QOKxdvrM+AtbE/BWuzZvq WaTfMyP/ZSwiL8W4TwVMTYMyDP59vn4ypTWIz5YUeb7YtETdg8V3bnIwcpa41Z9Mrs8I E+a6fLqV/yMwTTa7VSZeWQiVk96bVjQkEaHq9Yd0WItRd38I63gGYwK8rrNFbtDc3EZ/ FUtm9slvPhk6NkJEuP1pJsAo7sv9gUTvnrRNJ/ZdyARCTAPDHxyRH82n3/3qWP0UYBJ7 mcvQ== 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:in-reply-to :references; bh=jaRgsKEtsOGvff3jsdHVdXiEg5hRtsO6IGurGYIZocw=; b=E2CrWfD6szebk/HTF+/aK/I40nvNKIBk3YQdglyZ6By5FIdlWyzAHlnTKTwHv9mL/x I/tIxVtc2hvNk8a9rDIxeN9k3nEsFzVbpDT6WTU1qiis1Z2kwgcDHIFW57RjNraP7JYG Yj0td27/Q+CTGIX16ZQpTZ3EG/hqvVSEo3g5cFHbgcdAXxJ8LK/gLIP8L149rZSUF6nv xxBRanwkEbEutb0PFgFMuH+HSk3gb4JPRxVnmgr2FfHW7pg4NRPh0XwzzKY4atGuZBqp 5Q4COE2EnnVDsjl7OQULCUVTpQcdShCpWjdEqsq4xyJrEJvEDi0wwsNhfRhR2I6CMdOQ OtNw== X-Gm-Message-State: AGRZ1gKDEfUdbaTHcNhbv5yTE7oQDa+7bP1INqXRaK3aRcquEiQEZv/y KpLaLHqMnVMq+IpbzObOMwAhiT5+ X-Google-Smtp-Source: AJdET5dZzNt74OBCBiNbHKk7UaeaW6ZW9BuFon7Pa5GKLxvh4SLVKKXW6edcc86CyN1MziJc4lVaFA== X-Received: by 2002:a62:a50d:: with SMTP id v13-v6mr11016995pfm.18.1540730474934; Sun, 28 Oct 2018 05:41:14 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:14 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:43 +0900 Message-Id: <20181028124043.21773-8-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The socket congestion test is known to hang or fail randomly. It is disabled on python 3.6 branch upstream. * gnu/packages/patches/python-disable-congestion-test.patch: New file. * gnu/packages/python.scm (python-3.6)[patches]: Add the previous patch. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../python-disable-congestion-test.patch | 60 +++++++++++++++++++ gnu/packages/python.scm | 1 + 3 files changed, 62 insertions(+) create mode 100644 gnu/packages/patches/python-disable-congestion-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0828f4358..11974903d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ + %D%/packages/patches/python-disable-congestion-test.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-fix-tests.patch \ diff --git a/gnu/packages/patches/python-disable-congestion-test.patch b/gnu/packages/patches/python-disable-congestion-test.patch new file mode 100644 index 000000000..eca2379cf --- /dev/null +++ b/gnu/packages/patches/python-disable-congestion-test.patch @@ -0,0 +1,60 @@ +This patch is taken from python upstream repository: + https://bugs.python.org/issue34587. + +From 7484bdfd1e2e33fdd2c44dd4ffa044aacd495337 Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Mon, 17 Sep 2018 14:01:20 -0700 +Subject: [PATCH] bpo-34587, test_socket: remove RDSTest.testCongestion() + (GH-9277) + +The test tries to fill the receiver's socket buffer and expects an +error. But the RDS protocol doesn't require that. Moreover, the Linux +implementation of RDS expects that the producer of the messages +reduces its rate, it's not the role of the receiver to trigger an +error. + +The test fails on Fedora 28 by design, so remove it. +--- + Lib/test/test_socket.py | 27 ------------------- + .../2018-09-13-20-58-07.bpo-34587.rCcxp3.rst | 5 ++++ + 2 files changed, 5 insertions(+), 27 deletions(-) + create mode 100644 Misc/NEWS.d/next/Tests/2018-09-13-20-58-07.bpo-34587.rCcxp3.rst + +diff --git Lib/test/test_socket.py Lib/test/test_socket.py +index 4f3c4774e4..f4d58ebf71 100644 +--- Lib/test/test_socket.py ++++ Lib/test/test_socket.py +@@ -2054,33 +2054,6 @@ class RDSTest(ThreadedRDSSocketTest): + self.data = b'select' + self.cli.sendto(self.data, 0, (HOST, self.port)) + +- def testCongestion(self): +- # wait until the sender is done +- self.evt.wait() +- +- def _testCongestion(self): +- # test the behavior in case of congestion +- self.data = b'fill' +- self.cli.setblocking(False) +- try: +- # try to lower the receiver's socket buffer size +- self.cli.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 16384) +- except OSError: +- pass +- with self.assertRaises(OSError) as cm: +- try: +- # fill the receiver's socket buffer +- while True: +- self.cli.sendto(self.data, 0, (HOST, self.port)) +- finally: +- # signal the receiver we're done +- self.evt.set() +- # sendto() should have failed with ENOBUFS +- self.assertEqual(cm.exception.errno, errno.ENOBUFS) +- # and we should have received a congestion notification through poll +- r, w, x = select.select([self.serv], [], [], 3.0) +- self.assertIn(self.serv, r) +- + + @unittest.skipIf(fcntl is None, "need fcntl") + @unittest.skipUnless(HAVE_SOCKET_VSOCK, diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fbb280224..37755287c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -377,6 +377,7 @@ data types.") (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (patches (search-patches + "python-disable-congestion-test.patch" "python-fix-tests.patch" "python-3-fix-tests.patch" "python-3-deterministic-build-info.patch"