diff --git a/remove-unused-socket.patch b/remove-unused-socket.patch new file mode 100644 index 0000000000000000000000000000000000000000..7cf8700747e0e0a9f54fe3aa1a8f193c184dec91 --- /dev/null +++ b/remove-unused-socket.patch @@ -0,0 +1,55 @@ +From 2d999bb4fbbdbf3bb4cd24bdcfe105a9031c38fa Mon Sep 17 00:00:00 2001 +From: zhengxiaoxiao +Date: Sat, 13 Apr 2024 11:47:46 +0800 +Subject: [PATCH] remove unused socket + +--- + common/project/keywords.go | 3 --- + engine/selinux/builder/network.go | 3 --- + 2 files changed, 6 deletions(-) + +diff --git a/common/project/keywords.go b/common/project/keywords.go +index 8674aab..6213fc3 100644 +--- a/common/project/keywords.go ++++ b/common/project/keywords.go +@@ -122,7 +122,6 @@ const ( + NetDomainIpx = "ipx" + NetDomainAppletalk = "appletalk" + NetDomainNetrom = "netrom" +- NetDomainBridge = "bridge" + NetDomainAtmpvc = "atmpvc" + NetDomainX25 = "x25" + NetDomainInet6 = "inet6" +@@ -155,8 +154,6 @@ const ( + NetDomainAlg = "alg" + NetDomainNfc = "nfc" + NetDomainVsock = "vsock" +- NetDomainMpls = "mpls" +- NetDomainIb = "ib" + NetDomainSmc = "smc" + + NetTypeStream = "stream" +diff --git a/engine/selinux/builder/network.go b/engine/selinux/builder/network.go +index 354cc3a..fbb04bc 100644 +--- a/engine/selinux/builder/network.go ++++ b/engine/selinux/builder/network.go +@@ -29,7 +29,6 @@ var commonDomainSocketMap = map[string]string{ + project.NetDomainIpx: "ipx_socket", + project.NetDomainAppletalk: "appletalk_socket", + project.NetDomainNetrom: "netrom_socket", +- project.NetDomainBridge: "bridge_socket", + project.NetDomainAtmpvc: "atmpvc_socket", + project.NetDomainX25: "x25_socket", + project.NetDomainRose: "rose_socket", +@@ -59,8 +58,6 @@ var commonDomainSocketMap = map[string]string{ + project.NetDomainAlg: "alg_socket", + project.NetDomainNfc: "nfc_socket", + project.NetDomainVsock: "vsock_socket", +- project.NetDomainMpls: "mpls_socket", +- project.NetDomainIb: "ib_socket", + project.NetDomainSmc: "smc_socket", + } + +-- +2.33.0 + diff --git a/secpaver.spec b/secpaver.spec index d8dadcb2f8800fa4473e31c0cf2cef7d52b607ad..d322de344e6380b96379a17f4ca4be7d70f94f8d 100755 --- a/secpaver.spec +++ b/secpaver.spec @@ -2,7 +2,7 @@ Name: secpaver Summary: Security policy development tool Version: 1.0.2 -Release: 9 +Release: 10 License: MulanPSL-2.0 URL: https://gitee.com/openeuler/secpaver Source: https://gitee.com/openeuler/secpaver/repository/archive/%{name}-%{version}.tar.gz @@ -13,6 +13,7 @@ Patch0001: dont-do-daemon-reload-in-make-install.patch Patch0002: set-default-log-path.patch Patch0003: support-clang-build.patch Patch0004: fix-go-build-ref-cldflags.patch +Patch0005: remove-unused-socket.patch %ifarch riscv64 Patch1000: 1000-fix-build-on-riscv64.patch @@ -85,6 +86,9 @@ tar -xf %{SOURCE1} -C vendor/golang.org/x/ %systemd_postun_with_restart pavd.service %changelog +* Sat Apr 13 2024 zhengxiaoxiao - 1.0.2-10 +- remove unused socket + * Mon Apr 8 2024 luofeng - 1.0.2-9 - modify pav and pavd premission from 700 to 500