Thu Jan 16 20:06:13 UTC 202020200116200613

a/sed-4.8-x86_64-1.txz:  Upgraded.
d/gdb-8.3.1-x86_64-3.txz:  Rebuilt.
  Patched to fix a warning that breaks Emacs GDB mode.
  Thanks to Lockywolf and USUARIONUEVO.
d/guile-3.0.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
d/make-4.2.1-x86_64-5.txz:  Rebuilt.
  Recompiled against guile-3.0.0.
l/libcap-2.31-x86_64-1.txz:  Upgraded.
l/python-six-1.14.0-x86_64-1.txz:  Upgraded.
n/gnutls-3.6.11.1-x86_64-2.txz:  Rebuilt.
  Recompiled against guile-3.0.0.
n/lftp-4.9.1-x86_64-1.txz:  Upgraded.
n/libmbim-1.22.0-x86_64-1.txz:  Upgraded.
n/libqmi-1.24.4-x86_64-1.txz:  Upgraded.

5 files changed, 139 insertions, 7 deletions

diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index 3dadf1001..8f7947f57 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gdb
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -80,6 +80,9 @@ else
   GUILE_OPTION="--with-guile"
 fi
 
+# Fix for Python 3.8.x:
+zcat $CWD/gdb.python38.patch.gz | patch -p1 --verbose || exit 1
+
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/source/d/gdb/gdb.python38.patch b/source/d/gdb/gdb.python38.patch
new file mode 100644
index 000000000..96b3ad4af
--- /dev/null
+++ b/source/d/gdb/gdb.python38.patch
@@ -0,0 +1,129 @@
+From b6484282f85bf7f11451b2441599c241d302ad9d Mon Sep 17 00:00:00 2001
+From: Raul Tambre <raul@tambre.ee>
+Date: Sat, 4 May 2019 15:48:17 -0400
+Subject: [PATCH] Fix incorrect use of 'is' operator for comparison in
+ python/lib/gdb/command/prompt.py
+
+The 'is' operator is not meant to be used for comparisons. It currently working
+is an implementation detail of CPython.  CPython 3.8 has added a SyntaxWarning
+for this.
+
+diff --git a/gdb/python/lib/gdb/command/prompt.py b/gdb/python/lib/gdb/command/prompt.py
+index 3d662a7..04b9e49 100644
+--- a/gdb/python/lib/gdb/command/prompt.py
++++ b/gdb/python/lib/gdb/command/prompt.py
+@@ -45,7 +45,7 @@ The currently defined substitutions are:
+         self.hook_set = False
+ 
+     def get_show_string (self, pvalue):
+-        if self.value is not '':
++        if self.value:
+            return "The extended prompt is: " + self.value
+         else:
+            return "The extended prompt is not set."
+@@ -57,7 +57,7 @@ The currently defined substitutions are:
+         return ""
+ 
+     def before_prompt_hook(self, current):
+-        if self.value is not '':
++        if self.value:
+             return gdb.prompt.substitute_prompt(self.value)
+         else:
+             return None
+
+From d9c4ba536c522b8dc2194d4100270a159be7894a Mon Sep 17 00:00:00 2001
+From: Sergio Durigan Junior <sergiodj@redhat.com>
+Date: Sun, 25 Aug 2019 12:10:35 -0400
+Subject: [PATCH] Use raw strings on gdb.python/py-xmethods.exp (and fix Python
+ 3.8's "SyntaxWarning: invalid escape sequence")
+
+The way unrecognized escape sequences are handled has changed in
+Python 3.8: users now see a SyntaxWarning message, which will
+eventually become a SyntaxError in future versions of Python:
+
+  (gdb) source /blabla/gdb.python/py-xmethods/py-xmethods.py
+  /blabla/gdb.python/py-xmethods/py-xmethods.py:204: SyntaxWarning: invalid escape seque
+  nce \+
+    'operator\+',
+  /blabla/gdb.python/py-xmethods/py-xmethods.py:211: SyntaxWarning: invalid escape seque
+  nce \+
+    'operator\+\+',
+
+One of our testcases, gdb.python/py-xmethods.exp, contains strings in
+the form of "operator\+".  This is not recognized by Python, but is
+still needed by the testsuite to work properly.  The solution is
+simple: we just have to make sure these strings are marked as
+raw (i.e, r"").  This is what this patch does.  I took the opportunity
+to also convert other strings to raw, which, in two cases, allowed the
+removal of an extra backslash.
+
+I tested this using Python 3.7 and Python 3.8, and everything works
+fine.
+
+I think I could push this as obvious, but decided to send it to
+gdb-patches just in case.
+
+gdb/testsuite/ChangeLog:
+2019-08-26  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* gdb.python/py-xmethods.exp: Use raw strings when passing
+	arguments to SimpleXMethodMatcher.
+
+diff --git a/gdb/testsuite/gdb.python/py-xmethods.py b/gdb/testsuite/gdb.python/py-xmethods.py
+index 587842d7360..cea48b80d8c 100644
+--- a/gdb/testsuite/gdb.python/py-xmethods.py
++++ b/gdb/testsuite/gdb.python/py-xmethods.py
+@@ -199,34 +199,34 @@ def match(self, class_type, method_name):
+ 
+ 
+ global_dm_list = [
+-    SimpleXMethodMatcher('A_plus_A',
+-                         '^dop::A$',
+-                         'operator\+',
++    SimpleXMethodMatcher(r'A_plus_A',
++                         r'^dop::A$',
++                         r'operator\+',
+                          A_plus_A,
+                          # This is a replacement, hence match the arg type
+                          # exactly!
+                          type_A.const().reference()),
+-    SimpleXMethodMatcher('plus_plus_A',
+-                         '^dop::A$',
+-                         'operator\+\+',
++    SimpleXMethodMatcher(r'plus_plus_A',
++                         r'^dop::A$',
++                         r'operator\+\+',
+                          plus_plus_A),
+-    SimpleXMethodMatcher('A_geta',
+-                         '^dop::A$',
+-                         '^geta$',
++    SimpleXMethodMatcher(r'A_geta',
++                         r'^dop::A$',
++                         r'^geta$',
+                          A_geta),
+-    SimpleXMethodMatcher('A_getarrayind',
+-                         '^dop::A$',
+-                         '^getarrayind$',
++    SimpleXMethodMatcher(r'A_getarrayind',
++                         r'^dop::A$',
++                         r'^getarrayind$',
+                          A_getarrayind,
+                          type_int),
+-    SimpleXMethodMatcher('A_indexoper',
+-                         '^dop::A$',
+-                         'operator\\[\\]',
++    SimpleXMethodMatcher(r'A_indexoper',
++                         r'^dop::A$',
++                         r'operator\[\]',
+                          A_indexoper,
+                          type_int),
+-    SimpleXMethodMatcher('B_indexoper',
+-                         '^dop::B$',
+-                         'operator\\[\\]',
++    SimpleXMethodMatcher(r'B_indexoper',
++                         r'^dop::B$',
++                         r'operator\[\]',
+                          B_indexoper,
+                          type_int)
+ ]
+
diff --git a/source/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild
index 9c00b21f0..56767bf69 100755
--- a/source/d/guile/guile.SlackBuild
+++ b/source/d/guile/guile.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=guile
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild
index 7536d8daa..0ea16d1d0 100755
--- a/source/d/make/make.SlackBuild
+++ b/source/d/make/make.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2005-2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=make
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -77,7 +77,7 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/make.guile22.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/make.guile30.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/make.glibc-2.27.glob.diff.gz | patch -p1 --verbose || exit 1
 zcat $CWD/b552b05251980f693c729e251f93f5225b400714.patch.gz | patch -p1 --verbose || exit 1
 
diff --git a/source/d/make/make.guile22.diff b/source/d/make/make.guile30.diff
index b3a3a276b..8b13b14dd 100644
--- a/source/d/make/make.guile22.diff
+++ b/source/d/make/make.guile30.diff
@@ -6,7 +6,7 @@
  AS_IF([test "x$with_guile" != xno],
 -[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
 -  [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes],
-+[ PKG_CHECK_MODULES([GUILE], [guile-2.2], [have_guile=yes],
++[ PKG_CHECK_MODULES([GUILE], [guile-3.0], [have_guile=yes],
 +  [PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
      [have_guile=no])])
  ])