Page MenuHomeFreeBSD
Files F154844315

D22045.id63329.diff
No OneTemporary
Actions

D22045.id63329.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -13077,6 +13077,8 @@
java/jakarta-commons-lang3|java/apache-commons-lang3|2019-10-07|Renamed upstream
x11-clocks/xfce4-timer-out-plugin|x11-clocks/xfce4-time-out-plugin|2019-10-09|Port was incorrectly named different to upstream
x11-toolkits/gai||2019-10-10|Abandonware since 2005
+archivers/libunrar||2019-10-15|Has expired: Outdated version. Please use archivers/libunrar5 instead
+archivers/libunrar5|archivers/libunrar|2019-10-15|Rename as it is only supported version
palm/synce-libsynce||2019-10-14|Has expired: obsolete technology
french/py-grammalecte|french/py-grammalecte-fr|2019-10-14|Port was incorrectly named different to upstream
deskutils/xmaddressbook||2019-10-15|Depends on deprecated x11/liboldX
Index: archivers/Makefile
===================================================================
--- archivers/Makefile
+++ archivers/Makefile
@@ -67,7 +67,6 @@
SUBDIR += libpar2
SUBDIR += librtfcomp
SUBDIR += libunrar
- SUBDIR += libunrar5
SUBDIR += libzip
SUBDIR += linux-c7-lz4
SUBDIR += lizard
Index: archivers/libunrar/Makefile
===================================================================
--- archivers/libunrar/Makefile
+++ archivers/libunrar/Makefile
@@ -1,27 +1,51 @@
-# Created by: samm@freebsd.org
# $FreeBSD$
PORTNAME= libunrar
-PORTVERSION= 3.9.10
-PORTEPOCH= 1
+PORTVERSION= 5.6.8
+PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= http://www.rarlab.com/rar/
DISTNAME= unrarsrc-${PORTVERSION}
-MAINTAINER= samm@freebsd.org
-COMMENT= Library to work with RAR archives
+MAINTAINER= jhale@FreeBSD.org
+COMMENT= RAR archive extraction library
-WRKSRC= ${WRKDIR}/unrar
+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
-MAKEFILE= makefile.unix
-ALL_TARGET= lib
+USES= compiler:c++11-lang gmake
USE_LDCONFIG= yes
+ALL_TARGET= lib
+MAKEFILE= makefile
+MAKE_ARGS= AR="${AR}" \
+ CXX="${CXX}" \
+ CXXFLAGS="${CXXFLAGS} -fPIC" \
+ LDFLAGS="-Wl,-soname,${SONAME} -pthread ${LDFLAGS}" \
+ STRIP="${STRIP_CMD}"
+SONAME= libunrar.so.5
+WRKSRC= ${WRKDIR}/unrar
+
+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_LIB} ${WRKSRC}/libunrar.so.3 ${STAGEDIR}${PREFIX}/lib/
- cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libunrar.so.3 libunrar.so
- ${MKDIR} ${STAGEDIR}${PREFIX}/include/libunrar3
- ${INSTALL_DATA} ${WRKSRC}/dll.hpp ${STAGEDIR}${PREFIX}/include/libunrar3/dll.hpp
+ ${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 <bsd.port.mk>
Index: archivers/libunrar/distinfo
===================================================================
--- archivers/libunrar/distinfo
+++ archivers/libunrar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (unrarsrc-3.9.10.tar.gz) = 3b4627d8f5700588bc594afee6911865f55201625299f414438a654da488207a
-SIZE (unrarsrc-3.9.10.tar.gz) = 142718
+TIMESTAMP = 1539042126
+SHA256 (unrarsrc-5.6.8.tar.gz) = a4cc0ac14a354827751912d2af4a0a09e2c2129df5766576fa7e151791dd3dff
+SIZE (unrarsrc-5.6.8.tar.gz) = 226647
Index: archivers/libunrar/files/patch-dll.hpp
===================================================================
--- archivers/libunrar/files/patch-dll.hpp
+++ archivers/libunrar/files/patch-dll.hpp
@@ -1,19 +0,0 @@
---- dll.hpp.orig 2010-03-15 06:30:53 UTC
-+++ dll.hpp
-@@ -28,14 +28,14 @@
-
- #define RAR_DLL_VERSION 4
-
--#ifdef _UNIX
-+// #ifdef _UNIX
- #define CALLBACK
- #define PASCAL
- #define LONG long
- #define HANDLE void *
- #define LPARAM long
- #define UINT unsigned int
--#endif
-+// #endif
-
- struct RARHeaderData
- {
Index: archivers/libunrar/files/patch-dll.cpp
===================================================================
--- archivers/libunrar/files/patch-dll.cpp
+++ archivers/libunrar/files/patch-dll.cpp
@@ -1,13 +0,0 @@
---- dll.cpp.orig 2010-03-15 06:30:52 UTC
-+++ dll.cpp
-@@ -281,7 +281,9 @@ int PASCAL ProcessFile(HANDLE hArcData,i
- strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T");
- Data->Cmd.Test=Operation!=RAR_EXTRACT;
- bool Repeat=false;
-- Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat);
-+
-+ if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false)
-+ return (ERAR_UNKNOWN);
-
- while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD)
- {
Index: archivers/libunrar/files/patch-extract.cpp
===================================================================
--- archivers/libunrar/files/patch-extract.cpp
+++ archivers/libunrar/files/patch-extract.cpp
@@ -1,10 +0,0 @@
---- extract.cpp.orig 2010-03-15 06:30:52 UTC
-+++ extract.cpp
-@@ -354,6 +354,7 @@ bool CmdExtract::ExtractCurrentFile(Comm
- char CurVolName[NM];
- strcpy(CurVolName,ArcName);
-
-+ if(strcmp(ArcName,"")==0) return(false);
- VolNameToFirstName(ArcName,ArcName,(Arc.NewMhd.Flags & MHD_NEWNUMBERING)!=0);
- if (stricomp(ArcName,CurVolName)!=0 && FileExist(ArcName))
- {
Index: archivers/libunrar/files/patch-makefile.unix
===================================================================
--- archivers/libunrar/files/patch-makefile.unix
+++ archivers/libunrar/files/patch-makefile.unix
@@ -1,44 +0,0 @@
---- makefile.unix.orig 2009-05-03 05:18:45 UTC
-+++ makefile.unix
-@@ -7,10 +7,11 @@
-
- # Linux using GCC
- #CXX=g++
--#CXXFLAGS=-O2
--DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-+CXXFLAGS=$(CFLAGS) -fPIC -DPIC
-+DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DGUI -DSILENT
- STRIP=strip
- DESTDIR=/usr
-+RANLIB=ranlib
-
- # Linux using LCC
- #CXX=lcc
-@@ -100,7 +101,7 @@ LINK=$(CXX)
- WHAT=UNRAR
-
- UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
--LIB_OBJ=filestr.o scantree.o dll.o
-+LIB_OBJ=dll.o
-
- OBJECTS=rar.o strlist.o strfn.o pathfn.o savepos.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 +132,15 @@ sfx: $(OBJECTS)
- $(STRIP) default.sfx
-
- lib: WHAT=RARDLL
--lib: $(OBJECTS) $(LIB_OBJ)
-- @rm -f libunrar.so
-- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
-+lib: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ)
-+ @rm -f libunrar.so.3
-+ $(LINK) -shared -o libunrar.so.3 $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ)
-+
-+liba: WHAT=RARDLL
-+liba: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ)
-+ @rm -f libunrar.a
-+ $(AR) rc libunrar.a $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ)
-+ $(RANLIB) libunrar.a
-
- install-unrar:
- install unrar $(DESTDIR)/bin
Index: archivers/libunrar/pkg-descr
===================================================================
--- archivers/libunrar/pkg-descr
+++ archivers/libunrar/pkg-descr
@@ -1,7 +1,6 @@
- The UnRAR library is a minor part of the RAR archiver and contains
- RAR uncompression algorithm. UnRAR requires very small volume of
- memory to operate.
- UnRAR library can be used by other programs to extract RAR archives.
- This package contains small fixes from the http://mcmcc.bat.ru/clamav/.
+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/
Index: archivers/libunrar/pkg-plist
===================================================================
--- archivers/libunrar/pkg-plist
+++ archivers/libunrar/pkg-plist
@@ -1,3 +0,0 @@
-lib/libunrar.so
-lib/libunrar.so.3
-include/libunrar3/dll.hpp
Index: archivers/libunrar5/Makefile
===================================================================
--- archivers/libunrar5/Makefile
+++ archivers/libunrar5/Makefile
@@ -1,53 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= libunrar5
-PORTVERSION= 5.6.8
-PORTREVISION= 1
-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= compiler:c++11-lang gmake
-USE_LDCONFIG= yes
-
-ALL_TARGET= lib
-MAKEFILE= makefile
-MAKE_ARGS= AR="${AR}" \
- CXX="${CXX}" \
- CXXFLAGS="${CXXFLAGS} -fPIC" \
- 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 <bsd.port.mk>
Index: archivers/libunrar5/distinfo
===================================================================
--- archivers/libunrar5/distinfo
+++ archivers/libunrar5/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1539042126
-SHA256 (unrarsrc-5.6.8.tar.gz) = a4cc0ac14a354827751912d2af4a0a09e2c2129df5766576fa7e151791dd3dff
-SIZE (unrarsrc-5.6.8.tar.gz) = 226647
Index: archivers/libunrar5/files/patch-os.hpp
===================================================================
--- archivers/libunrar5/files/patch-os.hpp
+++ archivers/libunrar5/files/patch-os.hpp
@@ -1,13 +0,0 @@
---- os.hpp.orig 2017-04-28 17:28:46 UTC
-+++ os.hpp
-@@ -150,6 +150,10 @@
- #include <locale.h>
-
-
-+#ifdef OPENSSL_AES
-+#include <openssl/evp.h>
-+#endif // OPENSSL_AES
-+
- #ifdef S_IFLNK
- #define SAVE_LINKS
- #endif
Index: archivers/libunrar5/files/patch-rijndael.hpp
===================================================================
--- archivers/libunrar5/files/patch-rijndael.hpp
+++ archivers/libunrar5/files/patch-rijndael.hpp
@@ -1,24 +0,0 @@
---- rijndael.hpp.orig 2018-06-24 15:10:31 UTC
-+++ rijndael.hpp
-@@ -16,6 +16,13 @@
- class Rijndael
- {
- private:
-+#ifdef OPENSSL_AES
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX ctx;
-+#else
-+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
-+#endif
-+#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 +32,7 @@ class Rijndael
- 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.
Index: archivers/libunrar5/files/patch-rijndael.cpp
===================================================================
--- archivers/libunrar5/files/patch-rijndael.cpp
+++ archivers/libunrar5/files/patch-rijndael.cpp
@@ -1,136 +0,0 @@
---- rijndael.cpp.orig 2018-06-24 15:10:31 UTC
-+++ rijndael.cpp
-@@ -7,6 +7,8 @@
- ***************************************************************************/
- #include "rar.hpp"
-
-+#ifndef OPENSSL_AES
-+
- #ifdef USE_SSE
- #include <wmmintrin.h>
- #endif
-@@ -56,6 +58,7 @@ inline void Copy128(byte *dest,const byt
- #endif
- }
-
-+#endif // OPENSSL_AES
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // API
-@@ -63,14 +66,41 @@ inline void Copy128(byte *dest,const byt
-
- 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;
-+ }
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX_init(&ctx);
-+ EVP_CipherInit_ex(&ctx, cipher, NULL, key, initVector, Encrypt);
-+ EVP_CIPHER_CTX_set_padding(&ctx, 0);
-+#else
-+ EVP_CIPHER_CTX_init(ctx);
-+ EVP_CipherInit_ex(ctx, cipher, NULL, key, initVector, Encrypt);
-+ EVP_CIPHER_CTX_set_padding(ctx, 0);
-+#endif
-+#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 +141,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 +149,15 @@ void Rijndael::blockEncrypt(const byte *
- if (inputLen <= 0)
- return;
-
-+#ifdef OPENSSL_AES
-+ int outLen;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen);
-+#else
-+ EVP_CipherUpdate(ctx, outBuffer, &outLen, input, inputLen);
-+#endif
-+ return;
-+#else // OPENSSL_AES
- size_t numBlocks = inputLen/16;
- #ifdef USE_SSE
- if (AES_NI)
-@@ -176,6 +216,7 @@ void Rijndael::blockEncrypt(const byte *
- input += 16;
- }
- Copy128(m_initVector,prevBlock);
-+#endif // OPENSSL_AES
- }
-
-
-@@ -217,6 +258,15 @@ void Rijndael::blockDecrypt(const byte *
- if (inputLen <= 0)
- return;
-
-+#ifdef OPENSSL_AES
-+ int outLen;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CipherUpdate(&ctx, outBuffer, &outLen, input, inputLen);
-+#else
-+ EVP_CipherUpdate(ctx, outBuffer, &outLen, input, inputLen);
-+#endif
-+ return;
-+#else // OPENSSL_AES
- size_t numBlocks=inputLen/16;
- #ifdef USE_SSE
- if (AES_NI)
-@@ -279,6 +329,8 @@ void Rijndael::blockDecrypt(const byte *
- }
-
- memcpy(m_initVector,iv,16);
-+
-+#endif // OPENSSL_AES
- }
-
-
-@@ -314,7 +366,7 @@ void Rijndael::blockDecryptSSE(const byt
- }
- #endif
-
--
-+#ifndef OPENSSL_AES
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // ALGORITHM
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-@@ -454,7 +506,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);
- }
- }
--
-+#endif // OPENSSL_AES
-
- #if 0
- static void TestRijndael();
Index: archivers/libunrar5/pkg-descr
===================================================================
--- archivers/libunrar5/pkg-descr
+++ archivers/libunrar5/pkg-descr
@@ -1,6 +0,0 @@
-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/
Index: graphics/comical/Makefile
===================================================================
--- graphics/comical/Makefile
+++ graphics/comical/Makefile
@@ -14,7 +14,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libminizip.so:archivers/minizip \
- libunrar.so.5:archivers/libunrar5
+ libunrar.so.5:archivers/libunrar
USES= compiler:c++11-lang gmake
USE_WX= 2.8+
Index: sysutils/fusefs-rar2fs/Makefile
===================================================================
--- sysutils/fusefs-rar2fs/Makefile
+++ sysutils/fusefs-rar2fs/Makefile
@@ -33,7 +33,7 @@
bin/mkr2i \
man/man1/rar2fs.1.gz
-LIBUNRAR_PORT= archivers/libunrar5
+LIBUNRAR_PORT= archivers/libunrar
LIBUNRAR_PKG= ${LIBUNRAR_PORT:S|archivers/||}
post-patch:
Index: x11-fm/doublecmd/Makefile
===================================================================
--- x11-fm/doublecmd/Makefile
+++ x11-fm/doublecmd/Makefile
@@ -108,7 +108,7 @@
WFX_SAMBA \
DSX_LOCATE
-WCX_UNRAR_LIB_DEPENDS= libunrar.so.5:archivers/libunrar5
+WCX_UNRAR_LIB_DEPENDS= libunrar.so.5:archivers/libunrar
WFX_SAMBA_USES= samba:lib
WLX_MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 2:16 PM (21 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32524521
Default Alt Text
D22045.id63329.diff (16 KB)

Event Timeline