* [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 @ 2020-04-15 12:59 Matt Weber 2020-04-15 12:59 ` [Buildroot] [PATCH v4 1/8] package/libselinux: bump version " Matt Weber ` (7 more replies) 0 siblings, 8 replies; 18+ messages in thread From: Matt Weber @ 2020-04-15 12:59 UTC (permalink / raw) To: buildroot v4 * Dropped proposed v3 date based version and switched back to x.y * Thomas P. has added a release-monitoring.org bug report on sematic vs date version ordering (https://github.com/fedora-infra/anitya/issues/897) * Set the version and site in each package to avoid variable expansion issues v3 * Switches to using the date (i.e. 20191204) abased release tagging for better alignment with https://release-monitoring.org/project/01717/ * Sharing libselinux version and site across all related selinux pkgs * Added selinux-python which was missed in the v2 of this bump by Adam (http://patchwork.ozlabs.org/project/buildroot/list/?series=156673) v1 / v2 * Adam's series here: v2 - http://patchwork.ozlabs.org/project/buildroot/list/?series=156673 v1 - http://patchwork.ozlabs.org/project/buildroot/list/?series=147113 Tested with the following reduced configuration for legal info and build. BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_POLICYCOREUTILS=y BR2_PACKAGE_RESTORECOND=y BR2_PACKAGE_SELINUX_PYTHON=y BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW=y BR2_PACKAGE_SETOOLS=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set Adam Duskett (7): package/libselinux: bump version to 3.0 package/libsemanage: bump version to 3.0 package/libsepol: bump version to 3.0 package/policycoreutils: bump version to 3.0 package/restorecond: bump version to 3.0 package/semodule-utils: bump version to 3.0 package/checkpolicy: bump version to 3.0 Matt Weber (1): package/selinux-python: bump to version 3.0 package/checkpolicy/checkpolicy.hash | 2 +- package/checkpolicy/checkpolicy.mk | 4 +- package/libselinux/0001-fix-musl-build.patch | 22 +- ...-and-rely-on-the-installed-file-nam.patch} | 8 +- ...ng-against-musl-and-uclibc-libraries.patch | 32 +++ ...ython-distutils-to-install-SELinux-p.patch | 207 ------------------ ...-t-pass-bogus-I-and-L-to-python-setu.patch | 34 --- package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 25 +-- package/libsemanage/libsemanage.hash | 2 +- package/libsemanage/libsemanage.mk | 16 +- package/libsepol/Config.in | 3 +- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 4 +- package/policycoreutils/policycoreutils.hash | 2 +- package/policycoreutils/policycoreutils.mk | 4 +- package/restorecond/restorecond.hash | 2 +- package/restorecond/restorecond.mk | 4 +- package/selinux-python/selinux-python.hash | 2 +- package/selinux-python/selinux-python.mk | 4 +- package/semodule-utils/semodule-utils.hash | 2 +- package/semodule-utils/semodule-utils.mk | 4 +- 22 files changed, 84 insertions(+), 303 deletions(-) rename package/libselinux/{0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch => 0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch} (94%) create mode 100644 package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch delete mode 100644 package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch delete mode 100644 package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch -- 2.17.1 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 1/8] package/libselinux: bump version to 3.0 2020-04-15 12:59 [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 Matt Weber @ 2020-04-15 12:59 ` Matt Weber 2020-04-17 20:15 ` Thomas Petazzoni 2020-04-19 14:26 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 2/8] package/libsemanage: " Matt Weber ` (6 subsequent siblings) 7 siblings, 2 replies; 18+ messages in thread From: Matt Weber @ 2020-04-15 12:59 UTC (permalink / raw) To: buildroot From: Adam Duskett <aduskett@gmail.com> Other changes: - Remove upstream packages. - Modify existing patches to work with 3.0. - Remove Python2 check, as 3.0 has removed Python2 support. Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> --- Changes v3 -> v4 - Switched back to using x.y for versioning v2 -> v3 - Matt switched over the versioning to use dates --- package/libselinux/0001-fix-musl-build.patch | 22 +- ...-and-rely-on-the-installed-file-nam.patch} | 8 +- ...ng-against-musl-and-uclibc-libraries.patch | 32 +++ ...ython-distutils-to-install-SELinux-p.patch | 207 ------------------ ...-t-pass-bogus-I-and-L-to-python-setu.patch | 34 --- package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 25 +-- 7 files changed, 59 insertions(+), 271 deletions(-) rename package/libselinux/{0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch => 0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch} (94%) create mode 100644 package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch delete mode 100644 package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch delete mode 100644 package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch diff --git a/package/libselinux/0001-fix-musl-build.patch b/package/libselinux/0001-fix-musl-build.patch index 7af3a3c36f..44189e6400 100644 --- a/package/libselinux/0001-fix-musl-build.patch +++ b/package/libselinux/0001-fix-musl-build.patch @@ -1,4 +1,7 @@ -fix undefined macros in musl +From 78f7f09028fdd6a5e8e4e4b584749621eaef412f Mon Sep 17 00:00:00 2001 +From: Yann E. MORIN" <yann.morin.1998@free.fr> +Date: Sat, 7 Dec 2019 17:24:50 -0800 +Subject: [PATCH] fix undefined macros in musl musl does not define glibc-specific macros, so use a simple version of the macro when it is not defined. @@ -9,11 +12,13 @@ Domain, and we want to avoid license propagation, so this macro is completely written from scratch, and non-optimal. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> - -diff -durN libselinux-2.1.13.orig/src/booleans.c libselinux-2.1.13/src/booleans.c ---- libselinux-2.1.13.orig/src/booleans.c 2013-02-06 02:43:22.000000000 +0100 -+++ libselinux-2.1.13/src/booleans.c 2015-07-26 20:40:41.311801914 +0200 -@@ -62,6 +62,14 @@ +[Updated for 3.0] +Signed-off-by: Adam Duskett <Aduskett@gmail.com> +diff --git a/src/booleans.c b/src/booleans.c +index ffa8d26..8569002 100644 +--- a/src/booleans.c ++++ b/src/booleans.c +@@ -65,6 +65,14 @@ int security_get_boolean_names(char ***names, int *len) goto bad; } @@ -26,5 +31,8 @@ diff -durN libselinux-2.1.13.orig/src/booleans.c libselinux-2.1.13/src/booleans. +#endif + for (i = 0; i < *len; i++) { - n[i] = (char *)malloc(_D_ALLOC_NAMLEN(namelist[i])); + n[i] = strdup(namelist[i]->d_name); if (!n[i]) { +-- +2.23.0 + diff --git a/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch similarity index 94% rename from package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch rename to package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch index c960e1db7e..ed05197105 100644 --- a/package/libselinux/0006-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch @@ -17,12 +17,14 @@ was installed. [Upstream: https://github.com/SELinuxProject/selinux/pull/184] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +[Refreshed for 3.0] +Signed-off-by: Adam Duskett <Aduskett@gmail.com> --- - src/Makefile | 3 +-- + libselinux/src/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 799df2b0..95684ed7 100644 +index 4b6a4d4..7b14ef1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include @@ -43,5 +45,5 @@ index 799df2b0..95684ed7 100644 install-rubywrap: rubywrap test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) -- -2.21.0 +2.23.0 diff --git a/package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch b/package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch new file mode 100644 index 0000000000..1880c8f692 --- /dev/null +++ b/package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch @@ -0,0 +1,32 @@ +From 0f6cd4ef20639ac3b3e26af8f743ee03b5d6f8a4 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <Aduskett@gmail.com> +Date: Wed, 11 Dec 2019 14:00:16 -0800 +Subject: [PATCH] Fix building against musl and uClibc libc libraries. + +Currently, the src/Makefile provides the FTS_LDLIBS when building against musl +or uClibc. However, this is missing from utils/Makefile, which causes linking +to fail. + +Add the FTS_LDLIBS variable to the LDLIBS variable in utils/Makefile to fix +compiling against uClibc and musl. + +Signed-off-by: Adam Duskett <aduskett@gmail.com> + +--- + libselinux/utils/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/Makefile b/utils/Makefile +index 36150638..a5632b7c 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -45,7 +45,7 @@ endif + + override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) + override LDFLAGS += -L../src +-override LDLIBS += -lselinux ++override LDLIBS += -lselinux $(FTS_LDLIBS) + PCRE_LDLIBS ?= -lpcre + + ifeq ($(ANDROID_HOST),y) + diff --git a/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch b/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch deleted file mode 100644 index b1727af459..0000000000 --- a/package/libselinux/0003-libselinux-Use-Python-distutils-to-install-SELinux-p.patch +++ /dev/null @@ -1,207 +0,0 @@ -From 89c296e7e9219f54c74f8c3f42940100cbcac962 Mon Sep 17 00:00:00 2001 -From: Petr Lautrbach <plautrba@redhat.com> -Date: Fri, 7 Jun 2019 17:35:44 +0200 -Subject: [PATCH] libselinux: Use Python distutils to install SELinux python - bindings - -Follow officially documented way how to build C extension modules using -distutils - https://docs.python.org/3.8/extending/building.html#building - -Fixes: - -- selinux python module fails to load when it's built using SWIG-4.0: - ->>> import selinux -Traceback (most recent call last): - File "<stdin>", line 1, in <module> - File "/usr/lib64/python3.7/site-packages/selinux/__init__.py", line 13, in <module> - from . import _selinux -ImportError: cannot import name '_selinux' from 'selinux' (/usr/lib64/python3.7/site-packages/selinux/__init__.py) - -SWIG-4.0 changed (again?) its behavior so that it uses: from . import _selinux -which looks for _selinux module in the same directory as where __init__.py is - -$(PYLIBDIR)/site-packages/selinux. But _selinux module is installed into -$(PYLIBDIR)/site-packages/ since a9604c30a5e2f ("libselinux: Change the location -of _selinux.so"). - -- audit2why python module fails to build with Python 3.8 - -cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -DOVERRIDE_GETTID=0 -I../include -D_GNU_SOURCE -DDISABLE_RPM -DNO_ANDROID_BACKEND -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L. -shared -o python-3.8audit2why.so python-3.8audit2why.lo -lselinux -l:libsepol.a -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs -/usr/bin/ld: python-3.8audit2why.lo: in function `finish': -/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:166: undefined reference to `PyArg_ParseTuple' -/usr/bin/ld: python-3.8audit2why.lo: in function `_Py_INCREF': -/usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct' -/usr/bin/ld: /usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct' -/usr/bin/ld: python-3.8audit2why.lo: in function `check_booleans': -/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:84: undefined reference to `PyExc_RuntimeError' -... - -It's related to the following Python change -https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build - -Python distutils adds correct link options automatically. - -- selinux python module doesn't provide any Python metadata - -When selinux python module was built manually, it didn't provide any metadata. -distutils takes care about that so that selinux Python module is visible for -pip: - -$ pip3 list | grep selinux -selinux 2.9 - -Signed-off-by: Petr Lautrbach <plautrba@redhat.com> -[Upstream: commit 2efa06857575e4118e91ca250b6b92da68b130d5] -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> ---- - src/.gitignore | 2 +- - src/Makefile | 36 ++++++++---------------------------- - src/setup.py | 24 ++++++++++++++++++++++++ - 3 files changed, 33 insertions(+), 29 deletions(-) - create mode 100644 libselinux/src/setup.py - -diff --git a/src/.gitignore b/src/.gitignore -index 4dcc3b3b..428afe5a 100644 ---- a/src/.gitignore -+++ b/src/.gitignore -@@ -1,4 +1,4 @@ - selinux.py --selinuxswig_wrap.c -+selinuxswig_python_wrap.c - selinuxswig_python_exception.i - selinuxswig_ruby_wrap.c -diff --git a/src/Makefile b/src/Makefile -index e9ed0383..2b1696a0 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -36,7 +36,7 @@ TARGET=libselinux.so - LIBPC=libselinux.pc - SWIGIF= selinuxswig_python.i selinuxswig_python_exception.i - SWIGRUBYIF= selinuxswig_ruby.i --SWIGCOUT= selinuxswig_wrap.c -+SWIGCOUT= selinuxswig_python_wrap.c - SWIGPYOUT= selinux.py - SWIGRUBYCOUT= selinuxswig_ruby_wrap.c - SWIGLOBJ:= $(patsubst %.c,$(PYPREFIX)%.lo,$(SWIGCOUT)) -@@ -55,7 +55,7 @@ ifeq ($(LIBSEPOLA),) - LDLIBS_LIBSEPOLA := -l:libsepol.a - endif - --GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i -+GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) $(SWIGCOUT) selinuxswig_python_exception.i - SRCS= $(filter-out $(GENERATED) audit2why.c, $(sort $(wildcard *.c))) - - MAX_STACK_SIZE=32768 -@@ -125,25 +125,18 @@ DISABLE_FLAGS+= -DNO_ANDROID_BACKEND - SRCS:= $(filter-out label_backends_android.c, $(SRCS)) - endif - --SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(DISABLE_FLAGS) -- - SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) - - all: $(LIBA) $(LIBSO) $(LIBPC) - --pywrap: all $(SWIGFILES) $(AUDIT2WHYSO) -+pywrap: all selinuxswig_python_exception.i -+ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR) - - rubywrap: all $(SWIGRUBYSO) - --$(SWIGLOBJ): $(SWIGCOUT) -- $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $< -- - $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) - $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< - --$(SWIGSO): $(SWIGLOBJ) -- $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $< -lselinux $(PYLIBS) -- - $(SWIGRUBYSO): $(SWIGRUBYLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(RUBYLIBS) - -@@ -161,29 +154,15 @@ $(LIBPC): $(LIBPC).in ../VERSION - selinuxswig_python_exception.i: ../include/selinux/selinux.h - bash -e exception.sh > $@ || (rm -f $@ ; false) - --$(AUDIT2WHYLOBJ): audit2why.c -- $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< -- --$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSEPOLA) -- $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(LDLIBS_LIBSEPOLA) $(PYLIBS) -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs -- - %.o: %.c policy.h - $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< - - %.lo: %.c policy.h - $(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $< - --$(SWIGCOUT): $(SWIGIF) -- $(SWIG) $< -- --$(SWIGPYOUT): $(SWIGCOUT) -- - $(SWIGRUBYCOUT): $(SWIGRUBYIF) - $(SWIGRUBY) $< - --swigify: $(SWIGIF) -- $(SWIG) $< -- - install: all - test -d $(DESTDIR)$(LIBDIR) || install -m 755 -d $(DESTDIR)$(LIBDIR) - install -m 644 $(LIBA) $(DESTDIR)$(LIBDIR) -@@ -194,10 +173,9 @@ install: all - ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) - - install-pywrap: pywrap -- test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux -- install -m 755 $(SWIGSO) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) -- install -m 755 $(AUDIT2WHYSO) $(DESTDIR)$(PYTHONLIBDIR)/selinux/audit2why$(PYCEXT) -+ $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` - install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py -+ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) - - install-rubywrap: rubywrap - test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) -@@ -208,6 +186,8 @@ relabel: - - clean-pywrap: - -rm -f $(SWIGLOBJ) $(SWIGSO) $(AUDIT2WHYLOBJ) $(AUDIT2WHYSO) -+ $(PYTHON) setup.py clean -+ -rm -rf build *~ \#* *pyc .#* - - clean-rubywrap: - -rm -f $(SWIGRUBYLOBJ) $(SWIGRUBYSO) -diff --git a/src/setup.py b/src/setup.py -new file mode 100644 -index 00000000..4dc03f55 ---- /dev/null -+++ b/src/setup.py -@@ -0,0 +1,24 @@ -+#!/usr/bin/python3 -+ -+from distutils.core import Extension, setup -+ -+setup( -+ name="selinux", -+ version="2.9", -+ description="SELinux python 3 bindings", -+ author="SELinux Project", -+ author_email="selinux at vger.kernel.org", -+ ext_modules=[ -+ Extension('selinux._selinux', -+ sources=['selinuxswig_python.i'], -+ include_dirs=['../include'], -+ library_dirs=['.'], -+ libraries=['selinux']), -+ Extension('selinux.audit2why', -+ sources=['audit2why.c'], -+ include_dirs=['../include'], -+ library_dirs=['.'], -+ libraries=['selinux'], -+ extra_link_args=['-l:libsepol.a', '-Wl,--version-script=audit2why.map']) -+ ], -+) --- -2.21.0 - diff --git a/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch b/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch deleted file mode 100644 index 4c568d3386..0000000000 --- a/package/libselinux/0004-src-Makefile-don-t-pass-bogus-I-and-L-to-python-setu.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4b1568bce5bbdc7bf76a4bbf1066ba7e7b84649f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> -Date: Fri, 25 Oct 2019 11:45:04 +0200 -Subject: [PATCH] src/Makefile: don't pass bogus -I and -L to python setup.py - build_ext - -Using $(DESTDIR) during the build does not follow the normal/standard -semantic of DESTDIR: it is normally only needed during the -installation. Therefore, a lot of build systems/environments don't -pass any DESTDIR at build time, which causes setup.py to be called -with -I /usr/include -L /usr/lib, which breaks cross-compilation. - -[Upstream: https://github.com/SELinuxProject/selinux/pull/183] -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 2b1696a0..3b8bad81 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -130,7 +130,7 @@ SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) - all: $(LIBA) $(LIBSO) $(LIBPC) - - pywrap: all selinuxswig_python_exception.i -- CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR) -+ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext - - rubywrap: all $(SWIGRUBYSO) - --- -2.21.0 - diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index ed61ea8bd2..d1b4210483 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 1bccc8873e449587d9a2b2cf253de9b89a8291b9fbc7c59393ca9e5f5f4d2693 libselinux-2.9.tar.gz +sha256 2ea2b30f671dae9d6b1391cbe8fb2ce5d36a3ee4fb1cd3c32f0d933c31b82433 libselinux-3.0.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 1461e34539..5f87b5bc90 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSELINUX_VERSION = 2.9 -LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSELINUX_VERSION = 3.0 +LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE @@ -27,18 +27,13 @@ LIBSELINUX_DEPENDENCIES += musl-fts LIBSELINUX_MAKE_OPTS += FTS_LDLIBS=-lfts endif -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSELINUX_DEPENDENCIES += python3 host-swig LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON),y) -LIBSELINUX_DEPENDENCIES += python host-swig -LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -endif LIBSELINUX_MAKE_OPTS += \ $(PKG_PYTHON_DISTUTILS_ENV) \ - PYTHON=$(LIBSELINUX_PYLIBVER) + PYTHON=python$(PYTHON3_VERSION_MAJOR) LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap @@ -49,7 +44,7 @@ define LIBSELINUX_BUILD_PYTHON_BINDINGS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(LIBSELINUX_MAKE_OPTS) swigify pywrap endef -endif # python || python3 +endif # python3 # Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc # 2.22. We set CFLAGS and LDFLAGS here because we want to win over the @@ -82,15 +77,7 @@ define LIBSELINUX_INSTALL_TARGET_CMDS endef HOST_LIBSELINUX_DEPENDENCIES = \ - host-libsepol host-pcre host-swig - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_LIBSELINUX_DEPENDENCIES += host-python3 -HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else -HOST_LIBSELINUX_DEPENDENCIES += host-python -HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -endif + host-libsepol host-pcre host-swig host-python3 HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ @@ -98,7 +85,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ SHLIBDIR=$(HOST_DIR)/lib \ LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \ $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ - PYTHON=$(HOST_LIBSELINUX_PYLIBVER) + PYTHON=python$(PYTHON3_VERSION_MAJOR) define HOST_LIBSELINUX_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 1/8] package/libselinux: bump version to 3.0 2020-04-15 12:59 ` [Buildroot] [PATCH v4 1/8] package/libselinux: bump version " Matt Weber @ 2020-04-17 20:15 ` Thomas Petazzoni 2020-04-19 14:26 ` Thomas Petazzoni 1 sibling, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2020-04-17 20:15 UTC (permalink / raw) To: buildroot Hello, I've applied, after adjusting two minor nits. On Wed, 15 Apr 2020 07:59:14 -0500 Matt Weber <matthew.weber@rockwellcollins.com> wrote: > From: Adam Duskett <aduskett@gmail.com> > > Other changes: > - Remove upstream packages. ^^^^ patches > -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) > ifeq ($(BR2_PACKAGE_PYTHON3),y) > LIBSELINUX_DEPENDENCIES += python3 host-swig > LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) This variable was no longer used anywhere, so I dropped it. Thanks, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 1/8] package/libselinux: bump version to 3.0 2020-04-15 12:59 ` [Buildroot] [PATCH v4 1/8] package/libselinux: bump version " Matt Weber 2020-04-17 20:15 ` Thomas Petazzoni @ 2020-04-19 14:26 ` Thomas Petazzoni 1 sibling, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2020-04-19 14:26 UTC (permalink / raw) To: buildroot On Wed, 15 Apr 2020 07:59:14 -0500 Matt Weber <matthew.weber@rockwellcollins.com> wrote: > From: Adam Duskett <aduskett@gmail.com> > > Other changes: > - Remove upstream packages. > - Modify existing patches to work with 3.0. > - Remove Python2 check, as 3.0 has removed Python2 support. > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> > --- > Changes > v3 -> v4 > - Switched back to using x.y for versioning This breaks the build with some old glibc versions where <fts.h> is incompatible with FILE_OFFSET_BITS=64. We already have a work-around for this in libselinux.mk, but it seems it's no longer sufficient, as -D_FILE_OFFSET_BITS=64 gets into the command line: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-none-linux-gnueabi-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Os -I../include -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -lpcre -lpthread -L../src selabel_get_digests_all_partial_matches.c -lselinux -o selabel_get_digests_all_partial_matches In file included from selabel_get_digests_all_partial_matches.c:7:0: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/fts.h:41:3: error: #error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64" # error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64" ^ Could you have a look ? Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 2/8] package/libsemanage: bump version to 3.0 2020-04-15 12:59 [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 Matt Weber 2020-04-15 12:59 ` [Buildroot] [PATCH v4 1/8] package/libselinux: bump version " Matt Weber @ 2020-04-15 12:59 ` Matt Weber 2020-04-17 20:17 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 3/8] package/libsepol: " Matt Weber ` (5 subsequent siblings) 7 siblings, 1 reply; 18+ messages in thread From: Matt Weber @ 2020-04-15 12:59 UTC (permalink / raw) To: buildroot From: Adam Duskett <aduskett@gmail.com> Other changes: - Remove the Python2 check, as 3.0 has removed support for Python2. Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> --- Changes v3 -> v4 - Switched back to using x.y for versioning v2 -> v3 - Matt switched over the versioning to use dates --- package/libsemanage/libsemanage.hash | 2 +- package/libsemanage/libsemanage.mk | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 871ed192c4..85dafeb44d 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 2576349d344492e73b468059767268dec1dabd8c35f3c7222c3ec2448737bc1c libsemanage-2.9.tar.gz +sha256 a497b0720d54eac427f1f3f618eed417e50ed8f4e47ed0f7a1d391bd416e84cf libsemanage-3.0.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index fd90346049..cdf1a2f2f8 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 2.9 -LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSEMANAGE_VERSION = 3.0 +LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux bzip2 @@ -31,7 +31,8 @@ HOST_LIBSEMANAGE_DEPENDENCIES = \ host-libsepol \ host-libselinux \ host-bzip2 \ - host-swig + host-swig \ + host-python3 HOST_LIBSEMANAGE_MAKE_OPTS += \ $(HOST_CONFIGURE_OPTS) \ @@ -39,19 +40,10 @@ HOST_LIBSEMANAGE_MAKE_OPTS += \ SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/" \ DEFAULT_SEMANAGE_CONF_LOCATION=$(HOST_DIR)/etc/selinux/semanage.conf -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_LIBSEMANAGE_DEPENDENCIES += host-python3 HOST_LIBSEMANAGE_MAKE_OPTS += \ PYINC="-I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)/" \ PYTHONLIBDIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/" \ PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" -else -HOST_LIBSEMANAGE_DEPENDENCIES += host-python -HOST_LIBSEMANAGE_MAKE_OPTS += \ - PYINC="-I$(HOST_DIR)/include/python$(PYTHON_VERSION_MAJOR)/" \ - PYTHONLIBDIR="$(HOST_DIR)/lib/python$(PYTHON_VERSION_MAJOR)/" \ - PYLIBVER="python$(PYTHON_VERSION_MAJOR)" -endif define HOST_LIBSEMANAGE_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) all -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 2/8] package/libsemanage: bump version to 3.0 2020-04-15 12:59 ` [Buildroot] [PATCH v4 2/8] package/libsemanage: " Matt Weber @ 2020-04-17 20:17 ` Thomas Petazzoni 0 siblings, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2020-04-17 20:17 UTC (permalink / raw) To: buildroot On Wed, 15 Apr 2020 07:59:15 -0500 Matt Weber <matthew.weber@rockwellcollins.com> wrote: > HOST_LIBSEMANAGE_MAKE_OPTS += \ We had an unconditional assignment here. > $(HOST_CONFIGURE_OPTS) \ > @@ -39,19 +40,10 @@ HOST_LIBSEMANAGE_MAKE_OPTS += \ > SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/" \ > DEFAULT_SEMANAGE_CONF_LOCATION=$(HOST_DIR)/etc/selinux/semanage.conf > > -ifeq ($(BR2_PACKAGE_PYTHON3),y) > -HOST_LIBSEMANAGE_DEPENDENCIES += host-python3 > HOST_LIBSEMANAGE_MAKE_OPTS += \ And this one was conditional on python3 availability. But it is no longer optional, so the assignment can be grouped with the previous one. I fixed that, and applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 3/8] package/libsepol: bump version to 3.0 2020-04-15 12:59 [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 Matt Weber 2020-04-15 12:59 ` [Buildroot] [PATCH v4 1/8] package/libselinux: bump version " Matt Weber 2020-04-15 12:59 ` [Buildroot] [PATCH v4 2/8] package/libsemanage: " Matt Weber @ 2020-04-15 12:59 ` Matt Weber 2020-04-17 20:31 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 4/8] package/policycoreutils: " Matt Weber ` (4 subsequent siblings) 7 siblings, 1 reply; 18+ messages in thread From: Matt Weber @ 2020-04-15 12:59 UTC (permalink / raw) To: buildroot From: Adam Duskett <aduskett@gmail.com> Other changes: - Add policy version 32 as a default version of toolchains build with kernel headers 5.5 or later. - Add Help text for the above. Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> --- Changes v3 -> v4 - Switched back to using x.y for versioning v2 -> v3 - Matt switched over the versioning to use dates --- package/libsepol/Config.in | 3 ++- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 21d4d7865c..52c12bf290 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -11,6 +11,7 @@ if BR2_PACKAGE_LIBSEPOL config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION int "Policy version" + default 32 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 default 31 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 default 30 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 default 29 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 @@ -27,7 +28,7 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION > 3.5 <= 3.14 28 (27 and 28 were added@the same time) > 3.14 <= 4.3 29 > 4.3 <= 4.13 30 - > 4.13 31 + > 4.13 <= 5.5 31 endif diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index 83eb63213e..a43d387a4f 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 a34b12b038d121e3e459b1cbaca3c9202e983137819c16baf63658390e3f1d5d libsepol-2.9.tar.gz +sha256 5b7ae1881909f1048b06f7a0c364c5c8a86ec12e0ec76e740fe9595a6033eb79 libsepol-3.0.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 62b0744aa3..2d64c53bc3 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSEPOL_VERSION = 2.9 -LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSEPOL_VERSION = 3.0 +LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 3/8] package/libsepol: bump version to 3.0 2020-04-15 12:59 ` [Buildroot] [PATCH v4 3/8] package/libsepol: " Matt Weber @ 2020-04-17 20:31 ` Thomas Petazzoni 0 siblings, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2020-04-17 20:31 UTC (permalink / raw) To: buildroot On Wed, 15 Apr 2020 07:59:16 -0500 Matt Weber <matthew.weber@rockwellcollins.com> wrote: > config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION > int "Policy version" > + default 32 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 > default 31 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 > default 30 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 > default 29 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 > @@ -27,7 +28,7 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION > > 3.5 <= 3.14 28 (27 and 28 were added@the same time) > > 3.14 <= 4.3 29 > > 4.3 <= 4.13 30 > - > 4.13 31 > + > 4.13 <= 5.5 31 A line should have been added for version 32 here, but while doing this, I noticed our help text was wrong. Indeed, version 31 is supported starting from kernel 4.13 included, so it should have been a >= 4.13 here. I added a preliminary patch fixing that, and applied yours on top of it. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 4/8] package/policycoreutils: bump version to 3.0 2020-04-15 12:59 [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 Matt Weber ` (2 preceding siblings ...) 2020-04-15 12:59 ` [Buildroot] [PATCH v4 3/8] package/libsepol: " Matt Weber @ 2020-04-15 12:59 ` Matt Weber 2020-04-17 20:47 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 5/8] package/restorecond: " Matt Weber ` (3 subsequent siblings) 7 siblings, 1 reply; 18+ messages in thread From: Matt Weber @ 2020-04-15 12:59 UTC (permalink / raw) To: buildroot From: Adam Duskett <aduskett@gmail.com> Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> --- Changes v3 -> v4 - Switched back to using x.y for versioning v2 -> v3 - Matt switched over the versioning to use dates --- package/policycoreutils/policycoreutils.hash | 2 +- package/policycoreutils/policycoreutils.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index c601c7818b..206d2e35a7 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 c53c344f28007b3c0742bd958751e9b5d2385898adeb8aec6281ae57342f0f7b policycoreutils-2.9.tar.gz +sha256 3379c9bd722e36be9bf8856c6fa373bfa9b33305ac9da5fc807cfe7fa605f489 policycoreutils-3.0.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 6cd5a019c5..a06c7847ab 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -4,8 +4,8 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 2.9 -POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +POLICYCOREUTILS_VERSION = 3.0 +POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = COPYING -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 4/8] package/policycoreutils: bump version to 3.0 2020-04-15 12:59 ` [Buildroot] [PATCH v4 4/8] package/policycoreutils: " Matt Weber @ 2020-04-17 20:47 ` Thomas Petazzoni 0 siblings, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2020-04-17 20:47 UTC (permalink / raw) To: buildroot On Wed, 15 Apr 2020 07:59:17 -0500 Matt Weber <matthew.weber@rockwellcollins.com> wrote: > From: Adam Duskett <aduskett@gmail.com> > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> > --- > Changes > v3 -> v4 > - Switched back to using x.y for versioning Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 5/8] package/restorecond: bump version to 3.0 2020-04-15 12:59 [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 Matt Weber ` (3 preceding siblings ...) 2020-04-15 12:59 ` [Buildroot] [PATCH v4 4/8] package/policycoreutils: " Matt Weber @ 2020-04-15 12:59 ` Matt Weber 2020-04-17 20:48 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 6/8] package/semodule-utils: " Matt Weber ` (2 subsequent siblings) 7 siblings, 1 reply; 18+ messages in thread From: Matt Weber @ 2020-04-15 12:59 UTC (permalink / raw) To: buildroot From: Adam Duskett <aduskett@gmail.com> Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> --- Changes v3 -> v4 - Switched back to using x.y for versioning v2 -> v3 - Matt switched over the versioning to use dates --- package/restorecond/restorecond.hash | 2 +- package/restorecond/restorecond.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 7a82bda370..7532bbf054 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 cbf9820583e641ee0462fa7bc89e6024676af281e025703e17b2d019b1a25a4f restorecond-2.9.tar.gz +sha256 32a92c9f4bf48c613f9f467ced58d8c369eec8892239cd44d5d0e139b41926dc restorecond-3.0.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index c519b5de2b..0cf0ec35e9 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,8 +4,8 @@ # ################################################################################ -RESTORECOND_VERSION = 2.9 -RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +RESTORECOND_VERSION = 3.0 +RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 5/8] package/restorecond: bump version to 3.0 2020-04-15 12:59 ` [Buildroot] [PATCH v4 5/8] package/restorecond: " Matt Weber @ 2020-04-17 20:48 ` Thomas Petazzoni 0 siblings, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2020-04-17 20:48 UTC (permalink / raw) To: buildroot On Wed, 15 Apr 2020 07:59:18 -0500 Matt Weber <matthew.weber@rockwellcollins.com> wrote: > From: Adam Duskett <aduskett@gmail.com> > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> > --- > Changes > v3 -> v4 > - Switched back to using x.y for versioning Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 6/8] package/semodule-utils: bump version to 3.0 2020-04-15 12:59 [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 Matt Weber ` (4 preceding siblings ...) 2020-04-15 12:59 ` [Buildroot] [PATCH v4 5/8] package/restorecond: " Matt Weber @ 2020-04-15 12:59 ` Matt Weber 2020-04-17 20:48 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 7/8] package/checkpolicy: " Matt Weber 2020-04-15 12:59 ` [Buildroot] [PATCH v4 8/8] package/selinux-python: bump to version 3.0 Matt Weber 7 siblings, 1 reply; 18+ messages in thread From: Matt Weber @ 2020-04-15 12:59 UTC (permalink / raw) To: buildroot From: Adam Duskett <aduskett@gmail.com> Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> --- Changes v3 -> v4 - Switched back to using x.y for versioning v2 -> v3 - Matt switched over the versioning to use dates --- package/semodule-utils/semodule-utils.hash | 2 +- package/semodule-utils/semodule-utils.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index 386b442618..c1a4ef1b9b 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 8083679ee634570f6e9a18632f2c2862b9134fa308b689b2e1952a369ae5d907 semodule-utils-2.9.tar.gz +sha256 14ee2db21f36766ffbbb65770f8e7236d21675db9f0f5d40f50974711da598cf semodule-utils-3.0.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index 7102dbc5e0..ec1759ece1 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 2.9 -SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +SEMODULE_UTILS_VERSION = 3.0 +SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING SEMODULE_UTILS_DEPENDENCIES = libsepol -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 6/8] package/semodule-utils: bump version to 3.0 2020-04-15 12:59 ` [Buildroot] [PATCH v4 6/8] package/semodule-utils: " Matt Weber @ 2020-04-17 20:48 ` Thomas Petazzoni 0 siblings, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2020-04-17 20:48 UTC (permalink / raw) To: buildroot On Wed, 15 Apr 2020 07:59:19 -0500 Matt Weber <matthew.weber@rockwellcollins.com> wrote: > From: Adam Duskett <aduskett@gmail.com> > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> > --- > Changes > v3 -> v4 > - Switched back to using x.y for versioning Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 7/8] package/checkpolicy: bump version to 3.0 2020-04-15 12:59 [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 Matt Weber ` (5 preceding siblings ...) 2020-04-15 12:59 ` [Buildroot] [PATCH v4 6/8] package/semodule-utils: " Matt Weber @ 2020-04-15 12:59 ` Matt Weber 2020-04-17 20:48 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 8/8] package/selinux-python: bump to version 3.0 Matt Weber 7 siblings, 1 reply; 18+ messages in thread From: Matt Weber @ 2020-04-15 12:59 UTC (permalink / raw) To: buildroot From: Adam Duskett <aduskett@gmail.com> Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> --- Changes v3 -> v4 - Switched back to using x.y for versioning v2 -> v3 - Matt switched over the versioning to use dates --- package/checkpolicy/checkpolicy.hash | 2 +- package/checkpolicy/checkpolicy.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index 9e77b9b027..264e21b8f3 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 a946c32b284532447857e4c48830f8816867c61220c8c08bdd32e6f691335f8e checkpolicy-2.9.tar.gz +sha256 c88c719a141dd5c1202d49c378c7f063349d630522d5e04dc6e0c53da81aa4f8 checkpolicy-3.0.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index 8f1ec72549..3b055df489 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,8 +4,8 @@ # ################################################################################ -CHECKPOLICY_VERSION = 2.9 -CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +CHECKPOLICY_VERSION = 3.0 +CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 7/8] package/checkpolicy: bump version to 3.0 2020-04-15 12:59 ` [Buildroot] [PATCH v4 7/8] package/checkpolicy: " Matt Weber @ 2020-04-17 20:48 ` Thomas Petazzoni 0 siblings, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2020-04-17 20:48 UTC (permalink / raw) To: buildroot On Wed, 15 Apr 2020 07:59:20 -0500 Matt Weber <matthew.weber@rockwellcollins.com> wrote: > From: Adam Duskett <aduskett@gmail.com> > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> > --- > Changes > v3 -> v4 > - Switched back to using x.y for versioning Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 8/8] package/selinux-python: bump to version 3.0 2020-04-15 12:59 [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 Matt Weber ` (6 preceding siblings ...) 2020-04-15 12:59 ` [Buildroot] [PATCH v4 7/8] package/checkpolicy: " Matt Weber @ 2020-04-15 12:59 ` Matt Weber 2020-04-17 20:48 ` Thomas Petazzoni 7 siblings, 1 reply; 18+ messages in thread From: Matt Weber @ 2020-04-15 12:59 UTC (permalink / raw) To: buildroot Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> --- Changes v3 -> v4 - Switched back to using x.y for versioning v2 -> v3 - Matt switched over the versioning to use dates --- package/selinux-python/selinux-python.hash | 2 +- package/selinux-python/selinux-python.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 8cbac37016..8fb72423e8 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 3650b5393b0d1790cac66db00e34f059aa91c23cfe3c2559676594e295d75fde selinux-python-2.9.tar.gz +sha256 43c08fa881ccc64251d396b1ac6c56b354bf98421b4ec937d54a8db190135494 selinux-python-3.0.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 978bee7c88..cbd94f962b 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,8 +4,8 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 2.9 -SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +SELINUX_PYTHON_VERSION = 3.0 +SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v4 8/8] package/selinux-python: bump to version 3.0 2020-04-15 12:59 ` [Buildroot] [PATCH v4 8/8] package/selinux-python: bump to version 3.0 Matt Weber @ 2020-04-17 20:48 ` Thomas Petazzoni 0 siblings, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2020-04-17 20:48 UTC (permalink / raw) To: buildroot On Wed, 15 Apr 2020 07:59:21 -0500 Matt Weber <matthew.weber@rockwellcollins.com> wrote: > Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> You forgot to drop the Python 2.x support in this package, so I did it and applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2020-04-19 14:26 UTC | newest] Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-04-15 12:59 [Buildroot] [PATCH v4 0/8] Bump of SELinux related libs/tools to 3.0 Matt Weber 2020-04-15 12:59 ` [Buildroot] [PATCH v4 1/8] package/libselinux: bump version " Matt Weber 2020-04-17 20:15 ` Thomas Petazzoni 2020-04-19 14:26 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 2/8] package/libsemanage: " Matt Weber 2020-04-17 20:17 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 3/8] package/libsepol: " Matt Weber 2020-04-17 20:31 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 4/8] package/policycoreutils: " Matt Weber 2020-04-17 20:47 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 5/8] package/restorecond: " Matt Weber 2020-04-17 20:48 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 6/8] package/semodule-utils: " Matt Weber 2020-04-17 20:48 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 7/8] package/checkpolicy: " Matt Weber 2020-04-17 20:48 ` Thomas Petazzoni 2020-04-15 12:59 ` [Buildroot] [PATCH v4 8/8] package/selinux-python: bump to version 3.0 Matt Weber 2020-04-17 20:48 ` Thomas Petazzoni
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.