[-- Attachment #1: Type: text/plain, Size: 1597 bytes --] There is a new pull request by ailiop-git against master on the void-packages repository https://github.com/ailiop-git/void-packages libgcrypt https://github.com/void-linux/void-packages/pull/30364 libgcrypt: update to 1.9.3. <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/30364.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-libgcrypt-30364.patch --] [-- Type: text/x-diff, Size: 1101 bytes --] From 2ace34f52021f2b62c761248c51461e6b5e2c337 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos <ailiop@altatus.com> Date: Tue, 20 Apr 2021 12:50:55 +0200 Subject: [PATCH] libgcrypt: update to 1.9.3. --- srcpkgs/libgcrypt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template index da057a81fd85..e466a315e7f3 100644 --- a/srcpkgs/libgcrypt/template +++ b/srcpkgs/libgcrypt/template @@ -1,6 +1,6 @@ # Template file for 'libgcrypt' pkgname=libgcrypt -version=1.9.2 +version=1.9.3 revision=1 build_style=gnu-configure configure_args="--enable-static --without-capabilities" @@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>" license="LGPL-2.1-or-later" homepage="https://www.gnupg.org" distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2" -checksum=b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a +checksum=97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd if [ "$CROSS_BUILD" ]; then configure_args+=" ac_cv_sys_symbol_underscore=no"
[-- Attachment #1: Type: text/plain, Size: 1593 bytes --] There is a new pull request by skmpz against master on the void-packages repository https://github.com/skmpz/void-packages libgcrypt-1.9.3 https://github.com/void-linux/void-packages/pull/30587 libgcrypt: update to 1.9.3. <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/30587.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-libgcrypt-1.9.3-30587.patch --] [-- Type: text/x-diff, Size: 2445 bytes --] From f005a4731f839c9f40a31be2561e7eb69b968231 Mon Sep 17 00:00:00 2001 From: skmpz <dem.procopiou@gmail.com> Date: Fri, 30 Apr 2021 08:42:26 +0300 Subject: [PATCH] libgcrypt: update to 1.9.3. --- .../hwf-x86-fix-wrong-operand-type.patch | 24 +++++++++++++++++++ srcpkgs/libgcrypt/template | 5 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch diff --git a/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch b/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch new file mode 100644 index 000000000000..f6dde7e59742 --- /dev/null +++ b/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch @@ -0,0 +1,24 @@ +diff --git a/src/hwf-x86.c b/src/hwf-x86.c +index 91e4c411e..a1aa02e78 100644 +--- a/src/hwf-x86.c ++++ b/src/hwf-x86.c +@@ -83,14 +83,12 @@ get_cpuid(unsigned int in, unsigned int *eax, unsigned int *ebx, + unsigned int regs[4]; + + asm volatile +- ("movl %%ebx, %%edi\n\t" /* Save GOT register. */ +- "xorl %%ebx, %%ebx\n\t" ++ ("xchgl %%ebx, %1\n\t" /* Save GOT register. */ + "cpuid\n\t" +- "movl %%ebx, %1\n\t" +- "movl %%edi, %%ebx\n\t" /* Restore GOT register. */ +- : "=a" (regs[0]), "=g" (regs[1]), "=c" (regs[2]), "=d" (regs[3]) +- : "0" (in), "2" (0), "3" (0) +- : "cc", "edi" ++ "xchgl %%ebx, %1\n\t" /* Restore GOT register. */ ++ : "=a" (regs[0]), "=D" (regs[1]), "=c" (regs[2]), "=d" (regs[3]) ++ : "0" (in), "1" (0), "2" (0), "3" (0) ++ : "cc" + ); + + if (eax) diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template index da057a81fd85..3a6032d6cc6c 100644 --- a/srcpkgs/libgcrypt/template +++ b/srcpkgs/libgcrypt/template @@ -1,6 +1,6 @@ # Template file for 'libgcrypt' pkgname=libgcrypt -version=1.9.2 +version=1.9.3 revision=1 build_style=gnu-configure configure_args="--enable-static --without-capabilities" @@ -10,7 +10,8 @@ maintainer="skmpz <dem.procopiou@gmail.com>" license="LGPL-2.1-or-later" homepage="https://www.gnupg.org" distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2" -checksum=b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a +checksum=97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd +patch_args="-Np1" if [ "$CROSS_BUILD" ]; then configure_args+=" ac_cv_sys_symbol_underscore=no"
[-- Attachment #1: Type: text/plain, Size: 1438 bytes --] There's a closed pull request on the void-packages repository libgcrypt: update to 1.9.3. https://github.com/void-linux/void-packages/pull/30364 Description: <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [ ] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl -->