Browse Source

n/gnupg: Upgraded to gnupg-2.2.4.

slackware-14.2
Damien Goutte-Gattat 5 years ago
parent
commit
93fd521ff8
  1. 34
      n/gnupg/gnupg-2.1.17-fix-regexp-sanitization.diff
  2. 1
      n/gnupg/gnupg-2.2.3.tar.bz2.sha256
  3. 1
      n/gnupg/gnupg-2.2.4.tar.bz2.sha256
  4. 3
      n/gnupg/gnupg.SlackBuild

34
n/gnupg/gnupg-2.1.17-fix-regexp-sanitization.diff

@ -1,34 +0,0 @@
commit 7b9ce0365c32396ec0af68092804b43d88792a42
Author: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Tue Jan 17 22:53:14 2017 +0100
gpg: Fix regexp sanitization.
* g10/trustdb.c (sanitize_regexp): Do not escape normal characters.
--
The current sanitization code escapes ALL characters in the
regular expression, including characters that do not have any
special meaning and only match themselves. Only the dot (.)
is not escaped.
This leads to, e.g., 'example.com' being sanitized into
'\e\x\a\m\p\l\e.\c\o\m', which will then fail to match against
'alice@example.com'.
This patch updates the function to escape only the meaningful
characters (minus the dot).
diff --git a/g10/trustdb.c b/g10/trustdb.c
index c113b7e..e5f32da 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1498,7 +1498,7 @@ sanitize_regexp(const char *old)
{
if(!escaped && old[start]=='\\')
escaped=1;
- else if(!escaped && old[start]!='.')
+ else if(!escaped && strchr("[]$^()|*+?{}", old[start]))
new[idx++]='\\';
else
escaped=0;

1
n/gnupg/gnupg-2.2.3.tar.bz2.sha256

@ -1 +0,0 @@
cbd37105d139f7aa74f92b6f65d136658682094b0e308666b820ae4b984084b4 gnupg-2.2.3.tar.bz2

1
n/gnupg/gnupg-2.2.4.tar.bz2.sha256

@ -0,0 +1 @@
401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec gnupg-2.2.4.tar.bz2

3
n/gnupg/gnupg.SlackBuild

@ -28,7 +28,7 @@
# Source package infos
NAMESRC=${NAMESRC:-gnupg}
VERSION=${VERSION:-2.2.3}
VERSION=${VERSION:-2.2.4}
PKGVERSION=${VERSION/-beta/b}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.bz2}
WGET=${WGET:-https://www.gnupg.org/ftp/gcrypt/gnupg/$ARCHIVE}
@ -86,7 +86,6 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
patch -p 1 < $CWD/gnupg-2.1.17-fix-regexp-sanitization.diff
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
./configure \

Loading…
Cancel
Save