diff options
Diffstat (limited to 'app-emulation/open-vm-tools')
| -rw-r--r-- | app-emulation/open-vm-tools/Manifest | 3 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools/files/12.4.5-xmlsec1-pc.patch | 57 | ||||
| -rw-r--r-- | app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild | 5 |
3 files changed, 64 insertions, 1 deletions
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest index 769421ea6cef..2fb144a62703 100644 --- a/app-emulation/open-vm-tools/Manifest +++ b/app-emulation/open-vm-tools/Manifest @@ -1,5 +1,6 @@ AUX 10.1.0-Werror.patch 660 BLAKE2B a2877e473e2206259cf260b22d638643ae0e1a595f79bc69c401b9e5107445764868782e3cd4d8626f9a9d62fd748b7242530d89881678c12ac49230804cab41 SHA512 3bfbc1e5c064318b36b01e656ce6296726b31632222f8cebe96cac6acf011e1237380cdad71d01a0493c1382d0e3fc471e2a4e0ed0b902e70cf29e1d8a88633f AUX 11.3.5-icu.patch 840 BLAKE2B 7f49ef8e2f93bf813cd88504d708b66132678e6686f862e0c6b3fe4626386d8e6de0fc4fe1b5d860652873903cc3faabfe75c6d04becab2f0cd318cc4624206d SHA512 29f80dc1d918a8462484a405f827f02a6367270d5143c22c2a01e905350649fb1054bce696835cc98300ab3a4e53436665d47d74a12a69178c230fb22dd81d41 +AUX 12.4.5-xmlsec1-pc.patch 2132 BLAKE2B 59d6be7d7228eb7054dacfe63c0a54727ff6dde4d2fbc3ad6035b2e65371b44c67120160e39a603558656f5a0897fcd38b67c4e3e699550b3931a67e3999e309 SHA512 b62aae032e928b93c2d0342157c826d4d423d9219d73b6d5165dade7a550c2dff0083086bfc80f48c06077a0fc0323f0db25bbc092000ccfa03b8993d6ade99e AUX mount.vmhgfs 63 BLAKE2B 8214f6eaae9e1c2b6af7cb364572323f91e544d17d816ce93ca1a58e4f6c0ac8692000c95ef982ad6a2721bb070a5d0c4a65275a63e8cea91e14888713b560d4 SHA512 dbad70fbb96e37ffca4664abe7766c26ce3303e52ccfc80b5c83d1e21066d2a23d548910f8e15055be36e1ca162cdbbf6e19fcb672314888c63cd802a499acb9 AUX open-vm-tools.confd 88 BLAKE2B d82267674328d1e38cc850df238b8cc6c566588883d81e59f308ddd070fde6e4f9ae4950c9d68ac6daf2ed33e1a45f323d8f954430559b03697f1a25f1e7ef6a SHA512 fca30a3be4dd3247e16115fe32b4d27ede8751f96b5a33b9f489b0ce57823c605b6249ff722d6f4ed82a98979f36d28821603b4a5a1d967d3048d23d983a19be AUX open-vm-tools.initd 1225 BLAKE2B 279f572bfb07c40f0612c39989ba0048c640b5bdfdb06e624d8af974cd9fdff42ab0b4bb6ad79e19dedf3cd89fd90d61f7d549b9c8a8a6406129a5eab5e60cbc SHA512 a612dd69e671cd32b028caeefa8123243e46ed6ffe5f6f7cbd1f805ec10088dbe994d4ecb2346a7f6d094e913e70e87fa17fa195702a0825cc3af319d350d34d @@ -11,5 +12,5 @@ DIST open-vm-tools-12.2.5-21855600.tar.gz 4365531 BLAKE2B 1df621aea3d349af45c412 DIST open-vm-tools-12.4.5-23787635.tar.gz 4356612 BLAKE2B 59fab76bc740d6c8e8b76f8c2379f751a62a4d4c01add9520acafbd5601d9490c7fb7d5a3631d1198c811be33b1bd7c7b381de2f9a8f703ceec21aab6331797a SHA512 dd90622a0f1c773ed217040788a1bdbfba1e60256d4e5159a2557155f6ac642ab71488044860e417cdd853aad77a6495b98e8fd02f9755be90cc1dc71c840a3c EBUILD open-vm-tools-12.2.0.ebuild 3128 BLAKE2B ab78214990b104daeb5e6c8263b7eee4796a86356e2aa7272491ba3f54727c95d35f236a4a05a1f90ba1e27b051197690b407c1f3367438e1d50b2eeaf7bc3f5 SHA512 77e64de267aa15f43e17976d7fdde7818e592a0351f903919845adeb0bbbb86a659d1a5460dfa2fe8442a2b58460d2265104c3050d78b8bccfbdfa64068572d1 EBUILD open-vm-tools-12.2.5.ebuild 3135 BLAKE2B f6f2da4bab1ed8c7cd459bace91db1c70245b1c48ea4c5f2c50f89c8463b2d8e3b965d9bf36a052fc2b07b26afbca20b4539cfe259fb21b5858cbd5e0c5a74d7 SHA512 ddf28211bc51d1788c0c94c6e60008714f0304ea161d2aac29483d4109be4cef76e622403901ec176a94ce4047286d741701894bc3952232accda0284b94dac0 -EBUILD open-vm-tools-12.4.5.ebuild 3035 BLAKE2B ad4feedf33b55b705d5c69d01f3f41a80a380fca43737fc118b4b5192922410d19a8020c3adbe080aa6605c34cd9a5af8664f463074bba07287a1c3197624c4b SHA512 5bf46280861bc9a9ade384e59952b5bf4a92410fc3e77652fc180d85c79ba7cfe82df2bffdbc0bdc6333bcea3d07eac7507e48003b3b42e9afa861ed3e92fe31 +EBUILD open-vm-tools-12.4.5.ebuild 3219 BLAKE2B d84f625dc4dff1575493787120bb9868ab47b7e6647602fc41eda9d538c8deaad60056df9862583e460341842f6855898806a1284e000b16109a1628ecda6ae4 SHA512 0bf8c42d668fdeb9dcbe9fa9c890addc38200eb760658175d872ca5e867fe4229726f7bdfc219b6276fae91220c16b4fa8dc3cf1d3bb911fc19b5fc01d914d23 MISC metadata.xml 1153 BLAKE2B ee86cf0478cb11314cee973b0df974c915e79bf8e5ed42907b91cd3ee867ed7441fac261b759341ab0f4214f1665b8f2b6a4a88ceea4d6b463eaf87040cd6fdf SHA512 c5b0ae47bcf9f1e2dac7238772d9a70235deb8d15bb9c0dc702b1f8f2b922070651b6010b6a83fa4fe8406e7a7a844e53dc85615fdc8c73e1e3763add12f6b6c diff --git a/app-emulation/open-vm-tools/files/12.4.5-xmlsec1-pc.patch b/app-emulation/open-vm-tools/files/12.4.5-xmlsec1-pc.patch new file mode 100644 index 000000000000..9dfaad5e200c --- /dev/null +++ b/app-emulation/open-vm-tools/files/12.4.5-xmlsec1-pc.patch @@ -0,0 +1,57 @@ +https://github.com/vmware/open-vm-tools/pull/732 + +From 9403500c9aac5be8c38b528e9cc0c711ba2f0151 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 4 Aug 2024 14:53:16 +0100 +Subject: [PATCH 1/2] Also try using pkg-config to detect xmlsec + +The xmlsec1-config script does not help when cross-compiling. pkg-config is +subsequently used for a version detection anyway. +--- + open-vm-tools/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac +index 26b2e950..d46a51e2 100644 +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac +@@ -879,7 +879,7 @@ if test "$enable_vgauth" = "yes" ; then + AC_VMW_DEFAULT_FLAGS([XMLSEC1]) + AC_VMW_CHECK_LIB([xmlsec1], + [XMLSEC1], +- [], ++ [xmlsec1], + [xmlsec1-config], + [], + [xmlsec/xmlsec.h], +-- +2.45.2 + + +From b9f0bb3205039d2fa4e8d1f6d2e4d622f3ef97b1 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 4 Aug 2024 14:54:34 +0100 +Subject: [PATCH 2/2] Respect the $PKG_CONFIG variable when checking the xmlsec + version + +This particularly helps when cross-compiling. +--- + open-vm-tools/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac +index d46a51e2..39b9fa9c 100644 +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac +@@ -884,7 +884,7 @@ if test "$enable_vgauth" = "yes" ; then + [], + [xmlsec/xmlsec.h], + [xmlSecCheckVersionExt], +- [XMLSEC1_VER=`pkg-config --modversion xmlsec1` ++ [XMLSEC1_VER=`$PKG_CONFIG --modversion xmlsec1` + xmlsec1_major_version="`echo $XMLSEC1_VER | cut -f1 -d. | cut -f1 -d-`" + xmlsec1_minor_version="`echo $XMLSEC1_VER | cut -f2 -d. | cut -f1 -d-`" + xmlsec1_micro_version="`echo $XMLSEC1_VER | cut -f3 -d. | cut -f1 -d-`" +-- +2.45.2 + diff --git a/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild b/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild index 96a3b32786df..9e89b64ee6c5 100644 --- a/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild +++ b/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild @@ -64,6 +64,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/10.1.0-Werror.patch "${FILESDIR}"/11.3.5-icu.patch + "${FILESDIR}"/12.4.5-xmlsec1-pc.patch ) pkg_setup() { @@ -100,6 +101,10 @@ src_configure() { # Avoid a bug in configure.ac use ssl || myeconfargs+=( --without-ssl ) + # Avoid relying on dnet-config script, which breaks cross-compiling. This + # library has no pkg-config file. + export CUSTOM_DNET_LIBS="-ldnet" + econf "${myeconfargs[@]}" } |