Index: head/archivers/Makefile =================================================================== --- head/archivers/Makefile (revision 430149) +++ head/archivers/Makefile (revision 430150) @@ -1,241 +1,242 @@ # $FreeBSD$ # COMMENT = Archivers SUBDIR += 9e SUBDIR += advancecomp SUBDIR += amigadepacker SUBDIR += arc SUBDIR += arj SUBDIR += ark SUBDIR += atool SUBDIR += bicom SUBDIR += bzip SUBDIR += bzip2 SUBDIR += cabextract SUBDIR += dact SUBDIR += deb2targz SUBDIR += deco SUBDIR += deutex SUBDIR += dpkg SUBDIR += dzip SUBDIR += ecm SUBDIR += engrampa SUBDIR += fastjar SUBDIR += file-roller SUBDIR += fpc-bzip2 SUBDIR += fpc-unzip SUBDIR += freetar SUBDIR += freeze SUBDIR += gcab SUBDIR += gcpio SUBDIR += gnome-autoar SUBDIR += grzip SUBDIR += gtar SUBDIR += gzip SUBDIR += gzrecover SUBDIR += ha SUBDIR += hffzip SUBDIR += hlextract SUBDIR += hpack.non-usa.only SUBDIR += hs-tar SUBDIR += hs-zip-archive SUBDIR += hs-zlib SUBDIR += hs-zlib-bindings SUBDIR += hs-zlib-enum SUBDIR += innoextract SUBDIR += javatar SUBDIR += jzlib SUBDIR += kf5-karchive SUBDIR += kzip SUBDIR += laszip SUBDIR += lbrate SUBDIR += lbzip2 SUBDIR += lcab SUBDIR += lha SUBDIR += lha-ac SUBDIR += lhasa SUBDIR += libarc SUBDIR += libarchive SUBDIR += libcabinet SUBDIR += libcomprex SUBDIR += libdynamite SUBDIR += liblz4 SUBDIR += liblzxcomp SUBDIR += libmspack SUBDIR += liborange SUBDIR += libpar2 SUBDIR += librtfcomp SUBDIR += libunrar SUBDIR += libunrar4 + SUBDIR += libunrar5 SUBDIR += libzip SUBDIR += lrzip SUBDIR += lua-lzlib SUBDIR += lzfse SUBDIR += lzip SUBDIR += lzlib SUBDIR += lzma SUBDIR += lzmalib SUBDIR += lzo2 SUBDIR += lzop SUBDIR += macutils SUBDIR += makeself SUBDIR += mar SUBDIR += minizip SUBDIR += mscompress SUBDIR += mtf SUBDIR += nomarch SUBDIR += nulib SUBDIR += nwreckdum SUBDIR += ocaml-bz2 SUBDIR += ocaml-zip SUBDIR += p5-Archive-Any SUBDIR += p5-Archive-Any-Lite SUBDIR += p5-Archive-Any-Plugin-Rar SUBDIR += p5-Archive-Extract SUBDIR += p5-Archive-Extract-Libarchive SUBDIR += p5-Archive-Peek SUBDIR += p5-Archive-Rar SUBDIR += p5-Archive-SimpleExtractor SUBDIR += p5-Archive-Tar SUBDIR += p5-Archive-Zip SUBDIR += p5-Compress-Bzip2 SUBDIR += p5-Compress-LZ4 SUBDIR += p5-Compress-LZF SUBDIR += p5-Compress-LZO SUBDIR += p5-Compress-LZW SUBDIR += p5-Compress-Raw-Bzip2 SUBDIR += p5-Compress-Raw-Lzma SUBDIR += p5-Compress-Raw-Zlib SUBDIR += p5-Compress-Snappy SUBDIR += p5-IO-Compress SUBDIR += p5-IO-Compress-Lzf SUBDIR += p5-IO-Compress-Lzma SUBDIR += p5-IO-Compress-Lzop SUBDIR += p5-IO-Zlib SUBDIR += p5-Mac-Macbinary SUBDIR += p5-POE-Filter-Bzip2 SUBDIR += p5-POE-Filter-LZF SUBDIR += p5-POE-Filter-LZO SUBDIR += p5-POE-Filter-LZW SUBDIR += p5-POE-Filter-Zlib SUBDIR += p5-PerlIO-gzip SUBDIR += p5-PerlIO-via-Bzip2 SUBDIR += p7zip SUBDIR += p7zip-codec-rar SUBDIR += packddir SUBDIR += paq SUBDIR += par SUBDIR += par2cmdline SUBDIR += par2cmdline-tbb SUBDIR += parchive SUBDIR += pbzip2 SUBDIR += pear-File_Archive SUBDIR += pear-Horde_Compress SUBDIR += pear-Horde_Compress_Fast SUBDIR += pear-Horde_Pack SUBDIR += pear-PHP_Archive SUBDIR += peazip SUBDIR += pecl-lzf SUBDIR += pecl-phk SUBDIR += pecl-rar SUBDIR += pecl-snappy SUBDIR += php-horde_lz4 SUBDIR += php56-bz2 SUBDIR += php56-phar SUBDIR += php56-zip SUBDIR += php56-zlib SUBDIR += php70-bz2 SUBDIR += php70-phar SUBDIR += php70-zip SUBDIR += php70-zlib SUBDIR += pigz SUBDIR += pixz SUBDIR += plzip SUBDIR += ppmd SUBDIR += ppmd-7z SUBDIR += ppunpack SUBDIR += pxz SUBDIR += py-attic SUBDIR += py-borgbackup SUBDIR += py-brotli SUBDIR += py-bz2file SUBDIR += py-libarchive-c SUBDIR += py-librtfcomp SUBDIR += py-lz4 SUBDIR += py-lzma SUBDIR += py-pyliblzma SUBDIR += py-python-lhafile SUBDIR += py-python-snappy SUBDIR += py-rarfile SUBDIR += py-rcssmin SUBDIR += py-rjsmin SUBDIR += py-warctools SUBDIR += py3-libarchive-c SUBDIR += qpress SUBDIR += quazip SUBDIR += quazip-qt5 SUBDIR += rar SUBDIR += rox-archive SUBDIR += rpm2cpio SUBDIR += rpm4 SUBDIR += ruby-lha SUBDIR += rubygem-archive-tar-minitar SUBDIR += rubygem-archive-zip SUBDIR += rubygem-bzip2-ruby SUBDIR += rubygem-libarchive SUBDIR += rubygem-minitar SUBDIR += rubygem-ruby-xz SUBDIR += rubygem-rubyzip SUBDIR += rubygem-rubyzip2 SUBDIR += rvm SUBDIR += rzip SUBDIR += sectar SUBDIR += sharutils SUBDIR += snappy SUBDIR += snappy-java SUBDIR += snzip SUBDIR += squeeze SUBDIR += squsq SUBDIR += star SUBDIR += stuffit SUBDIR += szip SUBDIR += tardy SUBDIR += tclmkziplib SUBDIR += thunar-archive-plugin SUBDIR += torrentzip SUBDIR += ucl SUBDIR += unace SUBDIR += unadf SUBDIR += unalz SUBDIR += unarchiver SUBDIR += unarj SUBDIR += undms SUBDIR += unfoo SUBDIR += unlzx SUBDIR += unmakeself SUBDIR += unmass SUBDIR += unrar SUBDIR += unrar-iconv SUBDIR += unshield SUBDIR += untar SUBDIR += unzip SUBDIR += unzoo SUBDIR += upx SUBDIR += xar SUBDIR += xarchive SUBDIR += xarchiver SUBDIR += xdms SUBDIR += xmill SUBDIR += xpk SUBDIR += zip SUBDIR += zip-ada SUBDIR += zipmix SUBDIR += zipper SUBDIR += zoo SUBDIR += zopfli SUBDIR += zstd SUBDIR += zutils .include Index: head/archivers/libunrar5/Makefile =================================================================== --- head/archivers/libunrar5/Makefile (nonexistent) +++ head/archivers/libunrar5/Makefile (revision 430150) @@ -0,0 +1,58 @@ +# $FreeBSD$ + +PORTNAME= libunrar5 +PORTVERSION= 5.4.5 +CATEGORIES= archivers +MASTER_SITES= http://www.rarlab.com/rar/ +DISTNAME= unrarsrc-${PORTVERSION} + +MAINTAINER= jhale@FreeBSD.org +COMMENT= RAR archive extraction library + +LICENSE= UNRAR +LICENSE_NAME= UnRAR License +LICENSE_FILE= ${WRKSRC}/license.txt +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +USES= gmake +USE_LDCONFIG= yes + +ALL_TARGET= lib liba +MAKEFILE= makefile +MAKE_ARGS= AR="${AR}" \ + CXX="${CXX}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="-Wl,-soname,${SONAME} -pthread ${LDFLAGS}" \ + STRIP="${STRIP_CMD}" +SONAME= libunrar.so.5 +WRKSRC= ${WRKDIR}/unrar + +CONFLICTS_INSTALL= libunrar-3* libunrar4-4* + +OPTIONS_DEFINE= OPENSSL_AES +OPTIONS_DEFAULT= OPENSSL_AES + +OPENSSL_AES_DESC= Use OpenSSL implementation of AES +OPENSSL_AES_CPPFLAGS= -DOPENSSL_AES -I${OPENSSLINC} +OPENSSL_AES_LDFLAGS= -L${OPENSSLLIB} -lcrypto +OPENSSL_AES_USES= ssl + +PLIST_FILES= lib/libunrar.a \ + lib/libunrar.so \ + lib/${SONAME} \ + include/libunrar5/dll.hpp + +do-install: + ${INSTALL_DATA} ${WRKSRC}/libunrar.a ${STAGEDIR}${PREFIX}/lib/libunrar.a + ${INSTALL_LIB} ${WRKSRC}/libunrar.so ${STAGEDIR}${PREFIX}/lib/${SONAME} + (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf ${SONAME} libunrar.so) + @${MKDIR} ${STAGEDIR}${PREFIX}/include/libunrar5 + ${INSTALL_DATA} ${WRKSRC}/dll.hpp ${STAGEDIR}${PREFIX}/include/libunrar5/dll.hpp + +.include + +.if ${PORT_OPTIONS:MOPENSSL_AES} && ${SSL_DEFAULT:Mopenssl-devel} +BROKEN= OPENSSL_AES option does not build with openssl-devel +.endif + +.include Property changes on: head/archivers/libunrar5/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/libunrar5/distinfo =================================================================== --- head/archivers/libunrar5/distinfo (nonexistent) +++ head/archivers/libunrar5/distinfo (revision 430150) @@ -0,0 +1,3 @@ +TIMESTAMP = 1483207045 +SHA256 (unrarsrc-5.4.5.tar.gz) = e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c +SIZE (unrarsrc-5.4.5.tar.gz) = 226320 Property changes on: head/archivers/libunrar5/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/libunrar5/files/patch-makefile =================================================================== --- head/archivers/libunrar5/files/patch-makefile (nonexistent) +++ head/archivers/libunrar5/files/patch-makefile (revision 430150) @@ -0,0 +1,28 @@ +--- makefile.orig 2016-05-10 09:51:35 UTC ++++ makefile +@@ -98,7 +98,7 @@ LINK=$(CXX) + WHAT=UNRAR + + UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o qopen.o +-LIB_OBJ=filestr.o scantree.o dll.o qopen.o ++LIB_OBJ=dll.o + + OBJECTS=rar.o strlist.o strfn.o pathfn.o smallfn.o global.o file.o filefn.o filcreat.o \ + archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \ +@@ -131,9 +131,14 @@ sfx: clean $(OBJECTS) + + lib: WHAT=RARDLL + lib: CXXFLAGS+=$(LIBFLAGS) +-lib: clean $(OBJECTS) $(LIB_OBJ) ++lib: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) + @rm -f libunrar.so +- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) ++ $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ ++liba: WHAT=RARDLL ++liba: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) ++ @rm -f libunrar.a ++ $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) + + install-unrar: + install -D unrar $(DESTDIR)/bin/unrar Property changes on: head/archivers/libunrar5/files/patch-makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/libunrar5/files/patch-os.hpp =================================================================== --- head/archivers/libunrar5/files/patch-os.hpp (nonexistent) +++ head/archivers/libunrar5/files/patch-os.hpp (revision 430150) @@ -0,0 +1,13 @@ +--- os.hpp.orig 2013-12-01 08:10:14 UTC ++++ os.hpp +@@ -151,6 +151,10 @@ + #include + #include + ++#ifdef OPENSSL_AES ++#include ++#endif // OPENSSL_AES ++ + #ifdef S_IFLNK + #define SAVE_LINKS + #endif Property changes on: head/archivers/libunrar5/files/patch-os.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/libunrar5/files/patch-rijndael.cpp =================================================================== --- head/archivers/libunrar5/files/patch-rijndael.cpp (nonexistent) +++ head/archivers/libunrar5/files/patch-rijndael.cpp (revision 430150) @@ -0,0 +1,102 @@ +--- rijndael.cpp.orig 2014-06-10 17:14:06 UTC ++++ rijndael.cpp +@@ -7,6 +7,8 @@ + ***************************************************************************/ + #include "rar.hpp" + ++#ifndef OPENSSL_AES ++ + #ifdef USE_SSE + #include + #endif +@@ -56,6 +58,7 @@ + #endif + } + ++#endif // OPENSSL_AES + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // API +@@ -63,14 +66,35 @@ + + Rijndael::Rijndael() + { ++#ifndef OPENSSL_AES + if (S[0]==0) + GenerateTables(); ++#endif // OPENSSL_AES + CBCMode = true; // Always true for RAR. + } + + + void Rijndael::Init(bool Encrypt,const byte *key,uint keyLen,const byte * initVector) + { ++#ifdef OPENSSL_AES ++ const EVP_CIPHER *cipher; ++ switch(keyLen) ++ { ++ case 128: ++ cipher = EVP_aes_128_cbc(); ++ break; ++ case 192: ++ cipher = EVP_aes_192_cbc(); ++ break; ++ case 256: ++ cipher = EVP_aes_256_cbc(); ++ break; ++ } ++ ++ EVP_CIPHER_CTX_init(&ctx); ++ EVP_CipherInit_ex(&ctx, cipher, NULL, key, initVector, Encrypt); ++ EVP_CIPHER_CTX_set_padding(&ctx, 0); ++#else // OPENSSL_AES + #ifdef USE_SSE + // Check SSE here instead of constructor, so if object is a part of some + // structure memset'ed before use, this variable is not lost. +@@ -111,6 +135,7 @@ + + if(!Encrypt) + keyEncToDec(); ++#endif // OPENSSL_AES + } + + +@@ -120,6 +145,11 @@ + if (inputLen <= 0) + return; + ++#ifdef OPENSSL_AES ++ int outLen; ++ EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen); ++ return; ++#else // OPENSSL_AES + size_t numBlocks=inputLen/16; + #ifdef USE_SSE + if (AES_NI) +@@ -182,6 +212,8 @@ + } + + memcpy(m_initVector,iv,16); ++ ++#endif // OPENSSL_AES + } + + +@@ -217,7 +249,7 @@ + } + #endif + +- ++#ifndef OPENSSL_AES + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // ALGORITHM + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +@@ -357,7 +389,7 @@ + U1[b][0]=U2[b][1]=U3[b][2]=U4[b][3]=T5[i][0]=T6[i][1]=T7[i][2]=T8[i][3]=FFmul0e(b); + } + } +- ++#endif // OPENSSL_AES + + #if 0 + static void TestRijndael(); Property changes on: head/archivers/libunrar5/files/patch-rijndael.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/libunrar5/files/patch-rijndael.hpp =================================================================== --- head/archivers/libunrar5/files/patch-rijndael.hpp (nonexistent) +++ head/archivers/libunrar5/files/patch-rijndael.hpp (revision 430150) @@ -0,0 +1,20 @@ +--- rijndael.hpp.orig 2014-06-10 17:14:06 UTC ++++ rijndael.hpp +@@ -16,6 +16,9 @@ + class Rijndael + { + private: ++#ifdef OPENSSL_AES ++ EVP_CIPHER_CTX ctx; ++#else // OPENSSL_AES + #ifdef USE_SSE + void blockEncryptSSE(const byte *input,size_t numBlocks,byte *outBuffer); + void blockDecryptSSE(const byte *input, size_t numBlocks, byte *outBuffer); +@@ -25,6 +28,7 @@ + void keySched(byte key[_MAX_KEY_COLUMNS][4]); + void keyEncToDec(); + void GenerateTables(); ++#endif // OPENSSL_AES + + // RAR always uses CBC, but we may need to turn it off when calling + // this code from other archive formats with CTR and other modes. Property changes on: head/archivers/libunrar5/files/patch-rijndael.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/libunrar5/pkg-descr =================================================================== --- head/archivers/libunrar5/pkg-descr (nonexistent) +++ head/archivers/libunrar5/pkg-descr (revision 430150) @@ -0,0 +1,6 @@ +The UnRAR library is a minor part of the RAR archiver and contains +the RAR uncompression algorithm. UnRAR requires a very small amount +of memory to operate. It can be used by other programs to extract +RAR archives. + +WWW: http://www.rarsoft.com/ Property changes on: head/archivers/libunrar5/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property