From patchwork Fri Feb 21 20:13:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 38922 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 51CFD27BBE9; Fri, 21 Feb 2025 20:14:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4392927BBE2 for ; Fri, 21 Feb 2025 20:14:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tlZPW-00025J-Az; Fri, 21 Feb 2025 15:14:11 -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 1tlZPQ-00024S-Vx for guix-patches@gnu.org; Fri, 21 Feb 2025 15:14:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tlZPQ-0003wy-Lj for guix-patches@gnu.org; Fri, 21 Feb 2025 15:14:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=UhRrbEikBhZrZ7olz/yevq5ApvGHHtQZZZvqBgXFP48=; b=MG8gGf2Qviyz5ih+2RRcpyRjLDUwksZvdEPrJ4e/6e8PtGJ7eo+70IeQteXMJAAN3diLySKPxQ/GDkDTNGOopcM5d6aQSe/kPhtBwYMeVtFTfcjcOEVSX/eFqtA1Wl8ipA2/JAFGa9lWbtUPrSSCseYspPqVeobkokwbZeCmINCyInJCWDZooyIU4nDVcGcLfvxGke3lwoRK62jTD8PW7jkwQ+FliI5uETg0rOUu1FX/6Nm8ldZKIkHdIoVDBxexHx2trFm3oeFwFGJbDfYU8fJYw3SJ67uXS7NBTNPjozdS3T+5+S+y2QUDtQtlcQ78bwQohBZWGBCPMa+HOEusKw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tlZPQ-0007Rf-8k for guix-patches@gnu.org; Fri, 21 Feb 2025 15:14:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76001] [PATCH v3] gnu: Add jool. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Feb 2025 20:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org Cc: Ashish SHUKLA , 76001@debbugs.gnu.org Received: via spool by 76001-submit@debbugs.gnu.org id=B76001.174016883728539 (code B ref 76001); Fri, 21 Feb 2025 20:14:03 +0000 Received: (at 76001) by debbugs.gnu.org; 21 Feb 2025 20:13:57 +0000 Received: from localhost ([127.0.0.1]:37046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tlZPG-0007Py-T2 for submit@debbugs.gnu.org; Fri, 21 Feb 2025 15:13:56 -0500 Received: from anamika.lostca.se ([65.21.75.227]:59406) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tlZPD-0007Ob-48 for 76001@debbugs.gnu.org; Fri, 21 Feb 2025 15:13:52 -0500 Received: from localhost.localdomain (unknown [IPv6:2a02:9140:3880:f200:ba30:2720:fcf3:737c]) (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) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 47EBCB71C; Fri, 21 Feb 2025 20:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1740168822; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=UhRrbEikBhZrZ7olz/yevq5ApvGHHtQZZZvqBgXFP48=; b=PHQhEkTDhEXAMmyZH8KZJQRuoZXCu3GjwEYA3zkUvp5a6z4/RjnobT9v+opKc0hTE98gqD Z/LVayr8GZJTVYlqSZ5oBEki3UnPzYOJlBJ+bJ7/L/opBBXmc+JYKdqQwJVavsQl8AsUgj xYoGu1Nje2JYVq5PAUVkKvccvHdL94k= Date: Fri, 21 Feb 2025 21:13:08 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <8734g78lko.fsf_-_@gnu.org> References: <8734g78lko.fsf_-_@gnu.org> 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: , Reply-to: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (jool): Add jool. Change-Id: Ic517fc8c4afbb964363ec68b3d89ce9fcd00c7d8 --- gnu/packages/networking.scm | 71 +++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) base-commit: dfabaa8a6faa58612a069eb47ee3f35a94b146fb diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1b97853a59..4e2c8a04c5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -66,6 +66,7 @@ ;;; Copyright © 2024 Alexey Abramov ;;; Copyright © 2024 James Smith ;;; Copyright © 2025 Sughosha +;;; Copyright © 2025 Ashish SHUKLA ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,6 +93,7 @@ (define-module (gnu packages networking) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system linux-module) #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) @@ -5060,6 +5062,75 @@ (define-public dnstracer back to the servers which know the data.") (license license:bsd-2))) +(define-public jool + (package + (name "jool") + (version "4.1.13") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/NICMx/Jool") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rz8pqn692y61rv33hvr18ngjjyha0m14m4w4yr82xp3km5kfnsj")))) + (build-system linux-module-build-system) + (outputs '("out" "module")) + (native-inputs (list automake autoconf libtool pkg-config)) + (inputs (list libnl iptables)) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((modules-dir + (string-append + (assoc-ref inputs "linux-module-builder") "/lib/modules"))) + (invoke "make" "-C" "src/mod" + (string-append "MODULES_DIR=" modules-dir)) + (invoke "make")))) + + (add-after 'configure 'really-configure + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "CC" #$(cc-for-target)) + (invoke "./configure" + (string-append "--prefix=" #$output)))) + + (add-after 'unpack 'patch-Makefiles + (lambda _ + (substitute* "src/mod/Makefile" + (("/sbin/depmod") + "true")) + (substitute* "src/usr/iptables/Makefile" + (("^XTABLES_SO_DIR =.*$") + (string-append "XTABLES_SO_DIR = " #$output "/lib/xtables"))))) + + (replace 'install + (lambda* (#:key inputs parallel-build? make-flags + #:allow-other-keys) + (let ((modules-dir + (string-append (assoc-ref inputs "linux-module-builder") + "/lib/modules")) + (module-dir (string-append + #$output:module + "/lib/modules"))) + (invoke "make" "install") + (invoke "make" "-C" "src/mod" "modules_install" + "DEPMOD=true" + "INSTALL_MOD_STRIP=1" + (string-append "MODULES_DIR=" modules-dir) + (string-append "MODULE_DIR=" module-dir) + (string-append "INSTALL_PATH=" module-dir) + (string-append "INSTALL_MOD_PATH=" module-dir)))))))) + (home-page "https://nicmx.github.io/Jool/") + (synopsis "@acronym{SIIT} and @acronym{NAT64} implementation for Linux") + (description "Jool implements @acronym{SIIT} and @acronym{NAT64} for Linux. It provides a kernel module, iptables (and netfilter) extensions, and command-line utilities.") + (license license:gpl2+))) + (define-public dropwatch (package (name "dropwatch")