5 files changed, 87 insertions, 50 deletions
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
index b1a80a48e4..7ef6e2ceba 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
+++ b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Gridcoin-Research
 
-# Copyright 2018-2019 Edward W. Koenig, Vancouver, WA, USA
+# Copyright 2018-2021 Edward W. Koenig, Vancouver, WA, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Gridcoin-Research
-VERSION=${VERSION:-5.1.0.0}
+VERSION=${VERSION:-5.4.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-NUMJOBS=${NUMJOBS:-1}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "${QRENC:-no}" = "yes" ]; then
+if [ "${QRENC:-yes}" = "yes" ]; then
   useqr="--with-qrencode"
 else
   useqr="--without-qrencode"
@@ -98,7 +107,7 @@ CXXFLAGS="$SLKCFLAGS" \
   $usepnp \
   --build=$ARCH-slackware-linux
 
-make -j${NUMJOBS}
+make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -133,4 +142,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.desktop b/academic/Gridcoin-Research/Gridcoin-Research.desktop
deleted file mode 100644
index 5e6896f326..0000000000
--- a/academic/Gridcoin-Research/Gridcoin-Research.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Gridcoin
-Comment=Gridcoin is an open source cryptocurrency (Ticker: GRC) which securely rewards volunteer computing performed on the BOINC platform.
-Exec=gridcoinresearch
-Icon=grc
-Categories=Education;Science;
-Terminal=false
-Hidden=false
diff --git a/academic/Gridcoin-Research/Gridcoin-Research.info b/academic/Gridcoin-Research/Gridcoin-Research.info
index 9e1c3e3aee..8db3ea0b94 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.info
+++ b/academic/Gridcoin-Research/Gridcoin-Research.info
@@ -1,10 +1,10 @@
 PRGNAM="Gridcoin-Research"
-VERSION="5.1.0.0"
+VERSION="5.4.8.0"
 HOMEPAGE="https://gridcoin.us/"
-DOWNLOAD="https://github.com/gridcoin-community/Gridcoin-Research/archive/5.1.0.0/Gridcoin-Research-5.1.0.0.tar.gz"
-MD5SUM="1e4265d54713cc3270798598406d1f83"
+DOWNLOAD="https://github.com/gridcoin-community/Gridcoin-Research/archive/5.4.8.0/Gridcoin-Research-5.4.8.0.tar.gz"
+MD5SUM="69a861f7eca09f6142c8e737744ad9fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/academic/Gridcoin-Research/README b/academic/Gridcoin-Research/README
index dfccd82244..53cc2f8645 100644
--- a/academic/Gridcoin-Research/README
+++ b/academic/Gridcoin-Research/README
@@ -3,15 +3,37 @@ rewards volunteer computing performed on the BOINC platform. BOINC is
 an open source volunteer computing grid which combines the processing
 power of individual users for the purposes of scientific research.
 
-QT5, qrencode and miniupnpc are optional (available on SBo) to build
-GUI, QR and UPnP support. QT5 will be detected automatically, for the
-others, run script as
+qrencode support is detected automatically; override with
+  QRENC=no ./Gridcoin-Research.SlackBuild
 
-QRENC=yes ./Gridcoin-Research.SlackBuild
-UPNP=yes ./Gridcoin-Research.SlackBuild
+Miniupnpc (available on SBo) is optional for UPnP support. Run script as
+  UPNP=yes ./Gridcoin-Research.SlackBuild
 
 You will need to edit the configuration file gridcoinresearch.conf
 in /etc/Gridcoin-Research/ and place it in your home directory
 ~/.GridcoinResearch/ to provide the location of your boinc data
 and any other configurations that you require. For details, see
-https://wiki.gridcoin.us/Gridcoinresearch_config_file
+https://wiki.gridcoin.us/Gridcoinresearch_config_file and in
+/usr/share/Gridcoin-Research-$VERSION/doc/
+
+Notes: 
+1. New gridcoinsettings.json file
+
+This file contains settings changed by the node while running and
+settings stored in this file override the read-only settings in the
+gridcoinresearch.conf file (see changelog and documentation).
+
+2. Berkeley DB update
+
+Previous versions built against Slackware's Berkeley DB version 4.8.
+Since [5.4.2.0] 2023-03-26, leisure, "LaVerne", upstream source
+includes Berkeley DB version 5.3 in tree and will standardize all
+wallet.dat files to the bdb 5.3 format. THIS IS VERY IMPORTANT!
+This ugrade will be completely transparent. Please review the 
+release notes on
+https://github.com/gridcoin-community/Gridcoin-Research/releases
+
+** NOTE: **
+While this is a LEISURE update, you are highly encouraged to upgrade.
+Included are additonal fixes and improvements releated to the recent
+inadvertent fork as a result of an inadvertent protocol change.
diff --git a/academic/Gridcoin-Research/gridcoinresearch.conf b/academic/Gridcoin-Research/gridcoinresearch.conf
index 7ab2e07a3f..1c66a0b640 100644
--- a/academic/Gridcoin-Research/gridcoinresearch.conf
+++ b/academic/Gridcoin-Research/gridcoinresearch.conf
@@ -2,44 +2,38 @@
 #################### Example gridcoinresearch.conf file #####################
 #############################################################################
 ##
-## For further details on this configuration file please see:
-## http://wiki.gridcoin.us/Gridcoinresearch_config_file
-##
 ## Default gridcoinresearch.conf location:
 ##
 ##  Win:   %AppData%\GridcoinResearch\
 ##  Linux: ~/.GridcoinResearch/
-##  MacOS: /Users/USERNAME/Library/Application/Support/GridcoinResearch/
+##  macOS: /Users/USERNAME/Library/Application/Support/GridcoinResearch/
 ##
-## Single # lines are commands, remove the # in Front of the Command to use it
+## Single # lines are commands, remove the # in Front of the command to use it
 ## Double ## lines are comments
 ##
 #############################################################################
 ####################### Required Settings (All OS's) ########################
 #############################################################################
 
-## Community provided list of addnodes available at
-## http://wiki.gridcoin.us/List_of_Addnodes
+## Community provided list of addnodes available at https://github.com/gridcoin-community/Gridcoin-Wiki/wiki/List-of-Addnodes
 #~~~~~Copy & Paste Addnodes here~~~~~
 
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-## BOINC account settings, i.e. your BOINC CPID & E-Mail
-## Use INVESTOR for Investor or Pool Mining
-PrimaryCPID=INVESTOR
-email=INVESTOR
+## BOINC account E-Mail
+## Use blank or INVESTOR for Investor or Pool Mining
+## Note the PrimaryCPID field is deprecated and ignored since the 4.0.5.0
+## release.
+email=
 
-## Port 32749/TCP required for Inbound Connections
+## Port 32749/TCP open or forwarded required for Inbound Connections
 ## (Not required but highly recommended)
-listen=1
+#listen=1
 
 ## Required for Headless set-ups
 #daemon=1
 
-## Blocks client from upgrading on its own. 
-suppressupgrade=true
-
 #############################################################################
 ############# RPC Settings for Remote Access and Headless Users #############
 ############ Warning: Set a Good Password and Secure Your System ############
@@ -50,25 +44,46 @@ suppressupgrade=true
 #rpcallowip=<IP Address of Remote System>
 #rpcport=<Port for RPC Communication>
 #rpcuser=<A Username for RPC>
-#rpcpassword=<A GOOD Password for RPC>
+#rpcpassword=<A STRONG Password for RPC>
 
 #############################################################################
 ######################## Optional BOINC settings ############################
 ########### (Required if BOINC installed to non-default location) ###########
 #############################################################################
 
+## Windows (Note the double backslashes are necessary)
+#boincdatadir=C:\\ProgramData\\BOINC\\
+
 ## Linux
-boincdatadir=$HOME/.boinc_data/
+#boincdatadir=/var/lib/boinc-client/
+
+## macOS
+#boincdatadir=/Library/Application Support/BOINC Data/
 
 #############################################################################
 ######################## Optional Network settings ##########################
 #############################################################################
 
-## Maximum number of inbound+outbound connections.Default 125
-maxconnections=125
-## Maximum number of outbound connections.Default 8
-maxoutboundconnections=8
+## Maximum number of inbound+outbound connections. Default 125
+#maxconnections=125
+## Maximum number of outbound connections. Default 8
+#maxoutboundconnections=8
 ## Manually Set-up Ports
 #upnp=false
 #externalip=<Your IP Address>
-#port=32748
-\ No newline at end of file
+
+#############################################################################
+############################## Other Entries ################################
+#############################################################################
+
+## See detailed Other Entries description section below.
+
+#debug=true
+#debug=<category>
+
+#enablestakesplit=1
+#stakingefficiency=<percentage between 75 and 98, defaults to 90>
+#minstakesplitvalue=<value in GRC, minimum and defaults to 800>
+
+#enablesidestaking=1
+#sidestake=<address>,<allocation percentage>