diff --git a/util/crypt/p11-kit/actions.py b/util/crypt/p11-kit/actions.py index 997aaae79a..50bc5bdd36 100644 --- a/util/crypt/p11-kit/actions.py +++ b/util/crypt/p11-kit/actions.py @@ -14,16 +14,13 @@ def setup(): " if get.buildTYPE() == "emul32": - options += "--sysconfdir=/usr/emul32/etc \ - --bindir=/usr/emul32/bin \ - --libdir=/usr/lib32 \ - --datadir=/usr/emul32/share \ - --with-module-path=/usr/lib32/pkcs11 \ - --libexecdir=/usr/emul32/libexec" - shelltools.export("CC", "%s -m32" % get.CC()) shelltools.export("CXX", "%s -m32" % get.CXX()) shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") + options += "--prefix=/_emul32 \ + --libdir=/usr/lib32 \ + --libexecdir=/_emul32/libexec \ + --with-module-path=/usr/lib32/pkcs11" autotools.configure(options) @@ -36,7 +33,7 @@ def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) if get.buildTYPE() == "emul32": - pisitools.removeDir("/usr/emul32") + pisitools.removeDir("_emul32") return pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/util/crypt/p11-kit/pspec.xml b/util/crypt/p11-kit/pspec.xml index 4d64379153..e381fb95f2 100644 --- a/util/crypt/p11-kit/pspec.xml +++ b/util/crypt/p11-kit/pspec.xml @@ -13,7 +13,7 @@ util.crypt Library to work with PKCS#11 modules The p11-kit package Provides a way to load and enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules. - https://github.com/p11-glue/p11-kit/releases/download/0.23.9/p11-kit-0.23.9.tar.gz + https://github.com/p11-glue/p11-kit/releases/download/0.23.13/p11-kit-0.23.13.tar.gz libtasn1-devel libffi-devel @@ -68,8 +68,23 @@ /usr/lib32 + + + p11-kit-docs + Development documents for p11-kit + + /usr/share/gtk-doc/html + + + + 2019-01-23 + 0.23.13 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2018-07-31 0.23.9