From patchwork Fri Jun 12 16:45:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 22688 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 CF88827BBE3; Fri, 12 Jun 2020 17:46:08 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 379B527BBE1 for ; Fri, 12 Jun 2020 17:46:08 +0100 (BST) Received: from localhost ([::1]:40220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjmoh-0001dZ-OC for patchwork@mira.cbaines.net; Fri, 12 Jun 2020 12:46:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjmoc-0001dE-Kk for guix-patches@gnu.org; Fri, 12 Jun 2020 12:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jjmoc-0000RA-8x for guix-patches@gnu.org; Fri, 12 Jun 2020 12:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jjmoc-0001yY-7A for guix-patches@gnu.org; Fri, 12 Jun 2020 12:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41688] Add rsyslog Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Jun 2020 16:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41688 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Katherine Cox-Buday Cc: 41688@debbugs.gnu.org Received: via spool by 41688-submit@debbugs.gnu.org id=B41688.15919803397557 (code B ref 41688); Fri, 12 Jun 2020 16:46:02 +0000 Received: (at 41688) by debbugs.gnu.org; 12 Jun 2020 16:45:39 +0000 Received: from localhost ([127.0.0.1]:40515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjmoE-0001xp-RH for submit@debbugs.gnu.org; Fri, 12 Jun 2020 12:45:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjmoC-0001xX-7P for 41688@debbugs.gnu.org; Fri, 12 Jun 2020 12:45:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39728) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjmo6-0000FO-UB; Fri, 12 Jun 2020 12:45:30 -0400 Received: from [2a01:e0a:1d:7270:6a6c:dc17:fc02:cfda] (port=55258 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jjmo6-0000sb-1D; Fri, 12 Jun 2020 12:45:30 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: Date: Fri, 12 Jun 2020 18:45:26 +0200 In-Reply-To: (Katherine Cox-Buday's message of "Wed, 3 Jun 2020 09:29:57 -0500") Message-ID: <87r1uk44ih.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 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 Hi Katherine, Thanks for this long patch series! I’ve applied half of it. Here are some comments: Katherine Cox-Buday skribis: > From 8d8d97441b397a48ae26761c2d826f35ae5d56e9 Mon Sep 17 00:00:00 2001 > From: Katherine Cox-Buday > Date: Tue, 2 Jun 2020 14:55:23 -0500 > Subject: [PATCH 1/5] gnu: Add libestr. > > * gnu/packages/c.scm (libestr): New variable. Applied with the changes below. > From 0e0e9cc550ff002d7bebb4f93b573c5ba527ac4d Mon Sep 17 00:00:00 2001 > From: Katherine Cox-Buday > Date: Tue, 2 Jun 2020 15:47:41 -0500 > Subject: [PATCH 5/5] gnu: Add rsyslog. > > * gnu/packages/logging.scm (rsyslog): New variable. [...] > +(define-public rsyslog > + (let ((modules (list "fmhash" "fmhttp" "imbatchreport" > + "imczmq" "imdiag" "imdocker" > + "imfile" "imgssapi" "imkafka" > + "imklog" "imkmsg" "immark" > + "improg" "impstats" "imptcp" "imtcp" > + "imtuxedoulog" "imudp" "imuxsock" > + "mmanon" "mmaudit" "mmcount" > + "mmdblookup" "mmexternal" > + "mmfields" "mmjsonparse" > + "mmkubernetes" "mmnormalize" > + "mmpstrucdata" "mmrfc5424addhmac" > + "mmrm1stspace" "mmsequence" > + "mmsnmptrapd" "mmtaghostname" > + "mmutf8fix" "omclickhouse" > + "omczmq" "omelasticsearch" > + "omfile-hardened" "omgssapi" > + "omhttpfs" "omhttp" "omkafka" > + "omlibdbi" "ommail" "ommysql" "ompgsql" > + "omprog" "omruleset" "omsnmp" > + "omstdout" "omtcl" "omtesting" > + "omudpspoof" "omuxsock" > + "pmaixforwardedfrom" "pmciscoios" > + "pmcisconames" "pmdb2diag" > + "pmlastmsg" "pmnormalize" > + "pmnull" "pmpanngfw" "pmsnare"))) Could you add a comment explaining where this list comes from? Alternatively, do you think it could be generated at build time? > + #:configure-flags > + (list > + "--enable-largefile" > + "--enable-inet" > + "--enable-regexp" > + "--enable-rsyslogrt" > + "--enable-rsyslogd" That’s also a very long list. :-) Can we rely on defaults? Or, alternatively, could you add a comment explaining how to come up with the list? > + (outputs `("out" ,@modules)) Oh. Is it a good idea to have one output per module? We’ve never done such a thing before. Usually, extra outputs are justified if not having them would lead to a big closure (as reported by ‘guix size’). The solution is usually to have two or three outputs, but not 20ish. :-) WDYT? > + (home-page "https://www.rsyslog.com/") > + (synopsis "RSYSLOG is the rocket-fast system for log processing") > + (description > + "It offers high-performance, great security features and a modular s/It/Rsyslog/ > + (license (list license:gpl3 > + license:asl2.0 > + license:lgpl3))))) Please add a comment above explaining if it’s triple-licensing or a combination, and possibly add missing ‘+’ signs. > From 3667290c9d419ce5404d6a0631bf20ddbcf1c286 Mon Sep 17 00:00:00 2001 > From: Katherine Cox-Buday > Date: Tue, 2 Jun 2020 15:34:19 -0500 > Subject: [PATCH 4/5] gnu: Add liblognorm. > > * gnu/packages/c.scm (liblognorm): New variable. [...] > + (arguments > + ;; Bash scripts interact with the filesystem > + `(#:tests? #f Could you clarify what this means with regards to running tests? > + #:configure-flags > + (list (string-append "--includedir=" > + (assoc-ref %outputs "dev") > + "/include")) > + #:phases > + (modify-phases %standard-phases > + (add-after 'install 'fix-circular-dependency > + (lambda* (#:key outputs #:allow-other-keys) > + (write (string-append "KT: " (assoc-ref outputs "lib") > + "/lib/pkgconfig")) > + (write (string-append "KT: " (assoc-ref outputs "dev") > + "/lib/pkgconfig")) Leftovers. :-) > + (let ((pkgconfig (string-append (assoc-ref outputs "dev") > + "/lib/pkgconfig"))) > + (mkdir-p pkgconfig) > + (rename-file (string-append (assoc-ref outputs "lib") > + "/lib/pkgconfig") > + pkgconfig))))))) Missing #t return value. > + (outputs '("out" "lib" "dev")) “dev” is not part of the output names conventionally used. However, there’s “include”, which is automatically recognized by gnu-build-system and turned into a ‘--includedir’ flag. Perhaps you could try this? Or you can just have “out” and “lib”: so far, unless headers are very large, we just keep them alongside the library. > + (home-page "https://www.liblognorm.com") > + (synopsis > + "Fast samples-based log normalization library") > + (description > + "Liblognorm normalizes event data into well-defined name-value > +pairs and a set of tags describing the message.") > + (license license:lgpl2.1))) Could it be lgpl2.1+? (I haven’t checked.) > From db4bcfc18e95fa39851c72414261b19b25c49db0 Mon Sep 17 00:00:00 2001 > From: Katherine Cox-Buday > Date: Tue, 2 Jun 2020 15:24:59 -0500 > Subject: [PATCH 2/5] gnu: Add libfastjson. > > * gnu/packages/c.scm (libfastjson): New variable. Applied with minor changes. > From 9e0c24cc6e0666581b11b45f831ab49486adbdf8 Mon Sep 17 00:00:00 2001 > From: Katherine Cox-Buday > Date: Tue, 2 Jun 2020 15:29:08 -0500 > Subject: [PATCH 3/5] gnu: Add liblogging. > > * gnu/packages/c.scm (liblogging): New variable. Applied. Thank you! Ludo’. diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index e935042572..2e62111d44 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -394,14 +394,9 @@ more, like escaping special characters.") ("automake" ,automake) ("libtool" ,libtool))) (home-page "https://github.com/rsyslog/libfastjson") - (synopsis "Fast json library for C ") + (synopsis "Fast JSON library for C") (description - "libfastjson is a fork from json-c, and is currently under development. -The aim of this project is not to provide a slightly modified clone of json-c. -It's aim is to provide: a small library with essential json handling -functions, sufficiently good json support (not 100% standards compliant), and -be very fast in processing.") - (license - (license:non-copyleft - "https://github.com/rsyslog/libfastjson/blob/master/COPYING" - "It is a MIT license.")))) + "libfastjson is a fork from json-c aiming to provide: a small library +with essential JSON handling functions, sufficiently good JSON support (not +100% standards compliant), and very fast processing.") + (license license:expat)))