diff options
| author | bouyer <bouyer@pkgsrc.org> | 2002-05-06 13:16:57 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2002-05-06 13:16:57 +0000 |
| commit | aef124aa9a407411f4cb32c7f35b29a0d53d87ad (patch) | |
| tree | 82067ffd7b129e9a65afb04eb8a60a855ce5024b | |
| parent | 77fd55db136104f393d704067579acd8f1c57625 (diff) | |
| download | pkgsrc-aef124aa9a407411f4cb32c7f35b29a0d53d87ad.tar.gz | |
Remplace my patch for barcode reader with a fix from Thomas Hepper
(amanda developer).
| -rw-r--r-- | sysutils/amanda-dev-server/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/amanda-dev-server/patches/patch-bf | 60 |
2 files changed, 41 insertions, 23 deletions
diff --git a/sysutils/amanda-dev-server/distinfo b/sysutils/amanda-dev-server/distinfo index 7b07d9d6a93..623f051dc94 100644 --- a/sysutils/amanda-dev-server/distinfo +++ b/sysutils/amanda-dev-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +$NetBSD: distinfo,v 1.2 2002/05/06 13:16:57 bouyer Exp $ SHA1 (amanda-2.4.3b3.tar.gz) = 7028e5f060ee159d05c35635e79c5fd4701f08ee Size (amanda-2.4.3b3.tar.gz) = 1167303 bytes @@ -20,4 +20,4 @@ SHA1 (patch-bb) = c8c91b848e669f2ccd3a753cfa7aba64e47d2166 SHA1 (patch-bc) = 640144ef583cb5871e893485f67bd0943ea020c7 SHA1 (patch-bd) = 8b9277a48329993408e69ccd8e0ee9ed6b4bfc64 SHA1 (patch-be) = f9c292d3b219f8125e82439fea3feefaa9682572 -SHA1 (patch-bf) = 51587f339049d8195f0b67c0c350e8795490d7a0 +SHA1 (patch-bf) = ac5545f3677f7d48cd7a2ff35501d65618eafae0 diff --git a/sysutils/amanda-dev-server/patches/patch-bf b/sysutils/amanda-dev-server/patches/patch-bf index 2c0ebe063f6..2bf61634222 100644 --- a/sysutils/amanda-dev-server/patches/patch-bf +++ b/sysutils/amanda-dev-server/patches/patch-bf @@ -1,23 +1,41 @@ -$NetBSD: patch-bf,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ +$NetBSD: patch-bf,v 1.2 2002/05/06 13:16:58 bouyer Exp $ ---- changer-src/scsi-changer-driver.c.orig Sun Feb 10 13:49:51 2002 -+++ changer-src/scsi-changer-driver.c Tue Apr 30 20:02:06 2002 -@@ -331,6 +331,18 @@ - GenericBarCode, - GenericSearch, - GenericSenseHandler}, -+ {"LXB", -+ "Overland LXB", -+ GenericMove, -+ GenericElementStatus, -+ GenericResetStatus, -+ GenericFree, -+ GenericEject, -+ GenericClean, -+ GenericRewind, -+ GenericBarCode, -+ GenericSearch, -+ GenericSenseHandler}, - /* - * And now the tape devices +--- changer-src/chg-scsi.c.orig 24 Mar 2002 19:04:12 -0000 ++++ changer-src/chg-scsi.c 3 May 2002 16:15:24 -0000 +@@ -1037,6 +1037,7 @@ + char *clean_file=NULL; + char *time_file=NULL; + ++ char *ptr; /* a public pointer .... */ + /* + * For the emubarcode stuff */ +@@ -1065,6 +1066,7 @@ + chg.device = NULL; + chg.labelfile = NULL; + chg.conf = NULL; ++ chg.debuglevel = NULL; + #ifdef CHG_SCSI_STANDALONE + printf("Ups standalone\n"); + #else +@@ -1085,6 +1087,11 @@ + memset(pDev, 0, sizeof(OpenFiles_T) * CHG_MAXDEV ); + + ++ if ((ptr=getenv("CHG_DEBUG")) != NULL) ++ { ++ chg.debuglevel = strdup(ptr); ++ } ++ + switch(com.command_code) + { + case COM_SCAN: +@@ -1588,7 +1595,7 @@ + + printf("%d %d 1", loaded, use_slots); + +- if (BarCode(fd) == 1 || emubarcode == 1) ++ if (BarCode(fd) == 1 || emubarcode == 1 || chg.havebarcode == 1) + { + printf(" 1\n"); + } else { |