(filesystems/ltfs-ltotape) Add patches for icu-6.8

  pushd  /export/CHROOT/tmp/filesystems/ltfs-ltotape/work/ltfs-backends-0.2/
  foreach i (`egrep -lr 'TRUE|FALSE' .`)\nmv $i $i.orig ; sed -e 's/FALSE/false/g' -e 's/TRUE/true/g' $i.orig > $i\nend
  popd
  mkpatches

10 files changed, 890 insertions, 7 deletions

diff --git a/filesystems/ltfs-ltotape/distinfo b/filesystems/ltfs-ltotape/distinfo
index d44508b640d..8ceceab8fe6 100644
--- a/filesystems/ltfs-ltotape/distinfo
+++ b/filesystems/ltfs-ltotape/distinfo
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.2 2019/03/16 00:44:22 manu Exp $
+$NetBSD: distinfo,v 1.3 2020/12/26 05:23:12 mef Exp $
 
 SHA1 (ltfs-backends/v0.2.tar.gz) = b91bd72a39f7e4ef13f353a91ad9a2ed8d32b0bc
 RMD160 (ltfs-backends/v0.2.tar.gz) = 905f30d738991484c29d672a4c29d896815670a2
 SHA512 (ltfs-backends/v0.2.tar.gz) = 2c4966ac5902a22bd282e0b73540289e09cf919d420af70a1c5d7e34190cd80bc4dccbaf03239bf727e18420984b5a644cb3d17c8b1c68a384b27bc59efe320f
 Size (ltfs-backends/v0.2.tar.gz) = 129136 bytes
-SHA1 (patch-Makefile.am) = a0e6ab0fa0b247dc42c9a8a08c0007db9049d52f
+SHA1 (patch-Makefile.am) = 6a5de78c0972d84b85c28b27534f71fbe61a3b2f
+SHA1 (patch-src_tape__drivers_linux_ltotape_ltotape.c) = 9aa69bdc423e02b084d9fd116612d15ab60ac9ab
+SHA1 (patch-src_tape__drivers_linux_ltotape_ltotape__diag.c) = 20b00a01d300c7554ed6451e2532ef96d4b629fe
+SHA1 (patch-src_tape__drivers_linux_ltotape_ltotape__platform.c) = 6e6f145a80ec620daaa0fad792707c444df3686e
+SHA1 (patch-src_tape__drivers_netbsd_ltotape_ltotape.c) = cdcf62fe3fd5a5855de3eb4bd010baf155c970d0
+SHA1 (patch-src_tape__drivers_netbsd_ltotape_ltotape__diag.c) = f6b9aa3a44c33be340b5f2af72941c63652f5a16
+SHA1 (patch-src_tape__drivers_netbsd_ltotape_ltotape__platform.c) = be3a3ca494b1d2098ce9bf8f0979e4db8a95dc33
+SHA1 (patch-src_tape__drivers_osx_ltotape_ltotape.c) = 0625789b1e0c49ff9bcdb1929ed823fb479bd477
+SHA1 (patch-src_tape__drivers_osx_ltotape_ltotape__diag.c) = 19dd11a2fa59c6b9ef5d0b4515e5f140484f91ba
diff --git a/filesystems/ltfs-ltotape/patches/patch-Makefile.am b/filesystems/ltfs-ltotape/patches/patch-Makefile.am
index 87b51ef0411..817ed192604 100644
--- a/filesystems/ltfs-ltotape/patches/patch-Makefile.am
+++ b/filesystems/ltfs-ltotape/patches/patch-Makefile.am
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.am,v 1.2 2019/03/16 00:44:22 manu Exp $
+$NetBSD: patch-Makefile.am,v 1.3 2020/12/26 05:23:12 mef Exp $
 
 Make sure config.h is not copied at install time, we do not need it.
 
---- Makefile.am.orig	2019-03-15 05:24:46.000000000 +0100
-+++ Makefile.am	2019-03-15 09:59:08.473037879 +0100
-@@ -1,7 +1,7 @@
+--- Makefile.am.orig	2019-03-15 04:24:46.000000000 +0000
++++ Makefile.am
+@@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
 -nobase_pkginclude_HEADERS = config.h
@@ -12,4 +12,3 @@ Make sure config.h is not copied at install time, we do not need it.
  
  GEN_DRV =
  PLAT_DRV =
- 
diff --git a/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_linux_ltotape_ltotape.c b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_linux_ltotape_ltotape.c
new file mode 100644
index 00000000000..2c1d0defc50
--- /dev/null
+++ b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_linux_ltotape_ltotape.c
@@ -0,0 +1,180 @@
+$NetBSD: patch-src_tape__drivers_linux_ltotape_ltotape.c,v 1.1 2020/12/26 05:23:12 mef Exp $
+
+ICU_6.8 adaptation
+
+--- src/tape_drivers/linux/ltotape/ltotape.c.orig	2019-03-15 04:24:46.000000000 +0000
++++ src/tape_drivers/linux/ltotape/ltotape.c
+@@ -538,11 +538,11 @@ int ltotape_read (void *device, char *bu
+       break;
+     case -EFAULT:
+       ltfsmsg (LTFS_ERR, "20041E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EIO:
+       ltfsmsg (LTFS_ERR, "20042E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ENOMEM:
+       ltfsmsg (LTFS_ERR, "20043E", "read");
+@@ -552,20 +552,20 @@ int ltotape_read (void *device, char *bu
+       break;
+     case -EPERM:
+       ltfsmsg (LTFS_ERR, "20045E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ETIMEDOUT:
+       ltfsmsg (LTFS_ERR, "20046E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+       // read specific errors
+     case -EINVAL:
+       ltfsmsg (LTFS_ERR, "20047E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EAGAIN:
+       ltfsmsg (LTFS_ERR, "20055E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     default:
+       ltfsmsg (LTFS_ERR, "20054E", "read", -rc);
+@@ -604,15 +604,15 @@ int ltotape_write (void *device, const c
+       // General errors
+     case -EBUSY:
+       ltfsmsg (LTFS_ERR, "20040E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EFAULT:
+       ltfsmsg (LTFS_ERR, "20041E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EIO:
+       ltfsmsg (LTFS_ERR, "20042E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ENOMEM:
+       ltfsmsg (LTFS_ERR, "20043E", "write");
+@@ -625,12 +625,12 @@ int ltotape_write (void *device, const c
+       break;
+     case -ETIMEDOUT:
+       ltfsmsg (LTFS_ERR, "20046E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+       // write specific errors
+     case -EINVAL:
+       ltfsmsg (LTFS_ERR, "20047E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ENOSPC:
+       ltfsmsg (LTFS_WARN, "20048W", "write");
+@@ -840,7 +840,7 @@ int ltotape_locate (void *device, struct
+ 
+     } else {
+       ltfsmsg (LTFS_ERR, "20064E", status);
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+     }
+   }
+ 
+@@ -1048,7 +1048,7 @@ int ltotape_load (void *device, struct t
+     return read_pos_status;
+ #endif   
+ 
+-   status = ltotape_loadunload (device, TRUE, FALSE);  /* TRUE to load, FALSE to load fully (not hold)*/
++   status = ltotape_loadunload (device, true, false);  /* true to load, false to load fully (not hold)*/
+ 
+   ltotape_readposition (device, pos);
+ 
+@@ -1104,7 +1104,7 @@ int ltotape_load (void *device, struct t
+  */
+ int ltotape_unload(void *device, struct tc_position *pos)
+ {
+-   int status = ltotape_loadunload (device, FALSE, FALSE);   /* FALSE to unload, FALSE to unload fully (not hold)*/
++   int status = ltotape_loadunload (device, false, false);   /* false to unload, false to unload fully (not hold)*/
+    
+    ltotape_readposition (device, pos);
+    return status;
+@@ -1120,8 +1120,8 @@ int ltotape_unload(void *device, struct 
+ *  is wise or will succeed is beyond our control here.
+ * @param device a pointer to the ltotape backend
+ * @param pos a pointer to position data. This function will update position infomation.
+-* @param load TRUE if load is required, FALSE if unload
+-* @param hold TRUE if cart should be left in hold position, FALSE if full load/unload
++* @param load true if load is required, false if unload
++* @param hold true if cart should be left in hold position, false if full load/unload
+ * @return 0 on success or a negative value on error
+ */
+ int ltotape_ext_loadunload (void *device, struct tc_position *pos, bool load, bool hold)
+@@ -1243,7 +1243,7 @@ int ltotape_readposition (void *device, 
+ 
+     } else {
+       ltfsmsg (LTFS_ERR, "20066E", status);
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+     }
+   }
+ 
+@@ -1348,7 +1348,7 @@ int ltotape_format (void *device, TC_FOR
+   /* If it failed, take a log snapshot: */
+   if (status == -1) {
+     ltfsmsg (LTFS_ERR, "20068E", status);
+-    ltotape_log_snapshot (device, FALSE);
++    ltotape_log_snapshot (device, false);
+ 
+   /* But if it passed, set some CM attributes: */
+   } else {
+@@ -1531,7 +1531,7 @@ int ltotape_modesense (void *device, con
+ 
+   if (status == -1) {
+     ltfsmsg (LTFS_ERR, "20072E", status);
+-    ltotape_log_snapshot (device, FALSE);
++    ltotape_log_snapshot (device, false);
+   }
+ 
+   return status;
+@@ -1607,7 +1607,7 @@ int ltotape_modeselect (void *device, un
+ 
+   if (status == -1) {
+     ltfsmsg (LTFS_ERR, "20073E", status);
+-    ltotape_log_snapshot (device, FALSE);
++    ltotape_log_snapshot (device, false);
+   }
+ 
+   return status;
+@@ -1745,7 +1745,7 @@ int ltotape_allow_medium_removal (void *
+   int status;
+   status = ltotape_prevent_allow_medium_removal (device, 0); /* 0 = ALLOW */
+ 
+-  ltotape_log_snapshot (device, TRUE); /* sneak in to grab a log snapshot */
++  ltotape_log_snapshot (device, true); /* sneak in to grab a log snapshot */
+ 
+   return status;
+ }
+@@ -1916,7 +1916,7 @@ int ltotape_write_attribute (void *devic
+ 
+   if (status == -1) {
+      ltfsmsg(LTFS_ERR, "20075E", status);
+-     ltotape_log_snapshot (device, FALSE);
++     ltotape_log_snapshot (device, false);
+   }
+ 
+   free (pRawData);
+@@ -3175,7 +3175,7 @@ int ltotape_get_keyalias (void *device, 
+ int ltotape_takedump_drive (void *device)
+ {
+   // CR10859 - this was stubbed out before...
+-  return ltotape_log_snapshot (device, FALSE); // FALSE = not a minidump
++  return ltotape_log_snapshot (device, false); // false = not a minidump
+ }
+ 
+ bool ltotape_is_mountable (void *device, const char *barcode, const unsigned char density_code)
diff --git a/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_linux_ltotape_ltotape__diag.c b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_linux_ltotape_ltotape__diag.c
new file mode 100644
index 00000000000..f291fca8fb3
--- /dev/null
+++ b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_linux_ltotape_ltotape__diag.c
@@ -0,0 +1,86 @@
+$NetBSD: patch-src_tape__drivers_linux_ltotape_ltotape__diag.c,v 1.1 2020/12/26 05:23:12 mef Exp $
+
+ICU_6.8 adaptation
+
+--- src/tape_drivers/linux/ltotape/ltotape_diag.c.orig	2019-03-15 04:24:46.000000000 +0000
++++ src/tape_drivers/linux/ltotape/ltotape_diag.c
+@@ -137,7 +137,7 @@ char* ltotape_set_snapshotdir (char* new
+ /****************************************************************************
+  * Request, retrieve and store a drive log snapshot
+  * @param device a pointer to the ltotape backend tape device
+- * @param minidump TRUE, to generate mini dump or FALSE, to generate full dump
++ * @param minidump true, to generate mini dump or false, to generate full dump
+  * @return 0 on success or negative value on error
+  */
+ int ltotape_log_snapshot (void *device, int minidump)
+@@ -380,7 +380,7 @@ static int ltotape_read_drivedump (void 
+ 	int buf_id;
+ 	unsigned char cap_buf[DUMP_HEADER_SIZE];
+ 	unsigned char *dump_buf;
+-	bool updated_header = FALSE;
++	bool updated_header = false;
+ 	time_t               now;
+ 	int                  j;
+ 
+@@ -454,7 +454,7 @@ static int ltotape_read_drivedump (void 
+ 		}
+ 
+ 		/* Update the header */
+-		if (updated_header == FALSE) {
++		if (updated_header == false) {
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET   ] = 0x00;
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET+1 ] = 0x02; /* type2=UTC */
+ 
+@@ -471,7 +471,7 @@ static int ltotape_read_drivedump (void 
+ 			for (j = 0; j < LTOTAPE_LIBSN_LENGTH; j++) {
+ 				dump_buf [ LTOTAPE_LIBSN_OFFSET+j ] = (unsigned char) *(lsn+j);
+ 			}
+-			updated_header = TRUE;
++			updated_header = true;
+ 		}
+ 
+ 		/* write buffer data into dump file */
+@@ -523,14 +523,14 @@ static long long ltotape_get_buffer_size
+   size = -1;
+   buf_offset = 32;
+   bytes_processed = 0;
+-  not_found = TRUE;
++  not_found = true;
+ 
+   data_length = (((int)buffer[30]) << 8) + (int)buffer[31];
+ 
+   while (not_found && (bytes_processed < data_length)) {
+ 
+     if (buff_id == buffer[buf_offset]) {
+-      not_found = FALSE;
++      not_found = false;
+       size = (((long long)buffer[buf_offset + 4]) << 24) + 
+              (((long long)buffer[buf_offset + 5]) << 16) + 
+              (((long long)buffer[buf_offset + 6]) <<  8) + 
+@@ -561,7 +561,7 @@ static int ltotape_read_mini_drivedump (
+ 	int buf_id;
+ 	unsigned char cap_buf[MINI_DUMP_HEADER_SIZE];
+ 	unsigned char *dump_buf;
+-	bool updated_header = FALSE;
++	bool updated_header = false;
+ 	time_t               now;
+ 	int                  j;
+ 
+@@ -640,7 +640,7 @@ static int ltotape_read_mini_drivedump (
+ 		}
+ 
+ 		/* Update the header */
+-		if (updated_header == FALSE) {
++		if (updated_header == false) {
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET   ] = 0x00;
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET+1 ] = 0x02; /* type2=UTC */
+ 
+@@ -657,7 +657,7 @@ static int ltotape_read_mini_drivedump (
+ 			for (j = 0; j < LTOTAPE_LIBSN_LENGTH; j++) {
+ 				dump_buf [ LTOTAPE_LIBSN_OFFSET+j ] = (unsigned char) *(lsn+j);
+ 			}
+-			updated_header = TRUE;
++			updated_header = true;
+ 		}
+ 
+ 		/* write buffer data into dump file */
diff --git a/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_linux_ltotape_ltotape__platform.c b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_linux_ltotape_ltotape__platform.c
new file mode 100644
index 00000000000..4d44733d8ad
--- /dev/null
+++ b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_linux_ltotape_ltotape__platform.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_tape__drivers_linux_ltotape_ltotape__platform.c,v 1.1 2020/12/26 05:23:12 mef Exp $
+
+ICU_6.8 adaptation
+
+--- src/tape_drivers/linux/ltotape/ltotape_platform.c.orig	2019-03-15 04:24:46.000000000 +0000
++++ src/tape_drivers/linux/ltotape/ltotape_platform.c
+@@ -292,8 +292,8 @@ int ltotape_scsiexec (ltotape_scsi_io_ty
+  */
+ int ltotape_map_st2sg (const char *devname, char *sgdevname)
+ {
+-  bool  found = FALSE;
+-  bool  allocated = FALSE;
++  bool  found = false;
++  bool  allocated = false;
+   int   fd = 0;
+   int   outcome = 0;
+   int   i = 0;
+@@ -357,7 +357,7 @@ int ltotape_map_st2sg (const char *devna
+ 
+     strncat (nstdevname, "/dev/nst", strlen ("/dev/nst"));
+     strncat (nstdevname, temp, strlen (temp));
+-    allocated = TRUE;
++    allocated = true;
+ 
+     ltfsmsg (LTFS_DEBUG, "20101D", devname, nstdevname);
+ 
+@@ -410,10 +410,10 @@ int ltotape_map_st2sg (const char *devna
+       dev_lun     = (devinfo.four_in_one >> 8) & 0xFF;
+       dev_channel = (devinfo.four_in_one >> 16) & 0xFF;
+       dev_host_no = (devinfo.four_in_one >> 24) & 0xFF;
+-      found = FALSE;
++      found = false;
+       while (fscanf (fp, "%d %d %d %d %d %*d %*d %*d %*d", &sg_hba, &sg_chan, &sg_addr, &sg_lun, &sg_devtype) == 5) {
+         if ((sg_hba == dev_host_no) && (sg_chan == dev_channel) && (sg_addr == dev_scsi_id) && (sg_lun == dev_lun)) {
+-          found = TRUE;
++          found = true;
+           break;
+         } else {
+           i++;
diff --git a/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_netbsd_ltotape_ltotape.c b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_netbsd_ltotape_ltotape.c
new file mode 100644
index 00000000000..01ad54b7946
--- /dev/null
+++ b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_netbsd_ltotape_ltotape.c
@@ -0,0 +1,180 @@
+$NetBSD: patch-src_tape__drivers_netbsd_ltotape_ltotape.c,v 1.1 2020/12/26 05:23:12 mef Exp $
+
+ICU_6.8 adaptation
+
+--- src/tape_drivers/netbsd/ltotape/ltotape.c.orig	2019-03-15 04:24:46.000000000 +0000
++++ src/tape_drivers/netbsd/ltotape/ltotape.c
+@@ -538,11 +538,11 @@ int ltotape_read (void *device, char *bu
+       break;
+     case -EFAULT:
+       ltfsmsg (LTFS_ERR, "20041E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EIO:
+       ltfsmsg (LTFS_ERR, "20042E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ENOMEM:
+       ltfsmsg (LTFS_ERR, "20043E", "read");
+@@ -552,20 +552,20 @@ int ltotape_read (void *device, char *bu
+       break;
+     case -EPERM:
+       ltfsmsg (LTFS_ERR, "20045E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ETIMEDOUT:
+       ltfsmsg (LTFS_ERR, "20046E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+       // read specific errors
+     case -EINVAL:
+       ltfsmsg (LTFS_ERR, "20047E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EAGAIN:
+       ltfsmsg (LTFS_ERR, "20055E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     default:
+       ltfsmsg (LTFS_ERR, "20054E", "read", -rc);
+@@ -604,15 +604,15 @@ int ltotape_write (void *device, const c
+       // General errors
+     case -EBUSY:
+       ltfsmsg (LTFS_ERR, "20040E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EFAULT:
+       ltfsmsg (LTFS_ERR, "20041E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EIO:
+       ltfsmsg (LTFS_ERR, "20042E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ENOMEM:
+       ltfsmsg (LTFS_ERR, "20043E", "write");
+@@ -625,12 +625,12 @@ int ltotape_write (void *device, const c
+       break;
+     case -ETIMEDOUT:
+       ltfsmsg (LTFS_ERR, "20046E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+       // write specific errors
+     case -EINVAL:
+       ltfsmsg (LTFS_ERR, "20047E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ENOSPC:
+       ltfsmsg (LTFS_WARN, "20048W", "write");
+@@ -840,7 +840,7 @@ int ltotape_locate (void *device, struct
+ 
+     } else {
+       ltfsmsg (LTFS_ERR, "20064E", status);
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+     }
+   }
+ 
+@@ -1048,7 +1048,7 @@ int ltotape_load (void *device, struct t
+     return read_pos_status;
+ #endif   
+ 
+-   status = ltotape_loadunload (device, TRUE, FALSE);  /* TRUE to load, FALSE to load fully (not hold)*/
++   status = ltotape_loadunload (device, true, false);  /* true to load, false to load fully (not hold)*/
+ 
+   ltotape_readposition (device, pos);
+ 
+@@ -1104,7 +1104,7 @@ int ltotape_load (void *device, struct t
+  */
+ int ltotape_unload(void *device, struct tc_position *pos)
+ {
+-   int status = ltotape_loadunload (device, FALSE, FALSE);   /* FALSE to unload, FALSE to unload fully (not hold)*/
++   int status = ltotape_loadunload (device, false, false);   /* false to unload, false to unload fully (not hold)*/
+    
+    ltotape_readposition (device, pos);
+    return status;
+@@ -1120,8 +1120,8 @@ int ltotape_unload(void *device, struct 
+ *  is wise or will succeed is beyond our control here.
+ * @param device a pointer to the ltotape backend
+ * @param pos a pointer to position data. This function will update position infomation.
+-* @param load TRUE if load is required, FALSE if unload
+-* @param hold TRUE if cart should be left in hold position, FALSE if full load/unload
++* @param load true if load is required, false if unload
++* @param hold true if cart should be left in hold position, false if full load/unload
+ * @return 0 on success or a negative value on error
+ */
+ int ltotape_ext_loadunload (void *device, struct tc_position *pos, bool load, bool hold)
+@@ -1243,7 +1243,7 @@ int ltotape_readposition (void *device, 
+ 
+     } else {
+       ltfsmsg (LTFS_ERR, "20066E", status);
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+     }
+   }
+ 
+@@ -1348,7 +1348,7 @@ int ltotape_format (void *device, TC_FOR
+   /* If it failed, take a log snapshot: */
+   if (status == -1) {
+     ltfsmsg (LTFS_ERR, "20068E", status);
+-    ltotape_log_snapshot (device, FALSE);
++    ltotape_log_snapshot (device, false);
+ 
+   /* But if it passed, set some CM attributes: */
+   } else {
+@@ -1531,7 +1531,7 @@ int ltotape_modesense (void *device, con
+ 
+   if (status == -1) {
+     ltfsmsg (LTFS_ERR, "20072E", status);
+-    ltotape_log_snapshot (device, FALSE);
++    ltotape_log_snapshot (device, false);
+   }
+ 
+   return status;
+@@ -1607,7 +1607,7 @@ int ltotape_modeselect (void *device, un
+ 
+   if (status == -1) {
+     ltfsmsg (LTFS_ERR, "20073E", status);
+-    ltotape_log_snapshot (device, FALSE);
++    ltotape_log_snapshot (device, false);
+   }
+ 
+   return status;
+@@ -1745,7 +1745,7 @@ int ltotape_allow_medium_removal (void *
+   int status;
+   status = ltotape_prevent_allow_medium_removal (device, 0); /* 0 = ALLOW */
+ 
+-  ltotape_log_snapshot (device, TRUE); /* sneak in to grab a log snapshot */
++  ltotape_log_snapshot (device, true); /* sneak in to grab a log snapshot */
+ 
+   return status;
+ }
+@@ -1916,7 +1916,7 @@ int ltotape_write_attribute (void *devic
+ 
+   if (status == -1) {
+      ltfsmsg(LTFS_ERR, "20075E", status);
+-     ltotape_log_snapshot (device, FALSE);
++     ltotape_log_snapshot (device, false);
+   }
+ 
+   free (pRawData);
+@@ -3175,7 +3175,7 @@ int ltotape_get_keyalias (void *device, 
+ int ltotape_takedump_drive (void *device)
+ {
+   // CR10859 - this was stubbed out before...
+-  return ltotape_log_snapshot (device, FALSE); // FALSE = not a minidump
++  return ltotape_log_snapshot (device, false); // false = not a minidump
+ }
+ 
+ bool ltotape_is_mountable (void *device, const char *barcode, const unsigned char density_code)
diff --git a/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_netbsd_ltotape_ltotape__diag.c b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_netbsd_ltotape_ltotape__diag.c
new file mode 100644
index 00000000000..3bcac820735
--- /dev/null
+++ b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_netbsd_ltotape_ltotape__diag.c
@@ -0,0 +1,86 @@
+$NetBSD: patch-src_tape__drivers_netbsd_ltotape_ltotape__diag.c,v 1.1 2020/12/26 05:23:12 mef Exp $
+
+ICU_6.8 adaptation
+
+--- src/tape_drivers/netbsd/ltotape/ltotape_diag.c.orig	2019-03-15 04:24:46.000000000 +0000
++++ src/tape_drivers/netbsd/ltotape/ltotape_diag.c
+@@ -137,7 +137,7 @@ char* ltotape_set_snapshotdir (char* new
+ /****************************************************************************
+  * Request, retrieve and store a drive log snapshot
+  * @param device a pointer to the ltotape backend tape device
+- * @param minidump TRUE, to generate mini dump or FALSE, to generate full dump
++ * @param minidump true, to generate mini dump or false, to generate full dump
+  * @return 0 on success or negative value on error
+  */
+ int ltotape_log_snapshot (void *device, int minidump)
+@@ -380,7 +380,7 @@ static int ltotape_read_drivedump (void 
+ 	int buf_id;
+ 	unsigned char cap_buf[DUMP_HEADER_SIZE];
+ 	unsigned char *dump_buf;
+-	bool updated_header = FALSE;
++	bool updated_header = false;
+ 	time_t               now;
+ 	int                  j;
+ 
+@@ -454,7 +454,7 @@ static int ltotape_read_drivedump (void 
+ 		}
+ 
+ 		/* Update the header */
+-		if (updated_header == FALSE) {
++		if (updated_header == false) {
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET   ] = 0x00;
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET+1 ] = 0x02; /* type2=UTC */
+ 
+@@ -471,7 +471,7 @@ static int ltotape_read_drivedump (void 
+ 			for (j = 0; j < LTOTAPE_LIBSN_LENGTH; j++) {
+ 				dump_buf [ LTOTAPE_LIBSN_OFFSET+j ] = (unsigned char) *(lsn+j);
+ 			}
+-			updated_header = TRUE;
++			updated_header = true;
+ 		}
+ 
+ 		/* write buffer data into dump file */
+@@ -523,14 +523,14 @@ static long long ltotape_get_buffer_size
+   size = -1;
+   buf_offset = 32;
+   bytes_processed = 0;
+-  not_found = TRUE;
++  not_found = true;
+ 
+   data_length = (((int)buffer[30]) << 8) + (int)buffer[31];
+ 
+   while (not_found && (bytes_processed < data_length)) {
+ 
+     if (buff_id == buffer[buf_offset]) {
+-      not_found = FALSE;
++      not_found = false;
+       size = (((long long)buffer[buf_offset + 4]) << 24) + 
+              (((long long)buffer[buf_offset + 5]) << 16) + 
+              (((long long)buffer[buf_offset + 6]) <<  8) + 
+@@ -561,7 +561,7 @@ static int ltotape_read_mini_drivedump (
+ 	int buf_id;
+ 	unsigned char cap_buf[MINI_DUMP_HEADER_SIZE];
+ 	unsigned char *dump_buf;
+-	bool updated_header = FALSE;
++	bool updated_header = false;
+ 	time_t               now;
+ 	int                  j;
+ 
+@@ -640,7 +640,7 @@ static int ltotape_read_mini_drivedump (
+ 		}
+ 
+ 		/* Update the header */
+-		if (updated_header == FALSE) {
++		if (updated_header == false) {
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET   ] = 0x00;
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET+1 ] = 0x02; /* type2=UTC */
+ 
+@@ -657,7 +657,7 @@ static int ltotape_read_mini_drivedump (
+ 			for (j = 0; j < LTOTAPE_LIBSN_LENGTH; j++) {
+ 				dump_buf [ LTOTAPE_LIBSN_OFFSET+j ] = (unsigned char) *(lsn+j);
+ 			}
+-			updated_header = TRUE;
++			updated_header = true;
+ 		}
+ 
+ 		/* write buffer data into dump file */
diff --git a/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_netbsd_ltotape_ltotape__platform.c b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_netbsd_ltotape_ltotape__platform.c
new file mode 100644
index 00000000000..ce15c4962c9
--- /dev/null
+++ b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_netbsd_ltotape_ltotape__platform.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_tape__drivers_netbsd_ltotape_ltotape__platform.c,v 1.1 2020/12/26 05:23:12 mef Exp $
+
+ICU_6.8 adaptation
+
+--- src/tape_drivers/netbsd/ltotape/ltotape_platform.c.orig	2019-03-15 04:24:46.000000000 +0000
++++ src/tape_drivers/netbsd/ltotape/ltotape_platform.c
+@@ -284,8 +284,8 @@ int ltotape_scsiexec (ltotape_scsi_io_ty
+  */
+ int ltotape_map_st2sg (const char *devname, char *sgdevname)
+ {
+-  bool  found = FALSE;
+-  bool  allocated = FALSE;
++  bool  found = false;
++  bool  allocated = false;
+   int   fd = 0;
+   int   outcome = 0;
+   int   i = 0;
+@@ -349,7 +349,7 @@ int ltotape_map_st2sg (const char *devna
+ 
+     strncat (nstdevname, "/dev/nst", strlen ("/dev/nst"));
+     strncat (nstdevname, temp, strlen (temp));
+-    allocated = TRUE;
++    allocated = true;
+ 
+     ltfsmsg (LTFS_DEBUG, "20101D", devname, nstdevname);
+ 
+@@ -402,10 +402,10 @@ int ltotape_map_st2sg (const char *devna
+       dev_lun     = (devinfo.four_in_one >> 8) & 0xFF;
+       dev_channel = (devinfo.four_in_one >> 16) & 0xFF;
+       dev_host_no = (devinfo.four_in_one >> 24) & 0xFF;
+-      found = FALSE;
++      found = false;
+       while (fscanf (fp, "%d %d %d %d %d %*d %*d %*d %*d", &sg_hba, &sg_chan, &sg_addr, &sg_lun, &sg_devtype) == 5) {
+         if ((sg_hba == dev_host_no) && (sg_chan == dev_channel) && (sg_addr == dev_scsi_id) && (sg_lun == dev_lun)) {
+-          found = TRUE;
++          found = true;
+           break;
+         } else {
+           i++;
diff --git a/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_osx_ltotape_ltotape.c b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_osx_ltotape_ltotape.c
new file mode 100644
index 00000000000..a76659bbee7
--- /dev/null
+++ b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_osx_ltotape_ltotape.c
@@ -0,0 +1,180 @@
+$NetBSD: patch-src_tape__drivers_osx_ltotape_ltotape.c,v 1.1 2020/12/26 05:23:12 mef Exp $
+
+ICU_6.8 adaptation
+
+--- src/tape_drivers/osx/ltotape/ltotape.c.orig	2019-03-15 04:24:46.000000000 +0000
++++ src/tape_drivers/osx/ltotape/ltotape.c
+@@ -538,11 +538,11 @@ int ltotape_read (void *device, char *bu
+       break;
+     case -EFAULT:
+       ltfsmsg (LTFS_ERR, "20041E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EIO:
+       ltfsmsg (LTFS_ERR, "20042E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ENOMEM:
+       ltfsmsg (LTFS_ERR, "20043E", "read");
+@@ -552,20 +552,20 @@ int ltotape_read (void *device, char *bu
+       break;
+     case -EPERM:
+       ltfsmsg (LTFS_ERR, "20045E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ETIMEDOUT:
+       ltfsmsg (LTFS_ERR, "20046E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+       // read specific errors
+     case -EINVAL:
+       ltfsmsg (LTFS_ERR, "20047E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EAGAIN:
+       ltfsmsg (LTFS_ERR, "20055E", "read");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     default:
+       ltfsmsg (LTFS_ERR, "20054E", "read", -rc);
+@@ -604,15 +604,15 @@ int ltotape_write (void *device, const c
+       // General errors
+     case -EBUSY:
+       ltfsmsg (LTFS_ERR, "20040E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EFAULT:
+       ltfsmsg (LTFS_ERR, "20041E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -EIO:
+       ltfsmsg (LTFS_ERR, "20042E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ENOMEM:
+       ltfsmsg (LTFS_ERR, "20043E", "write");
+@@ -625,12 +625,12 @@ int ltotape_write (void *device, const c
+       break;
+     case -ETIMEDOUT:
+       ltfsmsg (LTFS_ERR, "20046E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+       // write specific errors
+     case -EINVAL:
+       ltfsmsg (LTFS_ERR, "20047E", "write");
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+       break;
+     case -ENOSPC:
+       ltfsmsg (LTFS_WARN, "20048W", "write");
+@@ -840,7 +840,7 @@ int ltotape_locate (void *device, struct
+ 
+     } else {
+       ltfsmsg (LTFS_ERR, "20064E", status);
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+     }
+   }
+ 
+@@ -1048,7 +1048,7 @@ int ltotape_load (void *device, struct t
+     return read_pos_status;
+ #endif   
+ 
+-   status = ltotape_loadunload (device, TRUE, FALSE);  /* TRUE to load, FALSE to load fully (not hold)*/
++   status = ltotape_loadunload (device, true, false);  /* true to load, false to load fully (not hold)*/
+ 
+   ltotape_readposition (device, pos);
+ 
+@@ -1104,7 +1104,7 @@ int ltotape_load (void *device, struct t
+  */
+ int ltotape_unload(void *device, struct tc_position *pos)
+ {
+-   int status = ltotape_loadunload (device, FALSE, FALSE);   /* FALSE to unload, FALSE to unload fully (not hold)*/
++   int status = ltotape_loadunload (device, false, false);   /* false to unload, false to unload fully (not hold)*/
+    
+    ltotape_readposition (device, pos);
+    return status;
+@@ -1120,8 +1120,8 @@ int ltotape_unload(void *device, struct 
+ *  is wise or will succeed is beyond our control here.
+ * @param device a pointer to the ltotape backend
+ * @param pos a pointer to position data. This function will update position infomation.
+-* @param load TRUE if load is required, FALSE if unload
+-* @param hold TRUE if cart should be left in hold position, FALSE if full load/unload
++* @param load true if load is required, false if unload
++* @param hold true if cart should be left in hold position, false if full load/unload
+ * @return 0 on success or a negative value on error
+ */
+ int ltotape_ext_loadunload (void *device, struct tc_position *pos, bool load, bool hold)
+@@ -1243,7 +1243,7 @@ int ltotape_readposition (void *device, 
+ 
+     } else {
+       ltfsmsg (LTFS_ERR, "20066E", status);
+-      ltotape_log_snapshot (device, FALSE);
++      ltotape_log_snapshot (device, false);
+     }
+   }
+ 
+@@ -1348,7 +1348,7 @@ int ltotape_format (void *device, TC_FOR
+   /* If it failed, take a log snapshot: */
+   if (status == -1) {
+     ltfsmsg (LTFS_ERR, "20068E", status);
+-    ltotape_log_snapshot (device, FALSE);
++    ltotape_log_snapshot (device, false);
+ 
+   /* But if it passed, set some CM attributes: */
+   } else {
+@@ -1531,7 +1531,7 @@ int ltotape_modesense (void *device, con
+ 
+   if (status == -1) {
+     ltfsmsg (LTFS_ERR, "20072E", status);
+-    ltotape_log_snapshot (device, FALSE);
++    ltotape_log_snapshot (device, false);
+   }
+ 
+   return status;
+@@ -1607,7 +1607,7 @@ int ltotape_modeselect (void *device, un
+ 
+   if (status == -1) {
+     ltfsmsg (LTFS_ERR, "20073E", status);
+-    ltotape_log_snapshot (device, FALSE);
++    ltotape_log_snapshot (device, false);
+   }
+ 
+   return status;
+@@ -1745,7 +1745,7 @@ int ltotape_allow_medium_removal (void *
+   int status;
+   status = ltotape_prevent_allow_medium_removal (device, 0); /* 0 = ALLOW */
+ 
+-  ltotape_log_snapshot (device, TRUE); /* sneak in to grab a log snapshot */
++  ltotape_log_snapshot (device, true); /* sneak in to grab a log snapshot */
+ 
+   return status;
+ }
+@@ -1916,7 +1916,7 @@ int ltotape_write_attribute (void *devic
+ 
+   if (status == -1) {
+      ltfsmsg(LTFS_ERR, "20075E", status);
+-     ltotape_log_snapshot (device, FALSE);
++     ltotape_log_snapshot (device, false);
+   }
+ 
+   free (pRawData);
+@@ -3175,7 +3175,7 @@ int ltotape_get_keyalias (void *device, 
+ int ltotape_takedump_drive (void *device)
+ {
+   // CR10859 - this was stubbed out before...
+-  return ltotape_log_snapshot (device, FALSE); // FALSE = not a minidump
++  return ltotape_log_snapshot (device, false); // false = not a minidump
+ }
+ 
+ bool ltotape_is_mountable (void *device, const char *barcode, const unsigned char density_code)
diff --git a/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_osx_ltotape_ltotape__diag.c b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_osx_ltotape_ltotape__diag.c
new file mode 100644
index 00000000000..e400bcd9135
--- /dev/null
+++ b/filesystems/ltfs-ltotape/patches/patch-src_tape__drivers_osx_ltotape_ltotape__diag.c
@@ -0,0 +1,86 @@
+$NetBSD: patch-src_tape__drivers_osx_ltotape_ltotape__diag.c,v 1.1 2020/12/26 05:23:12 mef Exp $
+
+ICU_6.8 adaptation
+
+--- src/tape_drivers/osx/ltotape/ltotape_diag.c.orig	2019-03-15 04:24:46.000000000 +0000
++++ src/tape_drivers/osx/ltotape/ltotape_diag.c
+@@ -137,7 +137,7 @@ char* ltotape_set_snapshotdir (char* new
+ /****************************************************************************
+  * Request, retrieve and store a drive log snapshot
+  * @param device a pointer to the ltotape backend tape device
+- * @param minidump TRUE, to generate mini dump or FALSE, to generate full dump
++ * @param minidump true, to generate mini dump or false, to generate full dump
+  * @return 0 on success or negative value on error
+  */
+ int ltotape_log_snapshot (void *device, int minidump)
+@@ -380,7 +380,7 @@ static int ltotape_read_drivedump (void 
+ 	int buf_id;
+ 	unsigned char cap_buf[DUMP_HEADER_SIZE];
+ 	unsigned char *dump_buf;
+-	bool updated_header = FALSE;
++	bool updated_header = false;
+ 	time_t               now;
+ 	int                  j;
+ 
+@@ -454,7 +454,7 @@ static int ltotape_read_drivedump (void 
+ 		}
+ 
+ 		/* Update the header */
+-		if (updated_header == FALSE) {
++		if (updated_header == false) {
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET   ] = 0x00;
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET+1 ] = 0x02; /* type2=UTC */
+ 
+@@ -471,7 +471,7 @@ static int ltotape_read_drivedump (void 
+ 			for (j = 0; j < LTOTAPE_LIBSN_LENGTH; j++) {
+ 				dump_buf [ LTOTAPE_LIBSN_OFFSET+j ] = (unsigned char) *(lsn+j);
+ 			}
+-			updated_header = TRUE;
++			updated_header = true;
+ 		}
+ 
+ 		/* write buffer data into dump file */
+@@ -523,14 +523,14 @@ static long long ltotape_get_buffer_size
+   size = -1;
+   buf_offset = 32;
+   bytes_processed = 0;
+-  not_found = TRUE;
++  not_found = true;
+ 
+   data_length = (((int)buffer[30]) << 8) + (int)buffer[31];
+ 
+   while (not_found && (bytes_processed < data_length)) {
+ 
+     if (buff_id == buffer[buf_offset]) {
+-      not_found = FALSE;
++      not_found = false;
+       size = (((long long)buffer[buf_offset + 4]) << 24) + 
+              (((long long)buffer[buf_offset + 5]) << 16) + 
+              (((long long)buffer[buf_offset + 6]) <<  8) + 
+@@ -561,7 +561,7 @@ static int ltotape_read_mini_drivedump (
+ 	int buf_id;
+ 	unsigned char cap_buf[MINI_DUMP_HEADER_SIZE];
+ 	unsigned char *dump_buf;
+-	bool updated_header = FALSE;
++	bool updated_header = false;
+ 	time_t               now;
+ 	int                  j;
+ 
+@@ -640,7 +640,7 @@ static int ltotape_read_mini_drivedump (
+ 		}
+ 
+ 		/* Update the header */
+-		if (updated_header == FALSE) {
++		if (updated_header == false) {
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET   ] = 0x00;
+ 			dump_buf [ LTOTAPE_TIMESTAMP_TYPE_OFFSET+1 ] = 0x02; /* type2=UTC */
+ 
+@@ -657,7 +657,7 @@ static int ltotape_read_mini_drivedump (
+ 			for (j = 0; j < LTOTAPE_LIBSN_LENGTH; j++) {
+ 				dump_buf [ LTOTAPE_LIBSN_OFFSET+j ] = (unsigned char) *(lsn+j);
+ 			}
+-			updated_header = TRUE;
++			updated_header = true;
+ 		}
+ 
+ 		/* write buffer data into dump file */