[bug#45398] [PATCH 0/2] xfsprogs 5.10.0 & libinih

[bug#45398] [PATCH 0/2] xfsprogs 5.10.0 & libinih

[Vincent Legoll]

Hello,

the new xfsprogs version now requires the
inih parser library.

The first patch add that new package and
the second one updates xfsprogs with it.

Please review, as this is my first contact
with the meson build system.

Also the license file contains "new BSD", so
I chose "bsd-4"...

Tchuss

-- 
Vincent Legoll

[bug#45398] [PATCH 1/2] gnu: Add libinih.

[Vincent Legoll]

* gnu/packages/linux.scm (libinih): New variable.
---
 gnu/packages/linux.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 01f12f77d9..d177f93502 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7000,6 +7000,31 @@ communicate with the kernel.  It can be used to add and remove interfaces, set
 IP addresses and routes, and configure IPsec.")
     (license license:asl2.0)))
 
+(define-public libinih
+  (package
+    (name "libinih")
+    (version "52")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/benhoyt/inih")
+                    (commit (string-append "r" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0lsvm34zabvi1xlximybzvgc58zb90mm3b9babwxlqs05jy871m4"))))
+    (build-system meson-build-system)
+    (arguments
+     '(#:configure-flags '("-Ddistro_install=true" "-Ddefault_library=shared")))
+    (home-page "https://github.com/benhoyt/inih")
+    (synopsis "Simple .INI parser library for C")
+    (description "The inih (INI Not Invented Here) library is a simple .INI file
+parser written in C. It's only a couple of pages of code, and it was designed to
+be small and simple, so it's good for embedded systems. It's also more or less
+compatible with Python's ConfigParser style of .INI files, including RFC
+822-style multi-line syntax and name: value entries.")
+    (license license:bsd-4)))
+
 (define-public xfsprogs
   (package
     (name "xfsprogs")
-- 
2.29.2

[bug#45398] [PATCH 2/2] gnu: xfsprogs: Update to 5.10.0.

[Vincent Legoll]

* gnu/packages/linux.scm (xfsprogs): Update to 5.10.0.
(inputs): Add libinih.
---
 gnu/packages/linux.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d177f93502..b260359808 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7028,7 +7028,7 @@ compatible with Python's ConfigParser style of .INI files, including RFC
 (define-public xfsprogs
   (package
     (name "xfsprogs")
-    (version "5.9.0")
+    (version "5.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -7036,7 +7036,7 @@ compatible with Python's ConfigParser style of .INI files, including RFC
                     "xfsprogs-" version ".tar.gz"))
               (sha256
                (base32
-                "13xkn9jpmwp4fm9r68vhgznkmxhnv83n2b39mhy2qdaph90w2a1l"))))
+                "1wcvcv9fl955g3zl68057hq7pp9bm7i733vc7j6xr6wnfd8qf6sr"))))
     (build-system gnu-build-system)
     (outputs (list "out" "python"))
     (arguments
@@ -7060,7 +7060,8 @@ compatible with Python's ConfigParser style of .INI files, including RFC
     (native-inputs
      `(("gettext" ,gettext-minimal)))
     (inputs
-     `(("libuuid" ,util-linux "lib")
+     `(("libinih" ,libinih)
+       ("libuuid" ,util-linux "lib")
        ("python" ,python-wrapper)))
     (home-page "https://xfs.wiki.kernel.org/")
     (synopsis "XFS file system tools")
-- 
2.29.2

bug#45398: [PATCH 1/2] gnu: Add libinih.

[Leo Famulari]

On Wed, Dec 23, 2020 at 06:14:25PM +0100, Vincent Legoll wrote:
> * gnu/packages/linux.scm (libinih): New variable.

Thanks!

> +    (description "The inih (INI Not Invented Here) library is a simple .INI file
> +parser written in C. It's only a couple of pages of code, and it was designed to
> +be small and simple, so it's good for embedded systems. It's also more or less
> +compatible with Python's ConfigParser style of .INI files, including RFC
> +822-style multi-line syntax and name: value entries.")
> +    (license license:bsd-4)))

I fixed the issues reported by `guix lint`, corrected the license to
bsd-3, and pushed both patches 9325171df468f6a84ac7cdab01f0c6461ff1c7bc