| Message ID | 20210520174649.1188340-2-aduskett@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | selinux packages: bump versions | expand |
Adam, > From: Adam Duskett <aduskett@gmail.com> > Sent: Thursday, May 20, 2021 12:46 PM > To: buildroot@buildroot.org <buildroot@buildroot.org> > Cc: Antoine Tenart <atenart@kernel.org>; Shotwell, Clayton L Collins <Clayton.Shotwell@collins.com>; Weber, Matthew L Collins <Matthew.Weber@collins.com>; Marcus Folkesson <marcus.folkesson@gmail.com>; Adam Duskett <aduskett@gmail.com> > Subject: [External] [PATCH/NEXT: 01/11] package/libsepol: bump to version 3.2 > > Signed-off-by: Adam Duskett <aduskett@gmail.com> I applied this series against NEXT and ran the following: ./support/testing/run-tests tests.core.test_selinux.TestSELinuxPackage However, it failed. 14:59:59 TestSELinuxPackage Starting 15:00:28 TestSELinuxPackage Cleaning up ====================================================================== ERROR: test_run (tests.core.test_selinux.TestSELinuxPackage) ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/lib/python3/dist-packages/pexpect/expect.py", line 99, in expect_loop incoming = spawn.read_nonblocking(spawn.maxread, timeout) File "/usr/lib/python3/dist-packages/pexpect/pty_spawn.py", line 462, in read_nonblocking raise TIMEOUT('Timeout exceeded.') pexpect.exceptions.TIMEOUT: Timeout exceeded. During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/accts/mlweber1/wip_patchwork/buildroot/support/testing/tests/core/test_selinux.py", line 76, in test_run out, ret = self.emulator.run("seinfo -t ntpd_t", 15) File "/accts/mlweber1/wip_patchwork/buildroot/support/testing/infra/emulator.py", line 110, in run self.qemu.expect("# ", timeout=timeout) File "/usr/lib/python3/dist-packages/pexpect/spawnbase.py", line 321, in expect timeout, searchwindowsize, async) File "/usr/lib/python3/dist-packages/pexpect/spawnbase.py", line 345, in expect_list return exp.expect_loop(timeout) File "/usr/lib/python3/dist-packages/pexpect/expect.py", line 107, in expect_loop return self.timeout(e) File "/usr/lib/python3/dist-packages/pexpect/expect.py", line 70, in timeout raise TIMEOUT(msg) pexpect.exceptions.TIMEOUT: Timeout exceeded. <pexpect.pty_spawn.spawn object at 0x7f7b9dc25d30> command: /usr/bin/qemu-system-arm args: [b'/usr/bin/qemu-system-arm', b'-serial', b'stdio', b'-display', b'none', b'-m', b'256', b'-initrd', b'/accts/mlweber1/wip_patchwork/buildroot/runtest/TestSELinuxPackage/images/rootfs.cpio', b'-dtb', b'/accts/mlweber1/vistajet/buildroot/dl/versatile-pb-4.19.dtb', b'-M', b'versatilepb', b'-device', b'virtio-rng-pci', b'-kernel', b'/accts/mlweber1/vistajet/buildroot/dl/kernel-versatile-4.19', b'-append', b'console=ttyAMA0'] buffer (last 100 chars): 'seinfo -t ntpd_t\r\r\n' before (last 100 chars): 'seinfo -t ntpd_t\r\r\n' after: <class 'pexpect.exceptions.TIMEOUT'> match: None match_index: None exitstatus: None flag_eof: False pid: 34609 child_fd: 11 closed: False timeout: 5 delimiter: <class 'pexpect.exceptions.EOF'> logfile: None logfile_read: <_io.TextIOWrapper name='/accts/mlweber1/wip_patchwork/buildroot/runtest/TestSELinuxPackage-run.log' mode='a+' encoding='UTF-8'> logfile_send: None maxread: 2000 ignorecase: False searchwindowsize: None delaybeforesend: 0.05 delayafterclose: 0.1 delayafterterminate: 0.1 searcher: searcher_re: 0: re.compile("# ") ---------------------------------------------------------------------- Ran 1 test in 29.328s FAILED (errors=1) I'll see if I can get more details beyond this runtime output that looks like it tried to run. Maybe the seinfo froze? $ tail runtest/TestSELinuxPackage-run.log Running sysctl: OK Saving random seed: OK Starting network: OK Welcome to Buildroot buildroot login: root # dmesg -n 1 # echo $? 0 # seinfo -t ntpd_t
Adam, > From: buildroot <buildroot-bounces@busybox.net> on behalf of Weber, Matthew L Collins via buildroot <buildroot@busybox.net> > Sent: Thursday, May 20, 2021 3:02 PM > To: Adam Duskett <aduskett@gmail.com>; buildroot@buildroot.org <buildroot@buildroot.org> > Cc: Antoine Tenart <atenart@kernel.org>; Shotwell, Clayton L Collins <Clayton.Shotwell@collins.com>; Marcus Folkesson <marcus.folkesson@gmail.com> > Subject: Re: [Buildroot] [External] [PATCH/NEXT: 01/11] package/libsepol: bump to version 3.2 > > Adam, > > > From: Adam Duskett <aduskett@gmail.com> > > Sent: Thursday, May 20, 2021 12:46 PM > > To: buildroot@buildroot.org <buildroot@buildroot.org> > > Cc: Antoine Tenart <atenart@kernel.org>; Shotwell, Clayton L Collins <Clayton.Shotwell@collins.com>; Weber, Matthew L Collins <Matthew.Weber@collins.com>; Marcus Folkesson <marcus.folkesson@gmail.com>; Adam Duskett <aduskett@gmail.com> > > Subject: [External] [PATCH/NEXT: 01/11] package/libsepol: bump to version 3.2 > > > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > > I applied this series against NEXT and ran the following: > ./support/testing/run-tests tests.core.test_selinux.TestSELinuxPackage > > However, it failed. So it turns out my test run didn't have a good rng and it failed for timeout reasons. I did some adjustments and the tests now pass for all 4 runtest use cases. 16:00:56 TestSELinuxExtraModulesDirs Starting 16:00:56 TestSELinuxExtraModules Starting 16:01:43 TestSELinuxExtraModulesDirs Cleaning up .16:01:43 TestSELinuxCustomGit Starting 16:01:43 TestSELinuxCustomGit Cleaning up .16:01:43 TestSELinuxPackage Starting 16:01:50 TestSELinuxExtraModules Cleaning up .16:03:07 TestSELinuxPackage Cleaning up . ---------------------------------------------------------------------- Ran 4 tests in 131.377s OK 1 776f05a270 (HEAD) package/audit: bump to version 3.0.1 2 3551c17333 package/setools: bump to version 4.4.0 3 6fffc6cc35 package/selinux-python: bump to version 3.2 4 581eb0e524 package/semodule-utils: bump to version 3.2 5 7671336b99 package/restorecond: bump to version 3.2 6 c0a9412021 package/checkpolicy: bump to version 3.2 7 0450bd2b6f package/policycoreutils: bump to version 3.2 8 0ee7f07bfc package/libselinux: bump to version 3.2 9 e79fc41939 package/libsemanage: bump to version 3.2 10 29ee5a71f1 package/libsepol/Config.in: Add policy version 33 11 419acd7f43 package/libsepol: bump to version 3.2 12 abc110e362 (refs/remotes/upstream/next, refs/remotes/origin/next) package/gobject-introspection: bump to version 1.68.0 Tested-by: Matthew Weber <matthew.weber@collins.com>
diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index 1759d3ba04..b273f982b6 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 ae6778d01443fdd38cd30eeee846494e19f4d407b09872580372f4aa4bf8a3cc libsepol-3.1.tar.gz +sha256 dfc7f662af8000116e56a01de6a0394ed79be1b34b999e551346233c5dd19508 libsepol-3.2.tar.gz # Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index a4398bdc42..55125f2203 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.1 -LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 +LIBSEPOL_VERSION = 3.2 +LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING LIBSEPOL_CPE_ID_VENDOR = selinuxproject
Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/libsepol/libsepol.hash | 4 ++-- package/libsepol/libsepol.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)