Skip to contentSkip to conversation

checkpolicy: bump version to 2.6

PATCH New Adam Duskett 2 participants 9 messages Jan 9, 2017 – Jan 25, 2017 1 message not in the archive

lore
Share & tools
lore

Adam Duskett

author
#0 lore raw

PATCH 1/5 checkpolicy: bump version to 2.6

Signed-off-by Adam Duskett <[email protected]>
---
 package/checkpolicy/checkpolicy.hash | 2 +-
 package/checkpolicy/checkpolicy.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
package/checkpolicy/checkpolicy.hash +1 -1
index bc5199c..6208d77 100644
@@ -1,2 +1,2 @@
 # https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 33af9f3eb19135a7e6536ecd3fbb9686323000016cd51eb88346346ed7546001  checkpolicy-2.5.tar.gz
+sha256 0bebd18688ca8027b1b3b4ff1532c0626f1fe49883ae6cb74d9d385940e74157  checkpolicy-2.6.tar.gz
package/checkpolicy/checkpolicy.mk +2 -2
index a21b39e..8328b39 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CHECKPOLICY_VERSION = 2.5
-CHECKPOLICY_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223
+CHECKPOLICY_VERSION = 2.6
+CHECKPOLICY_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
 CHECKPOLICY_LICENSE = GPLv2
 CHECKPOLICY_LICENSE_FILES = COPYING
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH 2/5 libselinux: bump version to 2.6

Signed-off-by Adam Duskett <[email protected]>
---
 package/libselinux/libselinux.hash | 2 +-
 package/libselinux/libselinux.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
package/libselinux/libselinux.hash +1 -1
index a4c3440..76130b2 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 94c9e97706280bedcc288f784f67f2b9d3d6136c192b2c9f812115edba58514f libselinux-2.5.tar.gz
+sha256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a libselinux-2.6.tar.gz
package/libselinux/libselinux.mk +2 -2
index 165ac4c..44120c4 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSELINUX_VERSION = 2.5
-LIBSELINUX_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223
+LIBSELINUX_VERSION = 2.6
+LIBSELINUX_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
 LIBSELINUX_LICENSE = Public Domain
 LIBSELINUX_LICENSE_FILES = LICENSE
Signature · 1 line
2.9.3
#2 lore raw

PATCH 2/5 libselinux: bump version to 2.6

Hello,

Quoted 5 lines · Adam Duskett
Signed-off-by Adam Duskett <[email protected]>
---
 package/libselinux/libselinux.hash | 2 +-
 package/libselinux/libselinux.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

I've tried a build with this entire series of patches applied, and I'm getting:

/usr/bin/gcc -O2 -I/home/test/buildroot/output/host/usr/include -I../include -I/home/test/buildroot/output/host/usr/include -D_GNU_SOURCE -DNO_ANDROID_BACKEND -c -o regex.o regex.c
regex.c:16:2: error: #error __BYTE_ORDER__ not defined. Unable to determine endianness. make[2]: *** [regex.o] Error 1
make[2]: Leaving directory `/home/test/buildroot/output/build/host-libselinux-2.6/src' make[1]: *** [all] Error 1
make[1]: Leaving directory `/home/test/buildroot/output/build/host-libselinux-2.6'
make: *** [/home/test/buildroot/output/build/host-libselinux-2.6/.stamp_built] Error 2

The configuration to reproduce is:

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_POLICYCOREUTILS=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_HOST_CHECKPOLICY=y

Could you have a look?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#4 lore raw

PATCH 2/5 libselinux: bump version to 2.6

Hello;

Quoted 37 lines · Adam Duskett

Sure can!

What C library are you using? I am using glibc and it compiles without any issue.

Adam

Quoted 29 lines · Thomas Petazzoni

Hello,

Quoted 5 lines · Adam Duskett
Signed-off-by Adam Duskett <[email protected]>
---
 package/libselinux/libselinux.hash | 2 +-
 package/libselinux/libselinux.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

I've tried a build with this entire series of patches applied, and I'm
getting:

/usr/bin/gcc -O2 -I/home/test/buildroot/output/host/usr/include

(quoted diff) +0 -2
-I../include -I/home/test/buildroot/output/host/usr/include
-D_GNU_SOURCE  -DNO_ANDROID_BACKEND   -c -o regex.o regex.c

regex.c:16:2: error: #error __BYTE_ORDER__ not defined. Unable to determine endianness.
make[2]: *** [regex.o] Error 1
make[2]: Leaving directory `/home/test/buildroot/output/build/host- libselinux-2.6/src'
make[1]: *** [all] Error 1
make[1]: Leaving directory `/home/test/buildroot/output/build/host- libselinux-2.6'
make: *** [/home/test/buildroot/output/build/host-libselinux- 2.6/.stamp_built] Error 2

The configuration to reproduce is:

Quoted 8 lines
Quoted 8 lines

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_POLICYCOREUTILS=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_HOST_CHECKPOLICY=y

I have built the packages without error with your configuration.

Quoted 6 lines
Quoted 6 lines

Could you have a look?

Thanks,

Thomas

Thanks!

Adam

#5 lore raw

PATCH 2/5 libselinux: bump version to 2.6

In reply to a message not in the archive

Hello,

Quoted 2 lines · Adam Duskett

What C library are you using? I am using glibc and it compiles without any issue.

The C library of the target system doesn't matter: what fails to build is host-libselinux, i.e a host package.

So it seems like to be that there is an issue with the old Debian system I'm using on my autobuilder instance (which is where I did the test build).

I'll try to have a closer look and see if I can understand what's going on, since you apparently can't reproduce it on a different host system.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#6 lore raw

PATCH 3/5 libsemanage: bump version to 2.6

In reply to Adam Duskett
Signed-off-by Adam Duskett <[email protected]>
---
 package/libsemanage/libsemanage.hash | 2 +-
 package/libsemanage/libsemanage.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
package/libsemanage/libsemanage.hash +1 -1
index 69f7c8d..62f4d83 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 46e2f36254369b6e91d1eea0460c262b139361b055a3a67d3ceea2d8ef72e006 libsemanage-2.5.tar.gz
+sha256 4f81541047290b751f2ffb926fcd381c186f22db18d9fe671b0b4a6a54e8cfce libsemanage-2.6.tar.gz
package/libsemanage/libsemanage.mk +2 -2
index 005b822..7545594 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSEMANAGE_VERSION = 2.5
-LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223
+LIBSEMANAGE_VERSION = 2.6
+LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
 LIBSEMANAGE_LICENSE = LGPLv2.1+
 LIBSEMANAGE_LICENSE_FILES = COPYING
 LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux ustr bzip2
Signature · 1 line
2.9.3
author
#7 lore raw

PATCH 4/5 libsepol: bump version to 2.6

In reply to Adam Duskett

Also removed patch 0003-add-stdarg-include.patch as this has been committed to upstream.

Signed-off-by Adam Duskett <[email protected]>
---
 package/libsepol/0003-add-stdarg-include.patch         | 18 ------------------
 ...ln-relative.patch => 0003-revert-ln-relative.patch} |  0
 package/libsepol/libsepol.hash                         |  2 +-
 package/libsepol/libsepol.mk                           |  4 ++--
 4 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 package/libsepol/0003-add-stdarg-include.patch
 rename package/libsepol/{0004-revert-ln-relative.patch => 0003-revert-ln-relative.patch} (100%)
package/libsepol/0003-add-stdarg-include.patch deleted +0 -18
deleted file mode 100644
index 246c965..0000000
@@ -1,18 +0,0 @@
-Add missing <stdarg.h> include
-
-This is needed to fix the build on uClibc, due to the usage of
-va_list.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Index: b/cil/src/cil_log.h
-===================================================================
---- a/cil/src/cil_log.h
-+++ b/cil/src/cil_log.h
-@@ -30,6 +30,7 @@
- #define CIL_LOG_H_
- 
- #include <stdlib.h>
-+#include <stdarg.h>
- #include <cil/cil.h>
- 
- #define MAX_LOG_SIZE 512
package/libsepol/0003-revert-ln-relative.patch renamed from package/libsepol/0004-revert-ln-relative.patch +0 -0
similarity index 100%
rename from package/libsepol/0004-revert-ln-relative.patch
rename to package/libsepol/0003-revert-ln-relative.patch
package/libsepol/libsepol.hash +1 -1
index 266ce43..6c70506 100644
@@ -1,2 +1,2 @@
 # From https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 2bdeec56d0a08b082b93b40703b4b3329cc5562152f7254d8f6ef6b56afe850a  libsepol-2.5.tar.gz
+sha256 d856d6506054f52abeaa3543ea2f2344595a3dc05d0d873ed7f724f7a16b1874  libsepol-2.6.tar.gz
package/libsepol/libsepol.mk +2 -2
index bf85eef..61d1e61 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSEPOL_VERSION = 2.5
-LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223
+LIBSEPOL_VERSION = 2.6
+LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
 LIBSEPOL_LICENSE = LGPLv2.1+
 LIBSEPOL_LICENSE_FILES = COPYING
Signature · 1 line
2.9.3
author
#8 lore raw

PATCH 5/5 policycoreutils: bump version to 2.6

In reply to Adam Duskett
Signed-off-by Adam Duskett <[email protected]>
---
 package/policycoreutils/policycoreutils.hash | 2 +-
 package/policycoreutils/policycoreutils.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
package/policycoreutils/policycoreutils.hash +1 -1
index 44cb0c3..999a778 100644
@@ -1,2 +1,2 @@
 # https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 329382cfe9fa977678abf541dcd8fe3847cf0c83b24654c8f7322343907078a1 policycoreutils-2.5.tar.gz
+sha256 68891b376f5048edc53c6ccb2fca44da3dc7f4563f4b6894e201d70c04a05a29 policycoreutils-2.6.tar.gz
package/policycoreutils/policycoreutils.mk +2 -2
index 86639cc..6076bb9 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-POLICYCOREUTILS_VERSION = 2.5
-POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223
+POLICYCOREUTILS_VERSION = 2.6
+POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
 POLICYCOREUTILS_LICENSE = GPLv2
 POLICYCOREUTILS_LICENSE_FILES = COPYING
Signature · 1 line
2.9.3
#9 lore raw

PATCH 1/5 checkpolicy: bump version to 2.6

In reply to Adam Duskett

Hello,

Quoted 5 lines · Adam Duskett
Signed-off-by Adam Duskett <[email protected]>
---
 package/checkpolicy/checkpolicy.hash | 2 +-
 package/checkpolicy/checkpolicy.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

I've applied all 5 patches, after adding a libselinux patch to fix the build failure with old compilers. This patch has been submitted upstream to the SELinux developers.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com