From 3693598d18be95e4abe93fac635a2b2c7624d259 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Tue, 2 Jul 2024 11:05:37 +0300 Subject: [PATCH 01/13] [libcgroup] added new port --- ports/libcgroup/portfile.cmake | 37 ++++++++++++++++++++++++++++++++++ ports/libcgroup/usage | 3 +++ ports/libcgroup/vcpkg.json | 8 ++++++++ versions/baseline.json | 4 ++++ versions/l-/libcgroup.json | 9 +++++++++ 5 files changed, 61 insertions(+) create mode 100644 ports/libcgroup/portfile.cmake create mode 100644 ports/libcgroup/usage create mode 100644 ports/libcgroup/vcpkg.json create mode 100644 versions/l-/libcgroup.json diff --git a/ports/libcgroup/portfile.cmake b/ports/libcgroup/portfile.cmake new file mode 100644 index 00000000000000..80ae8ceaf456b3 --- /dev/null +++ b/ports/libcgroup/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libcgroup/libcgroup + SHA512 29fb7f5c795080cafc27ab99f2f3d7683933515840226564e047605e41a76f7ca31b48c8c9e8e1963eb808e3fc82206ea6ad550c80dcfb745b5cb7425e2875a9 + REF "v${VERSION}" + HEAD_REF master +) + +message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n" + "\t- \n" + "\t- \n" + "\t- \n\n" + "It can be installed with your package manager" +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + --enable-tools=no + --enable-python=no + --enable-tests=no + --enable-samples=no + --enable-systemd=no + --enable-pam=no +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") \ No newline at end of file diff --git a/ports/libcgroup/usage b/ports/libcgroup/usage new file mode 100644 index 00000000000000..282e6ed7a7f791 --- /dev/null +++ b/ports/libcgroup/usage @@ -0,0 +1,3 @@ +libcgroup provides pkg-config modules: + # Libraries needed for apps that want to control cgroups + libcgroup \ No newline at end of file diff --git a/ports/libcgroup/vcpkg.json b/ports/libcgroup/vcpkg.json new file mode 100644 index 00000000000000..a1fd2e3388cd59 --- /dev/null +++ b/ports/libcgroup/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libcgroup", + "version-semver": "3.1.0", + "description": "Library for working with cgroup", + "homepage": "https://github.com/libcgroup/libcgroup", + "license": "GPL-2.0", + "supports": "linux" +} diff --git a/versions/baseline.json b/versions/baseline.json index 5e1bcb683c814f..b09131ecec936c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4268,6 +4268,10 @@ "baseline": "1.13", "port-version": 4 }, + "libcgroup": { + "baseline": "3.1.0", + "port-version": 0 + }, "libconfig": { "baseline": "1.7.3", "port-version": 5 diff --git a/versions/l-/libcgroup.json b/versions/l-/libcgroup.json new file mode 100644 index 00000000000000..18fbcc132281d2 --- /dev/null +++ b/versions/l-/libcgroup.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "954786a64a4a1fdb7f282f079564eb3ca6a90d2f", + "version-semver": "3.1.0", + "port-version": 0 + } + ] +} From 572ddcbb087c83c9e0d7ff6014936466997cf0c1 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Tue, 2 Jul 2024 11:08:24 +0300 Subject: [PATCH 02/13] [libcgroup] added new line at end of files --- ports/libcgroup/portfile.cmake | 2 +- ports/libcgroup/usage | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libcgroup/portfile.cmake b/ports/libcgroup/portfile.cmake index 80ae8ceaf456b3..ecd4083196ae43 100644 --- a/ports/libcgroup/portfile.cmake +++ b/ports/libcgroup/portfile.cmake @@ -34,4 +34,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libcgroup/usage b/ports/libcgroup/usage index 282e6ed7a7f791..804f35b8788d66 100644 --- a/ports/libcgroup/usage +++ b/ports/libcgroup/usage @@ -1,3 +1,3 @@ libcgroup provides pkg-config modules: # Libraries needed for apps that want to control cgroups - libcgroup \ No newline at end of file + libcgroup From 5c5cfe8a79b05b897fd1318a72268351af32caef Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Tue, 2 Jul 2024 11:08:30 +0300 Subject: [PATCH 03/13] [libcgroup] run x-add-version --- versions/l-/libcgroup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libcgroup.json b/versions/l-/libcgroup.json index 18fbcc132281d2..4ef0fd1003616f 100644 --- a/versions/l-/libcgroup.json +++ b/versions/l-/libcgroup.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "954786a64a4a1fdb7f282f079564eb3ca6a90d2f", + "git-tree": "3aa6f403471cccadd068cdecb1d7492af74e6d07", "version-semver": "3.1.0", "port-version": 0 } From 5d7e32d0fa40ce1e831177ea3e9f5764318ab55a Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Tue, 2 Jul 2024 11:10:05 +0300 Subject: [PATCH 04/13] [libcgroup] fixed license --- ports/libcgroup/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libcgroup/vcpkg.json b/ports/libcgroup/vcpkg.json index a1fd2e3388cd59..92a51a639a9e0d 100644 --- a/ports/libcgroup/vcpkg.json +++ b/ports/libcgroup/vcpkg.json @@ -3,6 +3,6 @@ "version-semver": "3.1.0", "description": "Library for working with cgroup", "homepage": "https://github.com/libcgroup/libcgroup", - "license": "GPL-2.0", + "license": "GPL-2.1", "supports": "linux" } From 6e97eda1dde5cb76a28f92317673620a5eb50d24 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Tue, 2 Jul 2024 12:02:02 +0300 Subject: [PATCH 05/13] [libcgroup] fixed license --- ports/libcgroup/vcpkg.json | 2 +- versions/l-/libcgroup.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libcgroup/vcpkg.json b/ports/libcgroup/vcpkg.json index 92a51a639a9e0d..3a75ca0c1a49fc 100644 --- a/ports/libcgroup/vcpkg.json +++ b/ports/libcgroup/vcpkg.json @@ -3,6 +3,6 @@ "version-semver": "3.1.0", "description": "Library for working with cgroup", "homepage": "https://github.com/libcgroup/libcgroup", - "license": "GPL-2.1", + "license": "LGPL-2.1", "supports": "linux" } diff --git a/versions/l-/libcgroup.json b/versions/l-/libcgroup.json index 4ef0fd1003616f..84971b13ab6d49 100644 --- a/versions/l-/libcgroup.json +++ b/versions/l-/libcgroup.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3aa6f403471cccadd068cdecb1d7492af74e6d07", + "git-tree": "17c743149de9e1d8d792ef18f446e4493fe3025c", "version-semver": "3.1.0", "port-version": 0 } From 7588f06081b7ab622497f939699fde8c578596e0 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Tue, 2 Jul 2024 12:02:48 +0300 Subject: [PATCH 06/13] [libcgroup] run x-add-version --- versions/l-/libcgroup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libcgroup.json b/versions/l-/libcgroup.json index 84971b13ab6d49..0eb29596d3b597 100644 --- a/versions/l-/libcgroup.json +++ b/versions/l-/libcgroup.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "17c743149de9e1d8d792ef18f446e4493fe3025c", + "git-tree": "fb3123c574a96bf24c7ca705787c44e230e17235", "version-semver": "3.1.0", "port-version": 0 } From dce4a36ac87599693ee5cf022d8fee92639e91f5 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Wed, 3 Jul 2024 14:29:30 +0300 Subject: [PATCH 07/13] [libcgroup] formatted portfile, removed static check --- ports/libcgroup/portfile.cmake | 38 ++++++++++++++++------------------ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/ports/libcgroup/portfile.cmake b/ports/libcgroup/portfile.cmake index ecd4083196ae43..4d775e83295182 100644 --- a/ports/libcgroup/portfile.cmake +++ b/ports/libcgroup/portfile.cmake @@ -1,30 +1,28 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO libcgroup/libcgroup - SHA512 29fb7f5c795080cafc27ab99f2f3d7683933515840226564e047605e41a76f7ca31b48c8c9e8e1963eb808e3fc82206ea6ad550c80dcfb745b5cb7425e2875a9 - REF "v${VERSION}" - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO libcgroup/libcgroup + SHA512 29fb7f5c795080cafc27ab99f2f3d7683933515840226564e047605e41a76f7ca31b48c8c9e8e1963eb808e3fc82206ea6ad550c80dcfb745b5cb7425e2875a9 + REF "v${VERSION}" + HEAD_REF master ) message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n" - "\t- \n" - "\t- \n" - "\t- \n\n" - "It can be installed with your package manager" + "\t- \n" + "\t- \n" + "\t- \n\n" + "It can be installed with your package manager" ) vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - OPTIONS - --enable-tools=no - --enable-python=no - --enable-tests=no - --enable-samples=no - --enable-systemd=no - --enable-pam=no + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + --enable-tools=no + --enable-python=no + --enable-tests=no + --enable-samples=no + --enable-systemd=no + --enable-pam=no ) vcpkg_install_make() From 2d001ddb89ac3c5bd964cd4400d5ada164ea8529 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Wed, 3 Jul 2024 15:39:09 +0300 Subject: [PATCH 08/13] [libcgroup] apply patch to fix systemd.h include installation --- ports/libcgroup/portfile.cmake | 9 ++++++++- ports/libcgroup/usage | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 ports/libcgroup/usage diff --git a/ports/libcgroup/portfile.cmake b/ports/libcgroup/portfile.cmake index 4d775e83295182..c0680199f283a5 100644 --- a/ports/libcgroup/portfile.cmake +++ b/ports/libcgroup/portfile.cmake @@ -1,9 +1,17 @@ +vcpkg_download_distfile(PATCH_FIX_SYSTEMD_HEADER_INSTALLATION + URLS https://github.com/t43rr7/libcgroup/commit/592dcdcf243576bd2517d3da9bc18990de08e37e.patch?full_index=1 + SHA512 0977e0b32119d1938ce2af6687ff31f6349aa6189307041d1249967e688ed9d84bc133ef270eb3d474a81644dd2152213c8605c6bd9a585c880fef0e026170fa + FILENAME 0000-fix-systemd-header-installation.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcgroup/libcgroup SHA512 29fb7f5c795080cafc27ab99f2f3d7683933515840226564e047605e41a76f7ca31b48c8c9e8e1963eb808e3fc82206ea6ad550c80dcfb745b5cb7425e2875a9 REF "v${VERSION}" HEAD_REF master + PATCHES + "${PATCH_FIX_SYSTEMD_HEADER_INSTALLATION}" ) message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n" @@ -31,5 +39,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libcgroup/usage b/ports/libcgroup/usage deleted file mode 100644 index 804f35b8788d66..00000000000000 --- a/ports/libcgroup/usage +++ /dev/null @@ -1,3 +0,0 @@ -libcgroup provides pkg-config modules: - # Libraries needed for apps that want to control cgroups - libcgroup From bf73983aceea47ff543271929d098f142d0c1910 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Wed, 3 Jul 2024 15:39:37 +0300 Subject: [PATCH 09/13] [libcgroup] run x-add-version --- versions/l-/libcgroup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libcgroup.json b/versions/l-/libcgroup.json index 0eb29596d3b597..cd753c7cae16ca 100644 --- a/versions/l-/libcgroup.json +++ b/versions/l-/libcgroup.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fb3123c574a96bf24c7ca705787c44e230e17235", + "git-tree": "bad18e9384ad5b0099b2999807d0d70cfa93edb0", "version-semver": "3.1.0", "port-version": 0 } From b43a95337dde0a0d4fc2dd8f696269c5bb0a9452 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Wed, 3 Jul 2024 20:03:25 +0300 Subject: [PATCH 10/13] [libcgroup] fixed license --- ports/libcgroup/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libcgroup/vcpkg.json b/ports/libcgroup/vcpkg.json index 3a75ca0c1a49fc..790fbaf392da4c 100644 --- a/ports/libcgroup/vcpkg.json +++ b/ports/libcgroup/vcpkg.json @@ -3,6 +3,6 @@ "version-semver": "3.1.0", "description": "Library for working with cgroup", "homepage": "https://github.com/libcgroup/libcgroup", - "license": "LGPL-2.1", + "license": "LGPL-2.1-only", "supports": "linux" } From 4174c861cb3bc80db23903880203a07dec8aa326 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Wed, 3 Jul 2024 20:03:38 +0300 Subject: [PATCH 11/13] [libcgroup] run x-add-version --- versions/l-/libcgroup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libcgroup.json b/versions/l-/libcgroup.json index cd753c7cae16ca..ea352b39ad1d25 100644 --- a/versions/l-/libcgroup.json +++ b/versions/l-/libcgroup.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bad18e9384ad5b0099b2999807d0d70cfa93edb0", + "git-tree": "469ba6582810b26e8fa28fe9232bc9953fbc983a", "version-semver": "3.1.0", "port-version": 0 } From 6f70b7fffc03ab2cb734d5721601d1c6a0bfc76a Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Thu, 4 Jul 2024 13:58:37 +0300 Subject: [PATCH 12/13] [audit] fixed version --- ports/libcgroup/vcpkg.json | 2 +- versions/l-/libcgroup.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libcgroup/vcpkg.json b/ports/libcgroup/vcpkg.json index 790fbaf392da4c..be3958822cf3b9 100644 --- a/ports/libcgroup/vcpkg.json +++ b/ports/libcgroup/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libcgroup", - "version-semver": "3.1.0", + "version": "3.1.0", "description": "Library for working with cgroup", "homepage": "https://github.com/libcgroup/libcgroup", "license": "LGPL-2.1-only", diff --git a/versions/l-/libcgroup.json b/versions/l-/libcgroup.json index ea352b39ad1d25..1d3701e8977862 100644 --- a/versions/l-/libcgroup.json +++ b/versions/l-/libcgroup.json @@ -2,7 +2,7 @@ "versions": [ { "git-tree": "469ba6582810b26e8fa28fe9232bc9953fbc983a", - "version-semver": "3.1.0", + "version": "3.1.0", "port-version": 0 } ] From 9c4e2c6a9209fdd86ba1c9513d6b77c9c8ea5a84 Mon Sep 17 00:00:00 2001 From: Timur Chernykh Date: Thu, 4 Jul 2024 13:58:46 +0300 Subject: [PATCH 13/13] [audit] run x-add-version --- versions/l-/libcgroup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libcgroup.json b/versions/l-/libcgroup.json index 1d3701e8977862..7c2f768317d0b0 100644 --- a/versions/l-/libcgroup.json +++ b/versions/l-/libcgroup.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "469ba6582810b26e8fa28fe9232bc9953fbc983a", + "git-tree": "c729cc038b705fdf523ff0ee17ae6d3cc9f08805", "version": "3.1.0", "port-version": 0 }