diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2022-08-28 10:29:27 +0800 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2022-08-28 13:54:59 -0400 |
commit | 123166b8c33f6aa3e292fee5025cba80f38374fd (patch) | |
tree | bab49884d53851a7b11ef13ffdcfe373d649e48c | |
parent | 7d634556b0400548dd2898d1c523a7a44432cf50 (diff) | |
download | meta-selinux-123166b8c33f6aa3e292fee5025cba80f38374fd.tar.gz |
mcstrans: upgrade 3.3 -> 3.4
Refresh patches.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r-- | recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch | 6 | ||||
-rw-r--r-- | recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch | 4 | ||||
-rw-r--r-- | recipes-security/selinux/mcstrans_3.4.bb (renamed from recipes-security/selinux/mcstrans_3.3.bb) | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch b/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch index 27fd677..74ae879 100644 --- a/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch +++ b/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 544b3c078374e5001e7fdc1b7d0b2eafda36f8fe Mon Sep 17 00:00:00 2001 | 1 | From 580a625e9e1266d92c248a5e3f471d12d42c149b Mon Sep 17 00:00:00 2001 |
2 | From: Joe MacDonald <joe_macdonald@mentor.com> | 2 | From: Joe MacDonald <joe_macdonald@mentor.com> |
3 | Date: Fri, 7 Aug 2015 15:16:45 -0400 | 3 | Date: Fri, 7 Aug 2015 15:16:45 -0400 |
4 | Subject: [PATCH] mcstrans: remove dependency on bash in initscript | 4 | Subject: [PATCH] mcstrans: remove dependency on bash in initscript |
@@ -8,7 +8,7 @@ dependency on bash. | |||
8 | 8 | ||
9 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> | 9 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> |
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Inappropriate [embedded specific] |
12 | 12 | ||
13 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 13 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
@@ -27,5 +27,5 @@ index 2804ec0..8b4737d 100644 | |||
27 | # mcstransd This starts and stops mcstransd | 27 | # mcstransd This starts and stops mcstransd |
28 | # | 28 | # |
29 | -- | 29 | -- |
30 | 2.7.4 | 30 | 2.25.1 |
31 | 31 | ||
diff --git a/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch b/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch index 79be090..a560722 100644 --- a/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch +++ b/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4d918a9679d2902ca2d41fe769a4d76f07a67b5f Mon Sep 17 00:00:00 2001 | 1 | From 123d5b6413905bfad535a072ff0ab5a495cb2a2a Mon Sep 17 00:00:00 2001 |
2 | From: Roy Li <rongqing.li@windriver.com> | 2 | From: Roy Li <rongqing.li@windriver.com> |
3 | Date: Wed, 6 Nov 2019 22:13:33 +0800 | 3 | Date: Wed, 6 Nov 2019 22:13:33 +0800 |
4 | Subject: [PATCH] mcstrans: fix the init script | 4 | Subject: [PATCH] mcstrans: fix the init script |
@@ -28,5 +28,5 @@ index 8b4737d..86c89ea 100644 | |||
28 | echo | 28 | echo |
29 | if test $RETVAL = 0 ; then | 29 | if test $RETVAL = 0 ; then |
30 | -- | 30 | -- |
31 | 2.7.4 | 31 | 2.25.1 |
32 | 32 | ||
diff --git a/recipes-security/selinux/mcstrans_3.3.bb b/recipes-security/selinux/mcstrans_3.4.bb index cd8780b..b5d6b54 100644 --- a/recipes-security/selinux/mcstrans_3.3.bb +++ b/recipes-security/selinux/mcstrans_3.4.bb | |||
@@ -9,18 +9,18 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
9 | 9 | ||
10 | require selinux_common.inc | 10 | require selinux_common.inc |
11 | 11 | ||
12 | inherit systemd update-rc.d | 12 | inherit pkgconfig systemd update-rc.d |
13 | 13 | ||
14 | SRC_URI += "file://mcstrans-de-bashify.patch \ | 14 | SRC_URI += "file://mcstrans-de-bashify.patch \ |
15 | file://mcstrans-fix-the-init-script.patch \ | 15 | file://mcstrans-fix-the-init-script.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | DEPENDS += "libsepol libselinux libcap" | 18 | DEPENDS = "libsepol libselinux libcap" |
19 | 19 | ||
20 | EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \ | 20 | EXTRA_OEMAKE = "SBINDIR=${base_sbindir} \ |
21 | INITDIR=${sysconfdir}/init.d \ | 21 | INITDIR=${sysconfdir}/init.d \ |
22 | SYSTEMDDIR=${systemd_unitdir} \ | 22 | SYSTEMDDIR=${systemd_unitdir} \ |
23 | " | 23 | " |
24 | 24 | ||
25 | S = "${WORKDIR}/git/mcstrans" | 25 | S = "${WORKDIR}/git/mcstrans" |
26 | 26 | ||