diff --git a/system/base/libgcrypt/actions.py b/system/base/libgcrypt/actions.py index 8f546115..184a83f3 100644 --- a/system/base/libgcrypt/actions.py +++ b/system/base/libgcrypt/actions.py @@ -6,19 +6,27 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools -from pisi.actionsapi import get from pisi.actionsapi import shelltools +from pisi.actionsapi import get def setup(): + if get.buildTYPE() != "emul32": + autotools.autoreconf("-fi") + options = "--disable-static \ --enable-noexecstack" if get.buildTYPE() == "emul32": + shelltools.system("sed 's:i586\*-\*-\*:x86_64-*-*:' -i mpi/config.links") + shelltools.system("sed 's:x86_64-\*-\*:ignore:;s:i?86-\*-\*:x86_64-*-*:' -i configure.ac") shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS()) + + autotools.autoreconf("-fi") options += " --libdir=/usr/lib32 --bindir=/usr/bin32" # Use 32-bit assembler, another option is to use --disable-asm option - pisitools.dosed("mpi/config.links", "path=\"amd64\"", "path=\"i586 i386\"") + #pisitools.dosed("mpi/config.links", "path=\"amd64\"", "path=\"i586 i386\"") + autotools.configure(options) diff --git a/system/base/libgcrypt/pspec.xml b/system/base/libgcrypt/pspec.xml index 792dbf95..fa9f5d52 100644 --- a/system/base/libgcrypt/pspec.xml +++ b/system/base/libgcrypt/pspec.xml @@ -12,7 +12,7 @@ library General purpose crypto library Libgcrypt is a general purpose crypto library based on the code used in GNU Privacy Guard. - https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2 + https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.3.tar.bz2 libgpg-error-devel @@ -70,6 +70,13 @@ + + 2021-05-28 + 1.9.3 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-12-09 1.8.6