Re: [Buildroot] [PATCH v2 11/13] package/selinux-python: bump to version 3.5

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Adam, All,

On 2023-04-25 10:14 -0700, Adam Duskett spake thusly:
> Also:
>   - Change the license file to LICENSE. The hash remains the same.
> 
>   - Add 0001-fix-ausearch-path.patch as audit 3.1 installs ausearch to
>     /usr/sbin not /sbin
> 
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
>  .../0001-fix-ausearch-path.patch              | 37 +++++++++++++++++++
>  package/selinux-python/selinux-python.hash    |  4 +-
>  package/selinux-python/selinux-python.mk      |  4 +-
>  3 files changed, 41 insertions(+), 4 deletions(-)
>  create mode 100644 package/selinux-python/0001-fix-ausearch-path.patch
> 
> diff --git a/package/selinux-python/0001-fix-ausearch-path.patch b/package/selinux-python/0001-fix-ausearch-path.patch
> new file mode 100644
> index 0000000000..c5f0a990ed
> --- /dev/null
> +++ b/package/selinux-python/0001-fix-ausearch-path.patch
> @@ -0,0 +1,37 @@
> +From 7a2456f18a49fa70de1f9ace12512bb00437b6ba Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <aduskett@gmail.com>
> +Date: Mon, 24 Apr 2023 12:25:19 -0700
> +Subject: [PATCH 1/1] fix ausearch path
> +
> +ausearch is installed in /usr/sbin not /sbin
> +
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>

    $ ./utils/docker-run make check-package
    package/selinux-python/0001-fix-ausearch-path.patch:4: generate your patches with 'git format-patch -N'
    package/selinux-python/0001-fix-ausearch-path.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation)

I changed the commit to an upstreamable one, and rewrote the commit log
with more in-depth explanations, so that fixed those two warnings.

Can you see into pushing that patch upstream, please?

Applied to master, thanks.

Regards,
Yann E. MORIN.

> +---
> + sepolgen/src/sepolgen/audit.py | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/sepolgen/src/sepolgen/audit.py b/sepolgen/src/sepolgen/audit.py
> +index 4adb851..5afe85d 100644
> +--- a/sepolgen/src/sepolgen/audit.py
> ++++ b/sepolgen/src/sepolgen/audit.py
> +@@ -41,7 +41,7 @@ def get_audit_boot_msgs():
> +     s = time.localtime(time.time() - off)
> +     bootdate = time.strftime("%x", s)
> +     boottime = time.strftime("%X", s)
> +-    output = subprocess.Popen(["/sbin/ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR", "-ts", bootdate, boottime],
> ++    output = subprocess.Popen(["/usr/sbin/ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR", "-ts", bootdate, boottime],
> +                               stdout=subprocess.PIPE).communicate()[0]
> +     if util.PY3:
> +         output = util.decode_input(output)
> +@@ -56,7 +56,7 @@ def get_audit_msgs():
> +        string contain all of the audit messages returned by ausearch.
> +     """
> +     import subprocess
> +-    output = subprocess.Popen(["/sbin/ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR"],
> ++    output = subprocess.Popen(["/usr/sbin/ausearch", "-m", "AVC,USER_AVC,MAC_POLICY_LOAD,DAEMON_START,SELINUX_ERR"],
> +                               stdout=subprocess.PIPE).communicate()[0]
> +     if util.PY3:
> +         output = util.decode_input(output)
> +-- 
> +2.40.0
> +
> diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash
> index 6ada3fee36..3592540703 100644
> --- a/package/selinux-python/selinux-python.hash
> +++ b/package/selinux-python/selinux-python.hash
> @@ -1,5 +1,5 @@
>  # https://github.com/SELinuxProject/selinux/wiki/Releases
> -sha256  8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec  selinux-python-3.3.tar.gz
> +sha256  8245bb4dae59333461f19ca0c79a829081f07972fa5e3ad4c2b2b917dd71d96b  selinux-python-3.5.tar.gz
>  
>  # Hash for license file
> -sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  COPYING
> +sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  LICENSE
> diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk
> index 0cec602f3d..7505474aa4 100644
> --- a/package/selinux-python/selinux-python.mk
> +++ b/package/selinux-python/selinux-python.mk
> @@ -4,10 +4,10 @@
>  #
>  ################################################################################
>  
> -SELINUX_PYTHON_VERSION = 3.3
> +SELINUX_PYTHON_VERSION = 3.5
>  SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION)
>  SELINUX_PYTHON_LICENSE = GPL-2.0
> -SELINUX_PYTHON_LICENSE_FILES = COPYING
> +SELINUX_PYTHON_LICENSE_FILES = LICENSE
>  SELINUX_PYTHON_DEPENDENCIES = python3
>  
>  SELINUX_PYTHON_MAKE_OPTS += \
> -- 
> 2.40.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot