From patchwork Mon Jun 28 15:22:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aljosha Papsch X-Patchwork-Id: 30759 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 B168627BC81; Mon, 28 Jun 2021 16:25:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 37EE527BC78 for ; Mon, 28 Jun 2021 16:25:44 +0100 (BST) Received: from localhost ([::1]:60286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxt8p-0006WC-AT for patchwork@mira.cbaines.net; Mon, 28 Jun 2021 11:25:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt8A-0005bh-5k for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxt89-0006p0-U7 for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxt89-0001nb-RL for guix-patches@gnu.org; Mon, 28 Jun 2021 11:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49254] [PATCH 1/4] gnu: Add wondershaper. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 15:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49254@debbugs.gnu.org Cc: Aljosha Papsch X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16248938546795 (code B ref -1); Mon, 28 Jun 2021 15:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jun 2021 15:24:14 +0000 Received: from localhost ([127.0.0.1]:52259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7N-0001lX-Ns for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:44960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxt7K-0001lO-F5 for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:24:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7J-0004aG-Jf for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:10 -0400 Received: from mail-fr2deu01on2130.outbound.protection.outlook.com ([40.107.135.130]:29345 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxt7G-0006GA-HL for guix-patches@gnu.org; Mon, 28 Jun 2021 11:24:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XNbIDLfFA/5t2ubq4puxtyGDZmDnq7l6XrRwcbcIXnXHDhEMGNJmx3r3YwZgR+xylhl2H4vlE8J4Q089Gfuylhruk121B38JmZu42ecyTdzn7y3MfEJUQK9lpUN3ukxiWSrM7vPdTiRxDFlnjld6WXriqbt+hnFeMTTDA+OKzchPSGPnCOWKhqy4OlABwH+g/QtH4VU3K7fqKeJ/LLB41K6SJH0M13wke3LMAcvjGMTkElRru4NCbBMtU34rEHbRA+WX5fwww7clfZlOQdPRjBYTjbTEJYHl67L4pwkyw25ZJD2zsMsUxjQUd184KHmkNHlUu/IoSf0zDiNGWnE93A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TT/O1aTfTJqprUzpvFf3YSxblPkjXFZuh/nGwxSCURU=; b=h4/gbmdU6if5YR7gJVZio6lH3inEqMEAowPJirDyc4vyZQSgLgvGjvT4b6SkNyXvmxz53+qJul54+gdIo3YfI3B4jwYErQHIFxq7MyGNVhPMBnawSw1tvsh8htJMo0ue8sORM9dk090Pm7aaf0F+YCEUsZkyBtIdwELFyfa8USB38fg9KewQ+KY3YBpWi/ah0xRCUTi934eZ7jV19VZ0cfmYkwwdptCBIRTJCU4IZYPnf6u+nMEhMF/4kjJo9vtwWS2r3KSTrnl0oA1IAKMz60mUOAWIo4y9fd38yroWt4vo1ljocrVMXJlXBCXU5EwHIh2y0pwMt8TCMJdB5LSMmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=stern-data.com; dmarc=pass action=none header.from=stern-data.com; dkim=pass header.d=stern-data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sternasset.onmicrosoft.com; s=selector1-sternasset-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TT/O1aTfTJqprUzpvFf3YSxblPkjXFZuh/nGwxSCURU=; b=3h57mWR6BPgkVELUSCbkovBMOd+kueZyT0307NrADjrWmWKRYnSQ99Hs+FiyVF1BfsXwW8+KdmvWxhaLJBOvAaWCoEkjVpSlSdcfdRkbP1kpUw/ci+ojTgmHbP8El/ZVcJiOzhjowWQla9AIzXmAJx+eP6VOfnVQRkIConXiZarhpMDHmJnPh0sPnG6vdBMttV0DsqfaFFFMo2UITHp2+UJs1URw5xE1+OwSOOp3XnbYOsMk98jzD27oqKPNzzjGkIZD30Fw5+Pa+3wPiN+nmytNmBfKFK5sTjkmSSBLknuXNE22Q1kuaT3n1/C/3On+6GMoMvt59X67KvcaAn2NCw== Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BE0P281MB0211.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.17; Mon, 28 Jun 2021 15:24:03 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%7]) with mapi id 15.20.4287.021; Mon, 28 Jun 2021 15:24:03 +0000 From: Aljosha Papsch Date: Mon, 28 Jun 2021 17:22:29 +0200 Message-Id: <20210628152232.31073-2-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210628152232.31073-1-ep@stern-data.com> References: <20210628152232.31073-1-ep@stern-data.com> X-ClientProxiedBy: PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) To BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:908:c39:9d60:ec9b:bd9a:f3b7:625d) by PR3P189CA0076.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Mon, 28 Jun 2021 15:24:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c4b35d1-e326-4039-e038-08d93a48c33a X-MS-TrafficTypeDiagnostic: BE0P281MB0211: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:182; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l7FPak5fIJj1CbEZMcaaYMG7CQCh4HiyC+jHL7099JUxyI/3m+kYPT0ua12S1dsz8sjiSy2Ygb06Wrgy92SE5PX0UFYJVkFmaF275G9jmQnkHF8E4DdbrI/ZbFComDuMigxG01fwjbuMaQRY+fowW6/Yypt/QUUsksTVfMchAGNVNPXwI+SWBaaqxaRTWQAOhBdsfQPsyawp38f3fsSpg0+FOBiavW6NpktDQk9yEjex0JiOLepNJZli6AwKdfvMm/z9QJ9r7tWNiTvKahqJZykOI2mBzUtkYPCfqRIpGw1EsbXO/hZBndO9gA/67eKEmjfSdiXiGC1n0/moKtyzyP2UrKuhU2DCOazsqje2V0obRKHOFi24Yv7GF7B5eLuAl5duDofp6tDSmfFf4BCyQkCskoQnOYakUo6zed2l/Av2yHPZKRUxu32XgWSaoU6mbgquraqC/9LNLmDKXl0n1Tlru9zBQ5vp9cWLQG3JDE3WymaLAg0uLnhs0gP5GjngOhXgd1edx6Z/UEx+YXMvUWwiWWwZOw0k7AfvYQ8AoDR8Lvp57KzKQk99SNFGyZIpxORkiWqFmY2W5ZJF47VMgEB7jWPdIo8TLChsA4X6NHYs31IKgonT6nMrguW9vM0k1QG4V8wqEeIbJgEzGV/fi13xGf1SBrVXp9hfmekGhV2OX3yPBNf9/LEUigeQ8RjjtCvmgJg4/8U1gg9dbedKq8hFbT2/6+KxLtYvoANhq1Xag9dRRA0HG3DW5eOQgtlz+/pi/xA2djomVMqLEYbwEw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(366004)(376002)(136003)(39830400003)(52116002)(107886003)(83380400001)(8676002)(6666004)(186003)(66574015)(478600001)(2906002)(86362001)(8936002)(6512007)(6506007)(6916009)(36756003)(4326008)(2616005)(316002)(38100700002)(5660300002)(6486002)(1076003)(66946007)(66556008)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K1LjRMA03jQOU7se/7F3Q9VylX2uDQStQ67jdoqOqZwklx2DOl9CbDTtlXGK6nXhT3OYHo0uDJSb44ixMk+Og0paNwpU2YnLmuqXmOM5/UkagixYzfJ7UIU4/KBve4IvYWA5E7e6qRPygfJUTPffjxcrfHf25aolONFf0SPppcJ9tiK1T21FBMxeOucwbaPOy+DxW0jHaG0drGJOPyLCXRjzIsHZlELsAHv39vq1i0UHWBkqn6upwpYsax/J69Z7TeQIyWWA3zL1mYnZbzFjaf2xM6RTrYDbb5CBJuSv0hk362ANxJa0IpE0MGG18e+qW/s7nGguYV16x1nnT3UaK9jWSqxbBpROcB2eJpBh5MuYrHrkcyN2BYU2D35zmEAx1SaFhtL5iEloR3+504OJ3WPzGF0tbp7YwQ65yUIAm4Qqqk+dqpD8QsEEZQzk6/Oswj7gHC5gVzs0h9EUWS/u1iSzThVmoLPcDqYs5E71QGTWjdRo0s2n3cEbAqOv070Ft5AZrGAhJOL/MGxkzkfEQgtGI1LEV8QcbbIpGAs7zgmadaoWXx8yelJdO9fS1oiLbRqAj3o+3lju2AmYj+b8iXzx7pSucF2bK5zcl1rQc0JqaHen5kqCDiKr3yURKoi1e1Y3P9atAXk6/jxNW4QXRpoIzrjkD0nUNjjAyA81kVZAOqpweYTAnzcVdii7Y+wLacwsMOQoR4Hnr3XmaOLInWvOwXWSUs1V7Gu+uNgk6DPDMCDXuI21jXYYdii7a3n/moaFlX9rKZ4NsBR8d62nYx+J6d+H62+UrloiTJVUn4jmoovan+xWlzMlBubRkUKgDKkIwmCBf6TXjBEPBss8DNer6kpZDXWEZxgIg0A8g6twjC7rqvgAsVIbG0Uf++le6Uu/Y0LJIujqubj61tjO1JYMK5Ac1Q83ISDOx95EawbNY78CgA321G8Ev1/EeAMrdSPS5h0hZQDbJphYk3XtJi/OzbeVFHe9jQJIJbPqy40MYsKHAhAL9nj2Rcwtv1vp6NN+i6MIvJDeE3dQQZIPIHIhYPmVNUs7xdUI4IfNguoum4B6x2m7IB9m1dIIiwNtISPf/CDE7Wb0M+UayJtoWoQxmQIs56f2XqNZGcTQlNbfbJ7qGzkIfikLnKS6CTlxgsAIgI2jN8EACdt0+CQC93dOykPi/erd9bARXziLqcEszZF6agq6rKXDqlkpFQ1XhJCeAiAd8bKdKVvQKNdnKocIAG8Xi7gsW83p40G7ddvsdy8jeINYRhvva47kB9XOACnlMWBVbpKvoCI62Ou/iHOa7Oo3p9QwrA9nk2IlwmDYN/4G+hVBB3NhZAfH7c4Lfs16IHdzFPil7O7xdrqUjslKgSqUxJCwxOui4ZSeNDeFE0VHtqnp7OBHzLuE8Zgp X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c4b35d1-e326-4039-e038-08d93a48c33a X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 15:24:03.8252 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e55b1d7b-b6d7-445f-a720-8de54d4464ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JCsP1BhJ1RABgkUywEWdSsbvtKiphVS2CaxCIpQlCHBQcNHhHMnCXORsydF2npNbapcahjGw8/DhWR5ykJLkXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE0P281MB0211 Received-SPF: pass client-ip=40.107.135.130; envelope-from=ep@stern-data.com; helo=DEU01-FR2-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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/networking.scm (wondershaper): New variable. --- gnu/packages/networking.scm | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 82c7a0161a..7374ad5dbc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -65,6 +65,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -4196,3 +4197,47 @@ IPv6 Internet connectivity - it also works over IPv4.") ;; version. This exception does not (and cannot) modify any license terms ;; which apply to the Application, with which you must still comply license:lgpl3))) + +(define-public wondershaper + (package + (name "wondershaper") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/apapsch/wondershaper") + (commit "0987dbb0c360184b8aacf391646e19ea9ee78b10"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hyivkpvr5pv8wg64i7vgpxib4allbp4v1ahp3qhc1d88rkw7gjs")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("./wondershaper" "./bin/")) + #:phases + (modify-phases %standard-phases + (add-after 'patch-shebangs 'patch-invoked-commands + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (substitute* (string-append bin "/wondershaper") + (("^\\s*ip ") + (string-append (which "ip") " ")) + (("^\\s*modprobe ") + (string-append (which "modprobe") " ")) + (("^\\s*tc ") + (string-append (which "tc") " ")))) + #t))))) + (inputs + `(("iproute2" ,iproute) + ("kmod" ,kmod))) + (synopsis "Command-line utility for limiting an adapter's bandwidth") + (description "Wonder Shaper allows the user to limit the bandwidth of one +or more network adapters. It does so by using iproute's tc command, but +greatly simplifies its operation. Wonder Shaper was first released by Bert +Hubert in 2002. A subsequent release added a command-line interface. Wonder +Shaper makes use of tc's Hierarchical Token Bucket (HTB) queue, ensuring good +bandwidth management on high speed (above ten megabits) links.") + (home-page "https://github.com/magnific0/wondershaper") + (license license:gpl2)))