From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 28 11:28:35 2021 Received: (at submit) by debbugs.gnu.org; 28 Jun 2021 15:28:35 +0000 Received: from localhost ([127.0.0.1]:52284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtBb-0001td-FN for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:28:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:49808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtBX-0001tT-DC for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:28:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxtBX-00081w-5Z for guix-patches@gnu.org; Mon, 28 Jun 2021 11:28:31 -0400 Received: from mail-be0deu01on20728.outbound.protection.outlook.com ([2a01:111:f400:7e23::728]:64769 helo=DEU01-BE0-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 1lxtBV-0000sV-Bg for guix-patches@gnu.org; Mon, 28 Jun 2021 11:28:30 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g49M1FwwDus1oMTKi538pzu/i06NGEQ9vZOxejLauuqAlRsX+XuC6rDmx+ahXzRuS2HEa2qhZCupHvEmrjv8stIepvl4NCJtT1g1wiKmHow3cUiGSlJFS/gheybqfrx1om9gpDBG7tB+cppELDqrqV388l0isGQtQtX9LDLXzLWDvG4UwCqCUp66bWPKqsm96ToIHiC7poddHvKm2TyuDO/nzjTmvNZ451L+3DNynl2Q9isPR2IRRsRxS0qKHJraO/EJ90JIhEnQxvf5djrIv1/DOxc8V7HjY4CBdS6DK8UW3vxI0HmeGioCwk9b9pQgBpKOgoOx6/Z4J4VxG1ysbg== 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=wvxW74fNoix3F7pWTA/maGhubq3hlJDbb4FL7DdlxbU=; b=fRTcjWzAsQa+F5k8ITKccU6wxyPCzwTYPqKjiCS1A/a86Ogkn7WDjFE3oD9WB4uyD6gMIYWp09kNMKyQ1KN8mSB9SN15510/May7kaqz5OY0ADOf2yUgvoa9veDkhiv34pwX4YBoYf6nr3mf9vIx14GtjsmdgW1PkyJuoNVqPoYRElOObq9D/UzByjMkDOzPsrmBJL8WJgjjMb8LtegcqBRsIAS7FnI5e8E9PlcTUoK8FPGKlGOksXWTUFRO/Tt/wExsqdiRzYWGmU9DKJDiDxgJY2RRkl0EKUQM0wthEObc8elDinZvXi1NWjsInPa16hHIX7EbK3djNiaHcwnqfg== 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=wvxW74fNoix3F7pWTA/maGhubq3hlJDbb4FL7DdlxbU=; b=DRz2qvQCjBwOmqhj3jKVYBKmPBt2gOstaPRV7dM9/NGXSMy31z5SGtnfo2Rjf0+b8aYdJHkQWFJAP0EFloZ47Tvy1kLF4DTR3r8REBrTPevljc2GDB24o4YP/L2N9AlkM0VL44aXt3MU8LAoGEKsWnOVqUA6rT0wwWsPcHwTJl5g6WNTJnP2TuwafH2uimdXnuJRXeuYedyGsv7dMNCA74ybSM3vw1pU1fV25p6zXT3w28ugvRXTXbE7y+/4rHvTAoGFZaRVhP7k21fFvL5skvz0dAyD6eiXEvxsqEvfMVUwKfny9crqEFc2bfTz64UTNe1X2poReldG1DMBTYGyKw== 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 BE0P281MB0257.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.14; Mon, 28 Jun 2021 15:23:24 +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:23:23 +0000 From: Aljosha Papsch To: guix-patches@gnu.org Subject: [PATCH] Add wondershaper package and service Date: Mon, 28 Jun 2021 17:22:28 +0200 Message-Id: <20210628152232.31073-1-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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:23:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3c9ee8f9-839f-42c8-12b7-08d93a48ab5b X-MS-TrafficTypeDiagnostic: BE0P281MB0257: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UxgKP1WjGWDdbFWLB+2ZdnI3Fy32JZuPEbGMHgPip7VS/roTod9YGk/0p2Q6+MXlAD7ufQF/8VhpdNUDV/gKdy7EEbIiVby94x0AsGWTdTFhsyT+fXh/ba+MeA5/2yeaalcF5zPJuxaRtQ1QqcAm53a7+fAgKjPreHXQLoyg8enHIo/5NEYRq6U/saaS/V0cJKfduCmDRHC0YPs461hz9fIz3Srg8wTGZZSyLnU8rdyEea8gnMwTjT6n9+SnOPj/gczcFKwXPRlOVjc9soaQXZUxkknY3yDpxa8REuyAMOJaNuNu2hLPkjXAp8H7TWE4vc+bK/DIEt3LoF+qBhVl4kmUAaf+shRTeKaee2VMn1YWONoP4M8aceryn+XDgAxisZUh1aFrVLCYOJpPDdDDZPexomYwh3HCpajbCttr9aIfhkn5ws0PEacUiYTzoHn5vvSLVDKzSq9rhTmLqGp+81YdAeC2EVlijeuIrloUtuV1w1SmMEtwFP7x2BfRy2Fww9K25KMS+W7tyKQCM8wRMZLzFpsU0HLgDb8MFxQQ8yqoRGqJqb4mwM4XuH0wpSHApaItaTT0Mu03yaDJoMAO8ZE31H7otbNQmI3EZYorsmZw8u17y9xSA2e36/tFRVrMxmG9cN/ZegYBAWVIp5aZC+0ZLuJ1+FKYnpg1jFUUDsOa448DQCvejnPKg+jmQLpUWddGY90TJp+Yv/jGre1DT6SA839CZKNKYbmf88UwpCWyFSaqdXSQ9wKMwNpay51w19hn1UMMg61cBxylQXvVTQ== 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)(376002)(366004)(346002)(136003)(39830400003)(83380400001)(186003)(1076003)(6916009)(8936002)(6512007)(66476007)(66556008)(316002)(2906002)(66946007)(2616005)(36756003)(478600001)(52116002)(86362001)(6486002)(5660300002)(8676002)(38100700002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FxP8HpgISt0AziZEjf86c8WHhOq3Id9azJlCU4+4WQnIYoMebeNmgooA+HsV?= =?us-ascii?Q?5xR1MvvXFcO476pBToOfXnPEdA6QQuaisXkdw/VtnOM4a706L3LDgWgAPVn9?= =?us-ascii?Q?+JZ7sEihBswC4Eo8ZFZVJHKxwirjdFbBVseaZoWJ8M0gLWiNA0SfgLB8IwGT?= =?us-ascii?Q?apx439m4rNvn236dkwOR8ni31wcd9eQM3jcxBlXXMQD9i7nIHrla6WQg398U?= =?us-ascii?Q?Rd/l7kAaxqjyILWoiogIYtkbQ94CwNTa3SKLYh0KlioddclQ3sfOxD5yeKjK?= =?us-ascii?Q?0feyRUOEZY462Z/BL/9q0jRnh5eINz9p0Y1K2V2ihuUYlqWAw75Zz+R9zfBx?= =?us-ascii?Q?ueHFSybAXS/xJhYEEGZveMpRPRM9BQg4AX9hAzVvLZHmttBFILWWZcQvYOR+?= =?us-ascii?Q?YftuSRenJoFqXqVIxWUWgZo+9uaBTwg+oi8Wm/FuwzqStV5Qjqw8b4bb+nCP?= =?us-ascii?Q?pjyu6HKE3m/mcHieeW4wqn+PTng8xWF7sf9SJFfAgAELL2sGsJGP3bMlk/3k?= =?us-ascii?Q?w78Tdt4PQZLOEzfajj9wxD4UahPFVEXDuchqzfCRfZRbkkpbmwXVyxobtTKP?= =?us-ascii?Q?rQt5NLK9/o2vFD/WIBFZRrhLOVAbFBtjXwdkHbyHuk6f0IGjqHjvaNYVuDmB?= =?us-ascii?Q?gHsBjrrSVWA19jWXK5ymS6ac92GyBSSjLYlm8utRri3c7TXPBfh06Fj6fNS5?= =?us-ascii?Q?7eed9crZ3BgtUtk7pUd6M99Jwg93zgmOQgiilin8CX2Yp+nE5msqTtPc4Dm3?= =?us-ascii?Q?saBabZyBhCSvEtHxShgCHdmMA5Q3k5HtzAFA9BSjIheW39TDztTN65N1zj07?= =?us-ascii?Q?KaCoHwhcbbbcrfmtVfRbazyTCnwRzTKoSJ0npXVWhoKEzcDKODeECm6so1Uf?= =?us-ascii?Q?1GE2kW9Lkf+9/GAMit9KRMPr9P6k/rW292zhkIjCCaukUGbBF3HElmjd+qb1?= =?us-ascii?Q?O6cDzj0/2HYOdzj3EWUyVRXAQd5yRsep9/nTmUI6nv9iOyGFPE8EfNkHuDmw?= =?us-ascii?Q?icS2Kezd6Xb+7JHvKHm5b+FWCYYsSHky2lfIwwQkVmuf8E4KKU8kDEhJNIb+?= =?us-ascii?Q?bQA8J8kuRRpk8a8oKJNfqrkPIxwaXKcnUaLxd1ls3he5ePU4g2LQzY9xlmLA?= =?us-ascii?Q?WtSDjINOPrF+ZMezFeyxiB5r2/d/Y03A8SYoJnvDjIGFiWNLIxG+z1g8JHnR?= =?us-ascii?Q?iJa5LbrJ7CDZIs4fYIfycGWnsWVPegZJuf7eHO1OrtHoSyrz0p33v62vowMx?= =?us-ascii?Q?3mqFrI4yGhrw2OHZR0s6AjDDWcxPEK1KgKn9ygLAX0ufmfoG1og6DrUlyZ0J?= =?us-ascii?Q?bT7SCV/ijQ20HTfEKLmBrZw3YPRm3JR411R2eFx3uWAstAB0u94yErvncgI4?= =?us-ascii?Q?Lz9VNv9pIZm1Pb47auEcNhnSeI8n?= X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c9ee8f9-839f-42c8-12b7-08d93a48ab5b 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:23:23.8277 (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: 8FgeCYjbeuXBv2MJ/RKchFAIa3fawVrKdhacCcQsTKynlwsawXPUm0kOaevlThESxjrc8LVtrtBEni870BmE5g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE0P281MB0257 Received-SPF: pass client-ip=2a01:111:f400:7e23::728; envelope-from=ep@stern-data.com; helo=DEU01-BE0-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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit 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.4 (--) Hello Guix! These patches add a package and service for Wonder Shaper, a nice little tool configuring traffic control. The defaults should suffice for desktop usage, with the exception of download-speed and upload-speed, which must be chosen according to your actual speeds. I forked the upstream repository and the package uses the fork. It's not meant as a long lived fork. Currently the tool doesn't provide a way to specify the config file, users are expected to edit the script. A patch is pending upstream (https://github.com/magnific0/wondershaper/pull/68) to add a CLI option but in the meantime wondershaper-service would have to jump through some hoops to specify the options. While at it, I also added two other options for the maximum rate and burst rate for the lowest priority traffic class. My goal is to make data exfiltration harder in a server environment and a custom rate seems just right for that. I plan to send these options upstream as well. If you don't like exposing non-upstream options, an alternative could be to instead expose a list of pairs for arbitrary additional options which get pasted into the configuration file. Best regards Aljosha From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 28 11:36:38 2021 Received: (at control) by debbugs.gnu.org; 28 Jun 2021 15:36:38 +0000 Received: from localhost ([127.0.0.1]:52289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtJO-00026m-B6 for submit@debbugs.gnu.org; Mon, 28 Jun 2021 11:36:38 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:33955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtJI-00026a-Lc for control@debbugs.gnu.org; Mon, 28 Jun 2021 11:36:37 -0400 Received: from nijino.local (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GDBXs458Yz1LXsR for ; Mon, 28 Jun 2021 17:36:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GDBXs458Yz1LXsR DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624894589; bh=sB0t++rnm+9m8/wuBAnvyWL8uk0wZJ/lC/9+6+TDTfA=; h=Subject:From:To:Date:From; b=MLS4CcrYuTMkfTH7av+DGw1hEcLpw+ZL6Sli4k0txceUABRPNULmToZqhK/iMmLra g48AY7hRDNr/CxCrcn9zZ3fd7wYCqLVuImf92uvvRHBrup70v/JLi6WNxgbd5FLwL/ 2VMx+oN1rwdr6KdJsEhmKcwpOp+GEAaEakkE1FdY= Message-ID: Subject: From: Leo Prikler To: control@debbugs.gnu.org Date: Mon, 28 Jun 2021 17:36:28 +0200 Content-Type: text/plain User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: control 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.3 (-) merge 49254 49255 49256 49257 49258 thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 09:55:03 2021 Received: (at 49258) by debbugs.gnu.org; 9 Jul 2021 13:55:04 +0000 Received: from localhost ([127.0.0.1]:58606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qy7-0006ot-I3 for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:03 -0400 Received: from mail-fr2deu01on2138.outbound.protection.outlook.com ([40.107.135.138]:8801 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qy5-0006nq-MP for 49258@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:02 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mC910fCaYZZE7q9gMx7ZCmw2bGYzqV47BviPqQ1inBvFlplgelwwWMp7tDUoAbEx03ZhnmDSCAnyKrgk0c+LfoK4m/rKXl63h7WMQJ0z99xkM10b03dz5PG27qRXgFuUEX7Djo2xT2YSp8QAtHMfNdHcvLPkuLdJDeDDMYtxYmBbS8CDUkRUtlP5iSo56q4gEoMcTaWGgISuB8AQ/uPwlzJJZVvlDN7s8y/YZ5wc4yszgG6+H1G/p+OKmKi7/FWeXg0qKtZkyctLFUmpzmXhvsWiE/u6vhFZmXnpYCEjCcKA+exEHvxkiJynzVxXVLFwVcSrPJYCnT8RT+zSucM4KQ== 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=+/HldnEbQXh1OeIQILKh6gH+PtBYHlPkZa6wXSVa7nU=; b=Ypo9Qmcnmi0ek7EcEemy23XT+n6w3cqi5gbQhMesN4RduS17vMAd3Yfj9X56PGQlXtxDKATb3nGo2GC+k7L/tACsIP0un6ppmpZaL5O2crqidHi9lYaW6CJ5Ueun7UxccJUmhCHBdENa3XCkQZOmsJQ3vMPXHZ8qE8iVnuSsYBYBr0Ol1f8lLaH1FchBi48qgTmEiA1aYsAf1gdcSVJFCND48YcL5Isd0bsjfmbIysR+XNSjP1aeB/r4WD7gOY/6Uz2bGulyeHXRoYSKiqymbCmL20w+QQrgfI8cAfNkEKsavKTwbmLx9IaxPrXVKzUQ9DkKLGd8QUKOtwqlXnDX3w== 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=+/HldnEbQXh1OeIQILKh6gH+PtBYHlPkZa6wXSVa7nU=; b=S359XzGxykvjZdAY06t0+QwyXIahgM5rHCYc5EAsdt+JF72L8FG2pyCM2Sifhq8Xc6jCOAwoVlkSAuIbl2JLJqmCGgZv9AZxKbGTIPVROEyT8sMTAPGRMm25Qpw7r0NQvjuzqjWno9sRjhGTP2YZud5eUspUl9kEomKod4HqMFEMD8RNPr97pN9ZHyWRWyOLumyCLWEWQAR04tmTP2vkE7cPsEphOZjXzIJdmRYZD8pf4vZvDPqwh16mbYo7QLdM7KC+qFJwaX0ypaqPgfN/6C9apwPC3z7lh29JHzovMbClV9RFRjUlMfcrdY31LJNiNp/C2Mm/Uqs5N21e5wOUFw== Authentication-Results: debbugs.gnu.org; dkim=none (message not signed) header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=stern-data.com; 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:54:53 +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:54:53 +0000 From: Aljosha Papsch To: 49258@debbugs.gnu.org Subject: [PATCH v2] Revise wondershaper package Date: Fri, 9 Jul 2021 15:54:05 +0200 Message-Id: <20210709135409.54308-1-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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:54:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d41c83f9-a210-496c-d8b8-08d942e12081 X-MS-TrafficTypeDiagnostic: BEXP281MB0136: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gaCW6xcmqQ6sFEXO+VvvJQYluCFvG60JjdbtxKPp0mOoqzDL/eOQDl1ESGReN0BXl1TTh9cQq7GZj7aXUATrWMAK9Et5woHy7nE2YZRkqb1FgS6LUL5tMeYLCS0M1jIaC8DTbEAhDxcyaOiFlc5rSrNjsQ6WNFtOMOGLAorvfi2v2g1PnwRghDzKA1c2b0Sj1+2s1Wb0P3Dm68HOTn/miVWs4GAoCH/i1QQT62EjCnbD6g3fGGtO+DWW9AVMm8/b3y5QJ7Da9xID210Oqbzkg0yrgwI7PXJKF0uzoP0S5WyKLmbiPEchyQ86ihYJws1rkT/r5Z/tr8M+Sqa3f0RY9ngerpZP3f6V8GFtwKdcq0mZfrLRzRRTUzLscb8UxR3YQvyWxV7YMiJmw32lqz2GnIbjlxz7OzTnUoOtgmQmil9mNO4x2c1ZGwDa84ULXHd8DlZeo7QQyNAWxcvKRYZRTDyle5pTLM6P8ym6rnLA6OmO80es7erPlmXuhRzal1jaMXpFFSC59QqWll4pVqVpFXKufz7xJeCPNejk7GcUmc58OPyIGd9qojGOGsbYnxYgmhNDGSPo12Gx/ODDLUbYAEUfjDJ9Wi2N5AGwS76AANnfS/NJDOwMFvbaK5CsmwK2MAebpNbOwAY+sB5/ns+MJcIxbYkpOVT6k+bsQKxd/GdYNYYr1ndPmrb1vHs4G+X2lfjTOB15qZ5ihQSYId3Lwk5K3WxO5/+/Wci+4CmMB9Y= 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)(52116002)(66946007)(186003)(5660300002)(6486002)(66476007)(6506007)(2906002)(2616005)(478600001)(38100700002)(6512007)(66556008)(36756003)(316002)(8936002)(6666004)(8676002)(86362001)(4744005)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b2Vzc0x0aXZkQUJTaXpxSmZkSmJFVEZidlB4WnF2bkt3MUwxZkZDZFRFM3RI?= =?utf-8?B?RXRsUHJIb3lpRzlvdTBJU2ZETUlQQlZsQ3locFJyeDRCNXJhV01TdTlRTmlI?= =?utf-8?B?Y1orY0xGSXRiN29NS3RiM2FPblZIcitVMWprZUFDbExaSURLb3V5TUoxRGVL?= =?utf-8?B?VnU4cTZPZWFMSHVJTXgyMjFHcUJDSEhncEdoa2gvL1YreGhzNkx6RWRodUtL?= =?utf-8?B?SnRMblZGZktQc1luNXVaTWM4TWtPMU55OW0rWm9RUFNrZTlwMzBYSkh4MUFx?= =?utf-8?B?enVib0FueG1rSTNDck9HSHBoWkhQNHZ2cW80UnBvY0NpMHUxTHdDNkVIR0Yr?= =?utf-8?B?OFNEeWZQVjlNOWtEMTRPbHlaMTZXUHB3OTJYRDJvRUVKYmxXWVEvL3N4Mk90?= =?utf-8?B?elYrbHlmSVdjZWgwWXUwaGljWURabVd5VGZwdjh3R2ZKdEUrOS95OFBsNmho?= =?utf-8?B?OXBDYWVmTllRZ2JyOW5xRWJyKzM0cmwwZ2NQVGtRckRHT0txZ0x4cWVNMHEv?= =?utf-8?B?T2dZQWIzU0MyK2RhdnVQQjU2WUl3ZnQ2RjlhaFlNRDRNeEkvd3pUWUw0bWlu?= =?utf-8?B?NGd2UXBmNHhOdStyY0Q0RlJUb1BWQUlGeWk5SWxiTERkZlBkSnpPdWVPRHpE?= =?utf-8?B?ckx6WVBwcE95SGlYaWNvakVnYnh6a0pPQU5xMVJ4NW1ZK2UwQVVTNnhYWk94?= =?utf-8?B?MExCc0lFdXRiSjRwaVlJYk1mQXBTSnhWMWFOT3ZMUmNCdTRFZDNoVWIwV2xs?= =?utf-8?B?S1djV1JGbVNOU0N4ZFhRTWkxc2RkSGFyRGh4RXRTUitDTy9pcEVOaXUySHNH?= =?utf-8?B?ZncvV0tkcXRTZVIyRmpvenphc0ZzZk04TnpRSk1qUnQrZTdMRHRXckZMOHA2?= =?utf-8?B?WFhDWHhhU3Z4ZzVjbmxzL21BYkFPTmRwcVN2WTd5cHEwdHBCME4yRWpOb2dW?= =?utf-8?B?OXRYdHkvOFBOM1FaVzBleGlQdDFVSFRNNjc1Z3BrL08yK3RnaUpsSlBmTVFO?= =?utf-8?B?L3B1eWJnbDlJc2FVZktqRWNVd0VTOEI5OEt6Sitxc0dqRFZkbng5L0dsY3dQ?= =?utf-8?B?ZGhYWUNkM0tRZS94SVJWUDVRVXZCNDM3bG9lNEc0Zllob2ZBM3QzUjQyWmtW?= =?utf-8?B?eUcvYXZYYVNPblJ6UGc3T3I4Vzh5QjFrcHdJdUpHMHZjcjlNa3ZvSlQrZVUw?= =?utf-8?B?VFF4MVZUVkRROWExQlFDNGZ2WlZRSWw2UVVWYjc2V3IyVmlWOTVRdTlFRHVX?= =?utf-8?B?MzNMYlNGRkpBVVpUUzVYMWpxd1poVitYQSs5NXZTWm55blJMc09BZ0lQZFlP?= =?utf-8?B?VVNRdnlSOHN0L1pNMFJjN3VVbzdCL2wwUG1TNkZVcytkM093K2Jjd0RIQzU1?= =?utf-8?B?dzl3ZSs1ZkpYeno0ZWhNMnhBRlR3aXFTZys3ZHFYL0hvVExLazF3V0Y3ekta?= =?utf-8?B?R0JlemxrWTJBMC9lYkwwWjAwOGZnV1BsN1BaUnRXWnpMeUJDTHhWVzhNTUVi?= =?utf-8?B?cUFleDdDbVlEWDQxY1BhVHlUeDk2KzdlbVE3ZzBPZWlJSnByMVpiYU1xMGxJ?= =?utf-8?B?ZlhpRmZ3Z0hZNVdOT29NMEd0ajBNMlhFaGpmakQ5cFFNMzRhSW1FNHlUem9t?= =?utf-8?B?SzI4V3NaVExmMG9xZzFTcG4zTVY5QWg1V0h5NjRwRis1UGtTYmVmTHBhaDJw?= =?utf-8?B?SFFqb0Nxc2FYaThhL012eFZydUo5TWxvNHZ4UHBJQ0U2RzlGWHB4bDhGZ1Ay?= =?utf-8?B?bUJUSFNjWGc2UUJBRHdITVNObDdpS2V4ZTVMUEMrby93cmw0TU4ySEErM2dR?= =?utf-8?B?U0JId09qdFdOVFEvc3JOQStYMXVBS0hYbGZJUGwxTlFkRXBIcW1sVTEyWEN6?= =?utf-8?Q?/q4IEzlLD71yL?= X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: d41c83f9-a210-496c-d8b8-08d942e12081 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:54:53.1763 (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: OeHOxPnyz2skcKnLsyv/JcFDPCh0EQ2muuGCYv4fKXBouf7dFjl93dPArW+JmCWkjq4Ro5+K5zaGs81kaufFjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BEXP281MB0136 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49258 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 (-) Hello, this new patch version takes care of the points raised by Maxime (https://issues.guix.gnu.org/49254#2): * add a comment describing why a fork is used * replace (which ...) with (string-append (assoc-ref inputs ...) ...). * copy config file to store and substitute store file as fallback config. * substitute "cat" with full name from coreutils package. Please take another look at these patches. Thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 09:55:15 2021 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== Authentication-Results: debbugs.gnu.org; dkim=none (message not signed) header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=stern-data.com; 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 To: 49258@debbugs.gnu.org Subject: [PATCH 1/4] gnu: Add wondershaper. 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: =?us-ascii?Q?REjbzmUdlJxLgbnJwZ5Lg8kgN849mOP6EPPGpnzL+4W22ffJovbZvDAyZ51O?= =?us-ascii?Q?gVNmoRM7UcTOvwonBYx+pVAy12WhiyasfnnDo1cfjtOb10F+LBIlF81rs9XW?= =?us-ascii?Q?fALcF5uxBy5Aq9oav79RMd6rZl7NaLAdWJVuHPvus24AbYGL/Lb+u6RBFTAq?= =?us-ascii?Q?ZnaXe3iPg2WjGZ5i/kxNz0J2IvsMDxgOmZAV2s+Xgnp5BuIoIrDtg4X/M7aW?= =?us-ascii?Q?zl2X6wbMYQRrDp07uxORoyTKw7JMlFtrDM2PV3YxzBMgaflX95IpPPOxHI/b?= =?us-ascii?Q?MVj8osZQbRuK037e6zfYltacx01odeo+qGBV8jnxBpe2lLS3bRd7aXx4rc7k?= =?us-ascii?Q?4fS2HmIoSS4HmjrCjU5/Fpg7qBDyAJjLUdhpzqugdeZfVIiajrfx7ol5N0PH?= =?us-ascii?Q?yVE27keQsDIWuRJe6mIUYQYNwxmE2sn3Ckep+f6MOdijrJbr47sNRpMwdlH3?= =?us-ascii?Q?dGUBhQtsbOTj0TLdaBQ4/Qy2r3LJSibhMKDNpIeKVzNi24h90OShV4FGnwhV?= =?us-ascii?Q?2aTCEWYhm1PrFk+a1Hh+UldyAYLZ6bubK8rPseUrR+LLyGIcBshihVElBvco?= =?us-ascii?Q?xLkAq+cdb2g1tAwCrX1PA60qSNoN9DR2WoT/9COQWH3qCg9DcemS1dt02wzo?= =?us-ascii?Q?2x6nXqehUIYSdnRa04EtDHGylngZo788DE4XV56MfVANNRZzDnEO2zsXSSxM?= =?us-ascii?Q?5kH0AJq1J8r0x6oOlvALLcN0umglL6EqSOfPtpDcJJ7VLHlAQvd8Y4w/Byje?= =?us-ascii?Q?wjrTJIWZpUWw8jKiACErbgnLfbP+mWrH8i1lUDo9akQ8jMhIUmKBXOqVhmUv?= =?us-ascii?Q?FNWpgYP/jWJzizEUUniW/OJN9ausYgrRk5y5p8hGnz+QjkxN313gSXUT9a5C?= =?us-ascii?Q?rEh8BsvwvBMwXUGFBbIMSggiC1TJHiLPOjTeJv5fN7Wttxc4UBJ8BziQtzK1?= =?us-ascii?Q?7ARM+9H58x8Wbi6miQQKUmT2toPJUu5Ti7o4RnKmiT6Adjr2/bey6FjC8sNd?= =?us-ascii?Q?675umpa3yev3+UKQd7zdK+I3OpOPOp0ZFIJP7FF6Fof3SD9NZ2kd/vNhrV3B?= =?us-ascii?Q?gC9Dk9gDbX3OWyHieQ0rr7xxpcEXV5eWQXCkD/ZPN0+Bl1VBxcJtXB9XJq+f?= =?us-ascii?Q?ykGU7E+eG3yt5ynmaGgoPvOUFS6Myiwz+4HKxX7bo4h5LVBc6CWIwU1w6rY8?= =?us-ascii?Q?bmrAUel06DtH/ftOfByS8LaIfaG1N9O5zdIuz57IfUvtHRNRqfpHgDe8onvA?= =?us-ascii?Q?tBBR8kCtbZbOC1dlg4JY/6lDDR3IjrhKU1mPLJD6OiPqWHT1yzEuL6y8OcB7?= =?us-ascii?Q?cEAP0wnnfS7IbFPkp9eZJaBl6mQTHHE+d/xig7/1klhzjGq3/5OV0bBMj+mm?= =?us-ascii?Q?/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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49258 Cc: Aljosha Papsch 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/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 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 09:55:17 2021 Received: (at 49258) by debbugs.gnu.org; 9 Jul 2021 13:55:17 +0000 Received: from localhost ([127.0.0.1]:58844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyK-0006tH-Pa for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:17 -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 1m1qyH-0006p1-Ll for 49258@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oPirDiWvX0F3iqrCsv5JQCJ05vSyps/QQh07k19FxECiH1xRRVOpSjSjXHZsjl/xQfdzHhp/NSo9uOaxE1a79TNQ3XRRWe4B9yxsXpuQuEc8WA2t3RHskHrdU4bMpOww1n2rfOT5zMkvCo484AlxFPLoBYUiiz3ltj706WX4hrj7q/piY3fDc6rkybPrmvDyHYr7HW15XkUUH6KDDeXXrl6SeSVsXupng4/Mgm1Qp1N1vKk964ZoYc6ucoFsjAPHlOrU06BCDmQz2UZ8NLiVhIwl1g9u7DRFEr2DYV9749jYzpR1ADChRC44miqzB6G817d8dnS56p2XvqMzl74AtQ== 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=qTJPmNlv5H6W/nLdyWF3iBZdq+X3P0nvtqnjah1Eq9s=; b=N0dkiv1KGc4taGrChy+CVBvfJ2LwxsC7EgEgE8sNsiTqC9Wwiu+qikNf2bX78M26kxbwmXZ0Bv66mz4M3BsarEwGabFAOBunn91d1kLyq1dFmALu5J3xLuzwDLaLUHqWuTLQtACOCz4EcxLS0MDKDxrNsX6HiyCpc5cUshkb+JKGRkE+UduIZ3jxd7EycE/4NTW7XWEuwtAwQfvBsJzlF1vbSUFb3koQKNhruPR7l0ZaM7M606zIKNNH2nBRTT/6UzG2uOqYx2JE+8o7M5HtqT5sAnMRXnbiJNcToJQMRTp5AqCwxj8h77/NZOubba44+ibpULUNzIZNN0KdEZUQnA== 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=qTJPmNlv5H6W/nLdyWF3iBZdq+X3P0nvtqnjah1Eq9s=; b=tSIJ6uDANRcJZIAHMkAEAPkA1/iNVjU2KWyqeqWpS6Ukk/QC9J/oJ8sKw3bMI2I/YebvMGx5XFY73LSQeydLb4iB+cbMKZG11gFLCfE6WjRAIhngQJVpukJ1EvrKH2+T1PwsL5s6jaVl+XpGkC8KWUojop681hYm6hU5INOvYZX5/p0B+E+ydQe41JSspOJ+LsM/newAwPaw4dupRecdmxdTkastFZvPGytYIkpOczo1FiW/lPVI4Ws6kMP+SYMf0ajKyqUNnr63jIU7mOA9WEnoGtLYifwRxIKgdnqQqpPot/jOMT01fU8IcZPVvsTSJhSzYAPdnJ3r3xVTn3ce/w== Authentication-Results: debbugs.gnu.org; dkim=none (message not signed) header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=stern-data.com; 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 To: 49258@debbugs.gnu.org Subject: [PATCH 2/4] gnu: Add wondershaper service. Date: Fri, 9 Jul 2021 15:54:07 +0200 Message-Id: <20210709135409.54308-3-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: b981ff73-63b6-42de-de85-08d942e12815 X-MS-TrafficTypeDiagnostic: BEXP281MB0136: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OSPXQcPmxDZta2CW3k3bLaYX2qU0U7Asc2c/SHDJcttDUU0KGjHaQA3ZNW5Y9V0UwX6wG550N8aAbWn1qpzTEh18brtUhKFC4/ueI8EszQ0nPftwYYzQFT/r3BDU5Rn+6jdZxDcidBz+ilBzhTVJQdKn7tNMAu30V84UxUsXxevN/uFIjNM86n0Itkxf25Vqne8TqFkCc2wEugvVCZtWG5DbofSuAOYnMlcKOHAhX4OnpcaBxPeOzuITyZGKGwJ0R3ojvvRscNHH5J+96ESRsu3QG9CPDa3CKYlCTo1udiWOyEwP6zbtRi4hN8t2lyFq808wszI7G/QNb2tA1AjUV2z1w2JJcPF67T/VCmom42cD8/s1kgF0rGydVA6RJDxVj1pRNPs+wSREOK8ONOrMQaruVUduhgbBJRcmRPXRJNf9Zv7Sm9k6GLAvX2YM9mUZir38z2ZtvevjMNx/OYrMlbxYs7m4zlXfylCc5t4/sSrHqAaKR0dDjGC+YtbQBgmwt6sb/bxajs/mQIbdaoyJeeKr0j+nJSdXZ3ic3fb3feHKugiCvFI4GTVFyURKw37u1Xd1dHicg5uNGVdIbB6SioaEK15kRi0Gdz8amlU1Ed05eDk5TTvqiQ/fx6vlFPnrsKIlitSzof99WWyS8Zh4agFhoDXH7uDiCYs3qa/j/fcXJqKG6ts+I1tBqlXvk31tQoF6rjPCrxM2x6UM5Yqa9qQPSOccFdRFBACChWzpUHU= 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)(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: =?us-ascii?Q?YYzPgWTEUJLUnF7DF+M2Tz1aChXjnVJpRFTXcz0kkUnDzBC83s6g77d8Ib3f?= =?us-ascii?Q?rKvi3ig2rYJLLzxczfPAiV4sUi/LZhsNm+a/tWylz9tdJSRDZTCXh56VxHSk?= =?us-ascii?Q?JOrJN4ElZofMIZAVXSflUIRpXWrPxsrJmdjwFOHCVtgEkhr3zHOAwEQrtMkP?= =?us-ascii?Q?s9A+LUGtlK7KJF3XO9aevLRGty3lyx21hK4b0mU9lTBCjSerD+558c3MaA+/?= =?us-ascii?Q?cMOt/O3d3uIZgXCrpMI3uiYdM9Ckhmf8W81YRc3tUQMfR9eshW0T6KbHpFFL?= =?us-ascii?Q?beVhW9sftdBBdNCLoAcpOG+lr9V/HsIGgvwMVLAffd5bTw8GeR2Kru3lit+0?= =?us-ascii?Q?np1ek11YNbxXinT7F0FL6vLoq+NcunRPGfL7eXDEL0eRu7zoFG0IRbzcwSzg?= =?us-ascii?Q?tJnc8IgRwSfHv3u/kK5Daj6Rs65mCw6TyAgHUjMEwcq9c8O9kDGK+ozRUt6/?= =?us-ascii?Q?thcP7N/2VBT8gVXhZouRdwlpYHO2gTuYhyS50kiizrmttR29vJHi49zCEM2H?= =?us-ascii?Q?/MFa3HllBtFk/Adj1ZK0ue+VwCKi2OAeK+NdHo7ycLaZesoryVbqDurcR3It?= =?us-ascii?Q?2NY04iptKhLqtH3aMmn7oWk3Xnrssrwic3Qikn6Eund5x7k0bTspwXLQp14R?= =?us-ascii?Q?ehhxJxHPn+F2F2dR2I1aiCjh6yM1jxwQJfQcYRZxB1sUBHY04r8qLekv/sL8?= =?us-ascii?Q?vc+IVE2+17YheYzOtK+x3FdFYsMK7Y8JCrDoIMNOAsvZnvEjhY+4P4go4HtI?= =?us-ascii?Q?m25pX4dd9ybaCeuYGb/kHQEIHfd7YAmGnCmJg3xfMqW23V5Jko36pCrf2V71?= =?us-ascii?Q?dO91bOofzooSclQw5JTJ6nqfwdoV1jTWwMd96+y6X/bSZpD9ZzrWxL7kptGB?= =?us-ascii?Q?Xaeld8OlOWEKAskx46algK/51GIi+gA9D2T/risRCKyRSUlLmOgY4e1lXf5y?= =?us-ascii?Q?5h+din+X7nF/ICSfphDrkPNkNWmA5B/LIV4meb8DgAeQcttAK50b24iORuM3?= =?us-ascii?Q?c01AiCjEkbORYQG6HvFGAgMzAiJG4UAocijWw8OX83GVfyuRvgyUrv2muHPp?= =?us-ascii?Q?AQ2MN5/xbpVj1S82VprrszSjDUjI2TOuNqLqzDmW8QyQGPTNVBnXX6YOY+L5?= =?us-ascii?Q?p3+ul5+Zod3zBfLP2rlhRFuVm1hvGK2uln/CHWRmFKKp6/5iCmn0ABK+SXkI?= =?us-ascii?Q?tmMUvVLZucy3epCV1fvMlJ0NfhqPPb0UMXIvy7Y61Rf7trPngO0ojNQLdFxv?= =?us-ascii?Q?/x7727lxiS8uMafxRX1q1kGx5WxkSAFnJUG6JCE67njRBbtrS5l4gCM54wG+?= =?us-ascii?Q?wlOZjmH9Jt3B8daVuJyBJW+ysbU/vHRAUtFu/0cGhGf+IreBp6HoGejCE+t4?= =?us-ascii?Q?oBwymJKh0p+fJyVF2BNgNG33Q2W0?= X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: b981ff73-63b6-42de-de85-08d942e12815 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.8367 (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: pUKGxLIOR+9S5mUhL2Xxp1IQFZBxFWcS7b0ZHFEVzBtNOa0FhBHTl+IT2kNsEOXl2z1TnHB3JHQ8K2UvX3JPFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BEXP281MB0136 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49258 Cc: Aljosha Papsch 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/services/networking.scm (wondershaper-configuration): New symbol. Configuration for wondershaper-service-type. * gnu/services/networking.scm (wondershaper-configuration?): New symbol. Predicate for wondershaper-configuration. * gnu/services/networking.scm (wondershaper-service-type): New symbol. One-shot service running wondershaper with a generated config file. --- gnu/services/networking.scm | 107 +++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 1ae58041d3..1d3e061758 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -218,7 +218,11 @@ keepalived-configuration keepalived-configuration? - keepalived-service-type)) + keepalived-service-type + + wondershaper-configuration + wondershaper-configuration? + wondershaper-service-type)) ;;; Commentary: ;;; @@ -2151,4 +2155,105 @@ of the IPFS peer-to-peer storage network."))) "Run @uref{https://www.keepalived.org/, Keepalived} routing software."))) + +;;; +;;; Wondershaper +;;; + +(define %wondershaper-default-download-speed 2048) + +(define-record-type* + wondershaper-configuration make-wondershaper-configuration + wondershaper-configuration? + (wondershaper wondershaper-configuration-wondershaper ; + (default wondershaper)) + (interface wondershaper-configuration-interface ;string + (default "eth0")) + (download-speed wondershaper-configuration-download-speed ;number (kbps) + (default %wondershaper-default-download-speed)) + (upload-speed wondershaper-configuration-upload-speed ;number (kbps) + (default 512)) + (prio-3-rate wondershaper-configuration-prio-3-rate ;number (kbps) + (default (/ (* 20 %wondershaper-default-download-speed) 100))) + (prio-3-ceil wondershaper-configuration-prio-3-ceil + (default (/ (* 90 %wondershaper-default-download-speed) 100))) + (high-prio-dest wondershaper-configuration-high-prio-dest ;list of ip addresses + (default '())) + (no-prio-host-src wondershaper-configuration-no-prio-host-src ;list of ip addresses + (default '())) + (no-prio-host-dest wondershaper-configuration-no-prio-host-dest ;list of ip addresses + (default '())) + (no-prio-port-src wondershaper-configuration-no-prio-port-src ;list of port numbers + (default '())) + (no-prio-port-dest wondershaper-configuration-no-prio-port-dest ;list of port numbers + (default '()))) + +(define wondershaper-config-file + (match-lambda + (($ _ interface download-speed + upload-speed prio-3-rate prio-3-ceil high-prio-dest + no-prio-host-src no-prio-host-dest + no-prio-port-src no-prio-port-dest) + (begin + (define (shell-quote str) + "Return STR wrapped in single quotes, with every single quote in the string escaped." + (let ((quote-char (lambda (chr) + (if (eq? chr #\') + "'\\''" + (string chr))))) + (string-append + "'" + (let loop ((chars (string->list str)) + (result "")) + (match chars + (() result) + ((head tail ...) + (loop tail + (string-append result + (quote-char head)))))) + "'"))) + (define (list->bash-array lst) + (string-append "(" (string-join (map shell-quote lst)) ")")) + (define (format-config) + (string-append + "IFACE=" (shell-quote interface) " +DSPEED=\"" (number->string download-speed) "\" +USPEED=\"" (number->string upload-speed) "\" +PRIO_3_RATE=\"" (number->string prio-3-rate) "\" +PRIO_3_CEIL=\"" (number->string prio-3-ceil) "\" +HIPRIODST=" (list->bash-array high-prio-dest) " +NOPRIOHOSTSRC=" (list->bash-array no-prio-host-src) " +NOPRIOHOSTDST=" (list->bash-array no-prio-host-dest) " +NOPRIOPORTSRC=" (list->bash-array (map number->string no-prio-port-src)) " +NOPRIOPORTDST=" (list->bash-array (map number->string no-prio-port-dest)) " +")) + (computed-file + "wondershaper.conf" + #~(call-with-output-file #$output + (lambda (port) + (display "# Generated by wondershaper-service\n" port) + (display #$(format-config) port)))))))) + +(define (wondershaper-shepherd-service config) + (match config + (($ wondershaper) + (list (shepherd-service + (provision '(wondershaper)) + (documentation "Configure traffic control") + (requirement '(networking)) + (start #~(lambda _ + (invoke #$(file-append wondershaper "/bin/wondershaper") + "-p" "-f" #$(wondershaper-config-file config)))) + (one-shot? #t)))))) + +(define wondershaper-service-type + (service-type + (name 'wondershaper) + (extensions + (list (service-extension shepherd-root-service-type + wondershaper-shepherd-service))) + (default-value (wondershaper-configuration)) + (description "Run @uref{https://github.com/magnific0/wondershaper, +wondershaper}, a small utility script setting up traffic control (tc)."))) + ;;; networking.scm ends here -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 09:55:17 2021 Received: (at 49258) by debbugs.gnu.org; 9 Jul 2021 13:55:18 +0000 Received: from localhost ([127.0.0.1]:58884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyL-0006tv-9X for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:17 -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 1m1qyI-0006p1-F7 for 49258@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j46yboZUz8ivufYYe7i9De61iv/arijB/oBJHPyf44y9omCR19TefcL9mU5UmF61OsYIfgGjof42xOu/1wVCdSKEanxqUPuUdvCF+5U68kxPo1MKb/r0ddpCdZbUfYihQeg4njUGiyS2YxsnsflDzwPI3Ct/sz9XXDt+b3uJvNSwY6C/o4zJKtHScU/Z5aLfWrN+MeLNeNZPJ5FBPDysyFPBhMkkHJHdv79CEoeOSJsx5nQia36GeAHodjGYCs6ZcBdT4pCEuYAotmuyHHRvUOoYqNs6hWabDPALnVabORoMMe2jmhm/euRLmDs+6UnoKvxx2FDGSJ7dVZ8rZ9c8DQ== 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=zK93GCIZkJdPvQmrshYdRdYpmjR0CnArto943FwzqWA=; b=JyZa6ACpwcLTkohjO9r7sWNzN+UfEwEr93y5U3VzmVIkL6aj3/OBtBVCuOxb2psKRsNrwPHVN2mGwE6ceTIFt8q903dJrKzYKJkm2aWYrdSXlFxs87KSC7gk1NE5pTBFTL166hW3i/7GBiPA4wy4pqdAG9odxsNC4Z1ZqBDFs/SzSaVRJp1SnzZZqex/fnwbxgYxYlQdoL7o1pXtbRpCjrk0UlbbrAG9rTrh/V4s/sIT9iPwM4joaX+W1/S9zwxdesE5USzpUsUW/e2Imy10YBOlIriLLgrwojIy5kH338lZNc9LYGepXa/ljlO8U+PQNeWOJL1DYzjD/nmihG0gZw== 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=zK93GCIZkJdPvQmrshYdRdYpmjR0CnArto943FwzqWA=; b=mOp626fA4N2KZMBw4CagoKWkiSNze3+54DlhqJr3+d/PQHaq7UkjI4lyB5Ng1pAybg4FiKg7FmBPjZ/OtiOlAZmP3qsGrM/Psg5qZUPlCAsvhV+ZV1aUAcJ2bIVoPQ3D3z2gBnOXJY/JfvrdjC1pkfP/Da8F0845gALW3hbNHd1CkHJZEPmHbr7NXDdq/03LaQPN0wBrxCX+UkMTWvQIjLYbU3YBXmYTMqb8X+FtpRnNUR12V7cqPO6Qao79Fy6LJsPWFgQThILTM56YUs6NTs2FYCpEm6eu1zZR9rOnx2hAvWSxypeUByqjPARX9D4l+nGlLLiXDp6OBLS1ku40Mw== Authentication-Results: debbugs.gnu.org; dkim=none (message not signed) header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=stern-data.com; 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:06 +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:06 +0000 From: Aljosha Papsch To: 49258@debbugs.gnu.org Subject: [PATCH 3/4] guix.texi: Document wondershaper-service-type. Date: Fri, 9 Jul 2021 15:54:08 +0200 Message-Id: <20210709135409.54308-4-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: d1b3ac1f-a75e-4e23-146d-08d942e1284e X-MS-TrafficTypeDiagnostic: BEXP281MB0136: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1rEyR93M3hZ+bhBtKtd3VgKcbmTTFVerQf2Ed1i+lhKGUdAHFZL3b4/WBRtlMhBXr7VK9+M99yIg1S7+skKYDz2JCVVqaHN6z3qI4EpGMJf0aNEwZOAQpwhEfSrdGsTW2nQ+bO0TdO1TcZUOdu3W9IkA5gRRf7YMgXM+hX762bTv6UweH9f4vtEFcUPcp2PBKPEDoMxkPmyiwOjPXvA9bvqHl6qk+1d8jUtxq9yqnZ/cnYSrOTB94YLbAxlvt7Uy1kP2IxD58Vwt8aXzwebBVDiUDQIzxu4NMsiFW1d3fimqjjGHw6mQoZUQ48s3fIiv33Pfqa1BrEtKrjzLWUNR+i8N+2Noy6+Vk8Na89G06co5uJfbwgdqI8aM8iYMrmNxZ3lZfOSSCJl1T36pimgg+ecjsIwd7tBM49fp57wsWWq0uWBkWw7n525119K4tc2IxAh5eMgDNT3urdn2mJ11MIb5TAnDVCh6ASuYCTwwiUTw9Yq/QfjzDGmY9AkdYv5dGsypvENJ/Vx96jNLtCgx9FfkK25HROI5cfAeUrmLvwyTaQRSjjh/IQZp3v9AMgcwYeMHIVrDSLiOZG3V9uPk+3N0uJ+Uy9jphsmakO3Y9RyWNGoddG9pKjUGHx1vwPSHypOt0bXZBcpt/I7TlbCOODuk/x9+X/gUsvfiMdMW9FhQtvvvbSDuR4tWqZMhHSzypO2A+7sM5Yt2IAsazqQ3dJUPCvJ1lxiBfgcvsZlEfv4= 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)(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: =?us-ascii?Q?JJ9jcUmzWpVEc8Q03LrUkK/k77+ExhP9bPwJS3bd9+ABKTuUoMO3Rxb5f0OP?= =?us-ascii?Q?uyjphKdSN9OL4ZAyx2kiO5iX2+ceNHUG2PTwoKEg4lX4Bp6iblWK6Ukr74Tu?= =?us-ascii?Q?h7VtzQmbP2RmKhJi4Gz2tptEgQszFbR/aqPvsAp9f0ViwAqjmpUBxhgWsqKp?= =?us-ascii?Q?kzHsgwyYgpGLhO4zfUj/W4//al9oRC63GJqJA5x0mVFqdcW0OnMFjSiM8tle?= =?us-ascii?Q?3OuCdXdttc2voDXm+WrNozxbQGBb88QOpD5ochlWt16PvEj2lX9XlZ+OXuDU?= =?us-ascii?Q?Oy4uMOBA1D+f/yhy7JvJRExyyx3z1d+oMHnlIdaA4thwbRy59bQpE7KgE0RW?= =?us-ascii?Q?hKoyRPs5vKQJmpwDc+u0ats7ooHA+wpUdhwB12xDwuPQLkRdtJBkP4Spdihz?= =?us-ascii?Q?0EAFNXFe7oWTJtrmmRsQkc1k0BABpn9qnthFKOzQODzFFesaJm+eIJYQBbPy?= =?us-ascii?Q?tuxPVYdSxBBmkYOUG7snEGdKMOAW49rBPjVkZhl3snandkOYgxz9IJRDKF/T?= =?us-ascii?Q?3tq7lJL6IZ88Nhj7W3IPgpxscKB/uhUzQVxZPLWMSIb3QaMufSZaRCBUXrRm?= =?us-ascii?Q?aXf3GSIeqom5e49bWVlEvJtJNxMOsObw4RecGWxxehbOG2RHLUHYz2L0vcI2?= =?us-ascii?Q?q2ErHANvKDKUlJg4r06UciIN2c44XnJ/ygnQrmKPLi9McX5+kY/BdfRs7HfV?= =?us-ascii?Q?95Dcuk9i7X429u51LkhUZ0571q2VviIu2vTU5yUk5DPW8+MqMDxovG7wOUJm?= =?us-ascii?Q?vKxiv7Xsut1qGWuEgH+UDDCSHbrf7v2J2NAaGLafs2oOMvmwr2F3CgY6bpTP?= =?us-ascii?Q?kKd+SVZDgFwP2FmeKwgjAeMMr/KuGN/iR5B6Hgb61fArcZPIHlKQ7xckVORA?= =?us-ascii?Q?JXkESEYgOLvglcx9+F5xZspoBu+Vx7HkXS1OKgC13O3PF39jA8GiJMYNnG8+?= =?us-ascii?Q?GdFSZPZToGNG6+8Ec3TlnJfcoigb82hgC+CwjGk20hQ+7LbkwYgM0LkvsY44?= =?us-ascii?Q?BtCrWz2cy6NNyneipVrF/I05bMl4Y1Tnk6h7vkS2kpuHTuYdjX+Y3f6A5UVo?= =?us-ascii?Q?Ma+9RYx7gGQZ0CGsrinLVosXWeZ9w2CJiPKQyHr/dDj2kycsqQKAOVuQIzot?= =?us-ascii?Q?uABkwoT/9BFgFvpdwx4RxNb6ktEkRSXdeI9KQ4yVbG9qhuFYyZ1Zotvqwa1Q?= =?us-ascii?Q?yWyzkglmkHbeyZBPNk7rZeqlRFDC479l3tOG0tFSpJXSlnBUYwdN7NAuZkGe?= =?us-ascii?Q?q4cVLHhdd+acmPXkNwAYNFuafJETU8EFNQK0lOHQWkN1+yNvbBY9b4mnG9Ja?= =?us-ascii?Q?aUSJtWYfCblK/hbhfh0VOZrOOrllBTDKXePTh4Vd5vDRg7/2yJyNr1SjRl3y?= =?us-ascii?Q?vH2N52N1mcRtV1R2iyhpRM63LGED?= X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1b3ac1f-a75e-4e23-146d-08d942e1284e 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:06.2081 (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: n3Mdh3Q43gECxpoCJ5ZXI0YhRHPam1z/74Hqv3J7dkxqRteLAoLtwr0f2vgxOD47vclotXFOmSX3TqqeqLpV3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BEXP281MB0136 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49258 Cc: Aljosha Papsch 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 (-) * doc/guix.texi: Document wondershaper-service-type and wondershaper-configuration fields. --- doc/guix.texi | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 18bc600440..58238f5935 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16945,6 +16945,79 @@ See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} for more information. @end deffn +@cindex Wondershaper +@defvr {Scheme Variable} wondershaper-service-type +This is the type for a service that runs +@uref{https://github.com/magnific0/wondershaper, Wonder Shaper} once +during boot. It configures traffic control (tc) with a Hierarchy Token +Bucket (htb) queue both for upload and download. For upload three +classes are added in order to prioritize traffic. Priority 1 is the +highest priority and priority 3 is the lowest priority. Interactive +traffic (e.g. ssh) is designated priority 1, while non-interactive +traffic is designated priority 2. Priority 3 is reserved for specially +configured ports and addresses. The service is configured using a +@code{} record. Some options below are not +found in the original upstream release but are maintained +@uref{https://github.com/apapsch/wondershaper, in a fork} until merged. +These options are marked specially. + +@end defvr + +@deftp {Data Type} wondershaper-configuration +@table @asis +@item @code{wondershaper} (default: @code{wondershaper}) +The package that provides Wonder Shaper. This package is expected to +provide the script at @file{bin/wondershaper} relative to its output +directory. The default package is +@uref{https://github.com/apapsch/wondershaper, a fork of Wonder Shaper} +adding more configuration options. + +@item @code{interface} (default: @code{"eth0"}) +The interface for which the limits shall be applied. + +@item @code{download-speed} (default: @code{2048}) +Maximum download speed in kbits. Tune this parameter to be a bit less than +your actual download speed. + +@item @code{upload-speed} (default: @code{512}) +Maximum upload speed in kbits. Tune this parameter to be a bit less than +your actual upload speed. + +@item @code{prio-3-rate} (default: @code{download-speed * 20 / 100}) +Maximum rate (kbits) for the priority 3 class, which is the lowest priority for +upload traffic. In a desktop environment the default computed value +should suffice, while in a controlled environment you might want to set +a static value. This option exists only in the fork! + +@item @code{prio-3-ceil} (default: @code{download-speed * 90 / 100}) +Maximum burst rate (kbits) for the priority 3 class. The same remarks as +for @code{prio-3-rate} apply. This option exists only in the fork! + +@item @code{high-prio-dest} (default: @code{'()}) +List of destination IP addresses for which traffic is designated +priority 1. This applies to upload only. Note that SSH (not SCP), ICMP +and packets smaller than 64b are automatically designated priority 1 no +matter the destination address. + +@item @code{no-prio-host-src} (default: @code{'()}) +List of source IP addresses for which traffic is designated priority 3. +This applies to upload only. + +@item @code{no-prio-host-dest} (default: @code{'()}) +List of destination IP addresses for which traffic is designated +priority 3. This applies to upload only. + +@item @code{no-prio-port-src} (default: @code{'()}) +List of source port numbers for which traffic is designated priority 3. +This applies to upload only. + +@item @code{no-prio-port-dest} (default: @code{'()}) +List of destination port numbers for which traffic is designated +priority 3. This applies to upload only. + +@end table +@end deftp + The @code{(gnu services rsync)} module provides the following services: You might want an rsync daemon if you have files that you want available -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 09 09:55:25 2021 Received: (at 49258) by debbugs.gnu.org; 9 Jul 2021 13:55:25 +0000 Received: from localhost ([127.0.0.1]:58898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyL-0006uF-TU for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:25 -0400 Received: from mail-fr2deu01on2107.outbound.protection.outlook.com ([40.107.135.107]:61280 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyI-0006p8-1r for 49258@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dS6PkYzR1O7O2pVP2seIr84Gw9L9Q82xXANLtruEZz7A/4OK2UZUMrKKRNUFBmXCVz5ZTdcXljLKuPnOzFVe9SlktEIAtRSWwMKnweJBEetxHPOx5iWqVgLznq4lcrRNf9m4V5s75OmXWWKLOzAu5YyVitmCmTjAJOMiOnLCWaqnbOJuSmypY6J4fsiVRhaj+SAafnYzoI6ypedINH1n+LUF00jpsiE3SJzBU6OTLKV3Z+/urqVYFn9YI9/SoMg+acymMVCxB1wH+9xkPQDLKkD5d/DTIQVZUmJNaf5iv19JT4SJNcvFUe/a8E9yN13oIwVy1lczHZorPdi8LICeRQ== 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=SVttmT2gMSNyTuIH70WGxcA+Pp8yQtcQnBIKrd/sONE=; b=W4cVxw7Vm6KlTwRo3Bz3INeV044J9q+Fv3J+EvZ8LoBdLUjmVibNHg3EODpak4oapD79X5b8QB0cOmsEbbAWYphaFUM9d2G35oUIlYIaY/8VcJxsp9avfOoh/a27GyhRlF5QsY4VosOEZUuG0TYh+4qCQPFXodPT7r02stF8NeYtl25xOOcUMuEeGlpV3VgGOWsm/+coKEdYN4+jqFCM1QcoliqWoFKWcxZo64aHG7jDmrrCOWJylXZw8hqgtrwDeLOTXMCuCnc4Vrr6TN8Ec8nI0H9WsNx7RTuqvur9F9gA4rPKr72+J6Dt4zm9Hkp35TBsMAjjJsMHBbsIC76CyA== 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=SVttmT2gMSNyTuIH70WGxcA+Pp8yQtcQnBIKrd/sONE=; b=0TWRZKfT4fkrKc/VDOpTqqElAymMg/Kduyt864AIVfRWwk62epsCFvIGOjk7sFApBw+5SBQS86ViB++Ff6JiERhwhAPFj5buSEYzRZa3SgWT5mbClxz6bouJg3Jms4vhh1yZ9/HxwOnaIO5r2SyPo+/j/9CRGkR2q+VvFmWNFgSTLBoFe9jUOZ6pflumXLkYYBudP+VQblNZKN93fqyTNqkY+vVb0NVhNNlrEZ/3NuiJ0lnaAwFe0ytm439aog9Dxu7xNz9zNHjHjLGdJD1RsVoool0toUnlrb9F2AyFrkEdde0wCfuvLHTb5Hn5xrJtRyxpgRBUXYftCz4dzgAmww== Authentication-Results: debbugs.gnu.org; dkim=none (message not signed) header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BE0P281MB0257.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.11; Fri, 9 Jul 2021 13:55:06 +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:06 +0000 From: Aljosha Papsch To: 49258@debbugs.gnu.org Subject: [PATCH 4/4] Add wondershaper related copright lines. Date: Fri, 9 Jul 2021 15:54:09 +0200 Message-Id: <20210709135409.54308-5-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89721b65-3a2a-44ca-2a4a-08d942e12890 X-MS-TrafficTypeDiagnostic: BE0P281MB0257: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1728; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yy837GqnYan4UwcV/1dwXa1piOT0yux7TYTcDP77ib/oz/jB3HdvqWjGt7vKuTu3fcUSZ1hx8GVSPXXcSAlPeNZ0m00W391Vh7stsVWosR4HCtaO7FbLzOQFlZtmoaXWZcpW9s4OWQl3w/H8OjStneM6MjvLsnXF2w3t3QJr/b0IedeJsm8qfQhtO8VTbX7sft6rIZvpZ09u71Sp4XCpBk/I8mIG5gyCIV6JcJ6yjAO+oVyY77ix/wlGCbeiM68BxZzzp1XPdGJc3i7p7Fsob+MmOJyODQ5gEpub8u45W620q2aS3efk8k5qhmeK96lbUrKctdYhytp6ZVARS6f4z06i48FP1Qhwvvw894Ewy5i64vafe45fEN/gG4F9Bl7gs7ipidwOb8H/hvLeAduMkTZNjJn2Cvtk01XvAxTICEbQNDN5TXb8MpPf5Sv/nL6o7Ieyr7mG//5F4rahq6y/Cdrv1PHvnR9105T9McDQjFw1uSbBqofj95evc1++6yZRqgx24RWH2UXe1o0S5gDLBPONydgUUC21Qy61zy+u3en1w5fxtTAtpJxJ+iSV/kVIcuSfB2bFcM/C224qp6Q4QBdw+bGMxQ5Cm4UCURkRGl/wUGQtTa8kHFAAgCvhIO3yk9an/5DXb+/ZF1yRhWUekHVc2vRH/iWpqpgyMhKlIG4PYW07del3b+WysBd3If6auGVsyWw78sn4n99k66qR/Vv2O+WlEBglvIOZTb16/qQ= 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)(346002)(366004)(376002)(396003)(39830400003)(136003)(5660300002)(36756003)(2616005)(6506007)(1076003)(316002)(186003)(52116002)(6916009)(478600001)(66556008)(86362001)(66476007)(66946007)(8676002)(107886003)(83380400001)(8936002)(6512007)(6486002)(38100700002)(4326008)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NFZMN3M4cG5uY2tpMVZUU1ZNeGFCWHJleEZiU245eUxFVHk4N01tQ1RjK1ZQ?= =?utf-8?B?Z2ZibGY5N2RMdFUzY3V0WGVwdFFJeHlUYlZBdnJUd1pIcEtkMjUxRmhobk9z?= =?utf-8?B?c1cyQ2JnRzloZFdUNWZ4MnZTTXJKOVExT21sRVBMNTZPK21WdmhFaUZsSTEr?= =?utf-8?B?RTZoNTloTmFzNEZzYmRDWDhkWXdoUjRpTm1BTkxFamFmWFpzVi8zV2x0d0Ry?= =?utf-8?B?YU5oNTR1Q3RUVGMvbm5qNnR5d1Ria2xRZUtLU2p4ZDFtNUZ0d1VYWUtTOHIz?= =?utf-8?B?NVBPajJlVm9DNTNaQTJlTlFGdC9pVWJmVEJwbi84dFBTdGFpcFJySTFtZkFt?= =?utf-8?B?MklrRFhKMmUrNlZ1dlI1c05wemh4MGNsSkZ5VURDeFpMc2IwZzRyN3NYY2pV?= =?utf-8?B?cHU0aGEra1M4MlJpaW9IOTgxeGFsTXdNdUdEWitONHBlTjNPUlcweGVZbFdX?= =?utf-8?B?T3Q3K2JWSnc2TGhablhEODhwTVlaYzNMTi9MTEorWVNSU2wzR3Q0SnFQVGZR?= =?utf-8?B?bkRwcUxVR0pLNVU0SmxDR2ZlTkgwWkYvU2JlU25aUEkyZ0h0UFQ0elRCVlQ5?= =?utf-8?B?Y3JobGo3WVF4eTNkVzRzQWVXQUJKblduTUhCZytZVkdlM2o2aHgrYUI5bDVn?= =?utf-8?B?ay90SVp2WTl4MTdwM2l5bFovbzR0L1Zmek1JVEh4V3JZeDY0L1FucmExN3l4?= =?utf-8?B?SXBVODlSbHcxcHFtWHNZNjRXME1WVzhjMlRLdTBpNDlPWXo4SWhDQlZJK1BE?= =?utf-8?B?RG9obDBLdnBhdVQwWndyb1gxa05Ba09lNmt4dWhMRm01Rm01SFcyY2dUaU1V?= =?utf-8?B?U05WQzdYc2xsd21RZXFzVVQxSVVrOFMzOEM3NnBGc05pRmdWcXArdXphU3BX?= =?utf-8?B?SGhKa0V6S1Nyd1VnbVp4MTVhcHd3WkRTWEc3dStJYzZBZUVUbThRSDdIVFNV?= =?utf-8?B?KzB0TGN3UVBOcm9WTUx0SE1zdjNoN1RoaDVIZmxjZWxpckVjVm5lUFFxQlpl?= =?utf-8?B?bEpiTVFlU1FwTDVCbERmMlBSd1BvSTVuYTlCSHdxNFpudTMrQU94T0NMV0dL?= =?utf-8?B?OWhYeVFIc1RiV0tGQVdzMmdLS3dPcHIwVnJHL20xZ3lraTl3OWVUR2tGNHYv?= =?utf-8?B?QW1XdmRhOXNKaG1xNmQrQTZVWnl6NEQxQjJLSlRlYkxVRE4wU29sVUxXZVdT?= =?utf-8?B?ZytWTW8zYUJ4cVpibHdlN1F6SDZURUNRUnZKR2gycmRRSnJjSzlJU2NDYU9D?= =?utf-8?B?dXd6SVFXbm5GR0dhSVNtTE9JYmJwR3dHa3o0SWZjWFJRaHNiY0VuQ0N2WUxy?= =?utf-8?B?T0dJRWF5a2dqcDVEU0VLS3NLZUtLaTJxMGJrUHVjczhWelVIRUh0N05LeUp1?= =?utf-8?B?dWRML1hHcVlBRDhhVnJSMXdQY0xPeGk2SlRRNHZmMVozMlk2UVJKNkJ2WXZP?= =?utf-8?B?VG0vRDNZcFVOYk9kVndJZzVKaFVJcFVBQnBHWUtVTklPR2VQOGp3UzNHczZF?= =?utf-8?B?NDd2VG1uN1YzenEwUmJPNUpnd3Q0eW1qNW9xbVQzd2dkQi9CSVhnbzFwWHhk?= =?utf-8?B?VmEwRSs4TE13Q0tLSW4zTEtzNUh4cVdRUWNYVGtHaklmTkh5VWJHamdLRGQ1?= =?utf-8?B?aFBpOXdveDQrMEN0RGU1Z0IrMW5Nb25RSnlkNDNvcm9uRGlQQ2RSTVdSbDVN?= =?utf-8?B?aXAyOWs2anJzTnk0Y2JKdVVnbHUxYVNKbWZDeHZoc0pFdWZ2ZjFDME9SVmVy?= =?utf-8?B?dzlTaWpvbm95dWpiS2RCV3NZMDEwYjZPYzZ3ZmdDcXN0OER5UndhOFYyNHRu?= =?utf-8?B?NlNRMFVBU1lDUElWR0xYTjNGQ0pTTWtWRVhzUW1ZN0p1aWpLTEZZMTZ4YVZs?= =?utf-8?Q?s+lYdIzvaBb9A?= X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89721b65-3a2a-44ca-2a4a-08d942e12890 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:06.6880 (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: Qyvcqm1Dmc/Pvi7SOSIsUBZor2ZRc1Xw2jmow84UOlyMgPWtM6h5fk8cVho71T8Lu56WgZXkQK1CBM/vMb/N3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE0P281MB0257 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49258 Cc: Aljosha Papsch 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 (-) --- doc/guix.texi | 8 ++++++-- gnu/packages/networking.scm | 1 + gnu/services/networking.scm | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 58238f5935..b07c7d7ebe 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -91,7 +91,7 @@ Copyright @copyright{} 2020 Edgar Vincent@* Copyright @copyright{} 2021 Maxime Devos@* Copyright @copyright{} 2021 B. Wilson@* Copyright @copyright{} 2021 Xinglu Chen@* -Copyright @copyright{} 2021 Raghav Gururajan@* +Copyright @copyright{} 2021 Aljosha Papsch@* Copyright @copyright{} 2021 Domagoj Stolfa@* Copyright @copyright{} 2021 Hui Lu@* @@ -864,6 +864,7 @@ version 0.1.0 or later; @item @uref{https://www.nongnu.org/guile-avahi/, Guile-Avahi}; @item @uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.5.0 + or later; @item @uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON} 4.3.0 or later; @@ -3740,6 +3741,7 @@ other substitute server. @cindex ACL (access control list), for substitutes To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER-1}}, @code{@value{SUBSTITUTE-SERVER-2}} or a mirror, you must add the relevant public key to the access control list (ACL) of archive + imports, using the @command{guix archive} command (@pxref{Invoking guix archive}). Doing so implies that you trust the substitute server to not be compromised and to serve genuine substitutes. @@ -18817,6 +18819,7 @@ Specifies whether to support HTTP keep-alive connections. Defaults to @samp{#t}. @end deftypevr + @deftypevr {@code{cups-configuration} parameter} non-negative-integer limit-request-body Specifies the maximum size of print files, IPP requests, and HTML form data. A limit of 0 disables the limit check. @@ -27233,6 +27236,7 @@ Defaults to @samp{#f}. @end deftypevr + @c %end of automatic openvpn-server documentation @subheading strongSwan @@ -35513,4 +35517,4 @@ providing artwork and themes, making suggestions, and more---thank you! @c Local Variables: @c ispell-local-dictionary: "american"; -@c End: +@c End: \ No newline at end of file diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 920d01d8e5..4feffcd2c7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2020 Hamzeh Nasajpour ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Hartmut Goebel +;;; Copyright © 2021 Aljosha Papsch ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 1d3e061758..4fb9c788d4 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Oleg Pykhalov ;;; Copyright © 2021 Christopher Lemmer Webber ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Aljosha Papsch ;;; ;;; This file is part of GNU Guix. ;;; -- 2.32.0