[Buildroot] [PATCH 1/2] package/refpolicy: fix build with cvs

[Buildroot] [PATCH 1/2] package/refpolicy: fix build with cvs

[Fabrice Fontaine]

Fix build failure with cvs raised since commit
da93f38cb19f7f7a9b75232f5f2bad25b8180982 by making inetd optional

Fixes:
 - http://autobuild.buildroot.org/results/838266bef1deec560e336d03a64d64fa1990c344

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...-services-cvs.te-make-inetd-optional.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/refpolicy/0002-policy-modules-services-cvs.te-make-inetd-optional.patch

diff --git a/package/refpolicy/0002-policy-modules-services-cvs.te-make-inetd-optional.patch b/package/refpolicy/0002-policy-modules-services-cvs.te-make-inetd-optional.patch
new file mode 100644
index 0000000000..ae1200a88f
--- /dev/null
+++ b/package/refpolicy/0002-policy-modules-services-cvs.te-make-inetd-optional.patch
@@ -0,0 +1,37 @@
+From 21b0a5bc50e15e9af7edb3edad9fac0bf03f7028 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 30 Jul 2021 23:11:38 +0200
+Subject: [PATCH 2/2] policy/modules/services/cvs.te: make inetd optional
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: not sent yet]
+---
+ policy/modules/services/cvs.te | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/policy/modules/services/cvs.te b/policy/modules/services/cvs.te
+index f2f60556c..61589228f 100644
+--- a/policy/modules/services/cvs.te
++++ b/policy/modules/services/cvs.te
+@@ -15,7 +15,6 @@ gen_tunable(allow_cvs_read_shadow, false)
+ 
+ type cvs_t;
+ type cvs_exec_t;
+-inetd_tcp_service_domain(cvs_t, cvs_exec_t)
+ init_daemon_domain(cvs_t, cvs_exec_t)
+ application_executable_file(cvs_exec_t)
+ 
+@@ -98,6 +97,10 @@ tunable_policy(`allow_cvs_read_shadow',`
+ 	auth_tunable_read_shadow(cvs_t)
+ ')
+ 
++optional_policy(`
++	inetd_tcp_service_domain(cvs_t, cvs_exec_t)
++')
++
+ optional_policy(`
+ 	kerberos_read_config(cvs_t)
+ 	kerberos_read_keytab(cvs_t)
+-- 
+2.30.2
+
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/cvs: fix SELinux

[Fabrice Fontaine]

Add apache module as for now it is unconditionally used in cvs.fc

Fixes:
 - http://autobuild.buildroot.org/results/838266bef1deec560e336d03a64d64fa1990c344

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/cvs/cvs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index 8200997d3a..bd1e04eee0 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -11,7 +11,7 @@ CVS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/
 CVS_LICENSE = GPL-1.0+, LGPL-2.0+, LGPL-2.1+ (glob)
 CVS_LICENSE_FILES = COPYING COPYING.LIB lib/glob-libc.h
 CVS_CPE_ID_VENDOR = gnu
-CVS_SELINUX_MODULES = cvs
+CVS_SELINUX_MODULES = apache cvs
 CVS_DEPENDENCIES = ncurses
 
 CVS_CONF_ENV = \
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/refpolicy: fix build with cvs

[Thomas Petazzoni]

On Sat, 31 Jul 2021 10:33:00 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fix build failure with cvs raised since commit
> da93f38cb19f7f7a9b75232f5f2bad25b8180982 by making inetd optional
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/838266bef1deec560e336d03a64d64fa1990c344
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...-services-cvs.te-make-inetd-optional.patch | 37 +++++++++++++++++++
>  1 file changed, 37 insertions(+)
>  create mode 100644 package/refpolicy/0002-policy-modules-services-cvs.te-make-inetd-optional.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/cvs: fix SELinux

[Thomas Petazzoni]

On Sat, 31 Jul 2021 10:33:01 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Add apache module as for now it is unconditionally used in cvs.fc
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/838266bef1deec560e336d03a64d64fa1990c344
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/cvs/cvs.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot