remove ARCH from sbopkg.conf since we now test for that internally; modify sbopkg.conf man page accordingly; update ChangeLog-current; add in fix for bug reported by neonflux that was previously committed to -stable

ChangeLog-current.txt

@@ -111,5 +111,9 @@ enhancements:
     bug report.
   * Add ability to pass build options in a queuefile when separated by a pipe
     character, i.e. app | FOO=yes BAR=no
+  * Fix rare issue where incorrect file was upgraded; thanks to neonflux for
+    the bug report.
+  * Fix issue where custom build options may not be correctly exported.
   * Add a 'diff' entry to the script customization menu.
+  * Add in 'uname -m' test for x86_64 and if so, set ARCH to x86_64.
 +--------------------------+

src/etc/sbopkg/sbopkg.conf.new

@@ -23,7 +23,6 @@ DEBUG=0
 # themselves.  They are exported for this reason.
 export TMP=${TMP:-/tmp/SBo}
 export OUTPUT=${OUTPUT:-/tmp}
-export ARCH=${ARCH:-i486}
 
 # The following variables are required and can be tweaked if desired,
 # although most users should leave them alone.  Note:  rsync already uses

src/usr/man/man5/sbopkg.conf.5

@@ -95,20 +95,6 @@ The default value of OUTPUT is:
 .br
 export OUTPUT=${OUTPUT:-/tmp}.
 
-.TP 5
-.B ARCH
-.br
-This option sets the default architecture for compiling packages from
-the repository.  ARCH must be exported as it is also used by the SBo
-SlackBuilds.  Also note that the default value of ARCH is therefore
-the same as in the SBo SlackBuilds.  Generally, this value can be
-set to either i486, i686, or x86_64, and probably should be set to
-x86_64 for Slackware64.
-
-The default value of ARCH is:
-.br
-export ARCH=${ARCH:-i486}.
-
 .TP 5
 .B QUEUEDIR
 .br

src/usr/sbin/sbopkg

@@ -2845,6 +2845,7 @@ build_package() {
             BUILDOPTIONS=$(< options.build)
             [[ $BUILDOPTIONS ]] && eval "export $BUILDOPTIONS"
         fi
+        [[ $(uname -m) == "x86_64" ]] && export ARCH=${ARCH:-x86_64}
         export OUTPUT=$SB_OUTPUT
         nice sh $PKGNAME.SlackBuild.build
     )