From patchwork Thu May 28 15:35:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 22420 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 4ED3D27BBE3; Thu, 28 May 2020 16:44:40 +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, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 ESMTP id 78DE827BBE1 for ; Thu, 28 May 2020 16:44:39 +0100 (BST) Received: from localhost ([::1]:50432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeKhz-0003P9-2C for patchwork@mira.cbaines.net; Thu, 28 May 2020 11:44:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeKfS-0005Ob-93 for guix-patches@gnu.org; Thu, 28 May 2020 11:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jeKfR-0005Rs-T7 for guix-patches@gnu.org; Thu, 28 May 2020 11:42:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jeKfR-0004IE-RB for guix-patches@gnu.org; Thu, 28 May 2020 11:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41578] [PATCH] gnu: Add opendoas. Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 May 2020 15:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41578@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159068049616466 (code B ref -1); Thu, 28 May 2020 15:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 May 2020 15:41:36 +0000 Received: from localhost ([127.0.0.1]:52857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeKf1-0004HV-6a for submit@debbugs.gnu.org; Thu, 28 May 2020 11:41:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:51504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeKZB-000489-3w for submit@debbugs.gnu.org; Thu, 28 May 2020 11:35:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeKZA-00026B-QU for guix-patches@gnu.org; Thu, 28 May 2020 11:35:32 -0400 Received: from mail-mw2nam12olkn2096.outbound.protection.outlook.com ([40.92.23.96]:46535 helo=NAM12-MW2-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 1jeKZ8-0002Jp-RP for guix-patches@gnu.org; Thu, 28 May 2020 11:35:32 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZCR/pcSgxKX2gyqur105AG6olKE1UGaWcGxjBVPEKiUBz/p6joZUMwQ3RZN/HbY8OstyhFxnu1A6YnMfR1AUDV+xbugarP53arlvbH4Wez9XmvwFfTAiF2Gue+0dZP2bxYB6gKQE/3iMf/WO/nkDd2TiJBxS/a1Bfvzfq/kFYkYX15vTK4Gt7cf376cqaG4B7+Ef9aNwI+BvZB7fH70wJlj4vRHIjWu9XzW1ISjsGmQMCk7+IjMKmS76q8Yv0XoPW9acYPGqjVnWKp8SqNEv9e/Zr6RnekAQFBdrNz+DjqkQJar/1fHUsYHsb390LguyG1s+LkSusPxf+aYoaBe3uw== 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=5nNxyN62Swb0/FBDEs3eLQD4Iqyf7JcPCz7TXR/qLgw=; b=LhvBOffKeNAptPPMoek/dkH6J7BCV6ECLluKh6wGKfQ5QX0x9uZJkwX01cLUdv6QwBbrO6mB0iS+k3jE7D9qvOqJw/JgFmRZrn+gyy7GlVRvTSpwxnNZ0x4JuPgS2VYKoRuuJ22M32ISg/vt+03EtdEWBXoz2cIEiU4Liw0QVmWta3kXabzPRkXZzFXfzUk1fEeTsaOPP3NCUTEwEo2bnephlK18bbSNRHKvhb5Y3hkRJ79gjy77+RBMfBMcxQ7RpcaPwTyC8TsyVO5S+TChINXMye8uqeUrezGqNZhYLuulcGXaZo1vzOMERZQBoAtmWFj70O7ZZegKZwrQmYqsVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5nNxyN62Swb0/FBDEs3eLQD4Iqyf7JcPCz7TXR/qLgw=; b=bePYxBes09g0qXG+7ujq2qEBBQ8xL1KJ0riQgyLWksiLCQsBq7q3mMKAa0/vY08U/j+9vT8NViR3dttcgfox/YgoAjenDYXEY5vyw/ADaLQt24g0Yg4UHSagM91UY6HRGeEbC4kgQq0dALEGi2e242VcQM+Z8RmVHc368g25AkTn59D8xwFzHuPbgrpkV/2S8QdEk9Ppy01uHfHkDOC6XbDZ7GvRGd1O9KUmJeCgGZw/JHs4nRRNuIesXgyCXHPFwn7/f36cyGP5oaTkTsVsN+wLKzRzb3GiO/P4kN3c331GY6+ro2d5D5E5yl5Gexgd+DuwekDzuHZyvjx9S7e6gw== Received: from DM6NAM12FT016.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::41) by DM6NAM12HT218.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::361) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.10; Thu, 28 May 2020 15:35:27 +0000 Received: from DM5PR1001MB2105.namprd10.prod.outlook.com (2a01:111:e400:fc64::46) by DM6NAM12FT016.mail.protection.outlook.com (2a01:111:e400:fc64::217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.10 via Frontend Transport; Thu, 28 May 2020 15:35:27 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FBD75ACC5FDD62AEC5137AC5B3CFBB2E4C2E25E9E04F76C4512BF0F5F36D632F; UpperCasedChecksum:0A92F05F25649AE64678292BC0C2659A492DAB534944E2080EA2FE61A26A9B5A; SizeAsReceived:7439; Count:48 Received: from DM5PR1001MB2105.namprd10.prod.outlook.com ([fe80::d1eb:1b79:777f:92d0]) by DM5PR1001MB2105.namprd10.prod.outlook.com ([fe80::d1eb:1b79:777f:92d0%7]) with mapi id 15.20.3021.029; Thu, 28 May 2020 15:35:26 +0000 From: Morgan.J.Smith@outlook.com Date: Thu, 28 May 2020 11:35:07 -0400 Message-ID: X-Mailer: git-send-email 2.26.2 X-ClientProxiedBy: YQBPR01CA0077.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::13) To DM5PR1001MB2105.namprd10.prod.outlook.com (2603:10b6:4:2b::24) X-Microsoft-Original-Message-ID: <20200528153507.21785-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from guix.gateway.2wire.net (70.27.158.64) by YQBPR01CA0077.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.17 via Frontend Transport; Thu, 28 May 2020 15:35:26 +0000 X-Mailer: git-send-email 2.26.2 X-Microsoft-Original-Message-ID: <20200528153507.21785-1-Morgan.J.Smith@outlook.com> X-TMN: [nfe9e8Y+1M0E91j0priehAkJ51i5pURf] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e821fcdb-db3d-4d3a-2e98-08d8031cbe95 X-MS-Exchange-SLBlob-MailProps: 3R77UsUWwWd5NDbMcjGjRSUjDGUUo30rYP74aMIyzLIn1Shr6CrKbknUmBj9i3IYxfC5QZihXJl5V0ZE2enHE1RV55U5EvM9slzvP/IaPwi0APP0i5/2YCeeAUUbQg3FO/OUkGzrA4qznqlXH/wMaBZkH1u0LNouA7UXshDx0/wQOzLH8s8PhMhcVs5Ovh0BB2ZGOuc4T5fKTI8AoGYGPxGaKyqWopUCg8zHYsYEyF1bPKcrRFRNCLq+hXSYQ4aUBq1JsHY9kEzDuwQy6ePZd28UcA+zZMjxlxKSfFDTffE8IeM6MrZLI+gC+jspkUbP2izv6A5KymYrIpyVLNCGqNi1uKZkehHZss4kVrXgEJcYM/Gb/QcG8dM6sSsbgKmpBL8LkGb/CF84F9RICaKPUWXgaSRR5ao0kKST0yLC5bKTUAGYLCvUZ4KjSsgCp7IX6j2AlcGVZZ9t4nrwyF0updRIKMFLc19czTUfjXuwi+dDvmf+02NV5pAQ6r884zz1GUxf9yESpkSPTLyQ9A30ky2jjmwkdZ3NLnbR1QqZl3J53QVrv+saNnb3NhyUH/WI5XtV4sqgaRaTUCQRb+F3HnsWQS9ptQcfUXQvzxv9Y1B6BhrNzV1eKo1PT7OhqHGHuLkGyeaUAexvuUSwlYowi+0Mc+QMWfPY6uYHnX4gcLYpCPq7++x+6i4QJphEE3U9ke228XuaOtxa6r2tM02cZ36FJZdW/wFcVfCFEMP2g/3Q0stGH/gV5p8tpmwai4im/EeK684LE+jiHY69Ff+OUa7n4aXm2N8GMzB9OiBTT98dN8aylhMYwRQiO87DX3dtbSKE2+udbwqqGRUCtUW8gMgTXGd0iJkcO8ISa2hLza9eGgOaHGUsJY4+e39r1+KWaD4xm6bH7hOMbfWG3nhwgA== X-MS-TrafficTypeDiagnostic: DM6NAM12HT218: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 06sNk/7GjeNT2z2uS3DlqVs1Rg+DYiVm6fKgqj4MFFow+ENE01qorlx4vpMDnNKJMlHv6Mc65ZDdO5QnInPURfzmKEsAa68SnkTTIopqxK9B7rKZ4+DJRrMUfuGKsIK6ZctOaSMRVTXIxb4kJZPoZ1PDYOQFhlebhSs1J8I1dAdJZgyRjMTgwzFxvqaAF0Z5bt9U+HQ8J4VRIgeb8xJq/QKlXwFRZpPMpW+rx0qh2pRexJFkzuALgUwOERYrPe5x X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:0; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR1001MB2105.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:; DIR:OUT; SFP:1901; X-MS-Exchange-AntiSpam-MessageData: ai091FHwZTG2phrQDHQYzAb13C1KVcol2hL4RUfYAyUapuB2N40a8PsC0xd7Lfpg7+LhFnNKJZbzU2Tu1rQykWPsJZX9azEkgAuZDDQ/f4oA4yW8UXq9aCCoZ0KXiRVv26c8E9PiSqisdOJeec5MQQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e821fcdb-db3d-4d3a-2e98-08d8031cbe95 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2020 15:35:26.7139 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6NAM12HT218 Received-SPF: pass client-ip=40.92.23.96; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM12-MW2-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 11:35:27 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Mailman-Approved-At: Thu, 28 May 2020 11:41:33 -0400 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 From: Morgan Smith * gnu/packages/admin.scm (opendoas): New variable. --- gnu/packages/admin.scm | 51 ++++++++++++++++++++++++++++++++++++++++++ gnu/system.scm | 1 + 2 files changed, 52 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b0a43d9644..594ec62c1d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1389,6 +1389,57 @@ commands and their arguments.") ;; See . (license license:x11))) +(define-public opendoas + (package + (name "opendoas") + (version "6.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Duncaen/OpenDoas.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn")))) + (build-system gnu-build-system) + (arguments (let* ((target (%current-target-system)) + (compiler (if target + (string-append target "-gcc") + "gcc"))) + `(#:phases + (modify-phases %standard-phases + ;; We replace the configure phase in order to remove all the + ;; default flags. The configure script doesn't accept most + ;; of the default flags + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + ;; The configure script can only be told which + ;; compiler to use through environment variables + (setenv "CC" ,compiler) + (apply invoke "./configure" configure-flags))) + (add-before 'install 'fix-makefile + (lambda* (#:key outputs #:allow-other-keys) + ;; We can't chown to root as the chroot doesn't have + ;; this user. Also the store is owned by root so this + ;; isn't necessary. + (substitute* "bsd.prog.mk" + (("^\tchown.*$") ""))))) + #:configure-flags (list (string-append "--prefix=" %output) + (string-append "--target=" (or ,target "")) + "--with-timestamp") + ;; Compiler choice is not carried over from the configure script + #:make-flags (list (string-append "CC=" ,compiler)) + ;; There are no tests provided + #:tests? #f))) + (native-inputs `(("bison" ,bison))) + (home-page "https://github.com/Duncaen/OpenDoas") + (synopsis "Portable version of OpenBSD's doas command") + (description "Doas is a minimal replacement for the venerable sudo. It was +initially written by Ted Unangst of the OpenBSD project to provide 95% of the +features of sudo with a fraction of the codebase.") + (license license:isc))) + (define-public wpa-supplicant-minimal (package (name "wpa-supplicant-minimal") diff --git a/gnu/system.scm b/gnu/system.scm index d929187695..d5fd0979a1 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -896,6 +896,7 @@ use 'plain-file' instead~%") (file-append inetutils "/bin/ping6") (file-append sudo "/bin/sudo") (file-append sudo "/bin/sudoedit") + (file-append opendoas "/bin/doas") (file-append fuse "/bin/fusermount") ;; To allow mounts with the "user" option, "mount" and "umount" must