From patchwork Tue Oct 12 09:12:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Foo Chuan Wei X-Patchwork-Id: 33787 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 9A2D027BBE3; Tue, 12 Oct 2021 10:43:46 +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=-1.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 ESMTPS id 052B327BBE1 for ; Tue, 12 Oct 2021 10:43:46 +0100 (BST) Received: from localhost ([::1]:39832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1maEJz-0005AA-99 for patchwork@mira.cbaines.net; Tue, 12 Oct 2021 05:43:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maE7i-0007iX-Br for guix-patches@gnu.org; Tue, 12 Oct 2021 05:31:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1maE7i-00062t-2t for guix-patches@gnu.org; Tue, 12 Oct 2021 05:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1maE7h-0000Tz-TO for guix-patches@gnu.org; Tue, 12 Oct 2021 05:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51015] [PATCH v3] gnu: Add Random Identity Generator (rig) References: In-Reply-To: Resent-From: Foo Chuan Wei Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Oct 2021 09:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51015@debbugs.gnu.org Received: via spool by 51015-submit@debbugs.gnu.org id=B51015.16340310101786 (code B ref 51015); Tue, 12 Oct 2021 09:31:01 +0000 Received: (at 51015) by debbugs.gnu.org; 12 Oct 2021 09:30:10 +0000 Received: from localhost ([127.0.0.1]:33517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1maE6s-0000Sk-3G for submit@debbugs.gnu.org; Tue, 12 Oct 2021 05:30:10 -0400 Received: from mail-oln040092255054.outbound.protection.outlook.com ([40.92.255.54]:29324 helo=APC01-HK2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1maE6p-0000Qm-7z for 51015@debbugs.gnu.org; Tue, 12 Oct 2021 05:30:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m/kuRF33lr9u9dWz/gmP0TlrEkhvJGKN5uuNB49Ft1gyr763EWVVWeYF3qXZtmJ3zHPYC76Tq3IYNBEl01nrfIiJWA4xdyDDUNl20vLt0XaHhY+XBGBKruAiWHNZDqAZNeokchu5NR4428RAZVLXhMfAVKP/lWf7sZmpf4QsQ4/T8tw73/G07w8x3Ed2bBPYEn7/GcQLKrZwg27Ia2tA+YwPaefxTengXwG4u7Qz7N2M62RbHegQZVvqKrqUK3bCrNr34DBIKOiCmFmjZQ0kMvbIW3KUiQJ8U+viN9JVbvZs/XvFGoYXfi8GntfZkSbWf4Zn38AgkiNRbumchEqXXg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4TaeB4/0a6rW79bAbPaPQqPmk5pFB8ZiJacdbZ22vDU=; b=QVUtn+FYDE0DBZKGegogw5W3xKUIDBDlWMQd7j2Pws8fnS5EGPjA/GoHnESVXbcF+G6uh0x9xxXM2hdaYRatrZ82IlSfm7Y0JHuCfPW4nONHg/63WKHKgQ1BAcNdmD9231C8PT5C5NSaZHSfLltIQbzc79p0x8qBxmBkOaxdUhKn7/YdcaUwLrsf73DvQFrotach8yIbtc7BIz6w5WSG108hFC72z8evGia+b8ORVWrwYWls+JFbe4TEs89IIkmTLiDRJHnwzCQsFd4RjnYf91HuEVMRbMJS8lf2q1SEwZY8I1KZiaTRWCmut0KGDSJIn2Wfv7LL+XJmtpZG4T0mZw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4TaeB4/0a6rW79bAbPaPQqPmk5pFB8ZiJacdbZ22vDU=; b=bbcDkpOgBCwzUHjp69wrNrlfGZGBPaQi8hfVG13jTupvGJJHJsuikasVPaD5+EsHd2z8XfH078wNG3hy0WYkT83EnZ8R5XOT61BjKkQJEpyOeuI7ACdgh9CUWc6THxbqBUzyNDVhpfNw0WB7jfhc50j8YBsYmxCrUaTgjMFW0tkmrFakEUAF86EhjBXNctbBgxrqCH2qLda9lZCn95LWnI9X6H0KbaFhdQ2oCrt9QoTMruqRFMT4lLbHdbhVysaJv0q6PRrNdkNikmHO2IsNR5ALOnWpnfEWmw9noFYZFQWX+NJfiHTXySTIJI4B/f8+zpZB80kDdv2Hy9NbIA6m3w== Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) by PU1PR01MB2060.apcprd01.prod.exchangelabs.com (2603:1096:803:27::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.20; Tue, 12 Oct 2021 09:29:57 +0000 Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::b81b:9b11:fede:9015]) by PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::b81b:9b11:fede:9015%6]) with mapi id 15.20.4587.026; Tue, 12 Oct 2021 09:29:57 +0000 Date: Tue, 12 Oct 2021 09:12:43 +0000 From: Foo Chuan Wei Message-ID: Content-Disposition: inline X-TMN: [lAuZ10coUjdh7GfU7GfaoltiWQuElAs89tkfOp5ADik=] X-ClientProxiedBy: HKAPR04CA0004.apcprd04.prod.outlook.com (2603:1096:203:d0::14) To PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) X-Microsoft-Original-Message-ID: <20211012091243.5dqbujfwblxhufsw@main> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from main (118.103.255.200) by HKAPR04CA0004.apcprd04.prod.outlook.com (2603:1096:203:d0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25 via Frontend Transport; Tue, 12 Oct 2021 09:29:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a2e1331-fac1-45c9-e5cf-08d98d62db31 X-MS-TrafficTypeDiagnostic: PU1PR01MB2060: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9uPE/XOYtD7VoEuVJ3nruK/EPJNMmK5VpPfhRinmqwcU/iVFsFXqtiRzoFCgrTrkqUXEQ2dufkfqQdRXPtYGUz7Gcyuw50EH8whn47j+tfYb0VYcPWmeBnHn6698O1F5B7qTQjmCQ8/hxboQjlp0bGN70leR3BqJ/8bf1MTshQEJvEReURnPPvCP7FpkI9j29AZMx2yYxktscBhvl6QJjv32iDOXAm5eCDbsf2I/ouBmKKMdJZhhpp750NtIYDhiZPPda1FA5CqSVxeoMXEo6pj6f2suK9DeicBImQXmQ2RhRxiZ/bI/bAOqFY7KjV04VmodFcWKb39Eb2T+/zR5JHsE60kUxxBbYkxjLNTejJI2JojdjsozyclXAnfxf4mKk2Nlx/8g/IUwmDgFbLCbdoRCX74cczIOOkkjyqc1Rv1Rd71t8qUKXfOUBRA73pxb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VUSzKU0o4tm3XrfRFkU6m6u6Z32PeZekNGuWi35LlLjBUMsPLpvIyxqkW3cbBe6dNUfIjtSL+zRm+a5H6IA8+EOz/+ZodkeoKgAJs1iWY+ZN0kf9Nc9+qxStrpkDeOW6YI7DnIcKIhCtk/K4R7zwbQ== X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-5c337.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 7a2e1331-fac1-45c9-e5cf-08d98d62db31 X-MS-Exchange-CrossTenant-AuthSource: PU1PR01MB2155.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 09:29:57.6076 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB2060 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 * gnu/packages/shellutils.scm (rig): New variable. --- gnu/packages/patches/rig-makefile.patch | 27 ++++++++++++++++++ gnu/packages/shellutils.scm | 38 +++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 gnu/packages/patches/rig-makefile.patch base-commit: 35aaf1fe10488ae9ed732fb2c383d09a70c109c0 diff --git a/gnu/packages/patches/rig-makefile.patch b/gnu/packages/patches/rig-makefile.patch new file mode 100644 index 0000000000..24cc1c5810 --- /dev/null +++ b/gnu/packages/patches/rig-makefile.patch @@ -0,0 +1,27 @@ +diff -ur rig-1.11-orig/Makefile rig-1.11/Makefile +--- rig-1.11-orig/Makefile ++++ rig-1.11/Makefile +@@ -5,16 +5,18 @@ + + all: rig rig.6 + rig: rig.cc +- g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\"" ++ ${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\"" + + rig.6: rig.6.in + sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6 + + install: rig rig.6 +- install -g 0 -m 755 -o 0 -s rig $(BINDIR) +- install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6 +- install -g 0 -m 755 -o 0 -d $(DATADIR) +- install -g 0 -m 644 -o 0 data/*.idx $(DATADIR) ++ install -m 755 -d $(DESTDIR)$(BINDIR) ++ install -m 755 -d $(DESTDIR)$(DATADIR) ++ install -m 755 -d $(DESTDIR)$(MANDIR)/man6/ ++ install -m 755 rig $(DESTDIR)$(BINDIR)/rig ++ install -m 644 data/*.idx $(DESTDIR)$(DATADIR) ++ install -m 644 rig.6 $(DESTDIR)$(MANDIR)/man6/rig.6 + + clean: + rm -rf *~ *.rej *.orig *.o rig rig.6 diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 94b5536df7..1a1b35d48b 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -35,6 +35,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) + #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) @@ -398,3 +399,40 @@ the UNIX philosophy, these commands are designed to be composed via pipes. A large collection of functions such as basename, replace, contains or is_dir are provided as arguments to these commands.") (license license:expat))) + +(define-public rig + (package + (name "rig") + (version "1.11") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/rig/rig/" + version "/rig-" + version ".tar.gz")) + (sha256 + (base32 + "1f3snysjqqlpk2kgvm5p2icrj4lsdymccmn3igkc2f60smqckgq0")) + (patches (search-patches "rig-makefile.patch")))) + (build-system gnu-build-system) + (arguments `(#:make-flags + (list (string-append "CXX=" ,(cxx-for-target)) + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "rig.cc" + (("^#include ") + "#include ")) + #t))) + #:tests? #f)) + (home-page "http://rig.sourceforge.net") + (synopsis "Random identity generator") + (description + "RIG (Random Identity Generator) generates random, yet real-looking, +personal data. It is useful if you need to feed a name to a Web site, BBS, or +real person, and are too lazy to think of one yourself. Also, if the Web +site/BBS/person you are giving the information to tries to cross-check the +city, state, zip, or area code, it will check out.") + (license license:gpl2+)))