@@ -1,4 +1,4 @@
-From 3bed8cf8fb9f6a1651d005619a2b029a838539ea Mon Sep 17 00:00:00 2001
+From 353f0521c52ea934cc1745d53fea8cad429b3a60 Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Thu, 28 Mar 2019 16:14:09 -0400
Subject: [PATCH] fc/subs/volatile: alias common /var/volatile paths
@@ -15,19 +15,22 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 6 insertions(+)
diff --git a/config/file_contexts.subs_dist b/config/file_contexts.subs_dist
-index a6b747fad..d64580e89 100644
+index deeadcb80..8b9423db8 100644
--- a/config/file_contexts.subs_dist
+++ b/config/file_contexts.subs_dist
-@@ -34,3 +34,9 @@
- # not for refpolicy intern, but for /var/run using applications,
+@@ -35,6 +35,12 @@
# like systemd tmpfiles or systemd socket configurations
/var/run /run
-+
+
+# volatile aliases
+# ensure the policy applied to the base filesystem objects are reflected in the
+# volatile hierarchy.
+/var/volatile/log /var/log
+/var/volatile/tmp /var/tmp
-2.34.1
++
+ # systemd system extension (systemd-sysext) staging dirs merge onto /usr and /opt,
+ # and systemd configuration extension (systemd-confext) staging dirs merge onto /etc.
+ # The staged trees are overlaid onto the host tree with overlayfs, so they must carry
+--
+2.43.0
@@ -1,4 +1,4 @@
-From e0221dfaf60dc6dedbf04247fabd5b13490bbabf Mon Sep 17 00:00:00 2001
+From 1cb7a914b570ca8dd51ea7b4e6a4ffadedde709d Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Thu, 28 Mar 2019 20:48:10 -0400
Subject: [PATCH] fc/subs/busybox: set aliases for bin, sbin and usr
@@ -15,19 +15,22 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 6 insertions(+)
diff --git a/config/file_contexts.subs_dist b/config/file_contexts.subs_dist
-index d64580e89..8a5274283 100644
+index 8b9423db8..bae4ef439 100644
--- a/config/file_contexts.subs_dist
+++ b/config/file_contexts.subs_dist
-@@ -40,3 +40,9 @@
- # volatile hierarchy.
+@@ -41,6 +41,12 @@
/var/volatile/log /var/log
/var/volatile/tmp /var/tmp
-+
+
+# busybox aliases
+# quickly match up the busybox built-in tree to the base filesystem tree
+/usr/lib/busybox/bin /usr/bin
+/usr/lib/busybox/sbin /usr/bin
+/usr/lib/busybox/usr /usr
-2.34.1
++
+ # systemd system extension (systemd-sysext) staging dirs merge onto /usr and /opt,
+ # and systemd configuration extension (systemd-confext) staging dirs merge onto /etc.
+ # The staged trees are overlaid onto the host tree with overlayfs, so they must carry
+--
+2.43.0
@@ -1,4 +1,4 @@
-From 3ed3519c26ea0146415bf915a78bad55086abbde Mon Sep 17 00:00:00 2001
+From 4beb1c28718bce5b470ea886c2cd0a38ca7a7463 Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong.fan@windriver.com>
Date: Mon, 27 Jan 2014 03:54:01 -0500
Subject: [PATCH] fc/fstools: fix real path for fstools
@@ -14,7 +14,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 11 insertions(+)
diff --git a/policy/modules/system/fstools.fc b/policy/modules/system/fstools.fc
-index ece09e6b4..aad5a608e 100644
+index 8386937c4..02adc5400 100644
--- a/policy/modules/system/fstools.fc
+++ b/policy/modules/system/fstools.fc
@@ -1,7 +1,9 @@
@@ -27,7 +27,7 @@ index ece09e6b4..aad5a608e 100644
/usr/bin/btrfs -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/cfdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/clubufflush -- gen_context(system_u:object_r:fsadm_exec_t,s0)
-@@ -15,23 +17,29 @@
+@@ -15,10 +17,13 @@
/usr/bin/e2mmpstatus -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/fatsort -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/fdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -41,6 +41,7 @@ index ece09e6b4..aad5a608e 100644
/usr/bin/install-mbr -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/jfs_.* -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/losetup.* -- gen_context(system_u:object_r:fsadm_exec_t,s0)
+@@ -26,13 +31,16 @@
/usr/bin/lsraid -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/mkdosfs -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/mke2fs -- gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -57,7 +58,7 @@ index ece09e6b4..aad5a608e 100644
/usr/bin/partx -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/raidautorun -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/raidstart -- gen_context(system_u:object_r:fsadm_exec_t,s0)
-@@ -43,8 +51,10 @@
+@@ -44,8 +52,10 @@
/usr/bin/sfdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/smartctl -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/swapoff -- gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -68,7 +69,7 @@ index ece09e6b4..aad5a608e 100644
/usr/bin/zdb -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/zhack -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/zinject -- gen_context(system_u:object_r:fsadm_exec_t,s0)
-@@ -53,6 +63,7 @@
+@@ -54,6 +64,7 @@
/usr/bin/ztest -- gen_context(system_u:object_r:fsadm_exec_t,s0)
/usr/bin/fstrim -- gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -76,6 +77,6 @@ index ece09e6b4..aad5a608e 100644
ifdef(`distro_gentoo',`
/var/db/smartmontools(/.*)? gen_context(system_u:object_r:fsadm_db_t,s0)
-2.34.1
+--
+2.43.0
@@ -1,4 +1,4 @@
-From c5f2bec748a7afbb6ea6ff4fdb2e729f749d7e99 Mon Sep 17 00:00:00 2001
+From 7d14d563c9e6256274e9b31068b8ae42d2fc4a08 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Fri, 15 Nov 2019 10:55:05 +0800
Subject: [PATCH] fc/kerberos: apply policy to kerberos alternatives
@@ -11,7 +11,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 10 insertions(+)
diff --git a/policy/modules/services/kerberos.fc b/policy/modules/services/kerberos.fc
-index 81627d2db..4966b06d4 100644
+index aae6c841d..9afe60ec4 100644
--- a/policy/modules/services/kerberos.fc
+++ b/policy/modules/services/kerberos.fc
@@ -12,9 +12,13 @@ HOME_DIR/\.k5login -- gen_context(system_u:object_r:krb5_home_t,s0)
@@ -26,9 +26,9 @@ index 81627d2db..4966b06d4 100644
+/usr/bin/kadmin\.local -- gen_context(system_u:object_r:kadmind_exec_t,s0)
+/usr/bin/kpropd -- gen_context(system_u:object_r:kpropd_exec_t,s0)
- /usr/kerberos/sbin/krb5kdc -- gen_context(system_u:object_r:krb5kdc_exec_t,s0)
- /usr/kerberos/sbin/kadmind -- gen_context(system_u:object_r:kadmind_exec_t,s0)
-@@ -39,6 +43,12 @@ HOME_DIR/\.k5login -- gen_context(system_u:object_r:krb5_home_t,s0)
+ /usr/lib/systemd/system/kadmin\.service -- gen_context(system_u:object_r:kerberos_unit_t,s0)
+ /usr/lib/systemd/system/krb5kdc\.service -- gen_context(system_u:object_r:kerberos_unit_t,s0)
+@@ -42,6 +46,12 @@ HOME_DIR/\.k5login -- gen_context(system_u:object_r:krb5_home_t,s0)
/var/kerberos/krb5kdc/principal.* gen_context(system_u:object_r:krb5kdc_principal_t,s0)
/var/kerberos/krb5kdc/principal.*\.ok -- gen_context(system_u:object_r:krb5kdc_lock_t,s0)
@@ -41,6 +41,6 @@ index 81627d2db..4966b06d4 100644
/var/log/krb5kdc\.log.* -- gen_context(system_u:object_r:krb5kdc_log_t,s0)
/var/log/kadmin\.log.* -- gen_context(system_u:object_r:kadmind_log_t,s0)
/var/log/kadmind\.log.* -- gen_context(system_u:object_r:kadmind_log_t,s0)
-2.34.1
+--
+2.43.0
@@ -1,4 +1,4 @@
-From 795b2380c6f1e3541384f69d0f00e8933dfacf93 Mon Sep 17 00:00:00 2001
+From 25b8af93a5684abf449afed1414ca6e38184e0ae Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sun, 5 Apr 2020 22:03:45 +0800
Subject: [PATCH] file_contexts.subs_dist: set aliase for /root directory
@@ -14,17 +14,20 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/config/file_contexts.subs_dist b/config/file_contexts.subs_dist
-index 8a5274283..f54517d89 100644
+index bae4ef439..fb966318b 100644
--- a/config/file_contexts.subs_dist
+++ b/config/file_contexts.subs_dist
-@@ -46,3 +46,7 @@
- /usr/lib/busybox/bin /usr/bin
+@@ -47,6 +47,10 @@
/usr/lib/busybox/sbin /usr/bin
/usr/lib/busybox/usr /usr
-+
+
+# The script genhomedircon.py will expand `/root` (i.e. root's home
+# directory) to `/home/root`. Add an alias for it.
+/root /home/root
-2.34.1
++
+ # systemd system extension (systemd-sysext) staging dirs merge onto /usr and /opt,
+ # and systemd configuration extension (systemd-confext) staging dirs merge onto /etc.
+ # The staged trees are overlaid onto the host tree with overlayfs, so they must carry
+--
+2.43.0
@@ -1,8 +1,8 @@
-PV = "2.20260616+git"
+PV = "2.20260922+git"
SRC_URI = "git://github.com/SELinuxProject/refpolicy.git;protocol=https;branch=main;name=refpolicy;destsuffix=refpolicy"
-SRCREV_refpolicy = "30d3cf5abd1872d3da5dd44de37de4251674f736"
+SRCREV_refpolicy = "acf41c52116fef3a9dcd8f1f39b133e0372fce7c"
UPSTREAM_CHECK_GITTAGREGEX = "RELEASE_(?P<pver>\d+_\d+)"