<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5080b0deda26a30fa23b7e84a567326a2fa4e4e7">https://github.com/macports/macports-ports/commit/5080b0deda26a30fa23b7e84a567326a2fa4e4e7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5080b0deda2 unalz: fix bugs and security flaws - Revive abandoned port - Fix Fails to Build From Source (FTBFS) on modern compilers - Use system zlib from Macports instead of the internal old version of zlib - Use system libbz2 from Macports instead of the internal old version of libbz2 - Fix type error caused by introduction of z_crc_t type in zlib - Correct pipe mode. Don't do close() or utime() in pipe mode - Check to see if the filename length field is invalid - Fix file offs [...]
</span>5080b0deda2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5080b0deda26a30fa23b7e84a567326a2fa4e4e7
</span>Author: Robert Kennedy <amtor@hotmail.com>
AuthorDate: Sat Aug 6 23:51:04 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> unalz: fix bugs and security flaws
</span><span style='display:block; white-space:pre;color:#404040;'> - Revive abandoned port
</span><span style='display:block; white-space:pre;color:#404040;'> - Fix Fails to Build From Source (FTBFS) on modern compilers
</span><span style='display:block; white-space:pre;color:#404040;'> - Use system zlib from Macports instead of the internal old version of zlib
</span><span style='display:block; white-space:pre;color:#404040;'> - Use system libbz2 from Macports instead of the internal old version of libbz2
</span><span style='display:block; white-space:pre;color:#404040;'> - Fix type error caused by introduction of z_crc_t type in zlib
</span><span style='display:block; white-space:pre;color:#404040;'> - Correct pipe mode. Don't do close() or utime() in pipe mode
</span><span style='display:block; white-space:pre;color:#404040;'> - Check to see if the filename length field is invalid
</span><span style='display:block; white-space:pre;color:#404040;'> - Fix file offset overflow on incomplete files
</span><span style='display:block; white-space:pre;color:#404040;'> - Add the license to the Portfile
</span><span style='display:block; white-space:pre;color:#404040;'> - Update the long description in the Portfile
</span><span style='display:block; white-space:pre;color:#404040;'> - Add two new library dependencies to the Portfile - zlib and bzip2
</span><span style='display:block; white-space:pre;color:#404040;'> - Update the developer's homepage in the Portfile
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove unnecessary statements from the Portfile
</span><span style='display:block; white-space:pre;color:#404040;'> - Add revision number to the Portfile
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60014
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65561
</span>---
archivers/unalz/Portfile | 95 ++++++++++++++--------
archivers/unalz/files/1000-Makefile.diff | 58 +++++++++++++
archivers/unalz/files/1001-libz-linkage.diff | 24 ++++++
archivers/unalz/files/1002-libbz2-linkage.diff | 38 +++++++++
archivers/unalz/files/1003-zlib-1.2.7-build.diff | 11 +++
archivers/unalz/files/1004-pipe-mode-fixes.diff | 11 +++
.../unalz/files/1005-filename-length-check.diff | 14 ++++
.../unalz/files/1006-fix-offset-overflow.diff | 15 ++++
.../files/1007-Remove-CXXFLAGS-from-linking.diff | 26 ++++++
9 files changed, 257 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unalz/Portfile b/archivers/unalz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d894b94efdf..7188dac76f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/unalz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unalz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +1,74 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name unalz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories archivers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description unarchiver for the AlZip format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Unalz is a BSD-licensed unarchiver for AlZip format which \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requires proprietary and win32-only software but widely used \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in Korea.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.65
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories archivers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {hotmail.com:amtor @RobK88} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bawi.org:minskim \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.kipple.pe.kr/win/unalz/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description unarchiver for the AlZip format
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libiconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Unalz is an unarchiver for the AlZip format which \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is widely used in Korea. The ALZ file format is a proprietary \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file compression and archiving format designed to overcome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the file size limitations of the ZIP file format. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If you want to create .alz archives, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ you will need to use the proprietary ALZip software which only \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runs in Windows.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 e4db2c4e3c8f6f5ee414b68bc55288e5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 98a64f799892f7adfffd4635bd19826fe8f18b26 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bb55aee26e12c8bf0e4422b11feffa5c88844771
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://kippler.com/win/unalz/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.suffix .tgz
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bb55aee26e12c8bf0e4422b11feffa5c88844771 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4c26699eb7545072de2ef7de79b4fff1f01c4db09cebff2d8d50ec03d5d74db0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 137985
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 1000-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1001-libz-linkage.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1002-libbz2-linkage.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1003-zlib-1.2.7-build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1004-pipe-mode-fixes.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1005-filename-length-check.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1006-fix-offset-overflow.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1007-Remove-CXXFLAGS-from-linking.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove this post-patch if you want to take advantage of the potential speed increase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# offered by using the "register" keyword in the C++ program.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Unfortunately, the "register" keyword is only available in older compilers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The "register" keyword was deprecated in the C++17 language standard.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/local|\$(DESTDIR)${prefix}|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C "s|register ||" ${worksrcpath}/UnAlz.cpp
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note: CPP in the Makefile is the C++ compiler, not preprocessor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/^CFLAGS/s|\$|${configure.cflags} [get_canonical_archflags cc]\\\nCPPFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/^LDFLAGS/s|\$|${configure.ldflags} [get_canonical_archflags ld]|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The following is needed so unalz will build on older Macs running Lion etc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append "-stdlib=${configure.cxx_stdlib}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CPP="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target posix-utf8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target posix-utf8
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/readme.txt ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${worksrcpath}/unalz ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/readme.txt ${destroot}${prefix}/share/doc/${name}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unalz/files/1000-Makefile.diff b/archivers/unalz/files/1000-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ea4979358c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unalz/files/1000-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2009-01-19 20:42:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-07-29 10:50:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CPP = g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OBJ = main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o zlib/adler32.o zlib/crc32.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/zutil.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BIN = unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXX := clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC := clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OBJ := main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o zlib/adler32.o zlib/crc32.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/zutil.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BIN := unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS +=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +13,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "TARGET_SYSTEM is one of"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo " posix-utf8 : POSIX with utf8 filesystem(Most of modern OS, e.g. OSX/Ubuntu)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @echo " posix-utf8 : POSIX with utf8 filesystem(Most of modern OS, e.g. OSX/Ubuntu)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo " posix : POSIX system (FreeBSD/linux/OSX/sparc/Win32)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo " linux-utf8 : LINUX with utf8 filesystem(without -liconv option)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo " posix-noiconv : POSIX without libiconv (Windows(MINGW32,CYGWIN) or EUC-KR file system)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,20 +24,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ posix: unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CPP) $(OBJ) $(LDFLAGS) -liconv -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(OBJ) $(LDFLAGS) $(CXXFLAGS) -liconv -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ posix-utf8: unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CPP) $(OBJ) $(LDFLAGS) -liconv -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(OBJ) $(LDFLAGS) $(CXXFLAGS) -liconv -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ posix-noiconv: unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CPP) $(OBJ) $(LDFLAGS) -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(OBJ) $(LDFLAGS) $(CXXFLAGS) -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linux-utf8: unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CPP) $(OBJ) $(LDFLAGS) -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(OBJ) $(LDFLAGS) $(CXXFLAGS) -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp unalz /usr/local/bin/
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unalz/files/1001-libz-linkage.diff b/archivers/unalz/files/1001-libz-linkage.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..62aa33163e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unalz/files/1001-libz-linkage.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.rev1 2022-07-29 10:50:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-07-29 11:13:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX := clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC := clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OBJ := main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o zlib/adler32.o zlib/crc32.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/zutil.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OBJ := main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIN := unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS +=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS += -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- UnAlzBzip2.cpp.orig 2007-04-12 08:04:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ UnAlzBzip2.cpp 2022-07-29 11:17:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ////////////////////////////////////////////////////////////////////////////////////////////////////
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //#include "stdafx.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "zlib/zlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <zlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "bzip2/bzlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "bzip2/bzlib_private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "UnAlz.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unalz/files/1002-libbz2-linkage.diff b/archivers/unalz/files/1002-libbz2-linkage.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..32bf50782f7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unalz/files/1002-libbz2-linkage.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.rev2 2022-07-29 11:13:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-07-29 11:26:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX := clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC := clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OBJ := main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o UnAlzbzlib.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o bzip2/huffman.o bzip2/randtable.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OBJ := main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIN := unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS += -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS += -lz -lbz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- UnAlzBzip2.cpp.rev1 2022-07-29 11:17:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ UnAlzBzip2.cpp 2022-07-29 11:32:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,10 +11,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //#include "stdafx.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <zlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "bzip2/bzlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "bzip2/bzlib_private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <bzlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "UnAlz.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// from bzlib_private.h of bzip2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef char Char;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned char Bool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned char UChar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef int Int32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned int UInt32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef short Int16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned short UInt16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define True ((Bool)1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define False ((Bool)0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CUnAlz* handle;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unalz/files/1003-zlib-1.2.7-build.diff b/archivers/unalz/files/1003-zlib-1.2.7-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c078c159058
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unalz/files/1003-zlib-1.2.7-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- UnAlz.cpp.orig 2009-04-01 02:00:27.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ UnAlz.cpp 2022-07-29 11:47:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1907,7 +1907,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ////////////////////////////////////////////////////////////////////////////////////////////////////
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UINT32 CUnAlz::CRC32(UINT32 l, BYTE c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const unsigned long *CRC_TABLE = get_crc_table();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const z_crc_t *CRC_TABLE = get_crc_table();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CRC_TABLE[(l ^ c) & 0xff] ^ (l >> 8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unalz/files/1004-pipe-mode-fixes.diff b/archivers/unalz/files/1004-pipe-mode-fixes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e760aec0fe0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unalz/files/1004-pipe-mode-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- UnAlz.cpp.rev1 2022-07-29 11:47:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ UnAlz.cpp 2022-07-29 12:03:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -794,7 +794,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(m_pFuncCallBack) m_pFuncCallBack(m_posCur->fileName, 0,m_posCur->uncompressedSize,m_pCallbackParam, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = ExtractTo(&dest);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(dest.fp!=NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!m_bPipeMode && dest.fp!=NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(dest.fp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // file time setting - from unalz_wcx_01i.zip
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unalz/files/1005-filename-length-check.diff b/archivers/unalz/files/1005-filename-length-check.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..68b16806bcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unalz/files/1005-filename-length-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- UnAlz.cpp.rev2 2022-07-29 12:03:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ UnAlz.cpp 2022-07-29 12:10:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -431,6 +431,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zipHeader.uncompressedSize = unalz_le64toh(zipHeader.uncompressedSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FILE NAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(zipHeader.head.fileNameLength<=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_nErr = ERR_INVALID_FILENAME_LENGTH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zipHeader.fileName = (char*)malloc(zipHeader.head.fileNameLength+sizeof(char));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(zipHeader.fileName==NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unalz/files/1006-fix-offset-overflow.diff b/archivers/unalz/files/1006-fix-offset-overflow.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a9e3dc130b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unalz/files/1006-fix-offset-overflow.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- UnAlz.cpp.rev3 2022-07-29 12:10:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ UnAlz.cpp 2022-07-29 12:17:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1634,7 +1634,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while(dwRemain)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dwRead = (UINT32)min(dwRemain, (m_files[m_nCurFile].nFileSize-m_nCurFilePos-m_files[m_nCurFile].nMultivolTailSize));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INT64 remain = m_files[m_nCurFile].nFileSize - m_nCurFilePos - m_files[m_nCurFile].nMultivolTailSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (remain <= 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_bIsEOF = TRUE; return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dwRead = (UINT32)min(dwRemain, remain);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(dwRead==0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_bIsEOF = TRUE;return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unalz/files/1007-Remove-CXXFLAGS-from-linking.diff b/archivers/unalz/files/1007-Remove-CXXFLAGS-from-linking.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e47ad01cc1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unalz/files/1007-Remove-CXXFLAGS-from-linking.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.rev3 2022-07-30 09:14:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-07-30 10:04:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,19 +25,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ posix: unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CXX) $(OBJ) $(LDFLAGS) $(CXXFLAGS) -liconv -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(OBJ) $(LDFLAGS) -liconv -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ posix-utf8: unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CXX) $(OBJ) $(LDFLAGS) $(CXXFLAGS) -liconv -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(OBJ) $(LDFLAGS) -liconv -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ posix-noiconv: unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CXX) $(OBJ) $(LDFLAGS) $(CXXFLAGS) -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(OBJ) $(LDFLAGS) -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ linux-utf8: unalz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CXX) $(OBJ) $(LDFLAGS) $(CXXFLAGS) -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(OBJ) $(LDFLAGS) -o $(BIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp unalz /usr/local/bin/
</span></pre><pre style='margin:0'>
</pre>