[bug#55083] [PATCH 1/2] gnu: add python-librouteros

[bug#55083] [PATCH 1/2] gnu: add python-librouteros

[Denis 'GNUtoo' Carikli]

* gnu/packages/python-xyz.scm (python-librouteros): New variable

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9a5d311680..8d6b91c8f7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -119,6 +119,7 @@
 ;;; Copyright © 2022 Evgeny Pisemsky <evgeny@pisemsky.com>
 ;;; Copyright © 2022 drozdov <drozdov@portalenergy.tech>
 ;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12347,6 +12348,22 @@ (define-public python-idna
 (define-public python2-idna
   (package-with-python2 python-idna))
 
+(define-public python-librouteros
+  (package
+    (name "python-librouteros")
+    (version "3.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "librouteros" version))
+              (sha256
+               (base32
+                "121z8w47sx9hczg0jhxwsy2ld1r52z9nnyxqzljb4vfphi0gkh78"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/luqasz/librouteros")
+    (synopsis "Python implementation of MikroTik RouterOS API")
+    (description "Python implementation of MikroTik RouterOS API")
+    (license license:gpl2)))
+
 (define-public python-libsass
   (package
     (name "python-libsass")
-- 
2.35.1

[bug#55083] [PATCH 2/2] gnu: Add bundlewrap

[Denis 'GNUtoo' Carikli]

* gnu/packages/configuration-management.scm (bundlewrap): New variable

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

diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index c64b937fe5..cbbddf3cd1 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18,11 +19,17 @@
 
 (define-module (gnu packages configuration-management)
   #:use-module (gnu packages)
-  #:use-module (guix build-system go)
-  #:use-module (guix git-download)
   #:use-module (gnu packages golang)
-  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages python-crypto)
+  #:use-module (gnu packages python-web)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages ssh)
   #:use-module (gnu packages textutils)
+  #:use-module (gnu packages version-control)
+  #:use-module (guix build-system go)
+  #:use-module (guix build-system python)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils))
@@ -103,3 +110,31 @@ (define-public chezmoi
     (description "This package helps to manage personal configuration files
 across multiple machines.")
     (license license:expat)))
+
+(define-public bundlewrap
+  (package
+    (name "bundlewrap")
+    (version "4.13.6")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "bundlewrap" version))
+              (sha256
+               (base32
+                "1fsy5kjpacrca85ckxhwq1y4lci4ysls5raam75jpkzg5ra1fxj7"))))
+    (build-system python-build-system)
+    (inputs (list python-cryptography
+                  python-jinja2
+                  python-librouteros
+                  python-mako
+                  python-passlib
+                  python-pyaml
+                  python-requests
+                  python-tomlkit
+                  openssh))
+    (arguments
+     ;; Tests require network
+     `(#:tests? #f))
+    (synopsis "Agent-less configuration management")
+    (description "Agent-less configuration management with Python")
+    (home-page "https://bundlewrap.org/")
+    (license license:gpl3)))
-- 
2.35.1

[bug#55083] [PATCH 1/2] gnu: add python-librouteros

[Maxime Devos]

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

Denis 'GNUtoo' Carikli schreef op za 23-04-2022 om 18:44 [+0200]:
> * gnu/packages/python-xyz.scm (python-librouteros): New variable
> 
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

While this is a thing for, say, the Linux kernel, Guix does not have a
DCO and this is not what Signed-off-by means in Guix.  From the Guix
manual:

   When pushing a commit on behalf of somebody else, please add a
‘Signed-off-by’ line at the end of the commit log message—e.g., with
‘git am --signoff’.  This improves tracking of who did what.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55083] [PATCH 1/2] gnu: add python-librouteros

[Maxime Devos]

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

Denis 'GNUtoo' Carikli schreef op za 23-04-2022 om 18:44 [+0200]:
> +    (synopsis "Python implementation of MikroTik RouterOS API")
> +    (description "Python implementation of MikroTik RouterOS API")

A description is missing here (it's identical to the synopsis)

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55083] [PATCH 1/2] gnu: add python-librouteros

[Maxime Devos]

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

Denis 'GNUtoo' Carikli schreef op za 23-04-2022 om 18:44 [+0200]:
> +    (license license:gpl2)))

GPL-2-only can easily cause compatibility issues, would upstream be
amenable to making it GPL-2-or-later, or (alternatively) just GPL-2-or-
3-at-your-choice?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55083] [PATCH 2/2] gnu: Add bundlewrap

[Maxime Devos]

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

Denis 'GNUtoo' Carikli schreef op za 23-04-2022 om 18:54 [+0200]:
> +    (license license:gpl3)))

Isn't this incompatible with librouteros' license?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55083] [PATCH 2/2] gnu: Add bundlewrap

[Maxime Devos]

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

Denis 'GNUtoo' Carikli schreef op za 23-04-2022 om 18:54 [+0200]:
> +    (synopsis "Agent-less configuration management")
> +    (description "Agent-less configuration management with Python")

What does this mean?  E.g., could I consider the text editor 'nano' to
be an ‘agent-less configuration management’ tool, because it allows me
the modify configuration files (‘managing’) and it doesn't have a
daemon (‘agent’)?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55083] [PATCH 2/2] gnu: Add bundlewrap

[Maxime Devos]

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

Denis 'GNUtoo' Carikli schreef op za 23-04-2022 om 18:54 [+0200]:
> +                  python-requests

Is python-requests used for contacting https:// URLs?  If so,
'bundlewrap' probably needs a SSL_CERT_FILE or SSL_CERT_DIR search path
(see, e.g., https://github.com/psf/requests/pull/2903).

Greeetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55083] [PATCH 2/2] gnu: Add bundlewrap

[Maxime Devos]

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

Denis 'GNUtoo' Carikli schreef op za 23-04-2022 om 18:54 [+0200]:
> +              (method url-fetch)
> +              (uri (pypi-uri "bundlewrap" version))
> +              (sha256
> +               (base32
> +               

It uses /usr/bin/less
<https://github.com/bundlewrap/bundlewrap/blob/567b5f055067b1e23ea8081b24f1bebfdc44c541/bundlewrap/utils/ui.py#L122>,
which does not exist in Guix.

It also uses git, bzr and hg:

https://github.com/bundlewrap/bundlewrap/blob/567b5f055067b1e23ea8081b24f1bebfdc44c541/bundlewrap/utils/scm.py#L10

these theoretically should be absolutised though there might be closure
size concerns.

There's also a use of 'stat':

https://github.com/bundlewrap/bundlewrap/blob/567b5f055067b1e23ea8081b24f1bebfdc44c541/bundlewrap/utils/remote.py#L8

Possibly there are more things to absolutise.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55083] [PATCH 2/2] gnu: Add bundlewrap

[Maxime Devos]

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

Denis 'GNUtoo' Carikli schreef op za 23-04-2022 om 18:54 [+0200]:
> +(define-public bundlewrap
> +  (package
> +    (name "bundlewrap")
> +    (version "4.13.6")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (pypi-uri "bundlewrap" version))
> +              (sha256
> +               (base32
> +                "1fsy5kjpacrca85ckxhwq1y4lci4ysls5raam75jpkzg5ra1fxj7"))))

There appears to be some code that is broken in non-English locales:

   "stat -c '%U:%G:%a:%s:%F' -- {}".format(quote(path)),

    @property
    def is_directory(self):
        return self.stat['type'] == "directory"

    @property
    def is_file(self):
        return self.stat['type'] in ("regular file", "regular empty
file")

    @property
    def is_symlink(self):
        return self.stat['type'] == "symbolic link"

In my locale, it's 'map', not 'directory'.

Greetings,
Maxime.


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55083] [PATCH 2/2] gnu: Add bundlewrap

[Denis 'GNUtoo' Carikli]

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

On Sat, 23 Apr 2022 20:49:00 +0200
Maxime Devos <maximedevos@telenet.be> wrote:

> Denis 'GNUtoo' Carikli schreef op za 23-04-2022 om 18:54 [+0200]:
> > +    (license license:gpl3)))
> 
> Isn't this incompatible with librouteros' license?
Yes it is.

I've deduced both licenses from the setup.py file which as I understand
constitutes a statement of the project license (according to the GPL
FAQ you need statements to be sure of the license, not just a COPYING
file), but the issue is that they don't tell if it's GPLv2-only or
GPLv2-or-later (or GPLv3-only or GPLv3-or-later for bundlewrap's).

At first I've asked librouteros to clarify the situation[1] and
if that doesn't work I can still ask bundlewrap to add an exception for
linking against GPLv2-only code.

The later is also possible because there is some copyright assignment
process when sending patches to bundlewrap[2].

References:
-----------
[1]https://github.com/luqasz/librouteros/issues/129
[2]https://github.com/bundlewrap/bundlewrap/blob/main/CAA.md

Denis.

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

[bug#55083] [PATCH 1/2] gnu: add python-librouteros

[Ludovic Courtès]

Hi Denis,

Did you have a chance to address Maxime’s comments?

Seems like little is missing to get those patches applied.

Thanks,
Ludo’.

[bug#55083] [PATCH 1/2] gnu: add python-librouteros

[Denis 'GNUtoo' Carikli]

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

On Mon, 23 May 2022 15:19:16 +0200
Ludovic Courtès <ludo@gnu.org> wrote:

> Hi Denis,
Hi,

> Did you have a chance to address Maxime’s comments?
> 
> Seems like little is missing to get those patches applied.
I could do that but we can only merge python-librouteros.

python-librouteros doesn't want to change license so only bundlewrap
can fix that licensing issue.

I've reported the bug upstream[1], and as there is a CLA, a single
entity (here a company) owns all the copyright, and they don't want to
re-license as GPLv2 or GPLv2-or-later, so as I understand the only
options left are:
- to somehow remove the python-librouteros dependency completely
- to add an exception to link it to GPLv2 code

As for the later the project expressed some doubts on if it's really
possible or not:
> Hm. Are you sure it's possible for me to "allow" BundleWrap to be
> linked against GPLv2 libs? Wouldn't that require the permission of
> the lib, rather than BundleWrap?

And so far I found the following information on the topic but nothing
really conclusive yet:
- https://www.gnu.org/licenses/gpl-faq.html#v2v3Compatibility
- https://www.gnu.org/licenses/gpl-faq.html#GPLIncompatibleLibs

And here the issue mentioned in the first link is the GPLv2 section 6
which has:
> [...]
> You may not impose any further restrictions on the recipients'
> exercise of the rights granted herein.
> [...]

So here I'm not sure anymore if there is a way to somehow satisfy
the GPLv2 of the library just with an exception in bundlewrap.

I'm also very interested in understanding that issue better as I've
written software (were I still own all the copyright) that has somewhat
similar requirements (I want to release it under GPLv2 or later (to
be able to be merged upstream) with an exception for linking against
Apache libraries).

References:
-----------
[1]https://github.com/bundlewrap/bundlewrap/issues/709

Denis.

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

[bug#55083] [PATCH 1/2] gnu: add python-librouteros

[Maxime Devos]

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

Denis 'GNUtoo' Carikli schreef op ma 23-05-2022 om 18:08 [+0200]:
> I could do that but we can only merge python-librouteros.
> 
> python-librouteros doesn't want to change license

Upstream clarified it's GPLv2-only, but AFAICT hasn't explicitly
expressed any opinion on whether they would mind relicensing.  I asked
for clarification [1]

[1]: <https://github.com/luqasz/librouteros/issues/129#issuecomment-1134892145>

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55083] gnu: add python-librouteros

[Denis 'GNUtoo' Carikli]

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

Hi,

In the bug report about licensing it was unclear if
python-librouteros was GPLv2 only[1] or GPLv2 or later[2].

The comments were by the same person (the project owner in github) and
the one stating that it is GPLv2 or later came after the one stating
that it is GPLv2 only.

Bundlewrap considered it as GPLv2 of that later comment[3].

So to get a definitive clarification I send a patch to librouteros
for the license clarification[4] and it was accepted.

So I can now cleanup the code, update the packages to the latest
versions if necessary and get all that merged.

Do I need to use the exact commit with the license clarification or can
I use the latest release? Or do I backport that commit?

Since it's a license clarification and not a license change, I guess
that it works retrospectively too.

References:
-----------
[1]https://github.com/luqasz/librouteros/issues/129#issuecomment-1111537090
[2]https://github.com/luqasz/librouteros/issues/129#issuecomment-1136123888
[3]https://github.com/bundlewrap/bundlewrap/issues/709#issuecomment-1249674037
[4]https://github.com/luqasz/librouteros/commit/bbf0e580ac03b818190d2a3839046dc7e1a06a90

Denis.

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