From: Bdale Garbee Date: Thu, 29 Jun 2006 03:57:44 +0000 (-0400) Subject: Imported Debian patch 1.2.17rel-1 X-Git-Tag: debian/1.2.17rel-1^0 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d6f537040e8071dc5bf97487067384c2439b84b9;p=debian%2Fmtx Imported Debian patch 1.2.17rel-1 --- diff --git a/CHANGES b/CHANGES index 8c055fd..145ca0c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +CHANGES, mtx 1.2.17: +- copy_barcode was off by one. +- Replace garbled chars with \0 in case barcodes full of BS. Barcode + changes courtesy of dirkx at covalent dot net. Set __WEIRD_CHAR_SUPPRESS + to activate this code (it is not activated by default in -current.) + CHANGES, mtx 1.2.16: - Fix a very special case that ADIC loaders presented to element status parser diff --git a/Makefile.in b/Makefile.in index 5eae01e..8012cbd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,7 +9,7 @@ # GNU Autoconf. # Version # for 'make dist'... -VERSION=1.2.16rel +VERSION=1.2.17rel BINS = mtx tapeinfo loaderinfo scsitape TARGET = @TARGET@ diff --git a/debian/changelog b/debian/changelog index e135e0e..92cd20d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mtx (1.2.17rel-1) unstable; urgency=low + + * new upstream version + + -- Bdale Garbee Wed, 28 Jun 2006 23:57:44 -0400 + mtx (1.2.16rel-5) unstable; urgency=low * add build-deps needed for GNU/kFreeBSD, closes: #367467 diff --git a/debian/control b/debian/control index 94138da..e4d16f6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: extra Maintainer: Bdale Garbee Build-Depends: debhelper (>= 5), libcam-dev [kfreebsd-i386 kfreebsd-amd64] -Standards-Version: 3.7.2.0 +Standards-Version: 3.7.2.1 Package: mtx Architecture: any diff --git a/debian/copyright b/debian/copyright index 68d5153..787ef08 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ mtx was downloaded from http://mtx.sourceforge.net/ Copyright: Copyright 1997, 1998 Leonard Zubkoff - Changes copyright 2000 Eric Green + Changes copyright 2000, 2001 Eric Green GPL, version 2 diff --git a/debian/rules b/debian/rules index 6ea375a..e729905 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,7 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 configure: configure-stamp configure-stamp: @@ -47,7 +46,7 @@ binary-arch: build install dh_installexamples contrib/* dh_installmenu dh_installcron - dh_installman +# dh_installman dh_installinfo dh_installchangelogs CHANGES dh_link diff --git a/mtx.spec b/mtx.spec index e2dbb85..7327935 100644 --- a/mtx.spec +++ b/mtx.spec @@ -1,10 +1,10 @@ Name: mtx -Version: 1.2.16rel +Version: 1.2.17rel Release: 1 Summary: SCSI media changer control program Copyright: Redistributable Group: Utilities/System -Source0: http://prdownloads.sourceforge.net/mtx/%{name}-%{version}.tar.gz +Source0: ftp://ftp.badtux.org/pub/storage/mtx/%{name}-%{version}.tar.gz Url: http://%{name}.sourceforge.net BuildRoot: /var/tmp/%{name}-%{version} diff --git a/mtx.spec.in b/mtx.spec.in index 2f38e76..4e2c191 100644 --- a/mtx.spec.in +++ b/mtx.spec.in @@ -4,7 +4,7 @@ Release: 1 Summary: SCSI media changer control program Copyright: Redistributable Group: Utilities/System -Source0: http://prdownloads.sourceforge.net/mtx/%{name}-%{version}.tar.gz +Source0: ftp://ftp.badtux.org/pub/storage/mtx/%{name}-%{version}.tar.gz Url: http://%{name}.sourceforge.net BuildRoot: /var/tmp/%{name}-%{version} diff --git a/mtxl.c b/mtxl.c index f2350a4..c92c348 100644 --- a/mtxl.c +++ b/mtxl.c @@ -2,8 +2,8 @@ Copyright 1997-1998 by Leonard N. Zubkoff -$Date: 2002/02/05 16:51:11 $ -$Revision: 1.8.2.3 $ +$Date: 2002/09/27 17:23:28 $ +$Revision: 1.8.2.7 $ This file created Feb 2000 by Eric Lee Green from pieces extracted from mtx.c, plus some additional routines. @@ -439,9 +439,14 @@ void copy_barcode(unsigned char *src, unsigned char *dest) { int i; for (i=0; i < 36; i++) { - *dest++ = *src++; + *dest=*src++; +#ifdef __WEIRD_CHAR_SUPPRESS + if ((*dest < 32) || (*dest > 127)) + *dest = '\0'; +#endif + dest++; } - *dest=0; /* null-terminate, sigh. */ + dest=0; /* null-terminate, sigh. */ } @@ -1216,8 +1221,20 @@ void PrintRequestSense(RequestSense_T *RequestSense) #endif -/* $Date: 2002/02/05 16:51:11 $ +/* $Date: 2002/09/27 17:23:28 $ * $Log: mtxl.c,v $ + * Revision 1.8.2.7 2002/09/27 17:23:28 elgreen + * Don't dereference pointer in barcode stuff + * + * Revision 1.8.2.6 2002/09/27 17:20:18 elgreen + * doh, get rid of the + from the patch process! + * + * Revision 1.8.2.5 2002/09/27 17:17:13 elgreen + * fix copy_barcode + * + * Revision 1.8.2.4 2002/09/27 16:49:43 elgreen + * copy_barcode was off by one (sigh!) + * * Revision 1.8.2.3 2002/02/05 16:51:11 elgreen * mtx 1.2.16pre3 *