[bug#71212] [PATCH] gnu: aide: Update to 0.18.8.

[bug#71212] [PATCH] gnu: aide: Update to 0.18.8.

[Artyom V. Poptsov]

* gnu/packages/admin.scm (aide): Update to 0.18.8.
  [native-inputs]: Add "pkg-config".
  [inputs]: Use "pcre2".

Change-Id: I15ae1d86ea9fdfed16e901c041bae292ec68a742
---
 gnu/packages/admin.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index bae9ee1308..4d4fbf55ac 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -234,23 +234,22 @@ (define-public ktsuss
 (define-public aide
   (package
     (name "aide")
-    (version "0.16.2")
+    (version "0.18.8")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/aide/aide/releases/download/v"
                            version "/aide-" version ".tar.gz"))
        (sha256
-        (base32 "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"))))
+        (base32 "0q1sp0vwrwbmw6ymw1kwd4i8walijwppa0dq61b2qzni6b32srhn"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list bison flex))
+     (list bison flex pkg-config))
     (inputs
      (list libgcrypt
            libgpg-error
            libmhash
-           `(,pcre "static")
-           pcre
+           pcre2
            `(,zlib "static")
            zlib))
     (synopsis "File and directory integrity checker")

base-commit: dc8fb5672464b6386f6b4b94723f9b36edc4e625
-- 
2.41.0

[bug#71212] [PATCH] gnu: aide: Update to 0.18.8.

[Zheng Junjie]

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

"Artyom V. Poptsov" <poptsov.artyom@gmail.com> writes:

> * gnu/packages/admin.scm (aide): Update to 0.18.8.
>   [native-inputs]: Add "pkg-config".
>   [inputs]: Use "pcre2".
>
> Change-Id: I15ae1d86ea9fdfed16e901c041bae292ec68a742
> ---
>  gnu/packages/admin.scm | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index bae9ee1308..4d4fbf55ac 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -234,23 +234,22 @@ (define-public ktsuss
>  (define-public aide
>    (package
>      (name "aide")
> -    (version "0.16.2")
> +    (version "0.18.8")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (string-append "https://github.com/aide/aide/releases/download/v"
>                             version "/aide-" version ".tar.gz"))
>         (sha256
> -        (base32 "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"))))
> +        (base32 "0q1sp0vwrwbmw6ymw1kwd4i8walijwppa0dq61b2qzni6b32srhn"))))
>      (build-system gnu-build-system)
>      (native-inputs
> -     (list bison flex))
> +     (list bison flex pkg-config))
>      (inputs
>       (list libgcrypt
>             libgpg-error
>             libmhash
> -           `(,pcre "static")
> -           pcre
> +           pcre2
>             `(,zlib "static")
>             zlib))
>      (synopsis "File and directory integrity checker")
>
> base-commit: dc8fb5672464b6386f6b4b94723f9b36edc4e625

hello, when i try 'aide -i', will report 
  ERROR: cannot open config file '/gnu/store/crq4phhak3pw3ihi03ywmy811qnihyx3-aide-0.18.8/etc/aide.conf': No such file or directory

can you fix it? i think it should /etc/aide.conf

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

[bug#71212] [PATCH v2] gnu: aide: Update to 0.18.8.

[Artyom V. Poptsov]

* gnu/packages/admin.scm (aide): Update to 0.18.8.

  [arguments]: Add configure flags to enable features "--with-posix-acl",
  "--with-selinux" and "--with-xattr".  Add
  "--with-config-file=/etc/aide.conf" to instruct the program to use this
  patch to search for the configuration file.
  [native-inputs]: Add "pkg-config".
  [inputs]: Use "acl", "attr", "libselinux" and "pcre2".

Change-Id: I15ae1d86ea9fdfed16e901c041bae292ec68a742
---
 gnu/packages/admin.scm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 775083c92c..127ad2867a 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -65,7 +65,6 @@
 ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2023 Tomás Ortín Fernández <tomasortin@mailbox.org>
 ;;; Copyright © 2024 dan <i@dan.games>
-;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -234,23 +233,30 @@ (define-public ktsuss
 (define-public aide
   (package
     (name "aide")
-    (version "0.16.2")
+    (version "0.18.8")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/aide/aide/releases/download/v"
                            version "/aide-" version ".tar.gz"))
        (sha256
-        (base32 "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"))))
+        (base32 "0q1sp0vwrwbmw6ymw1kwd4i8walijwppa0dq61b2qzni6b32srhn"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:configure-flags #~(list "--with-posix-acl"
+                                     "--with-selinux"
+                                     "--with-xattr"
+                                     "--with-config-file=/etc/aide.conf")))
     (native-inputs
-     (list bison flex))
+     (list bison flex pkg-config))
     (inputs
-     (list libgcrypt
+     (list acl
+           attr
+           libgcrypt
            libgpg-error
            libmhash
-           `(,pcre "static")
-           pcre
+           libselinux
+           pcre2
            `(,zlib "static")
            zlib))
     (synopsis "File and directory integrity checker")

base-commit: 6f72ad465c1e2df965e8d73b209497b4ef456527
-- 
2.41.0

[bug#71212] [PATCH] gnu: aide: Update to 0.18.8.

[Artyom V. Poptsov]

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

Hello Zheng Junjie,

thank you for reviewing my patch!

> can you fix it? i think it should /etc/aide.conf

Yes, I specified this as the path for the default configuration file.
But it should be created by the end user.

Also I've enabled some features for "aide" as it was done in Nix.[1]

Please find the second version of my patch attached to the issue.

Thanks,
- avp

References:
1. https://github.com/NixOS/nixpkgs/blob/f7a63cf975cc66559d5f488ffe6367c987a79826/pkgs/tools/security/aide/default.nix#L16

-- 
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE  B57C E9C5 A2D9 0898 A02F

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

bug#71212: [PATCH v2] gnu: aide: Update to 0.18.8.

[Zheng Junjie]

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

"Artyom V. Poptsov" <poptsov.artyom@gmail.com> writes:

> * gnu/packages/admin.scm (aide): Update to 0.18.8.
>
>   [arguments]: Add configure flags to enable features "--with-posix-acl",
>   "--with-selinux" and "--with-xattr".  Add
>   "--with-config-file=/etc/aide.conf" to instruct the program to use this
>   patch to search for the configuration file.
>   [native-inputs]: Add "pkg-config".
>   [inputs]: Use "acl", "attr", "libselinux" and "pcre2".
>
> Change-Id: I15ae1d86ea9fdfed16e901c041bae292ec68a742
> ---
>  gnu/packages/admin.scm | 20 +++++++++++++-------
>  1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index 775083c92c..127ad2867a 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -65,7 +65,6 @@
>  ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
>  ;;; Copyright © 2023 Tomás Ortín Fernández <tomasortin@mailbox.org>
>  ;;; Copyright © 2024 dan <i@dan.games>
> -;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -234,23 +233,30 @@ (define-public ktsuss
>  (define-public aide
>    (package
>      (name "aide")
> -    (version "0.16.2")
> +    (version "0.18.8")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (string-append "https://github.com/aide/aide/releases/download/v"
>                             version "/aide-" version ".tar.gz"))
>         (sha256
> -        (base32 "15xp47sz7kk1ciffw3f5xw2jg2mb2lqrbr3q6p4bkbz5dap9iy8p"))))
> +        (base32 "0q1sp0vwrwbmw6ymw1kwd4i8walijwppa0dq61b2qzni6b32srhn"))))
>      (build-system gnu-build-system)
> +    (arguments
> +     (list #:configure-flags #~(list "--with-posix-acl"
> +                                     "--with-selinux"
> +                                     "--with-xattr"
> +                                     "--with-config-file=/etc/aide.conf")))
>      (native-inputs
> -     (list bison flex))
> +     (list bison flex pkg-config))
>      (inputs
> -     (list libgcrypt
> +     (list acl
> +           attr
> +           libgcrypt
>             libgpg-error
>             libmhash
> -           `(,pcre "static")
> -           pcre
> +           libselinux
> +           pcre2
>             `(,zlib "static")
>             zlib))
>      (synopsis "File and directory integrity checker")
>
> base-commit: 6f72ad465c1e2df965e8d73b209497b4ef456527

Thanks.

push, see https://git.savannah.gnu.org/cgit/guix.git/commit/?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272

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