[bug#51500] [PATCH] gnu: Add kiwix-tools

[bug#51500] [PATCH] gnu: Add kiwix-tools

[Denis 'GNUtoo' Carikli]

* gnu/packages/web.scm (kiwix-tools): New variable.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/web.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d7df3079b3..c775610634 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8124,6 +8124,44 @@ (define-public kiwix-desktop
 offline (such as Wikipedia), without any access to Internet.")
     (license license:gpl3)))
 
+(define-public kiwix-tools
+  (package
+    (name "kiwix-tools")
+    (version "3.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://download.kiwix.org/release/kiwix-tools/kiwix-tools-"
+                    version
+                    ".tar.xz"))
+              (sha256
+               (base32
+                "1npf9ddhpkmx97gxmvmwmi8a69md8kh2szimd9rpg6ggd4big03a"))))
+    (build-system meson-build-system)
+    (inputs
+     `(("curl" ,curl)
+       ("icu4c" ,icu4c)
+       ("kiwix-lib" ,kiwix-lib)
+       ("libmicrohttpd" ,libmicrohttpd)
+       ("libzim" ,libzim)
+       ("pugixml" ,pugixml)
+       ("xapian" ,xapian)
+       ("zlib" ,zlib)
+       ("zstd" ,zstd "lib")))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "https://wiki.kiwix.org/wiki/Software")
+    (synopsis "Kiwix command line tools")
+    (description "The Kiwix tools is a collection of Kiwix related command line
+tools:
+@itemize
+@item kiwix-manage: Manage XML based library of ZIM files
+@item kiwix-read: Read ZIM file content
+@item kiwix-search: Fulltext search in ZIM files
+@item kiwix-serve: HTTP daemon serving ZIM files
+@end itemize\n")
+    (license license:gpl3)))
+
 (define-public uriparser
   (let ((commit "25dddb16cf044a7df27884e7ad3911baaaca3d7c")
         (revision "1"))
-- 
2.33.0

[bug#51500] [PATCH] gnu: Add kiwix-tools

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

Hi,

Last time I sent a patch I was told that "by convention we keep [the
signed-off-by] for the person who applies the patch.".

Does it means that next times I send patches, it's better if I do not
add my signed-off-by at all?

Or is it better if I leave it and that it get stripped by the person
who merge the patch each time as through that way way I also formally
signed the developer certificate of origin, and even if it's stripped
it offers more guarantees.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#51500] [PATCH] gnu: Add kiwix-tools

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 76 bytes --]

Hi,

It's been (way) more than two weeks so I can safely ping.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#51500: [PATCH] gnu: Add kiwix-tools

[Leo Famulari]

On Sat, Oct 30, 2021 at 07:36:31AM +0200, Denis 'GNUtoo' Carikli wrote:
> * gnu/packages/web.scm (kiwix-tools): New variable.

Thanks for the patch!

I pushed as 9e67f2ad418e9a5a7a83dc2349624572e9dbfc8b with minor changes,
shown below.

> +    (license license:gpl3)))

I also changed the license to 'gpl3+', because the source files include
the phrase "either version 3 of the License, or any later version", and
README.md confirms that the authors intend to allow licensing under
later GPL revisions.

And I added you to the list of authors of 'gnu/packages/web.scm'.

------
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 05cbf4d8cc..2f2ed4d8d2 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8133,10 +8133,8 @@ (define-public kiwix-tools
     (version "3.1.2")
     (source (origin
               (method url-fetch)
-              (uri (string-append
-                    "https://download.kiwix.org/release/kiwix-tools/kiwix-tools-"
-                    version
-                    ".tar.xz"))
+              (uri (string-append "https://download.kiwix.org/release/"
+                                  "kiwix-tools/kiwix-tools-" version ".tar.xz"))
               (sha256
                (base32
                 "1npf9ddhpkmx97gxmvmwmi8a69md8kh2szimd9rpg6ggd4big03a"))))
@@ -8155,7 +8153,7 @@ (define-public kiwix-tools
      `(("pkg-config" ,pkg-config)))
     (home-page "https://wiki.kiwix.org/wiki/Software")
     (synopsis "Kiwix command line tools")
-    (description "The Kiwix tools is a collection of Kiwix related command line
+    (description "The Kiwix tools are a collection of Kiwix-related command line
 tools:
 @itemize
 @item kiwix-manage: Manage XML based library of ZIM files
@@ -8163,7 +8161,7 @@ (define-public kiwix-tools
 @item kiwix-search: Fulltext search in ZIM files
 @item kiwix-serve: HTTP daemon serving ZIM files
 @end itemize\n")
-    (license license:gpl3)))
+    (license license:gpl3+)))
 
 (define-public uriparser
   (let ((commit "25dddb16cf044a7df27884e7ad3911baaaca3d7c")
------

[bug#51500] [PATCH] gnu: Add kiwix-tools

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1859 bytes --]

On Sat, Oct 30, 2021 at 07:51:56AM +0200, Denis 'GNUtoo' Carikli wrote:
> Last time I sent a patch I was told that "by convention we keep [the
> signed-off-by] for the person who applies the patch.".
> 
> Does it means that next times I send patches, it's better if I do not
> add my signed-off-by at all?

Right. In Guix, we used the "signed-off-by" line to say who pushed the
patch on behalf of its author.

This information is actually always there in the Git history, but it's
not shown unless you add '--format=full' to commands such as `git log`
and `git show`.

And of course, the ultimate source of truth about who pushed the patch
is contained in the PGP signature of the commit, shown with a command
such as `git show --show-signature 9e67f2ad418e9a5a7a83`.

So, using "signed-off-by" in this way is just for convenience, for
anyone reading the log. This convention is described in the manual
section Commit Access:

https://guix.gnu.org/manual/en/html_node/Commit-Access.html#Commit-Access

> Or is it better if I leave it and that it get stripped by the person
> who merge the patch each time as through that way way I also formally
> signed the developer certificate of origin, and even if it's stripped
> it offers more guarantees.

You can do as you like, but adding the line "signed-off-by" to your
patches does not communicate anything related to copyright ownership or
licensing.

It's assumed that you are sharing your patches under the license used by
Guix, and that you have the right to do so. If it happens that we accept
a contribution that does not meet those criteria, we will remove it from
Guix, as part of our "Commitment to Correct Mistakes", which is part of
the Free System Distribution Guidelines that we follow:

https://www.gnu.org/distros/free-system-distribution-guidelines.en.html

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]