apply post-1.18.1 patches, bump version to 1.18.21_18_2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/archival/bzip2.c b/archival/bzip2.c
index a6abc931c..ab08ffc1a 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PA
                         break;
         }
 
-#if ENABLE_FEATURE_CLEAN_UP
+        /* Can't be conditional on ENABLE_FEATURE_CLEAN_UP -
+         * we are called repeatedly
+         */
         BZ2_bzCompressEnd(strm);
         free(iobuf);
-#endif
+
         return total;
 }