From: skmpz <skmpz@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libgcrypt: update to 1.9.3.
Date: Fri, 30 Apr 2021 17:40:12 +0200 [thread overview]
Message-ID: <20210430154012.jrrAap2WPTTu8eYs_AwzVVHFfcJRMXH2A-V5MdQAEuA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30587@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]
There is an updated 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: 3372 bytes --]
From f8812df237fae40ac9737fc303e05512207f52de 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 | 46 +++++++++++++++++++
srcpkgs/libgcrypt/template | 5 +-
2 files changed, 49 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..51165dcb0022
--- /dev/null
+++ b/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch
@@ -0,0 +1,46 @@
+From ec87511d9cd2dc31434e939b6351d74a38d4ceaa Mon Sep 17 00:00:00 2001
+From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+Date: Wed, 28 Apr 2021 19:19:15 +0300
+Subject: [PATCH] hwf-x86: fix use of wrong operand type
+
+* src/hwf-x86.c (get_cpuid): Use xchg for swapping %ebx back
+and forth between operand register.
+--
+
+HW feature routine was giving wrong results with certain compiler &
+compiler flag combinations on i386. Issue was that "=g" operand was
+used which caused problem if compiler allocated %ebx register for
+this operand. CPUID assembly block attempts to save %ebx as in older
+GCC versions this register was fixed for GOT pointer use and could
+not be modified otherwise (could not be used as operand or clobber).
+
+Reported-by: Iru Cai <vimacs@disroot.org>
+Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+---
+ src/hwf-x86.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+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"
next prev parent reply other threads:[~2021-04-30 15:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 5:43 [PR PATCH] " skmpz
2021-04-30 5:43 ` skmpz
2021-04-30 15:22 ` [PR REVIEW] " ericonr
2021-04-30 15:38 ` skmpz
2021-04-30 15:39 ` [PR PATCH] [Updated] " skmpz
2021-04-30 15:40 ` skmpz [this message]
2021-04-30 15:53 ` ericonr
2021-04-30 15:53 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210430154012.jrrAap2WPTTu8eYs_AwzVVHFfcJRMXH2A-V5MdQAEuA@z \
--to=skmpz@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).