svn commit: r447277 - in head/archivers/libunrar5: . files
Jason E. Hale
jhale at FreeBSD.org
Thu Aug 3 19:38:29 UTC 2017
Author: jhale
Date: Thu Aug 3 19:38:28 2017
New Revision: 447277
URL: https://svnweb.freebsd.org/changeset/ports/447277
Log:
Update to 5.5.7
Simplify OPENSSL_AES broken message
Deleted:
head/archivers/libunrar5/files/patch-makefile
Modified:
head/archivers/libunrar5/Makefile
head/archivers/libunrar5/distinfo
head/archivers/libunrar5/files/patch-os.hpp
head/archivers/libunrar5/files/patch-rijndael.cpp
head/archivers/libunrar5/files/patch-rijndael.hpp
Modified: head/archivers/libunrar5/Makefile
==============================================================================
--- head/archivers/libunrar5/Makefile Thu Aug 3 19:24:44 2017 (r447276)
+++ head/archivers/libunrar5/Makefile Thu Aug 3 19:38:28 2017 (r447277)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libunrar5
-PORTVERSION= 5.4.5
-PORTREVISION= 1
+PORTVERSION= 5.5.7
CATEGORIES= archivers
MASTER_SITES= http://www.rarlab.com/rar/
DISTNAME= unrarsrc-${PORTVERSION}
@@ -18,7 +17,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se
USES= gmake
USE_LDCONFIG= yes
-ALL_TARGET= lib liba
+ALL_TARGET= lib
MAKEFILE= makefile
MAKE_ARGS= AR="${AR}" \
CXX="${CXX}" \
@@ -37,6 +36,7 @@ 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
+OPENSSL_AES_VARS= BROKEN_SSL=openssl-devel
PLIST_FILES= lib/libunrar.a \
lib/libunrar.so \
@@ -50,10 +50,4 @@ do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/include/libunrar5
${INSTALL_DATA} ${WRKSRC}/dll.hpp ${STAGEDIR}${PREFIX}/include/libunrar5/dll.hpp
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MOPENSSL_AES} && ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN= OPENSSL_AES option does not build with openssl-devel
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/archivers/libunrar5/distinfo
==============================================================================
--- head/archivers/libunrar5/distinfo Thu Aug 3 19:24:44 2017 (r447276)
+++ head/archivers/libunrar5/distinfo Thu Aug 3 19:38:28 2017 (r447277)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483207045
-SHA256 (unrarsrc-5.4.5.tar.gz) = e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c
-SIZE (unrarsrc-5.4.5.tar.gz) = 226320
+TIMESTAMP = 1501787450
+SHA256 (unrarsrc-5.5.7.tar.gz) = 8aef0a0d91bf9c9ac48fab8a26049ac7ac49907e75a2dcbd511a4ba375322d8f
+SIZE (unrarsrc-5.5.7.tar.gz) = 222293
Modified: head/archivers/libunrar5/files/patch-os.hpp
==============================================================================
--- head/archivers/libunrar5/files/patch-os.hpp Thu Aug 3 19:24:44 2017 (r447276)
+++ head/archivers/libunrar5/files/patch-os.hpp Thu Aug 3 19:38:28 2017 (r447277)
@@ -1,8 +1,8 @@
---- os.hpp.orig 2013-12-01 08:10:14 UTC
+--- os.hpp.orig 2017-04-28 17:28:46 UTC
+++ os.hpp
-@@ -151,6 +151,10 @@
- #include <utime.h>
+@@ -150,6 +150,10 @@
#include <locale.h>
+
+#ifdef OPENSSL_AES
+#include <openssl/evp.h>
Modified: head/archivers/libunrar5/files/patch-rijndael.cpp
==============================================================================
--- head/archivers/libunrar5/files/patch-rijndael.cpp Thu Aug 3 19:24:44 2017 (r447276)
+++ head/archivers/libunrar5/files/patch-rijndael.cpp Thu Aug 3 19:38:28 2017 (r447277)
@@ -1,4 +1,4 @@
---- rijndael.cpp.orig 2014-06-10 17:14:06 UTC
+--- rijndael.cpp.orig 2017-04-28 17:28:47 UTC
+++ rijndael.cpp
@@ -7,6 +7,8 @@
***************************************************************************/
@@ -9,7 +9,7 @@
#ifdef USE_SSE
#include <wmmintrin.h>
#endif
-@@ -56,6 +58,7 @@
+@@ -56,6 +58,7 @@ inline void Copy128(byte *dest,const byt
#endif
}
@@ -17,7 +17,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// API
-@@ -63,14 +66,35 @@
+@@ -63,14 +66,35 @@ inline void Copy128(byte *dest,const byt
Rijndael::Rijndael()
{
@@ -53,15 +53,35 @@
#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 @@
+@@ -111,6 +135,7 @@ void Rijndael::Init(bool Encrypt,const b
if(!Encrypt)
keyEncToDec();
+#endif // OPENSSL_AES
}
+ void Rijndael::blockEncrypt(const byte *input,size_t inputLen,byte *outBuffer)
+@@ -118,6 +143,11 @@ void Rijndael::blockEncrypt(const byte *
+ if (inputLen <= 0)
+ return;
-@@ -120,6 +145,11 @@
++#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)
+@@ -176,6 +206,7 @@ void Rijndael::blockEncrypt(const byte *
+ input += 16;
+ }
+ Copy128(m_initVector,prevBlock);
++#endif // OPENSSL_AES
+ }
+
+
+@@ -217,6 +248,11 @@ void Rijndael::blockDecrypt(const byte *
if (inputLen <= 0)
return;
@@ -73,7 +93,7 @@
size_t numBlocks=inputLen/16;
#ifdef USE_SSE
if (AES_NI)
-@@ -182,6 +212,8 @@
+@@ -279,6 +315,8 @@ void Rijndael::blockDecrypt(const byte *
}
memcpy(m_initVector,iv,16);
@@ -82,7 +102,7 @@
}
-@@ -217,7 +249,7 @@
+@@ -314,7 +352,7 @@ void Rijndael::blockDecryptSSE(const byt
}
#endif
@@ -91,7 +111,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ALGORITHM
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-@@ -357,7 +389,7 @@
+@@ -454,7 +492,7 @@ void Rijndael::GenerateTables()
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);
}
}
Modified: head/archivers/libunrar5/files/patch-rijndael.hpp
==============================================================================
--- head/archivers/libunrar5/files/patch-rijndael.hpp Thu Aug 3 19:24:44 2017 (r447276)
+++ head/archivers/libunrar5/files/patch-rijndael.hpp Thu Aug 3 19:38:28 2017 (r447277)
@@ -1,4 +1,4 @@
---- rijndael.hpp.orig 2014-06-10 17:14:06 UTC
+--- rijndael.hpp.orig 2017-04-28 17:28:47 UTC
+++ rijndael.hpp
@@ -16,6 +16,9 @@
class Rijndael
@@ -10,7 +10,7 @@
#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 @@
+@@ -25,6 +28,7 @@ class Rijndael
void keySched(byte key[_MAX_KEY_COLUMNS][4]);
void keyEncToDec();
void GenerateTables();
More information about the svn-ports-head
mailing list