From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 6224 invoked from network); 23 May 2022 03:22:30 -0000 Received: from 9front.inri.net (168.235.81.73) by inbox.vuxu.org with ESMTPUTF8; 23 May 2022 03:22:30 -0000 Received: from mail-il1-f170.google.com ([209.85.166.170]) by 9front; Sun May 22 23:21:12 -0400 2022 Received: by mail-il1-f170.google.com with SMTP id z16so2822137ilp.5 for <9front@9front.org>; Sun, 22 May 2022 20:21:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:in-reply-to:references:organization :mime-version; bh=gn9D1y7ZzYGhA44lQUVuCSg0JAnYovauPdFZ0HWnPHw=; b=MwRpyVf0ZBDpR/b8d3DNioxhOzXu9hCXcvoWGQ4Wg6xlYU7Qp7E8ez2N0aHq2AHUBv 9DwDnz9NnSrBIe+no9DfXfeaPI6zV0jeoEeUiAF0leIzNwy/AfDWbdNT2wv9qbolT5ko bJSScspc+3tLwbkXSx1Z21A3Xa/50cq14XnL1pHQsQZbbdlbViGQoxg4Twydkbo7S1pl qUPypM4rN0VZ9yfckZ5BlFS7kpEDVS9QTUS8ujBd0Yz3oTO+vIglka1Ao6sCTp5dOHtB LdYG4U8F8P5Lx5khN9HCx8RAyOMqvkITkrbHgVY/5aeJQels823Sx3oZk4srvQnwpv87 1p9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:organization:mime-version; bh=gn9D1y7ZzYGhA44lQUVuCSg0JAnYovauPdFZ0HWnPHw=; b=DZU4ZGTPaanletFXsIddQNKkzxQVJGA7j9mj/lY0NJa0VXcSgzsF7UF/qBCOxa4QFk jfN2M9LbP0gf0VNDocrTnYBnSq0lStbfGsuJkxsYOaEaAobeI8wbzmW9i4KSjd9w5CaP 150n4VgdlX09NnYbUMyYwxRC6k2uFlYtQwU7sN3ra3/W652PAL7kxylGvd4sWCgh95Nc Gk3VLm9Jbk3AvO2Y7QCkDzTuuC0Rg6nx2HaUBA0E1O0uk5gMgY4kKmmB2iDFXM+a70zf 8fcXYJSxudOSVQc7KGbV0YoWtmQwn2vgdIZc3ECnnWxfemXSm4ZLgc7UuxYx7BbpjtyN UDig== X-Gm-Message-State: AOAM530yIwaOtnSDrlm8GkvfqgK92HdbLFzR8wC/wKIE+XZaVnAVeKEH LcaEm1gKi+5m03NrZJdm7QaCd+Ttv0Q= X-Google-Smtp-Source: ABdhPJyd8kKS+FBHqx6S6xFusWsBMeIE6aZ1cSZWCADng6T8H7TXomMSzYYSYOVJX9/HJoIkn5YYLQ== X-Received: by 2002:a05:6e02:1c29:b0:2d1:7a01:a7db with SMTP id m9-20020a056e021c2900b002d17a01a7dbmr6447121ilh.176.1653276067412; Sun, 22 May 2022 20:21:07 -0700 (PDT) Return-Path: Received: from spruce.localdomain ([2601:246:4e03:dc20::f726]) by smtp.gmail.com with ESMTPSA id w7-20020a029007000000b0032df31d45fesm2432683jaf.166.2022.05.22.20.21.06 for <9front@9front.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 20:21:06 -0700 (PDT) Date: Sun, 22 May 2022 22:18:20 -0500 From: Amavect To: 9front@9front.org Message-ID: <20220522221820.4294230d@spruce.localdomain> In-Reply-To: <5BED10E2E8586FE65164516C75BFE8CC@eigenstate.org> References: <8A703EB8EACED4EFE003DD77486E70FE@eigenstate.org> <5BED10E2E8586FE65164516C75BFE8CC@eigenstate.org> Organization: Amavect Industries X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/SrOLAld_ewrPshf=zSCIipE" List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: distributed converged CSS cloud ActivityPub configuration component Subject: Re: [9front] patch: import replacement for ape/patch Reply-To: 9front@9front.org Precedence: bulk --MP_/SrOLAld_ewrPshf=zSCIipE Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Sun, 22 May 2022 19:09:40 -0400 ori@eigenstate.org wrote: > We've been dragging along an antique version of Gnu patch > as part of ape. It's a bulky program with built in remote > code execution as part of ed-style diffs. This will conflict with /rc/bin/patch and /sys/man/1/patch, which I'm all for removing. Attached is my edit of the man page: correct Synopsis patch italics clarify what patch does Addtions -> Additions fix table italics clarify -p in See Also, add comma in Bugs, use all bold for commands I can't seem to apply your diff with your program: cpu% touch patch patch.c cpu% lc 6.out* diff patch patch.c cpu% 6.out diff 6.out: diff:4: unable to find patch offset cpu% 6.out -p4 diff 6.out: open null: 'null' not found cpu% ape/patch -i diff patching file `patch' patching file `patch.c' cpu% I'm guessing /dev/null is special-cased in gnu patch. Thanks, Amavect --MP_/SrOLAld_ewrPshf=zSCIipE Content-Type: application/x-troff-man Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=patch.man LlRIIFBBVENIIDEKLlNIIE5BTUUKcGF0Y2ggXC0gYXBwbHkgZGlmZnMKLlNIIFNZTk9QU0lTCi5C IHBhdGNoClsKLkIgLVIKXQpbCi5CIC1wCi5JIG5zdHJpcApdClsKLkIgLWYKLkkgbWF4ZnV6egpd ClsKLkkgcGF0Y2ggLi4uCl0KLlNIIERFU0NSSVBUSU9OCi5JIFBhdGNoCnRha2VzIGEgcGF0Y2gg ZmlsZSBpbiB1bmlmaWVkIGRpZmYgZm9ybWF0IGFuZCBhcHBseSB0aGUgZGlmZmVyZW5jZXMgdG8g dGhlIGZpbGUgdHJlZS4KSWYgdGhlIGZpbGUgaXMgbm90IGFuIGV4YWN0IG1hdGNoLCBpdCB3aWxs IHNlYXJjaCBmb3J3YXJkcyBhbmQKYmFja3dhcmRzIGZvciB0aGUgc3Vycm91bmRpbmcgY29udGV4 dCB1cCB0bwouSSBtYXhmdXp6CmxpbmVzLgoKVGhlIGZvbGxvd2luZyBvcHRpb25zIGFyZSBzdXBw b3J0ZWQ6Ci5UUAouQiAtUgpSZXZlcnNlIGRpcmVjdGlvbiBvZiB0aGUgcGF0Y2guIEFkZGl0aW9u cyBiZWNvbWUgcmVtb3ZhbHMsCmFuZCB0aGUgbmV3IGFuZCBvbGQgZmlsZSBuYW1lcyBhcmUgc3dh cHBlZC4KLlRQCi5CSSAtcCBcIG5zdHJpcApSZW1vdmUKLkkgbnN0cmlwCmVsZW1lbnRzIGZyb20g dGhlIHBhdGhzIHRvIHRoZSBmaWxlcy4KLlRQCi5CSSAtZiBcIG1heGZ1enoKQ29udHJvbHMgaG93 IGZhcgouSSBwYXRjaApzZWFyY2hlcyBmb3IgY29udGV4dCB3aGVuIGFwcGx5aW5nIGEgcGF0Y2gu CklmIG5vdCBzcGVjaWZpZWQsIHRoaXMgZGVmYXVsdHMgdG8gMjUwIGxpbmVzLgouU0ggU0VFIEFM U08KLklSIGRpZmYgKDEpLAouSVIgZ2l0L2V4cG9ydCAoMSkKCi5TSCBCVUdTCi5QUApUaGUgb3V0 cHV0IG9mCi5JUiBkaWZmIC1jCmlzIG5vdCBoYW5kbGVkLgouUFAKUmVqZWN0IGZpbGVzIGFuZCBi YWNrdXBzIGFyZSBub3Qgc3VwcG9ydGVkLgouUFAKQWxsIGZpbGVzIGFyZSBwcm9jZXNzZWQgaW4g bWVtb3J5LCB3aGljaCBsaW1pdHMKdGhlIGZpbGVzIGhhbmRsZWQgdG8gMiBnaWdhYnl0ZXMuCg== --MP_/SrOLAld_ewrPshf=zSCIipE--