[krb5] Fix relative path fixup (#38972)

- Fix unsuitable substitution (`$(pwd)` in single quotes).
- Fix wrong substitution in debug variant.
This commit is contained in:
Kai Pastor 2024-05-29 10:56:13 +02:00 committed by GitHub
parent 16e95cee85
commit 9af6fa506c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 39 deletions

View File

@ -5,8 +5,6 @@ vcpkg_from_github(
REF krb5-${VERSION}-final
SHA512 184ef8645d7e17f30a8e3d4005364424d2095b3d0c96f26ecef0c2dd2f3a096a0dd40558ed113121483717e44f6af41e71be0e5e079c76a205535d0c11a2ea34
HEAD_REF master
PATCHES
relative_paths.patch
)
if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@ -83,7 +81,15 @@ else()
"CFLAGS=-fcommon \$CFLAGS"
)
vcpkg_install_make()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/krb5-config" "${CURRENT_INSTALLED_DIR}" [[$(cd "$(dirname "$0")/../../.."; pwd -P)]])
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/compile_et" "${CURRENT_INSTALLED_DIR}" [[$(cd "$(dirname "$0")/../../.."; pwd -P)]])
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/krb5-config" "${CURRENT_INSTALLED_DIR}" [[$(cd "$(dirname "$0")/../../../.."; pwd -P)]])
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/compile_et" "${CURRENT_INSTALLED_DIR}" [[$(cd "$(dirname "$0")/../../../.."; pwd -P)]])
endif()
endif()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

View File

@ -1,35 +0,0 @@
diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
index 8e6eb8660..89a401dab 100755
--- a/src/build-tools/krb5-config.in
+++ b/src/build-tools/krb5-config.in
@@ -27,7 +27,7 @@
# Configurable parameters set by autoconf
version_string="Kerberos 5 release @KRB5_VERSION@"
-prefix=@prefix@
+prefix='$(pwd)/../../../'
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
@@ -39,7 +39,7 @@ PTHREAD_CFLAGS='@PTHREAD_CFLAGS@'
DL_LIB='@DL_LIB@'
DEFCCNAME='@DEFCCNAME@'
DEFKTNAME='@DEFKTNAME@'
-DEFCKTNAME='@DEFCKTNAME@'
+DEFCKTNAME='$(pwd)/../../../var/krb5/user/%{euid}/client.keytab'
LIBS='@LIBS@'
GEN_LIB=@GEN_LIB@
diff --git a/src/util/et/compile_et.sh b/src/util/et/compile_et.sh
index f17ddba71..6a98a8bab 100755
--- a/src/util/et/compile_et.sh
+++ b/src/util/et/compile_et.sh
@@ -2,7 +2,7 @@
#
#
AWK=@AWK@
-DIR=@DIR@
+DIR='$(pwd)/../../../share/et'
usage="usage: $0 [ -d scriptDir ] [ --textdomain domain [ --localedir dir ] ]"
usage="$usage inputfile.et"

View File

@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "krb5",
"version": "1.21.2",
"port-version": 1,
"port-version": 2,
"description": [
"Kerberos is a network authentication protocol.",
"It is designed to provide strong authentication for client/server applications by using secret-key cryptography.",

View File

@ -4054,7 +4054,7 @@
},
"krb5": {
"baseline": "1.21.2",
"port-version": 1
"port-version": 2
},
"ktx": {
"baseline": "4.3.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6ab073c854c5580092585186e6a7fef808c91e6b",
"version": "1.21.2",
"port-version": 2
},
{
"git-tree": "ea9bd42d5123185ac2cc46bf6eb1db73990de124",
"version": "1.21.2",