From b90e21b5e770ca59fdc5aadaae5b70eb544f59a6 Mon Sep 17 00:00:00 2001
From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com>
Date: Mon, 26 Aug 2024 08:14:47 +0000
Subject: [PATCH] [vcpkg baseline][openscap] Fix dependency acl (#40575)

Co-authored-by: Monica <v-liumonica@microsoft.com>
---
 ports/openscap/fix-dependencies.patch | 32 +++++++++++++++++++++++++++
 ports/openscap/portfile.cmake         |  3 +++
 ports/openscap/vcpkg.json             |  5 +++++
 versions/baseline.json                |  2 +-
 versions/o-/openscap.json             |  5 +++++
 5 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 ports/openscap/fix-dependencies.patch

diff --git a/ports/openscap/fix-dependencies.patch b/ports/openscap/fix-dependencies.patch
new file mode 100644
index 0000000000..767c7e2576
--- /dev/null
+++ b/ports/openscap/fix-dependencies.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 494512e..22ab043 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,8 +84,12 @@ include(CMakeDependentOption)
+ find_package(ACL)
+ if(ACL_FOUND)
+        check_library_exists("${ACL_LIBRARY}" acl_extended_file "" HAVE_ACL_EXTENDED_FILE)
+-       check_include_file(acl/libacl.h HAVE_ACL_LIBACL_H)
+-       check_include_file(sys/acl.h HAVE_SYS_ACL_H)
++       if(EXISTS "${ACL_INCLUDE_DIR}/acl/libacl.h")
++                set(HAVE_ACL_LIBACL_H 1)
++        endif()
++       if(EXISTS "${ACL_INCLUDE_DIR}/sys/acl.h")
++                set(HAVE_SYS_ACL_H 1)
++        endif()
+ endif()
+
+ find_package(Blkid)
+diff --git a/cmake/FindACL.cmake b/cmake/FindACL.cmake
+index a41f2c1..9675498 100644
+--- a/cmake/FindACL.cmake
++++ b/cmake/FindACL.cmake
+@@ -12,7 +12,7 @@ libfind_pkg_check_modules(ACL_PKGCONF libacl)
+
+ # Include dir
+ find_path(ACL_INCLUDE_DIR
+-       NAMES "acl/libacl.h" "sys/libacl.h"
++       NAMES "acl/libacl.h" "sys/acl.h"
+        PATHS ${ACL_PKGCONF_INCLUDE_DIRS}
+ )
+
diff --git a/ports/openscap/portfile.cmake b/ports/openscap/portfile.cmake
index e1d1c0d767..d1c6aa2011 100644
--- a/ports/openscap/portfile.cmake
+++ b/ports/openscap/portfile.cmake
@@ -1,3 +1,5 @@
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenSCAP/openscap
@@ -8,6 +10,7 @@ vcpkg_from_github(
         fix-build.patch
         fix-buildflag-and-install.patch
         fix-utils.patch
+        fix-dependencies.patch
 )
 file(REMOVE "${SOURCE_PATH}/cmake/FindThreads.cmake")
 
diff --git a/ports/openscap/vcpkg.json b/ports/openscap/vcpkg.json
index 0df9f5ba8f..20adfa6684 100644
--- a/ports/openscap/vcpkg.json
+++ b/ports/openscap/vcpkg.json
@@ -1,11 +1,16 @@
 {
   "name": "openscap",
   "version": "1.4.0",
+  "port-version": 1,
   "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.",
   "homepage": "https://github.com/OpenSCAP/openscap",
   "license": "LGPL-2.1-or-later",
   "supports": "!xbox",
   "dependencies": [
+    {
+      "name": "acl",
+      "platform": "linux"
+    },
     "curl",
     "glib",
     "libpopt",
diff --git a/versions/baseline.json b/versions/baseline.json
index 1bb908c297..7c4d26af62 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6622,7 +6622,7 @@
     },
     "openscap": {
       "baseline": "1.4.0",
-      "port-version": 0
+      "port-version": 1
     },
     "openslide": {
       "baseline": "3.4.1",
diff --git a/versions/o-/openscap.json b/versions/o-/openscap.json
index 34097ba3cc..eca964c137 100644
--- a/versions/o-/openscap.json
+++ b/versions/o-/openscap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fdb8954725485a8b874a7947b02a4af8a4eed468",
+      "version": "1.4.0",
+      "port-version": 1
+    },
     {
       "git-tree": "854ccfd3c08afae1dbf963c9c18b5cea7c5f4ae5",
       "version": "1.4.0",