update sbopkg for Slackware 12.2 by making 12.2 the default Slackware version; revise man pages and docs for 12.2; add --no-owner to default rsync flags to avoid local repository from having incorrect owner permissions; thanks to Pierre Cazenave for the bug report and Erik Hanson for the suggested solution; tweak the recent fix in r228 for built package names showing up incorrectly in the menus

src/etc/sbopkg/sbopkg.conf.new

@@ -8,7 +8,7 @@
 # exported as it is used by the SlackBuild scripts as well.  Any of
 # the other variables could be exported as well, if desired.
 RSYNCMIRROR=slackbuilds.org::slackbuilds
-SLACKVER=12.1
+SLACKVER=12.2
 LOCALREPO=${LOCALREPO:-/home/sbo}
 SRCDIR=${SRCDIR:-/var/cache/sbopkg}
 export TMP=${TMP:-/tmp/SBo}
@@ -17,11 +17,11 @@ TERMBUILD=NO
 
 # The following variables are required and can be tweaked if desired,
 # although most users should leave them alone.  Note:  rsync already
-# uses --archive, --delete, and --exclude in the main sbopkg script so
-# there is no need to add those flags here.  Similarly, wget already
-# uses the -O options so there is no need to add that either.  In
-# general, it is not recommended that users change these default
-# values.
+# uses --archive, --delete, --no-owner, and --exclude in the main
+# sbopkg script so there is no need to add those flags here.
+# Similarly, wget already uses the -O options so there is no need to
+# add that either.  In general, it is not recommended that users
+# change these default values.
 RSYNCFLAGS="--verbose --timeout=10"
 WGETFLAGS="--continue --progress=bar --timeout=10 --tries=5"
 

src/usr/bin/sbopkg

@@ -31,8 +31,8 @@
 #  Hanson, Antoine, ktabic, Ken Roberts, samac, Bert Babington, Murat
 #  D. Kadirov, The-spiki, David Somero, LukenShiro, Drew Ames, nille,
 #  acidchild, mancha, macavity, Zordrak, Joao Felipe Santos,
-#  cotterochan, and necropresto.  This script would not be where it is
-#  without the help of these folks.  Thank you!
+#  cotterochan, necropresto, and Pierre Cazenave.  This script would
+#  not be where it is without the help of these folks.  Thank you!
 #set -x
 
 # Variables
@@ -457,7 +457,8 @@ while [ 0 ]; do
 --menu "You are currently using sbopkg to browse a local copy of SBo \
 for Slackware version $SLACKVER.  If you would like to change \
 it, please select another version below or press <Back> to \
-go back." 15 50 3 \
+go back." 15 50 4 \
+"12.2" "Slackware version 12.2" \
 "12.1" "Slackware version 12.1" \
 "12.0" "Slackware version 12.0" \
 "11.0" "Slackware version 11.0" 2>$TMP/sbopkg_version_selection
@@ -497,8 +498,8 @@ RBUILD=$(egrep -m1 "^BUILD" $LOCALREPO/$SLACKVER/$CATEGORY/$APP/$APP.SlackBuild
 U="README"
 while [ 0 ]; do
 PKGOUTPUT=${OUTPUT:-/tmp}
-if $(echo $(ls -lt $PKGOUTPUT) | grep -E -q "$APP.*$RVERSION"); then
-    IPACKAGE="$(basename $(ls -1t $PKGOUTPUT/${APP}*tgz | head -n 1))"
+if $(echo $(ls -1 $PKGOUTPUT) | grep -E -q "$APP.*$RVERSION"); then
+    IPACKAGE="$(basename $(ls -1 $PKGOUTPUT/${APP}*${RVERSION}*tgz | head -n 1))"
 else
     IPACKAGE=""
 fi
@@ -507,7 +508,7 @@ if [ "$IPACKAGE" = "" ]; then
 else
     JPACKAGE="Install $IPACKAGE"
 fi
-KPACKAGE="$(basename $(ls -1t /var/log/packages/* | grep -hZm1 $APP))"
+KPACKAGE="$(basename $(ls -1 /var/log/packages/* | grep -hZm1 $APP.*$RVERSION))"
 if [ "$KPACKAGE" = "" ]; then
     LPACKAGE="$APP (Not Installed)"
 else
@@ -770,8 +771,8 @@ rsync_command () {
 # This function holds the rsync command.
 # We do not use -z as this causes heavy CPU load on the server
 # and has very limited effect when most of the pull is .gz files.
-/usr/bin/rsync --archive --delete --exclude="*.sbopkg" $RSYNCFLAGS \
-$RSYNCMIRROR/$SLACKVER/ $LOCALREPO/$SLACKVER/
+/usr/bin/rsync --archive --delete --no-owner --exclude="*.sbopkg" \
+$RSYNCFLAGS $RSYNCMIRROR/$SLACKVER/ $LOCALREPO/$SLACKVER/
 RSYNC_RETVAL=$?
 rm -rf $TMP/sbopkg_rsync.lck
 if [ ! $RSYNC_RETVAL = 0 ]; then
@@ -1434,7 +1435,7 @@ if found,"
             echo "               display package information."
             echo "  -v version   Set the Slackware version for the"
             echo "               mirror (current choices are 11.0, 12.0, \
-and 12.1)"
+12.1, and 12.2)"
             echo
             echo "Note: multiple arguments to -b, -q, and -s must be \
 quoted (\"pkg1 pkg2\")"

src/usr/doc/TODO

@@ -12,6 +12,7 @@ Sbopkg TODO (in no particular order)
   have rsync blocked.
 * Add ability to install packages from the command line using a -i
   switch.
+* Add a build queue.
 * Add 'long' switches to the cli options, i.e. --build in addition to
   the current -b switch.
 * Add in ability to edit the *.info file so folks can quickly change

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

@@ -28,7 +28,7 @@ The default value of RSYNCMIRROR is: slackbuilds.org::slackbuilds.
 This option allows the user to set the default Slackware version in
 order to rsync with the matching SBo repository.
 
-The default value of SLACKVER is: 12.1.
+The default value of SLACKVER is: 12.2.
 
 .TP 5
 .B LOCALREPO
@@ -87,8 +87,9 @@ This option allows the user to manually tweak the rsync flags
 (options) that are used by sbopkg.  Users are cautioned against making
 any changes to the default values since new flags may or may not work.
 Note:  the rsync command in sbopkg already uses the --archive,
---delete, and --exclude flags, so there is no need to add them to the
-RSYNCFLAGS option.  Changing these default options is not recommended.
+--delete, --no-owner, and --exclude flags, so there is no need to add
+them to the RSYNCFLAGS option.  Changing these default options is not
+recommended.
 
 The default value of RSYNCFLAGS is: "--timeout=10 --verbose".
 

src/usr/man/man8/sbopkg.8

@@ -121,7 +121,7 @@ will search for foo and then bar.
 .TP 5
 .B -v VERSION
 Set the Slackware version to use for the matching local SBo mirror.
-Current options are 11.0, 12.0, and 12.1.
+Current options are 11.0, 12.0, 12.1, and 12.2.
 
 .SH FILES
 .B /etc/sbopkg/sbopkg.conf