Skip to content

Commit 4648470

Browse files
committed
microsoft.genpolicy: 3.2.0.azl3.genpolicy2 -> 3.2.0.azl3.genpolicy3
Signed-off-by: Paul Meyer <katexochen0@gmail.com>
1 parent 2c06b61 commit 4648470

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

packages/by-name/microsoft/genpolicy/0001-genpolicy-add-rules-and-types-for-volumeDevices.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ Signed-off-by: Markus Rudy <mr@edgeless.systems>
1414
6 files changed, 85 insertions(+)
1515

1616
diff --git a/src/tools/genpolicy/rules.rego b/src/tools/genpolicy/rules.rego
17-
index a5208cf9d3b38edfe6ab777ce0bafb81bf3b84dc..aa0488ae2dffc63780967ca706ea2c8ffcfb1391 100644
17+
index 4e4c3b3e03ddf173ebfcf07915f3f16a6801627b..b904391af531327d7def819cb9da47cd04d7124e 100644
1818
--- a/src/tools/genpolicy/rules.rego
1919
+++ b/src/tools/genpolicy/rules.rego
20-
@@ -62,6 +62,7 @@ CreateContainerRequest {
20+
@@ -63,6 +63,7 @@ CreateContainerRequest {
2121

2222
i_oci := input.OCI
2323
i_storages := input.storages
2424
+ i_devices := input.devices
2525

2626
# Check if any element from the policy_data.containers array allows the input request.
2727
some p_container in policy_data.containers
28-
@@ -85,6 +86,9 @@ CreateContainerRequest {
28+
@@ -86,6 +87,9 @@ CreateContainerRequest {
2929
p_storages := p_container.storages
3030
allow_by_anno(p_oci, i_oci, p_storages, i_storages)
3131

@@ -35,7 +35,7 @@ index a5208cf9d3b38edfe6ab777ce0bafb81bf3b84dc..aa0488ae2dffc63780967ca706ea2c8f
3535
allow_linux(p_oci, i_oci)
3636

3737
print("CreateContainerRequest: true")
38-
@@ -361,6 +365,16 @@ allow_log_directory(p_oci, i_oci) {
38+
@@ -362,6 +366,16 @@ allow_log_directory(p_oci, i_oci) {
3939
print("allow_log_directory: true")
4040
}
4141

@@ -52,15 +52,15 @@ index a5208cf9d3b38edfe6ab777ce0bafb81bf3b84dc..aa0488ae2dffc63780967ca706ea2c8f
5252
allow_linux(p_oci, i_oci) {
5353
p_namespaces := p_oci.Linux.Namespaces
5454
print("allow_linux: p namespaces =", p_namespaces)
55-
@@ -372,6 +386,7 @@ allow_linux(p_oci, i_oci) {
55+
@@ -373,6 +387,7 @@ allow_linux(p_oci, i_oci) {
5656

5757
allow_masked_paths(p_oci, i_oci)
5858
allow_readonly_paths(p_oci, i_oci)
5959
+ allow_linux_devices(p_oci.Linux.Devices, i_oci.Linux.Devices)
6060

6161
print("allow_linux: true")
6262
}
63-
@@ -460,6 +475,13 @@ allow_readonly_path(p_elem, i_array, masked_paths) {
63+
@@ -461,6 +476,13 @@ allow_readonly_path(p_elem, i_array, masked_paths) {
6464
print("allow_readonly_path 2: true")
6565
}
6666

packages/by-name/microsoft/genpolicy/0004-genpolicy-regex-check-contrast-specific-layer-src-pr.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/src/tools/genpolicy/rules.rego b/src/tools/genpolicy/rules.rego
12-
index aa0488ae2dffc63780967ca706ea2c8ffcfb1391..38171ac667d6084b085633aedf669ed381c10e22 100644
12+
index b904391af531327d7def819cb9da47cd04d7124e..33c44fd4c8d20dcc4c13cbd12fcd9e577994ee97 100644
1313
--- a/src/tools/genpolicy/rules.rego
1414
+++ b/src/tools/genpolicy/rules.rego
15-
@@ -944,7 +944,7 @@ allow_storage_options(p_storage, i_storage, layer_ids, root_hashes) {
15+
@@ -948,7 +948,7 @@ allow_storage_options(p_storage, i_storage, layer_ids, root_hashes) {
1616
i_count == p_count + 3
1717

1818
print("allow_storage_options 2: i_storage.options[0] =", i_storage.options[0])

packages/by-name/microsoft/genpolicy/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818
rustPlatform.buildRustPackage rec {
1919
pname = "genpolicy";
20-
version = "3.2.0.azl3.genpolicy2";
20+
version = "3.2.0.azl3.genpolicy3";
2121

2222
src = applyPatches {
2323
src = fetchFromGitHub {
2424
owner = "microsoft";
2525
repo = "kata-containers";
2626
rev = "refs/tags/${version}";
27-
hash = "sha256-kdXCwiDQSs9K70KCgvYjglQrU80PgjHFYXWPM/1+1/I=";
27+
hash = "sha256-1LodjolEG45EcYVoV07TlAb6ym4GR1bOiS7A5Bib8jY=";
2828
};
2929

3030
patches = [
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec {
8282

8383
sourceRoot = "${src.name}/src/tools/genpolicy";
8484

85-
cargoHash = "sha256-/s8D6uHVU6iao6Jq/pyiK1inXPlousICoYaqbyzH/II=";
85+
cargoHash = "sha256-gmO8DYMcNjkHWXJlGEJcD9qgilfJ3HFDeF/UPEshqwk=";
8686

8787
OPENSSL_NO_VENDOR = 1;
8888

0 commit comments

Comments
 (0)