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

p11-kit: update to 0.23.18.1

Browse Source
This commit is contained in:
Helenerineium
2020-01-07 12:10:13 +08:00
parent 6b5c013eb2
commit bf7b7cfa4d
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mingw-w64-p11-kit/0010-fix-transport-test.patch
View File

@@ -6,11 +6,11 @@
+#ifdef __MINGW32__
+ const char *envstr;
+ envstr = "P11_KIT_PRIVATEDIR=" BUILDDIR;
+ envstr = "P11_KIT_PRIVATEDIR=" BUILDDIR "/p11-kit";
+ putenv(envstr);
+#else
setenv ("P11_KIT_PRIVATEDIR", BUILDDIR, 1);
setenv ("P11_KIT_PRIVATEDIR", BUILDDIR "/p11-kit", 1);
+#endif
data = "remote: |" BUILDDIR "/p11-kit/p11-kit" EXEEXT " remote " BUILDDIR "/.libs/mock-two" SHLEXT "\n";
data = "remote: |" BUILDDIR "/p11-kit/p11-kit" EXEEXT " remote " P11_MODULE_PATH "/mock-two" SHLEXT "\n";
p11_test_file_write (test.user_modules, "remote.module", data, strlen (data));
data = "remote: |" BUILDDIR "/p11-kit/p11-kit" EXEEXT " remote " BUILDDIR "/.libs/mock-five" SHLEXT "\nx-init-reserved: initialize-arg";
data = "remote: |" BUILDDIR "/p11-kit/p11-kit" EXEEXT " remote " P11_MODULE_PATH "/mock-five" SHLEXT "\nx-init-reserved: initialize-arg";

15
mingw-w64-p11-kit/0012-no-getuid.patch
View File

@@ -1,15 +0,0 @@
diff -Naur p11-kit-0.23.16.1.orig/p11-kit/conf.c p11-kit-0.23.16.1/p11-kit/conf.c
--- p11-kit-0.23.16.1.orig/p11-kit/conf.c 2019-05-23 15:09:01.266282300 -0400
+++ p11-kit-0.23.16.1/p11-kit/conf.c 2019-05-23 15:17:23.528706900 -0400
@@ -232,9 +232,11 @@
if (getauxval (AT_SECURE)) {
p11_debug ("skipping user config in setuid or setgid program");
mode = CONF_USER_NONE;
+#ifndef _WIN32
} else if (getuid () == 0) {
p11_debug ("skipping user config in program running as root");
mode = CONF_USER_NONE;
+#endif
} else if (secure_getenv ("P11_KIT_NO_USER_CONFIG")) {
p11_debug ("skipping user config due to P11_NO_USER_CONFIG");
mode = CONF_USER_NONE;

12
mingw-w64-p11-kit/0012-no-version-script.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -aur p11-kit-0.23.18/p11-kit/Makefile.am p11-kit-0.23.18.1/p11-kit/Makefile.am
--- p11-kit-0.23.18/p11-kit/Makefile.am 2019-09-30 20:57:35.000000000 +0800
+++ p11-kit-0.23.18.1/p11-kit/Makefile.am 2020-01-07 12:00:40.029248200 +0800
@@ -88,7 +88,7 @@
-no-undefined \
-version-info $(P11KIT_LT_RELEASE)
-if HAVE_LD_VERSION_SCRIPT
+if !OS_WIN32
libp11_kit_la_LDFLAGS += -Wl,--version-script=$(srcdir)/p11-kit/libp11-kit.map
else
libp11_kit_la_LDFLAGS += -export-symbols-regex '^C_GetFunctionList|^p11_kit_'

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

@@ -5,7 +5,7 @@
_realname=p11-kit
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.23.16.1
pkgver=0.23.18.1
pkgrel=1
pkgdesc="Library to work with PKCS#11 modules"
arch=('any')
@@ -28,9 +28,9 @@ source=(https://github.com/p11-glue/p11-kit/releases/download/${pkgver}/${_realn
0009-add-debugging-to-path.patch
0010-fix-transport-test.patch
0011-p11-kit-spawn-external.patch
0012-no-getuid.patch)
0012-no-version-script.patch)
validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
sha256sums=('4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d'
sha256sums=('34c3bd8c0050dd7c4e6228aecf0f168de0a1b34562ddbf74a1c70904c2523c6f'
'195b2e8695f701caf545e2a468383ad29457febd9b1ee57de1986de04ad3c31c'
'aa92f986d3f7dfc119e86f9a8f3987e6ac2562149921820eadbe09218c4df99c'
'ea4593324db6d2d193733561f0352c6d679d1fb00aed0a2bae0d28aecbe92721'
@@ -38,9 +38,9 @@ sha256sums=('4b34e92ae36fa493e0d94366c767f06d5f9951e3d8581d10fd935d738db1574d'
'2b0fc5c54776aca54e306315338323075e7412d8d800f490a31870008c34f8d1'
'652e4be637bf77f20d8fde91175286701430e720e4082e8818a50ebddff28460'
'8c796ade0ef6356c796d2e87b967c7a9d888783c08e740e35d5686f6deb7f009'
'9aae8454b11270c39dba924731fd5555e3a1b97cd4dd6fd61566c737b1adde72'
'6c4b94bb8aee1981c07215d2c8449614f1a604a705f05806f6f1e8299b729698'
'd5e804ba795aefe0a3938bc527b0e6c8ff8c1d5dfa1c0c1728c20a249504af6b'
'3a6793fa328b7ac5f6242d7b232ea0c1e064f00d6603222ac2d82270c9433076')
'15a2729f39e260f7fe8d55a91a399f2512854da626a69bc215470f902fc178cd')
prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
@@ -54,7 +54,7 @@ prepare() {
# patch -p1 -i ${srcdir}/0008-add-debugging-to-path.patch
patch -p1 -i ${srcdir}/0010-fix-transport-test.patch
patch -p1 -i ${srcdir}/0011-p11-kit-spawn-external.patch
patch -p1 -i ${srcdir}/0012-no-getuid.patch
patch -p1 -i ${srcdir}/0012-no-version-script.patch
autoreconf -vfi
gtkdocize