Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

p11-kit: Also relocate trust.exe.

Browse Source
This commit is contained in:
Ray Donnelly
2014-08-27 18:19:13 +01:00
parent 9b552c1de6
commit 8124e48ae2
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mingw-w64-p11-kit/PKGBUILD
View File

@@ -1,10 +1,11 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
# Contributor: Saul Ibarra Corretge <saghul@gmail.com>
# Contributor: Ray Donnelly <mingw.android@gmail.com>
_realname=p11-kit
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.20.3
pkgrel=1
pkgrel=2
pkgdesc="Library to work with PKCS#11 modules"
arch=('any')
url="http://p11-glue.freedesktop.org"
@@ -30,10 +31,11 @@ md5sums=('c0b057be50ab9721cfc15a7aae86ca3b'
'd4feddce2bb360ab466861dbbe4fdadd'
'9a91b743f18126ff7d4d08e43c38d0a3'
'8837624f5b0c588ce043f2774388632d'
'36db7a7efe5ef816cf42dbaba317c4ab')
'c332ac101f44d5d8c9af34c586c88f3c')
prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
rm common/pathtools.c common/pathtools.h || true
patch -p1 -i ${srcdir}/0000-no-proxy.mingw.patch
patch -p1 -i ${srcdir}/0001-allow-gtkdocize.all.patch
patch -p1 -i ${srcdir}/0002-disable-managed-test.all.patch
@@ -57,12 +59,12 @@ build() {
--sysconfdir=${MINGW_PREFIX}/etc \
--localstatedir=${MINGW_PREFIX}/var \
--with-trust-paths=${MINGW_PREFIX}/etc/pki/ca-trust/source:${MINGW_PREFIX}/share/pki/ca-trust-source
MSYS2_ARG_CONV_EXCL="-DP11_SYSTEM_CONFIG_FILE=;-DP11_SYSTEM_CONFIG_MODULES=;-DP11_PACKAGE_CONFIG_MODULES=;-DP11_MODULE_PATH=;-DP11_BINDIR=;-DDATADIR=;-DSYSCONFDIR=;-DPRIVATEDIR=" \
make
MSYS2_ARG_CONV_EXCL="-DP11_SYSTEM_CONFIG_FILE=;-DP11_SYSTEM_CONFIG_MODULES=;-DP11_PACKAGE_CONFIG_MODULES=;-DP11_MODULE_PATH=;-DP11_BINDIR=;-DBINDIR=;-DDATADIR=;-DSYSCONFDIR=;-DPRIVATEDIR=" \
make
}
package() {
cd "${srcdir}/build-${MINGW_CHOST}"
MSYS2_ARG_CONV_EXCL="-DP11_SYSTEM_CONFIG_FILE=;-DP11_SYSTEM_CONFIG_MODULES=;-DP11_PACKAGE_CONFIG_MODULES=;-DP11_MODULE_PATH=;-DP11_BINDIR=;-DDATADIR=;-DSYSCONFDIR=;-DPRIVATEDIR=" \
make DESTDIR="$pkgdir" install
MSYS2_ARG_CONV_EXCL="-DP11_SYSTEM_CONFIG_FILE=;-DP11_SYSTEM_CONFIG_MODULES=;-DP11_PACKAGE_CONFIG_MODULES=;-DP11_MODULE_PATH=;-DP11_BINDIR=;-DBINDIR=;-DDATADIR=;-DSYSCONFDIR=;-DPRIVATEDIR=" \
make DESTDIR="$pkgdir" install
}

20
mingw-w64-p11-kit/p11-kit-relocation.patch
View File

@@ -700,3 +700,23 @@ diff -Naur p11-kit-0.20.3-orig/trust/p11-kit-trust.module p11-kit-0.20.3/trust/p
# This setting affects the order that trust policy and other information
# is looked up when going across various modules. Other trust policy modules
diff -Naur p11-kit-0.20.3-orig/p11-kit/p11-kit.c p11-kit-0.20.3/p11-kit/p11-kit.c
--- p11-kit-0.20.3-orig/p11-kit/p11-kit.c 2014-07-04 14:48:45.000000000 +0100
+++ p11-kit-0.20.3/p11-kit/p11-kit.c 2014-08-27 17:42:24.949805700 +0100
@@ -74,7 +74,7 @@
args = calloc (argc + 2, sizeof (char *));
return_val_if_fail (args != NULL, 1);
- args[0] = BINDIR "/trust";
+ args[0] = p11_path_relocation(BINDIR "/trust");
memcpy (args + 1, argv, sizeof (char *) * argc);
args[argc + 1] = NULL;
@@ -83,6 +83,7 @@
/* At this point we have no command */
p11_message_err (errno, "couldn't run trust tool");
+ free (argv[0]);
free (args);
return 2;
}