From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IPNkCq1a6GDAiQAAgWs5BA (envelope-from ) for ; Fri, 09 Jul 2021 16:18:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id EAYgBq1a6GCcbQAAbx9fmQ (envelope-from ) for ; Fri, 09 Jul 2021 14:18:21 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9C0D7268F1 for ; Fri, 9 Jul 2021 16:18:20 +0200 (CEST) Received: from localhost ([::1]:45294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1r07-0007tK-F0 for larch@yhetil.org; Fri, 09 Jul 2021 09:57:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1qz4-0007L9-UT for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1qz4-0006BW-M7 for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m1qz4-00074M-Gh for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49258] [PATCH 1/4] gnu: Add wondershaper. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jul 2021 13:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49258@debbugs.gnu.org Cc: Aljosha Papsch Received: via spool by 49258-submit@debbugs.gnu.org id=B49258.162583891526462 (code B ref 49258); Fri, 09 Jul 2021 13:56:02 +0000 Received: (at 49258) by debbugs.gnu.org; 9 Jul 2021 13:55:15 +0000 Received: from localhost ([127.0.0.1]:58794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyI-0006sD-UJ for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:15 -0400 Received: from mail-fr2deu01on2110.outbound.protection.outlook.com ([40.107.135.110]:64480 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyF-0006p1-Po for 49258@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ko9NHtEZnAJD9JN2Qi8fJT78PBkq5Ky7LyCigbEu6GIqyizJr9OSgzYOtv3fm44EdQkz425OTbiPayp3HbjpwHsv9mauBKQn8wy+srVrCVF8ESdIe4ALwXBF/uClz2V02opcG3PPrLKMV8bim0Conf7YYjQ2ZxzgxoiSZL66oz+CjLr6e7JaZuHmkVIs8wEjYmq1vyi0WipH01NSnAGPgsEXXCal2Fd/n2a6fQSWZunn0/N1WBbovwD66e75pJDuq+vL3nIfu7UFWxM8C8Vkuliyr69Gih8VwhSCww+jK/sam+hvS2K76m0CJPzQXgu5UourADC1xIOb0HhEEh9Xaw== 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=qcNafUF77Xe94PGIELysn/IebY/jb2MeTDSeYbZgwIw=; b=WObetADg2X6y7jxZ4hUXdzby2nk0K7ghDUB2QHzcm6JeQ5dxei3DQKGlvg3qJ5SGUG8O9a+13/WCOmS474cenXHDCX6katBgwlJUjUuGO7JPlJJxqGSDlJ8XnnlE1rPG1s57RAi4JM9a2UFDKXg0tl7JSJ23UKvAgA653uvh9JVqVAqS7XDmybnod054uBh4nYeYt2qTqigfjS2dWokK6ZpN/q0ewscsP7r2kLSEHr8TM2z5iZt/VDXgp2EW7hdkuajrAYDPW2xNoWwscErodzU7EuWqPQxCEPSC4QN3/dr8I3b/z/S3rSyRIU8yh3ruQ9KTCt2L+egeTpAe+gEZcg== 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=qcNafUF77Xe94PGIELysn/IebY/jb2MeTDSeYbZgwIw=; b=vEc7xgcn884kczN7mDFXKJfH8qAXsVkZXP5t6aiYE2CQKnyfw/rx0NqEV3IPcFrh7lpNxCiAxyztqUcJbwdRT+he87NSEox3NHuK3lKHNYEamingXnHHvfWgGn3UujKNu9ylcXuZ1qwsLCUuL9zUi1Kf811S5dhs3zThWsDsQ81dbWiK9KbVSJVH3Nlrui8nqSZrLOWa4zOtBXXJuAZjWQxsMw6BMk5GzTVT3JRkmcJ07SDUazXk7s6lLMYYiPsyVnFajmxYfQtNkSdRFkq1lZ1w7atyjw+JW+CF1EJ4RUcfxp9skp5dtXWtE6yVDZMaIu0k8MKQeQ82HQz3aVRxKA== Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BEXP281MB0136.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.10; Fri, 9 Jul 2021 13:55:05 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%9]) with mapi id 15.20.4331.014; Fri, 9 Jul 2021 13:55:05 +0000 From: Aljosha Papsch Date: Fri, 9 Jul 2021 15:54:06 +0200 Message-Id: <20210709135409.54308-2-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210709135409.54308-1-ep@stern-data.com> References: <20210709135409.54308-1-ep@stern-data.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) 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 AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20 via Frontend Transport; Fri, 9 Jul 2021 13:55:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c9c5b21-4d06-4a4f-033e-08d942e127da X-MS-TrafficTypeDiagnostic: BEXP281MB0136: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:196; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SUOs8mKg/n3NtbvhDH/83HUByp78ACV5gqWlD06/4Q+5/AbBZVa5/Obo9TETijJcyaCQIt1JwoGh1+TXkFfvNwdMSryu3ENiSuEQe06spn4PNAA2NLG/58o5rF7Eq4uQesVaNAhpjhWDYzlqRvWYtPMycNT30rXm53us4ZUmjaleAji6YBRlGcOH9oGcL06XSQrau4iAt7VAOOeheYGn6Gf8AgVwDubSmpr5Z9V7bnJZjR2uRWLl7Xo7Q6zr9RTWHPMgeLjLwOm+/dD6yYHb3UP+99sGhJGm61J3cGzE8YsCjWP7djHItyp65+p7AuPSodntRIo174H4FYPnAX0tRzJ768InTAJha4KF4/YT+RIlGLXlzVkgvZ6ch/BJSXpdsVNSc0xPyKbrHqWVIq41YHeG1kPz+twuhD6Z9hZPntDKfweQ8bf/7GH6Vj8KIwG0VSGZtN3uAzAyYAcMIKL3RUgOTxJPoEQ8z8LiFbWakNfU0pR5pML4jb1fk14+YhJVTSQiX/vnAugEbruyMD+odLI/WDkp4ufNoaDe+qoUSLzVyU0YTtRwJ2UNWUlPAjgfS2Nz6GaaSG5TA/pfMpqwlBBD9Fl0FSLy5J4rfLDq/dRfaD2G/uGcin5RsOwZyBZXPG4TYq1dp4tpOowwu63MiMGya31kluFfD2bTElZHigdnoYppcgKDraRQkDOXcG5xG9qzKLravjG2/iCTs7w+HprC4oH69r+p3q4CXtkV7N8= 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)(366004)(396003)(346002)(136003)(376002)(39830400003)(6916009)(66574015)(52116002)(66946007)(83380400001)(186003)(5660300002)(6486002)(66476007)(6506007)(2906002)(107886003)(2616005)(478600001)(38100700002)(6512007)(4326008)(66556008)(36756003)(316002)(8936002)(8676002)(86362001)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: REjbzmUdlJxLgbnJwZ5Lg8kgN849mOP6EPPGpnzL+4W22ffJovbZvDAyZ51OgVNmoRM7UcTOvwonBYx+pVAy12WhiyasfnnDo1cfjtOb10F+LBIlF81rs9XWfALcF5uxBy5Aq9oav79RMd6rZl7NaLAdWJVuHPvus24AbYGL/Lb+u6RBFTAqZnaXe3iPg2WjGZ5i/kxNz0J2IvsMDxgOmZAV2s+Xgnp5BuIoIrDtg4X/M7aWzl2X6wbMYQRrDp07uxORoyTKw7JMlFtrDM2PV3YxzBMgaflX95IpPPOxHI/bMVj8osZQbRuK037e6zfYltacx01odeo+qGBV8jnxBpe2lLS3bRd7aXx4rc7k4fS2HmIoSS4HmjrCjU5/Fpg7qBDyAJjLUdhpzqugdeZfVIiajrfx7ol5N0PHyVE27keQsDIWuRJe6mIUYQYNwxmE2sn3Ckep+f6MOdijrJbr47sNRpMwdlH3dGUBhQtsbOTj0TLdaBQ4/Qy2r3LJSibhMKDNpIeKVzNi24h90OShV4FGnwhV2aTCEWYhm1PrFk+a1Hh+UldyAYLZ6bubK8rPseUrR+LLyGIcBshihVElBvcoxLkAq+cdb2g1tAwCrX1PA60qSNoN9DR2WoT/9COQWH3qCg9DcemS1dt02wzo2x6nXqehUIYSdnRa04EtDHGylngZo788DE4XV56MfVANNRZzDnEO2zsXSSxM5kH0AJq1J8r0x6oOlvALLcN0umglL6EqSOfPtpDcJJ7VLHlAQvd8Y4w/ByjewjrTJIWZpUWw8jKiACErbgnLfbP+mWrH8i1lUDo9akQ8jMhIUmKBXOqVhmUvFNWpgYP/jWJzizEUUniW/OJN9ausYgrRk5y5p8hGnz+QjkxN313gSXUT9a5CrEh8BsvwvBMwXUGFBbIMSggiC1TJHiLPOjTeJv5fN7Wttxc4UBJ8BziQtzK1 7ARM+9H58x8Wbi6miQQKUmT2toPJUu5Ti7o4RnKmiT6Adjr2/bey6FjC8sNd675umpa3yev3+UKQd7zdK+I3OpOPOp0ZFIJP7FF6Fof3SD9NZ2kd/vNhrV3BgC9Dk9gDbX3OWyHieQ0rr7xxpcEXV5eWQXCkD/ZPN0+Bl1VBxcJtXB9XJq+fykGU7E+eG3yt5ynmaGgoPvOUFS6Myiwz+4HKxX7bo4h5LVBc6CWIwU1w6rY8bmrAUel06DtH/ftOfByS8LaIfaG1N9O5zdIuz57IfUvtHRNRqfpHgDe8onvAtBBR8kCtbZbOC1dlg4JY/6lDDR3IjrhKU1mPLJD6OiPqWHT1yzEuL6y8OcB7cEAP0wnnfS7IbFPkp9eZJaBl6mQTHHE+d/xig7/1klhzjGq3/5OV0bBMj+mm/z8aUevlgc93xGfnxl+byEdVcmPJ X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c9c5b21-4d06-4a4f-033e-08d942e127da X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2021 13:55:05.4504 (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: 7/XON/MErEAchXPKmKJHxadpcwoj4VC5N8f29x2UkArmsrciaF+w6gffn5NEGlWd7cF3RgY8YlXID8sxEgVjhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BEXP281MB0136 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625840300; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=qcNafUF77Xe94PGIELysn/IebY/jb2MeTDSeYbZgwIw=; b=RShLSpc2GCORWSiFToA5chgf9sCT38s6QnC+YOFsMMiF43QSGe2Xd90JJVeJrfRjJ6PrV1 CXfZvnfMjAZ38XHN0sxCHYtau1tcjMW8YYCZF7wqjg8VV0MQSDiCdu0QfZksYd5Fe4B8zL eOq+kBKPTX6jmOu0CuZt1BFRqxrDPfVVwtWCt7VH2cg9V9Ec0NWNtOj0J/R9IzMjT5nLCG XX3b3PUUFc8E5Y7aPiqX9vIxkiIFTasQoIjI2nnWjCc9WKz01wKzKsqVlkCsupDxU7p9F2 9e3JBzduajHS7BgVMRpgrkowHG3cJJ67OKSJIHqNitkXLFhD+21Jp8ZaQ5TJog== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1625840300; a=rsa-sha256; cv=fail; b=tdiPk1LulV+W01buHJYN5xPXAUfwA/iLKeoKfLApYJ206HtLSfMGvWEZ9vLIam25qeKbn3 U0FbLpTnqpvwTm31zBzIZjPZhFN1pbW33PXVCod75U+DsN1Taw4h/c/nK3DsvbJ+vDZcyk jrMxZNkwVcQmrTW/F0v61gSVRxsKAt7XI5jy9VQyG6V0onBQvsWm0flg2f5gdGq/4/TfR2 IpKr/+ex7ujLlBa02vU74YS7Ty+T0OI1TorNp1Sc1Q4n6B9H5TMY6bJ4Fg6xuuHPVkGnch Om+3DWOzqamvD1PJGiwtkEETWkbJGYIWM4yesKx3tOhsnE5aV6a+aks2qHRp1g== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sternasset.onmicrosoft.com header.s=selector1-sternasset-onmicrosoft-com header.b=vEc7xgcn; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 4.10 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sternasset.onmicrosoft.com header.s=selector1-sternasset-onmicrosoft-com header.b=vEc7xgcn; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9C0D7268F1 X-Spam-Score: 4.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: 0zJaObYkCcDD * gnu/packages/networking.scm (wondershaper): New variable. --- gnu/packages/networking.scm | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fe73c9cdc7..920d01d8e5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -64,6 +64,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) @@ -4069,3 +4070,53 @@ 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 + ;; Use a fork that allows overriding the configuration file + (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/") + ("./wondershaper.conf" "./etc/")) + #: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"))) + (substitute* (string-append out "/bin/wondershaper") + (("^\\s*ip ") + (string-append (assoc-ref inputs "iproute2") "/sbin/ip ")) + (("^\\s*modprobe ") + (string-append (assoc-ref inputs "kmod") "/bin/modprobe ")) + (("^\\s*tc ") + (string-append (assoc-ref inputs "iproute2") "/sbin/tc ")) + (("^\\s*cat ") + (string-append (assoc-ref inputs "coreutils") "/bin/cat ")) + (("/etc/.+/wondershaper.conf") + (string-append out "/etc/wondershaper.conf")))) + #t))))) + (inputs + `(("coreutils" ,coreutils) + ("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))) -- 2.32.0