CVS commit: pkgsrc/sysutils/bacula

["John Nemeth" <jnemeth%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Fri Oct  8 07:28:36 UTC 2021

Modified Files:
        pkgsrc/sysutils/bacula: Makefile
        pkgsrc/sysutils/bacula/files: chio-changer

Log Message:
update bacula to 9.6.7nb5:

adjust chio-changer script:
- subtract 1 from slot provided by bacula as bacula starts counting
  from 1 and chio(4) starts counting from 0
- adjust list output to what bacula expects when barcodes aren't
  present


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/sysutils/bacula/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/bacula/files/chio-changer

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/bacula/Makefile
diff -u pkgsrc/sysutils/bacula/Makefile:1.92 pkgsrc/sysutils/bacula/Makefile:1.93
--- pkgsrc/sysutils/bacula/Makefile:1.92        Wed Jun 23 20:33:16 2021
+++ pkgsrc/sysutils/bacula/Makefile     Fri Oct  8 07:28:36 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2021/06/23 20:33:16 nia Exp $
+# $NetBSD: Makefile,v 1.93 2021/10/08 07:28:36 jnemeth Exp $
 
 CONFLICTS+=            bacula-client-[0-9]* bacula-clientonly-[0-9]* bareos-[0-9]* bareos-clientonly-[0-9]*
 
-PKGREVISION=   4
+PKGREVISION=   5
 
 .include "options.mk"
 

Index: pkgsrc/sysutils/bacula/files/chio-changer
diff -u pkgsrc/sysutils/bacula/files/chio-changer:1.2 pkgsrc/sysutils/bacula/files/chio-changer:1.3
--- pkgsrc/sysutils/bacula/files/chio-changer:1.2       Tue Mar  9 07:06:00 2010
+++ pkgsrc/sysutils/bacula/files/chio-changer   Fri Oct  8 07:28:36 2021
@@ -60,6 +60,8 @@ slot=$3
 device=$4
 drive=$5
 
+slot=$((${slot} - 1))
+
 case $cmd in 
    unload)
       ${CHIO} -f $ctl move drive $drive slot $slot
@@ -70,9 +72,9 @@ case $cmd in 
       ;;
 
    list) 
-      ${CHIO} -f $ctl status slot voltags | /usr/bin/awk "/</ { slot=\$2 }\
-               /Primary volume tag:/ { tag=\$4 }\
-               /From:/ { print slot tag }"
+      ${CHIO} -f $ctl status slot voltags | /usr/bin/awk "/</ { slot=\$2; gsub(\":$\", \"\", slot); slot++ }\
+               /Primary volume tag: [^ ] / { tag=\$4 }\
+               /From:/ { printf \"%s:%s\n\", slot, tag }"
       ;;
 
    listall)