From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +EvGJycL1GJMdQAAbAwnHQ (envelope-from ) for ; Sun, 17 Jul 2022 15:14:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aMqgJycL1GLDbwEA9RJhRA (envelope-from ) for ; Sun, 17 Jul 2022 15:14:15 +0200 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 A15ED3AF20 for ; Sun, 17 Jul 2022 15:14:14 +0200 (CEST) Received: from localhost ([::1]:59498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oD469-00077y-Ov for larch@yhetil.org; Sun, 17 Jul 2022 09:14:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oD45y-000777-Fk for bug-guix@gnu.org; Sun, 17 Jul 2022 09:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49115) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oD45y-0004sH-3d for bug-guix@gnu.org; Sun, 17 Jul 2022 09:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oD45x-0007F1-Rh for bug-guix@gnu.org; Sun, 17 Jul 2022 09:14:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#54691: [PATCH] gnu: fortune-mod: Remove off database. Resent-From: Csepp Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 17 Jul 2022 13:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54691 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Liliana Marie Prikler Cc: 54691@debbugs.gnu.org, control@debbugs.gnu.org, Csepp Received: via spool by 54691-submit@debbugs.gnu.org id=B54691.165806359227751 (code B ref 54691); Sun, 17 Jul 2022 13:14:01 +0000 Received: (at 54691) by debbugs.gnu.org; 17 Jul 2022 13:13:12 +0000 Received: from localhost ([127.0.0.1]:46872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oD459-0007DX-Ov for submit@debbugs.gnu.org; Sun, 17 Jul 2022 09:13:12 -0400 Received: from mx1.riseup.net ([198.252.153.129]:39748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oD455-0007DA-6k; Sun, 17 Jul 2022 09:13:10 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4Lm5B54DnHzDqGM; Sun, 17 Jul 2022 13:13:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1658063581; bh=t3+h1NQHhYyt9j2J26fmUiNhfRzD1Mry5Dtd4y3ARpI=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=OT7KdLuWV8ZTceZZ/OxZlRamTpIpikVrOfs6TmRyFbZlmggsP9fpZ+vGZBaFN5KLo VDtVjA0F9QQat8e0g3VTVlpgVi/NIyGCzHVyjP/RPFyLpYg7M5LnoF2lhLh1enUid7 YCUqYVoTSGW08P7MxXEzPXLXOTGlTeWvmRvTO+C8= X-Riseup-User-ID: 7F54B43E502EBCA0BDADBAAE2612552AE7EBDCC20879AA96F76EFA9498AC77ED Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4Lm5B468Lxz5vW6; Sun, 17 Jul 2022 13:13:00 +0000 (UTC) References: <20220716122126.26328-1-raingloom@riseup.net> <6ffa96ebffc7aa7858c2b20eb0f795f702b23528.camel@student.tugraz.at> <8735f19nth.fsf@riseup.net> <5dfc6d81f8b0600cde73254c42323a2c79c0453c.camel@gmail.com> From: Csepp Date: Sun, 17 Jul 2022 15:05:09 +0200 In-reply-to: <5dfc6d81f8b0600cde73254c42323a2c79c0453c.camel@gmail.com> Message-ID: <87r12jsx0m.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658063655; 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=qhGtbthj7kuUoD9uIRCdXUZdagm+St4ZpOLYw4Mt6fk=; b=pvx8Ri2Z0YSVdh8lO3S3kyJ15TY3Y6CZJUqUb+SXiCuB+pDbekG/V8qtKkqXoq237XWy9z hPeocZmKfG1kaHstYKrgA+wiw05uneNrFLazT3yrK333YmaOIjjsLAqqucqGmT9cSG2HgZ cTx2Lo6/E+jubNXL0cHo97E8Ek2YV3rttMMZIZNQq6/TObe++QukkRBE9MmORaKAf9eOrt AhFiFf9Tx5tcfosFUTo0YL/zcFnTvCtdwanjliWciw6oMgkHyElFIrar8yn1RXtpLJGAKP Q35k+/AJlsLyjKayBQclWkX8hsW9OLDR7SYXykMsraXUnEbmhmw2BkXkO2gwFw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658063655; a=rsa-sha256; cv=none; b=dg9pMrPkYPXoN9XxlbsCg7efDpsQ58Fim9jTwrrhTSmWLinhOqKWHYYdUklFH42KXIajkK GoBDn4/hNicUhw4LHiACkjxDhsFRmNK7PF/e083HunUpkaQxeBrHN2Byag1zZZjba1qVnI AYblT6hN+bffnjLYeAvhlQsTz19uhjSMWEmPFhPv6RMggOjuku2RiULJXV+SN4Cpx1ENKh /RPX9DVbwpbRx94YgxEVfRyQAIWAPByUx0QSf2NvV+moFRn7gklOKNCtX74guzMMrCf8wF UpRwmRkHVvKkS/UfFxxWRK0+0IswWGzLMNcM6E8JmH7OnHJU/wWNpM94UtYxGQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=OT7KdLuW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 5.97 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=OT7KdLuW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A15ED3AF20 X-Spam-Score: 5.97 X-Migadu-Scanner: scn1.migadu.com X-TUID: ik1FF+0ujIeW Liliana Marie Prikler writes: > Am Samstag, dem 16.07.2022 um 15:40 +0200 schrieb Csepp: >>=20 >> Liliana Marie Prikler writes: >>=20 >> > merge 56599 54691 >> > thanks >> >=20 >> > Am Samstag, dem 16.07.2022 um 14:21 +0200 schrieb raingloom: >> > > * gnu/packages/games.scm (fortune-mod): Delete off database after >> > > install phase. >> > > --- >> > > =C2=A0gnu/packages/games.scm | 5 ++++- >> > > =C2=A01 file changed, 4 insertions(+), 1 deletion(-) >> > >=20 >> > > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm >> > > index 713f9339b2..cf10ebc9b6 100644 >> > > --- a/gnu/packages/games.scm >> > > +++ b/gnu/packages/games.scm >> > > @@ -7721,7 +7721,10 @@ (define-public fortune-mod >> > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (lambda _ >> > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (with-directory-excursion = #$output >> > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (rename-file "= games/fortune" "bin/fortune") >> > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (rmdir "games"))))))) >> > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (rmdir "games")))) >> > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 (add-after 'install 'commit-censorship >> > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (lambda* (#:key outputs #:allow-other-keys) >> > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (delete-file-recursively (string= -append >> > Truly offensive files should be removed with a snippet rather than >> > a funnily named phase.=C2=A0 I'm not sure if this applies to all of of= f, >> > but let it be said, that there's plenty of fortunes that'd violate >> > the CoC in files not labeled as such.=C2=A0 Some files could probably = be >> > salvaged if we only removed some quotes =E2=80=93 for example limericks >> > about numbers are probably fine, but other limericks aren't.=C2=A0 >> > Furthermore, we should also revise the list of fortunes not in off, >> > men-women is just an alternate spelling of sexism. >> >=20 >> > Cheers >>=20 >> That's probably better done as a fork of upstream. If no one wants to >> do that, I wouldn't miss the package if it got yeeted. :shrug: > I'm not necessarily asking you to go over joke for joke; that would > need to be a collective decision of Guix folk anyway. Right now I just > want to (1) make that a snippet and (2) also take a critical look at > the files not labeled "offensive".=20 > > Cheers Doing it before the install phase requires also patching the build scripts. There are a bunch of other bugs calling me sadly, so I'm not super keen on putting more energy into this one.