* [Buildroot] [PATCH 2/6] package/libselinux: bump to version 3.3
2022-01-04 22:02 [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 Fabrice Fontaine
@ 2022-01-04 22:02 ` Fabrice Fontaine
2022-01-04 22:02 ` [Buildroot] [PATCH 3/6] package/libsemanage: " Fabrice Fontaine
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2022-01-04 22:02 UTC (permalink / raw)
To: buildroot
Cc: Antoine Tenart, Marcus Folkesson, Clayton Shotwell, Matt Weber,
Fabrice Fontaine
- Drop third patch (already in version)
- Update indentation in hash file (two spaces)
https://github.com/SELinuxProject/selinux/releases/tag/3.3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...s-getseuser.c-fix-build-with-gcc-4.8.patch | 47 -------------------
package/libselinux/libselinux.hash | 4 +-
package/libselinux/libselinux.mk | 2 +-
3 files changed, 3 insertions(+), 50 deletions(-)
delete mode 100644 package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch
diff --git a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch b/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch
deleted file mode 100644
index 645e84b236..0000000000
--- a/package/libselinux/0003-libselinux-utils-getseuser.c-fix-build-with-gcc-4.8.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5c4ddfc88f0a7f10a5e9edddbdbe8e8ef1f9945e Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 10 Jun 2021 07:38:02 +0200
-Subject: [PATCH] libselinux/utils/getseuser.c: fix build with gcc 4.8
-
-Fix the following build failure with gcc 4.8 which is raised since
-version 3.2 and
-https://github.com/SELinuxProject/selinux/commit/156dd0de5cad31e7d437c64e11a8aef027f0a691
-
-getseuser.c:53:2: error: 'for' loop initial declarations are only allowed in C99 mode
- for (int i = 0; i < n; i++)
- ^
-
-Fixes:
- - http://autobuild.buildroot.org/results/37eb0952a763256fbf6ef3c668f6c95fbdf2dd35
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/SELinuxProject/selinux/pull/289]
----
- libselinux/utils/getseuser.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/utils/getseuser.c b/utils/getseuser.c
-index ce1b7b27..34f2e887 100644
---- a/utils/getseuser.c
-+++ b/utils/getseuser.c
-@@ -9,7 +9,7 @@ int main(int argc, char **argv)
- {
- char *seuser = NULL, *level = NULL;
- char **contextlist;
-- int rc, n;
-+ int rc, n, i;
-
- if (argc != 3) {
- fprintf(stderr, "usage: %s linuxuser fromcon\n", argv[0]);
-@@ -50,7 +50,7 @@ int main(int argc, char **argv)
- if (n == 0)
- printf("no valid context found\n");
-
-- for (int i = 0; i < n; i++)
-+ for (i = 0; i < n; i++)
- printf("Context %d\t%s\n", i, contextlist[i]);
-
- freeconary(contextlist);
---
-2.30.2
-
diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash
index 797b978ee1..a2e0083f7b 100644
--- a/package/libselinux/libselinux.hash
+++ b/package/libselinux/libselinux.hash
@@ -1,5 +1,5 @@
# From: https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161 libselinux-3.2.tar.gz
+sha256 acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057 libselinux-3.3.tar.gz
# Hash for license file
-sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE
+sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE
diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk
index 0f36db1cfd..c1e90130d2 100644
--- a/package/libselinux/libselinux.mk
+++ b/package/libselinux/libselinux.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBSELINUX_VERSION = 3.2
+LIBSELINUX_VERSION = 3.3
LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION)
LIBSELINUX_LICENSE = Public Domain
LIBSELINUX_LICENSE_FILES = LICENSE
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 3/6] package/libsemanage: bump to version 3.3
2022-01-04 22:02 [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 Fabrice Fontaine
2022-01-04 22:02 ` [Buildroot] [PATCH 2/6] package/libselinux: " Fabrice Fontaine
@ 2022-01-04 22:02 ` Fabrice Fontaine
2022-01-04 22:02 ` [Buildroot] [PATCH 4/6] package/checkpolicy: " Fabrice Fontaine
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2022-01-04 22:02 UTC (permalink / raw)
To: buildroot
Cc: Antoine Tenart, Marcus Folkesson, Clayton Shotwell, Matt Weber,
Fabrice Fontaine
Update indentation in hash file (two spaces)
https://github.com/SELinuxProject/selinux/releases/tag/3.3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/libsemanage/libsemanage.hash | 4 ++--
package/libsemanage/libsemanage.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash
index 117fd40d6a..1f333aac30 100644
--- a/package/libsemanage/libsemanage.hash
+++ b/package/libsemanage/libsemanage.hash
@@ -1,5 +1,5 @@
# From: https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 d722a55ca4fe2d4e2b30527720db657e6238b28079e69e2e4affeb8e733ee511 libsemanage-3.2.tar.gz
+sha256 84d0ec5afa34bbbb471f602d8c1bf317d12443d07852a34b60741d428d597ce8 libsemanage-3.3.tar.gz
# Hash for license file
-sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
+sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk
index bbe976a2c9..db9f16bb6a 100644
--- a/package/libsemanage/libsemanage.mk
+++ b/package/libsemanage/libsemanage.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBSEMANAGE_VERSION = 3.2
+LIBSEMANAGE_VERSION = 3.3
LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION)
LIBSEMANAGE_LICENSE = LGPL-2.1+
LIBSEMANAGE_LICENSE_FILES = COPYING
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 4/6] package/checkpolicy: bump to version 3.3
2022-01-04 22:02 [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 Fabrice Fontaine
2022-01-04 22:02 ` [Buildroot] [PATCH 2/6] package/libselinux: " Fabrice Fontaine
2022-01-04 22:02 ` [Buildroot] [PATCH 3/6] package/libsemanage: " Fabrice Fontaine
@ 2022-01-04 22:02 ` Fabrice Fontaine
2022-01-04 22:02 ` [Buildroot] [PATCH 5/6] package/restorecond: " Fabrice Fontaine
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2022-01-04 22:02 UTC (permalink / raw)
To: buildroot
Cc: Antoine Tenart, Marcus Folkesson, Clayton Shotwell, Matt Weber,
Fabrice Fontaine
Update indentation in hash file (two spaces)
https://github.com/SELinuxProject/selinux/releases/tag/3.3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/checkpolicy/checkpolicy.hash | 4 ++--
package/checkpolicy/checkpolicy.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash
index c237913eaf..3586389047 100644
--- a/package/checkpolicy/checkpolicy.hash
+++ b/package/checkpolicy/checkpolicy.hash
@@ -1,5 +1,5 @@
# https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 9b1c81fa86fe3867842164448d90c8e7ea94b2987497809c65d4caa87a5c5bc8 checkpolicy-3.2.tar.gz
+sha256 25c84edfa3a10ab8cb073b97bc55cb66377532d54a2723da9accdabd05431485 checkpolicy-3.3.tar.gz
# Hash for license file
-sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
+sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk
index f8ce48c175..af9a58cee8 100644
--- a/package/checkpolicy/checkpolicy.mk
+++ b/package/checkpolicy/checkpolicy.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CHECKPOLICY_VERSION = 3.2
+CHECKPOLICY_VERSION = 3.3
CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION)
CHECKPOLICY_LICENSE = GPL-2.0
CHECKPOLICY_LICENSE_FILES = COPYING
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 5/6] package/restorecond: bump to version 3.3
2022-01-04 22:02 [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 Fabrice Fontaine
` (2 preceding siblings ...)
2022-01-04 22:02 ` [Buildroot] [PATCH 4/6] package/checkpolicy: " Fabrice Fontaine
@ 2022-01-04 22:02 ` Fabrice Fontaine
2022-01-04 22:02 ` [Buildroot] [PATCH 6/6] package/selinux-python: " Fabrice Fontaine
2022-01-05 9:33 ` [Buildroot] [PATCH 1/6] package/libsepol: " Yann E. MORIN
5 siblings, 0 replies; 8+ messages in thread
From: Fabrice Fontaine @ 2022-01-04 22:02 UTC (permalink / raw)
To: buildroot
Cc: Antoine Tenart, Marcus Folkesson, Clayton Shotwell, Matt Weber,
Fabrice Fontaine
Update indentation in hash file (two spaces)
https://github.com/SELinuxProject/selinux/releases/tag/3.3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/restorecond/restorecond.hash | 4 ++--
package/restorecond/restorecond.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash
index 1869100188..b38c6dcf14 100644
--- a/package/restorecond/restorecond.hash
+++ b/package/restorecond/restorecond.hash
@@ -1,5 +1,5 @@
# https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 471c17e64aa6d7226e861d4d0125d15fdf9b38892c542be32bd83d999e5e75f5 restorecond-3.2.tar.gz
+sha256 218c3d8873f31764e3c82d53ac713c0c9faaa07caf42ed7184e93ca2b27d8f27 restorecond-3.3.tar.gz
# Hash for license file
-sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
+sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk
index 671f071b1d..7d6ed86f08 100644
--- a/package/restorecond/restorecond.mk
+++ b/package/restorecond/restorecond.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RESTORECOND_VERSION = 3.2
+RESTORECOND_VERSION = 3.3
RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION)
RESTORECOND_LICENSE = GPL-2.0
RESTORECOND_LICENSE_FILES = COPYING
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 6/6] package/selinux-python: bump to version 3.3
2022-01-04 22:02 [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 Fabrice Fontaine
` (3 preceding siblings ...)
2022-01-04 22:02 ` [Buildroot] [PATCH 5/6] package/restorecond: " Fabrice Fontaine
@ 2022-01-04 22:02 ` Fabrice Fontaine
2022-01-05 9:33 ` Yann E. MORIN
2022-01-05 9:33 ` [Buildroot] [PATCH 1/6] package/libsepol: " Yann E. MORIN
5 siblings, 1 reply; 8+ messages in thread
From: Fabrice Fontaine @ 2022-01-04 22:02 UTC (permalink / raw)
To: buildroot
Cc: Antoine Tenart, Marcus Folkesson, Clayton Shotwell, Matt Weber,
Fabrice Fontaine
Update indentation in hash file (two spaces)
https://github.com/SELinuxProject/selinux/releases/tag/3.3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/selinux-python/selinux-python.hash | 4 ++--
package/selinux-python/selinux-python.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash
index 00c28b722c..93a28becdd 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 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz
+sha256 8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec selinux-python-3.2.tar.gz
# Hash for license file
-sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
+sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk
index 61ec7eb595..0cec602f3d 100644
--- a/package/selinux-python/selinux-python.mk
+++ b/package/selinux-python/selinux-python.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SELINUX_PYTHON_VERSION = 3.2
+SELINUX_PYTHON_VERSION = 3.3
SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION)
SELINUX_PYTHON_LICENSE = GPL-2.0
SELINUX_PYTHON_LICENSE_FILES = COPYING
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH 6/6] package/selinux-python: bump to version 3.3
2022-01-04 22:02 ` [Buildroot] [PATCH 6/6] package/selinux-python: " Fabrice Fontaine
@ 2022-01-05 9:33 ` Yann E. MORIN
0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2022-01-05 9:33 UTC (permalink / raw)
To: Fabrice Fontaine
Cc: Antoine Tenart, Clayton Shotwell, Matt Weber, Marcus Folkesson,
buildroot
Fabrice, All,
On 2022-01-04 23:02 +0100, Fabrice Fontaine spake thusly:
> Update indentation in hash file (two spaces)
>
> https://github.com/SELinuxProject/selinux/releases/tag/3.3
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/selinux-python/selinux-python.hash | 4 ++--
> package/selinux-python/selinux-python.mk | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash
> index 00c28b722c..93a28becdd 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 770855ea8120ef23007fdb9db94b1ed6e8cd77917b584ed8877bbee9c16e74fb selinux-python-3.2.tar.gz
> +sha256 8ad91061300387996ccb474962fb93dde263d924aa8f740618be16b22e2444ec selinux-python-3.2.tar.gz
You did update the hash, but forgot to update the version. ;-)
Applied to master with the above fixed, thanks.
Regards,
Yann E. MORIN.
> # Hash for license file
> -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
> +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
> diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk
> index 61ec7eb595..0cec602f3d 100644
> --- a/package/selinux-python/selinux-python.mk
> +++ b/package/selinux-python/selinux-python.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -SELINUX_PYTHON_VERSION = 3.2
> +SELINUX_PYTHON_VERSION = 3.3
> SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION)
> SELINUX_PYTHON_LICENSE = GPL-2.0
> SELINUX_PYTHON_LICENSE_FILES = COPYING
> --
> 2.34.1
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3
2022-01-04 22:02 [Buildroot] [PATCH 1/6] package/libsepol: bump to version 3.3 Fabrice Fontaine
` (4 preceding siblings ...)
2022-01-04 22:02 ` [Buildroot] [PATCH 6/6] package/selinux-python: " Fabrice Fontaine
@ 2022-01-05 9:33 ` Yann E. MORIN
5 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2022-01-05 9:33 UTC (permalink / raw)
To: Fabrice Fontaine
Cc: Antoine Tenart, Clayton Shotwell, Matt Weber, Marcus Folkesson,
buildroot
Fabrice, All,
On 2022-01-04 23:02 +0100, Fabrice Fontaine spake thusly:
> Add gcc >= 5 dependency because __builtin_add_overflow is
> unconditionally used since
> https://github.com/SELinuxProject/selinux/commit/0744fa4f533c765d0a704fe8aa7174a0f93eb7bc
>
> https://github.com/SELinuxProject/selinux/releases/tag/3.3
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Series of 6 patches applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/checkpolicy/Config.in | 6 ++++--
> package/libselinux/Config.in | 6 ++++--
> package/libsepol/Config.in | 6 ++++--
> package/libsepol/libsepol.hash | 2 +-
> package/libsepol/libsepol.mk | 2 +-
> package/refpolicy/Config.in | 6 ++++--
> package/restorecond/Config.in | 5 +++--
> package/selinux-python/Config.in | 8 ++++++++
> package/semodule-utils/Config.in | 6 ++++--
> package/setools/Config.in | 5 +++--
> 10 files changed, 36 insertions(+), 16 deletions(-)
>
> diff --git a/package/checkpolicy/Config.in b/package/checkpolicy/Config.in
> index ad769d22b7..6a1f22991d 100644
> --- a/package/checkpolicy/Config.in
> +++ b/package/checkpolicy/Config.in
> @@ -2,6 +2,7 @@ config BR2_PACKAGE_CHECKPOLICY
> bool "checkpolicy"
> depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux
> depends on !BR2_STATIC_LIBS # libselinux
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol
> select BR2_PACKAGE_LIBSELINUX
> select BR2_PACKAGE_FLEX
> help
> @@ -13,5 +14,6 @@ config BR2_PACKAGE_CHECKPOLICY
>
> http://selinuxproject.org/page/Main_Page
>
> -comment "checkpolicy needs a toolchain w/ threads, dynamic library"
> - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
> +comment "checkpolicy needs a toolchain w/ threads, dynamic library, gcc >= 5"
> + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
> + !BR2_TOOLCHAIN_GCC_AT_LEAST_5
> diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in
> index 62070c8d59..348757abce 100644
> --- a/package/libselinux/Config.in
> +++ b/package/libselinux/Config.in
> @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSELINUX
> bool "libselinux"
> depends on BR2_TOOLCHAIN_HAS_THREADS
> depends on !BR2_STATIC_LIBS
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol
> select BR2_PACKAGE_LIBSEPOL
> select BR2_PACKAGE_PCRE
> select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
> @@ -16,5 +17,6 @@ config BR2_PACKAGE_LIBSELINUX
>
> http://selinuxproject.org/page/Main_Page
>
> -comment "libselinux needs a toolchain w/ threads, dynamic library"
> - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
> +comment "libselinux needs a toolchain w/ threads, dynamic library, gcc >= 5"
> + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
> + !BR2_TOOLCHAIN_GCC_AT_LEAST_5
> diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in
> index 04af880e67..7516076cd5 100644
> --- a/package/libsepol/Config.in
> +++ b/package/libsepol/Config.in
> @@ -1,6 +1,7 @@
> config BR2_PACKAGE_LIBSEPOL
> bool "libsepol"
> depends on BR2_TOOLCHAIN_HAS_THREADS # pthread
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
> help
> Libsepol is the binary policy manipulation library. It doesn't
> depend upon or use any of the other SELinux components.
> @@ -35,5 +36,6 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION
>
> endif
>
> -comment "libsepol needs a toolchain w/ threads"
> - depends on !BR2_TOOLCHAIN_HAS_THREADS
> +comment "libsepol needs a toolchain w/ threads, gcc >= 5"
> + depends on !BR2_TOOLCHAIN_HAS_THREADS || \
> + !BR2_TOOLCHAIN_GCC_AT_LEAST_5
> diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash
> index b273f982b6..039e4e3c7e 100644
> --- a/package/libsepol/libsepol.hash
> +++ b/package/libsepol/libsepol.hash
> @@ -1,5 +1,5 @@
> # From: https://github.com/SELinuxProject/selinux/wiki/Releases
> -sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz
> +sha256 2d97df3eb8466169b389c3660acbb90c54200ac96e452eca9f41a9639f4f238b libsepol-3.3.tar.gz
>
> # Hash for license file
> sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
> diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk
> index 55125f2203..8551a5de79 100644
> --- a/package/libsepol/libsepol.mk
> +++ b/package/libsepol/libsepol.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -LIBSEPOL_VERSION = 3.2
> +LIBSEPOL_VERSION = 3.3
> LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION)
> LIBSEPOL_LICENSE = LGPL-2.1+
> LIBSEPOL_LICENSE_FILES = COPYING
> diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in
> index c529b85e1d..043cc40a72 100644
> --- a/package/refpolicy/Config.in
> +++ b/package/refpolicy/Config.in
> @@ -1,6 +1,7 @@
> config BR2_PACKAGE_REFPOLICY
> bool "refpolicy"
> depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol
> # Even though libsepol is not necessary for building, we get
> # the policy version from libsepol, so we select it, and treat
> # it like a runtime dependency.
> @@ -113,5 +114,6 @@ endif
>
> endif
>
> -comment "refpolicy needs a toolchain w/ threads"
> - depends on !BR2_TOOLCHAIN_HAS_THREADS
> +comment "refpolicy needs a toolchain w/ threads, gcc >= 5"
> + depends on !BR2_TOOLCHAIN_HAS_THREADS || \
> + !BR2_TOOLCHAIN_GCC_AT_LEAST_5
> diff --git a/package/restorecond/Config.in b/package/restorecond/Config.in
> index 31f85f2882..5e5567b213 100644
> --- a/package/restorecond/Config.in
> +++ b/package/restorecond/Config.in
> @@ -4,6 +4,7 @@ config BR2_PACKAGE_RESTORECOND
> depends on BR2_USE_WCHAR # libglib2
> depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> depends on !BR2_STATIC_LIBS # libselinux
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol
> select BR2_PACKAGE_DBUS
> select BR2_PACKAGE_DBUS_GLIB
> select BR2_PACKAGE_LIBGLIB2
> @@ -15,7 +16,7 @@ config BR2_PACKAGE_RESTORECOND
>
> https://github.com/SELinuxProject/selinux/wiki/Releases
>
> -comment "restorecond needs a toolchain w/ wchar, threads, dynamic library"
> +comment "restorecond needs a toolchain w/ wchar, threads, dynamic library, gcc >= 5"
> depends on BR2_USE_MMU
> depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
> - BR2_STATIC_LIBS
> + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
> diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in
> index 0f1c281777..6a518f97d4 100644
> --- a/package/selinux-python/Config.in
> +++ b/package/selinux-python/Config.in
> @@ -17,6 +17,7 @@ if BR2_PACKAGE_SELINUX_PYTHON
>
> config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW
> bool "audit2allow"
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol
> select BR2_PACKAGE_CHECKPOLICY
> select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN
> select BR2_PACKAGE_SEMODULE_UTILS
> @@ -29,13 +30,20 @@ config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW
> audit2why - translates SELinux audit messages into a
> description of why the access was denied (audit2allow -w)
>
> +comment "audit2allow needs a toolchain w/ gcc 5"
> + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5
> +
> config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN
> bool "sepolgen"
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # semodule-utils -> libsepol
> select BR2_PACKAGE_SEMODULE_UTILS
> help
> This package contains a Python module that allows you to
> generate an initial SELinux policy module template.
>
> +comment "sepolgen needs a toolchain w/ gcc 5"
> + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5
> +
> endif
>
> comment "selinux-python needs python3"
> diff --git a/package/semodule-utils/Config.in b/package/semodule-utils/Config.in
> index 38e043dc2c..5d98dc615f 100644
> --- a/package/semodule-utils/Config.in
> +++ b/package/semodule-utils/Config.in
> @@ -1,6 +1,7 @@
> config BR2_PACKAGE_SEMODULE_UTILS
> bool "semodule-utils"
> depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol
> select BR2_PACKAGE_LIBSEPOL
> help
> semodule-utils is a package that contains tools for handling
> @@ -15,5 +16,6 @@ config BR2_PACKAGE_SEMODULE_UTILS
>
> https://github.com/SELinuxProject/selinux/wiki/Releases
>
> -comment "semodule-utils needs a toolchain w/ threads"
> - depends on !BR2_TOOLCHAIN_HAS_THREADS
> +comment "semodule-utils needs a toolchain w/ threads, gcc >= 5"
> + depends on !BR2_TOOLCHAIN_HAS_THREADS || \
> + !BR2_TOOLCHAIN_GCC_AT_LEAST_5
> diff --git a/package/setools/Config.in b/package/setools/Config.in
> index 3ab7f55948..5a71672bdf 100644
> --- a/package/setools/Config.in
> +++ b/package/setools/Config.in
> @@ -5,6 +5,7 @@ config BR2_PACKAGE_SETOOLS
> depends on BR2_USE_WCHAR
> depends on BR2_USE_MMU
> depends on BR2_PACKAGE_PYTHON3
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol
> select BR2_PACKAGE_PYTHON_NETWORKX # runtime
> select BR2_PACKAGE_PYTHON_SETUPTOOLS
> select BR2_PACKAGE_LIBSELINUX
> @@ -19,10 +20,10 @@ config BR2_PACKAGE_SETOOLS
>
> https://github.com/SELinuxProject/setools/
>
> -comment "setools needs a toolchain w/ threads, wchar, dynamic library"
> +comment "setools needs a toolchain w/ threads, wchar, dynamic library, gcc >= 5"
> depends on BR2_USE_MMU
> depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
> - !BR2_USE_WCHAR
> + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
>
> comment "setools needs python3"
> depends on BR2_USE_MMU
> --
> 2.34.1
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 8+ messages in thread