Package: guix-patches;
Reported by: Ashish SHUKLA <ashish.is <at> lostca.se>
Date: Sat, 1 Feb 2025 21:39:02 UTC
Severity: normal
Tags: patch
To reply to this bug, email your comments to 76001 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#76001; Package guix-patches.
(Sat, 01 Feb 2025 21:39:02 GMT) Full text and rfc822 format available.Ashish SHUKLA <ashish.is <at> lostca.se>:guix-patches <at> gnu.org.
(Sat, 01 Feb 2025 21:39:03 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Ashish SHUKLA <ashish.is <at> lostca.se> To: guix-patches <at> gnu.org Cc: Ashish SHUKLA <ashish.is <at> lostca.se> Subject: [PATCH] gnu: Add jool. Date: Sat, 1 Feb 2025 22:36:44 +0100
* gnu/packages/networking.scm (jool): Add jool.
Change-Id: Ic517fc8c4afbb964363ec68b3d89ce9fcd00c7d8
---
Hi,
This patch adds Jool software, which implements NAT64 support in Linux kernel, and is helpful in updating IPv6-only networks, e.g. FOSDEM network at FOSDEM.
Thanks!
gnu/packages/networking.scm | 73 +++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 09e0359122..ec7279d38b 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -66,6 +66,7 @@
;;; Copyright © 2024 Alexey Abramov <levenson <at> mmer.org>
;;; Copyright © 2024 James Smith <jsubuntuxp <at> disroot.org>
;;; Copyright © 2025 Sughosha <sughosha <at> disroot.org>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
;;;
;;; 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)
@@ -5064,6 +5066,77 @@ (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* (#:key outputs #:allow-other-keys)
+ (setenv "CONFIG_SHELL" (which "sh"))
+ (setenv "CC" #$(cc-for-target))
+ (invoke "./configure"
+ (string-append "--prefix=" (assoc-ref outputs "out")))))
+
+ (add-after 'unpack 'patch-Makefiles
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "src/mod/Makefile"
+ (("/sbin/depmod")
+ "true"))
+ (substitute* "src/usr/iptables/Makefile"
+ (("^XTABLES_SO_DIR =.*$")
+ (string-append "XTABLES_SO_DIR = " out "/lib/xtables"))))))
+
+ (replace 'install
+ (lambda* (#:key inputs outputs parallel-build? make-flags
+ #:allow-other-keys)
+ (let ((modules-dir
+ (string-append (assoc-ref inputs "linux-module-builder")
+ "/lib/modules"))
+ (out (assoc-ref outputs "out"))
+ (module-dir (string-append
+ (assoc-ref outputs "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 "SIIT and NAT64 implementation for Linux")
+ (description "Jool implements SIIT and NAT64 for Linux.")
+ (license license:gpl2+)))
+
(define-public dropwatch
(package
(name "dropwatch")
base-commit: aba3e48ae1ce70deba8e6ad63e2ac9b102abfd4d
--
2.48.1
guix-patches <at> gnu.org:bug#76001; Package guix-patches.
(Wed, 12 Feb 2025 09:55:01 GMT) Full text and rfc822 format available.Message #8 received at 76001 <at> debbugs.gnu.org (full text, mbox):
From: Ludovic Courtès <ludo <at> gnu.org> To: Ashish SHUKLA <ashish.is <at> lostca.se> Cc: 76001 <at> debbugs.gnu.org Subject: Re: [bug#76001] [PATCH] gnu: Add jool. Date: Wed, 12 Feb 2025 10:54:40 +0100
Ashish SHUKLA <ashish.is <at> lostca.se> skribis: > * gnu/packages/networking.scm (jool): Add jool. > > Change-Id: Ic517fc8c4afbb964363ec68b3d89ce9fcd00c7d8 [...] > + (out (assoc-ref outputs "out")) > + (module-dir (string-append > + (assoc-ref outputs "module") > + "/lib/modules"))) I’d suggest using #$output and #$output:module throughout. > + (home-page "https://nicmx.github.io/Jool/") > + (synopsis "SIIT and NAT64 implementation for Linux") > + (description "Jool implements SIIT and NAT64 for Linux.") Could you expand the description as per <https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html>? You should probably make it clear that the package provides a kernel module. Thanks in advance, Ludo’.
guix-patches <at> gnu.org:bug#76001; Package guix-patches.
(Thu, 13 Feb 2025 23:50:05 GMT) Full text and rfc822 format available.Message #11 received at 76001 <at> debbugs.gnu.org (full text, mbox):
From: Ashish SHUKLA <ashish.is <at> lostca.se> To: ludo <at> gnu.org Cc: Ashish SHUKLA <ashish.is <at> lostca.se>, 76001 <at> debbugs.gnu.org Subject: [PATCH v2] gnu: Add jool. Date: Fri, 14 Feb 2025 00:49:00 +0100
* gnu/packages/networking.scm (jool): Add jool.
Change-Id: Ic517fc8c4afbb964363ec68b3d89ce9fcd00c7d8
---
gnu/packages/networking.scm | 72 +++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 8ae7f84015..f51266c764 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -66,6 +66,7 @@
;;; Copyright © 2024 Alexey Abramov <levenson <at> mmer.org>
;;; Copyright © 2024 James Smith <jsubuntuxp <at> disroot.org>
;;; Copyright © 2025 Sughosha <sughosha <at> disroot.org>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
;;;
;;; 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)
@@ -5059,6 +5061,76 @@ (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 "SIIT and NAT64 implementation for Linux")
+ (description "Jool implements SIIT and NAT64 for Linux. It provides a kernel module,
+iptables (and netfilter) extensions, and CLI utilities.")
+ (license license:gpl2+)))
+
(define-public dropwatch
(package
(name "dropwatch")
base-commit: 87dd002575fb5090649e56a3a2d10b86b1773c74
--
2.48.1
"Ashish SHUKLA" <ashish.is <at> lostca.se>
to control <at> debbugs.gnu.org.
(Thu, 13 Feb 2025 23:51:01 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#76001; Package guix-patches.
(Fri, 21 Feb 2025 13:39:03 GMT) Full text and rfc822 format available.Message #16 received at 76001 <at> debbugs.gnu.org (full text, mbox):
From: Ludovic Courtès <ludo <at> gnu.org> To: Ashish SHUKLA <ashish.is <at> lostca.se> Cc: 76001 <at> debbugs.gnu.org Subject: Re: bug#76001: [PATCH v2] gnu: Add jool. Date: Fri, 21 Feb 2025 14:38:15 +0100
Hi, Ashish SHUKLA <ashish.is <at> lostca.se> skribis: > * gnu/packages/networking.scm (jool): Add jool. > > Change-Id: Ic517fc8c4afbb964363ec68b3d89ce9fcd00c7d8 [...] > + (home-page "https://nicmx.github.io/Jool/") > + (synopsis "SIIT and NAT64 implementation for Linux") > + (description "Jool implements SIIT and NAT64 for Linux. It provides a kernel module, > +iptables (and netfilter) extensions, and CLI utilities.") That still doesn’t give any hint as to what SIIT and NAT64 are. :-) Please use @acronym, at least in the description. Also, “command-line utilities” rather than “CLI utilities”: no need for extra acronyms. Could you send one last update? Thanks in advance, Ludo’.
guix-patches <at> gnu.org:bug#76001; Package guix-patches.
(Fri, 21 Feb 2025 20:14:04 GMT) Full text and rfc822 format available.Message #19 received at 76001 <at> debbugs.gnu.org (full text, mbox):
From: Ashish SHUKLA <ashish.is <at> lostca.se> To: ludo <at> gnu.org Cc: Ashish SHUKLA <ashish.is <at> lostca.se>, 76001 <at> debbugs.gnu.org Subject: [PATCH v3] gnu: Add jool. Date: Fri, 21 Feb 2025 21:13:08 +0100
* gnu/packages/networking.scm (jool): Add jool.
Change-Id: Ic517fc8c4afbb964363ec68b3d89ce9fcd00c7d8
---
gnu/packages/networking.scm | 71 +++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
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 <levenson <at> mmer.org>
;;; Copyright © 2024 James Smith <jsubuntuxp <at> disroot.org>
;;; Copyright © 2025 Sughosha <sughosha <at> disroot.org>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
;;;
;;; 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")
base-commit: dfabaa8a6faa58612a069eb47ee3f35a94b146fb
--
2.48.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.