From unknown Sun Jun 15 01:09:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75508] [PATCH 0/2] gnu: Add chimerautils. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 12 Jan 2025 09:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75508@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.173667316328897 (code B ref -1); Sun, 12 Jan 2025 09:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jan 2025 09:12:43 +0000 Received: from localhost ([127.0.0.1]:46081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWu1T-0007W1-1C for submit@debbugs.gnu.org; Sun, 12 Jan 2025 04:12:43 -0500 Received: from lists.gnu.org ([2001:470:142::17]:57346) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tWu1Q-0007Vm-Cq for submit@debbugs.gnu.org; Sun, 12 Jan 2025 04:12:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tWu1K-0008GK-JX for guix-patches@gnu.org; Sun, 12 Jan 2025 04:12:34 -0500 Received: from magnesium.8pit.net ([45.76.88.171]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tWu1I-00065m-Es; Sun, 12 Jan 2025 04:12:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=C2nFSSpA 1wU+eme9GB16AjujUZuTy7e1sLhNBHsUr5g=; h=date:subject:to:from; d=soeren-tempel.net; b=PcFY2LYGocfWPdvvNO5ENxs4Z0+gmCjTFUCVuAqyaHolP51 zpS1Ua+p3zFMibMPntuSkVC1bEeQrs919zrIzPnS4mPAJhIlGMoaN3VFIYbFLN51a2Kanv H4agfdxRfz/XwVNA5GP6CzmeVy26iVc7t/0G09XAHoS9fngU/Vcb64= Received: from localhost ( [2a02:560:4d3d:df00:a0e3:3d9b:43c1:9542]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 5f20f5af (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 12 Jan 2025 10:12:28 +0100 (CET) From: soeren@soeren-tempel.net Date: Sun, 12 Jan 2025 10:12:05 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=45.76.88.171; envelope-from=soeren@soeren-tempel.net; helo=magnesium.8pit.net X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: =?UTF-8?Q?S=C3=B6ren?= Tempel This patchseries adds a package for chimerautils, the FreeBSD-based Linux userland from Chimera Linux [1]. This userland can be used as an alternative to coreutils/util-linux/findutils/... within a us [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: chimera-linux.org] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: chimera-linux.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=soeren%40soeren-tempel.net;ip=2001%3A470%3A142%3A%3A17;r=debbugs.gnu.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) From: Sören Tempel This patchseries adds a package for chimerautils, the FreeBSD-based Linux userland from Chimera Linux [1]. This userland can be used as an alternative to coreutils/util-linux/findutils/... within a user's profile. In that sense, it is similar to existing packages such as sbase or BusyBox. It requires packaging libxo, which is not packaged so far. Further, I backported a patch which fixes compatibility of Chimera's find(1) implementation with GNU getopt(3). [1]: https://chimera-linux.org Sören Tempel (2): gnu: Add libxo. gnu: Add chimerautils. gnu/local.mk | 1 + gnu/packages/admin.scm | 36 +++++++++++++++++++ .../chimerautils-find-getopt-fix.patch | 25 +++++++++++++ gnu/packages/textutils.scm | 25 +++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 gnu/packages/patches/chimerautils-find-getopt-fix.patch base-commit: 5d6c8767f67885bc9b2c8f18ab1f667d0065346b From unknown Sun Jun 15 01:09:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75508] [PATCH 1/2] gnu: Add libxo. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Jan 2025 09:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75508@debbugs.gnu.org Received: via spool by 75508-submit@debbugs.gnu.org id=B75508.173667357629928 (code B ref 75508); Sun, 12 Jan 2025 09:20:02 +0000 Received: (at 75508) by debbugs.gnu.org; 12 Jan 2025 09:19:36 +0000 Received: from localhost ([127.0.0.1]:46091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWu88-0007me-D9 for submit@debbugs.gnu.org; Sun, 12 Jan 2025 04:19:36 -0500 Received: from magnesium.8pit.net ([45.76.88.171]:37750) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tWu85-0007mQ-TA; Sun, 12 Jan 2025 04:19:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=ZB92MwVQ zBcix6fvFZWnol+jyUsCnJvRrzlZNEZVUXE=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=vg9OhN8BUVleX83oQRDL7GfBwTFIVE 3sBvMt8B0UeRB6+gYunQGAWsmB0E34lLqQUwkj57cdK1kDLhEUQzq8T6uB0BkNK8oN/B4p rJkr9iv2cSzotLHAjDvmtkjpmMmWiEDhVRoqEMKrDslhkNXO4rv3231rp6WCgdGv0pDp3f c= Received: from localhost ( [2a02:560:4d3d:df00:a0e3:3d9b:43c1:9542]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 98b36511 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 12 Jan 2025 10:19:31 +0100 (CET) From: soeren@soeren-tempel.net Date: Sun, 12 Jan 2025 10:19:25 +0100 Message-ID: <5a1ed57719c244d292b02447f869232b45abd08c.1736672673.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) From: Sören Tempel * gnu/packages/textutils.scm (libxo): New procedure. --- gnu/packages/textutils.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 6091d1ea6d4..d33dcb6f093 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -334,6 +334,31 @@ (define-public libgtextutils the Hannon Lab.") (license license:agpl3+))) +(define-public libxo + (package + (name "libxo") + (version "1.7.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Juniper/libxo") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "115jv067msym0lsxkiz95ddvspd6smvww37248xkqyin0rxb2m0j")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool)) + (home-page "http://juniper.github.io/libxo/libxo-manual.html") + (synopsis "Library for Generating Text, XML, JSON, and HTML Output") + (description + "This library allows an application to generate text, XML, +JSON, and HTML output using a common set of function calls. The application +decides at run time which output style should be produced. The application +calls a function @code{xo_emit} to product output that is described in a format +string. A \"field descriptor\" tells libxo what the field is and what it means.") + (license license:bsd-2))) + (define-public cityhash (let ((commit "8af9b8c")) (package From unknown Sun Jun 15 01:09:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75508] [PATCH 2/2] gnu: Add chimerautils. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 12 Jan 2025 09:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75508@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 75508-submit@debbugs.gnu.org id=B75508.173667358029939 (code B ref 75508); Sun, 12 Jan 2025 09:20:02 +0000 Received: (at 75508) by debbugs.gnu.org; 12 Jan 2025 09:19:40 +0000 Received: from localhost ([127.0.0.1]:46093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWu8B-0007mo-SU for submit@debbugs.gnu.org; Sun, 12 Jan 2025 04:19:40 -0500 Received: from magnesium.8pit.net ([45.76.88.171]:37750) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tWu86-0007mQ-W2; Sun, 12 Jan 2025 04:19:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=8ZNFNu8Q aiesfLjr4173lOBCBPdEm1ByBYiM24/EuL4=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=Pu2/+Ws6G4BLiqt81AOI2SYmk3TnD8 dZoZitZnFm7yUYeoworxlllpgw6WyLOY7yS8e3Kiyvo0qWLkd/l7P80iFDWDrTHwNJTUZV wrNkNphtWVtZu0NF8XOdOY/EBD8MUQ6KN3TIOkUoY8SL5rjFFY8l38gJtjlMl6uW4gn/xE M= Received: from localhost ( [2a02:560:4d3d:df00:a0e3:3d9b:43c1:9542]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 7e95a2c5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 12 Jan 2025 10:19:33 +0100 (CET) From: soeren@soeren-tempel.net Date: Sun, 12 Jan 2025 10:19:26 +0100 Message-ID: <957ea4efbeb380dc25cfe177d94eb54f3dd06d50.1736672673.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/admin.scm (chimerautils): New procedure. * gnu/packages/patches/chimerautils-find-getopt-fix.patch: New file. * gnu/local.mk: Add new patch. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 36 +++++++++++++++++++ .../chimerautils-find-getopt-fix.patch | 25 +++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 gnu/packages/patches/chimerautils-find-getopt-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9201230f35f..54789bf62cb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1075,6 +1075,7 @@ dist_patch_DATA = \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/ceph-fix-for-newer-boost.patch \ %D%/packages/patches/cf-tool-add-languages.patch \ + %D%/packages/patches/chimerautils-find-getopt-fix.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/cl-asdf-config-directories.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7fd05341993..a5383682720 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -154,6 +154,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages imagemagick) #:use-module (gnu packages inkscape) #:use-module (gnu packages kerberos) + #:use-module (gnu packages libedit) #:use-module (gnu packages libbsd) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) @@ -669,6 +670,41 @@ (define-public daemontools (license license:public-domain) (home-page "https://cr.yp.to/daemontools.html"))) +(define-public chimerautils + (package + (name "chimerautils") + (version "14.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chimera-linux/chimerautils") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "chimerautils-find-getopt-fix.patch")) + (sha256 + (base32 "1z23ii57r9li4ffk9fg8q5k6n74rkzvmj2v5bcwb7dgkjanmhrn5")))) + (build-system meson-build-system) + (arguments + (list + #:tests? #f)) ;no test suite + (inputs (list (list zstd "lib") + zlib + ncurses + acl + libedit + libxo + openssl)) + (native-inputs (list flex bison pkg-config)) + (home-page "https://github.com/chimera-linux/chimerautils") + (synopsis "The FreeBSD-based core Linux userland from Chimera Linux") + (description + "This is a port of the FreeBSD userland for Linux provided by +the Chimera Linux distribution. Essentially, it is a collection of UNIX tools +such as @command{grep}, @command{cp}, @command{vi}, etc. and can be used as an +alternative to the corresponding implementations from the GNU project.") + (license license:bsd-2))) + (define-public daemonize (package (name "daemonize") diff --git a/gnu/packages/patches/chimerautils-find-getopt-fix.patch b/gnu/packages/patches/chimerautils-find-getopt-fix.patch new file mode 100644 index 00000000000..8748b877a86 --- /dev/null +++ b/gnu/packages/patches/chimerautils-find-getopt-fix.patch @@ -0,0 +1,25 @@ +Patch-Source: https://github.com/chimera-linux/chimerautils/commit/b82903e6fbe37eb4feeeec259600611d46a71282 + +By default, GNU getopt(3) will continue parsing options after the +first nonoption. This behavior is incompatible with this find(1) +implementation, causing parts of the expression to be parsed as +(invalid) options. + +The behavior can be disabled by prefixing the option string with +a `+` character. Other applets, such as flock or mcookie do it +already so it would be cool to do this here too to make find(1) +compatible with glibc. + +diff --git a/src.freebsd/findutils/find/main.c b/src.freebsd/findutils/find/main.c +index 931d811..876d532 100644 +--- a/src.freebsd/findutils/find/main.c ++++ b/src.freebsd/findutils/find/main.c +@@ -90,7 +90,7 @@ main(int argc, char *argv[]) + p = start = argv; + Hflag = Lflag = 0; + ftsoptions = FTS_NOSTAT | FTS_PHYSICAL; +- while ((ch = getopt(argc, argv, "EHLPXdf:sx")) != -1) ++ while ((ch = getopt(argc, argv, "+EHLPXdf:sx")) != -1) + switch (ch) { + case 'E': + regexp_flags |= REG_EXTENDED;