diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index 526ba5873568..4e5b040db9df 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -1,114 +1,114 @@ # $FreeBSD$ PORTNAME= libarchive -PORTVERSION= 3.2.2 +PORTVERSION= 3.3.1 PORTEPOCH= 1 CATEGORIES= archivers MASTER_SITES= http://libarchive.org/downloads/ MAINTAINER= glewis@FreeBSD.org COMMENT= Library to create and read several streaming archive formats LICENSE= BSD2CLAUSE LIB_DEPENDS= libexpat.so:textproc/expat2 OPTIONS_DEFINE= LZ4 LZO NETTLE OPTIONS_DEFAULT=LZ4 LZO LZ4_DESC= Support lz4 compression via liblz4 LZO_DESC= Support lzo compression via liblzo2 NETTLE_DESC= Use Nettle instead of OpenSSL USES= cpe iconv libtool pathfix GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes CONFIGURE_ARGS= --without-xml2 PLIST_FILES= bin/bsdcat \ bin/bsdcpio \ bin/bsdtar \ include/archive.h \ include/archive_entry.h \ lib/libarchive.a \ lib/libarchive.so \ lib/libarchive.so.13 \ - lib/libarchive.so.13.2.2 \ + lib/libarchive.so.13.3.1 \ libdata/pkgconfig/libarchive.pc \ man/man1/bsdcat.1.gz \ man/man1/bsdcpio.1.gz \ man/man1/bsdtar.1.gz \ man/man3/archive_entry.3.gz \ man/man3/archive_entry_acl.3.gz \ man/man3/archive_entry_linkify.3.gz \ man/man3/archive_entry_paths.3.gz \ man/man3/archive_entry_perms.3.gz \ man/man3/archive_entry_stat.3.gz \ man/man3/archive_entry_time.3.gz \ man/man3/archive_read.3.gz \ man/man3/archive_read_add_passphrase.3.gz \ man/man3/archive_read_data.3.gz \ man/man3/archive_read_disk.3.gz \ man/man3/archive_read_extract.3.gz \ man/man3/archive_read_filter.3.gz \ man/man3/archive_read_format.3.gz \ man/man3/archive_read_free.3.gz \ man/man3/archive_read_header.3.gz \ man/man3/archive_read_new.3.gz \ man/man3/archive_read_open.3.gz \ man/man3/archive_read_set_options.3.gz \ man/man3/archive_util.3.gz \ man/man3/archive_write.3.gz \ man/man3/archive_write_blocksize.3.gz \ man/man3/archive_write_data.3.gz \ man/man3/archive_write_disk.3.gz \ man/man3/archive_write_filter.3.gz \ man/man3/archive_write_finish_entry.3.gz \ man/man3/archive_write_format.3.gz \ man/man3/archive_write_free.3.gz \ man/man3/archive_write_header.3.gz \ man/man3/archive_write_new.3.gz \ man/man3/archive_write_open.3.gz \ man/man3/archive_write_set_options.3.gz \ man/man3/archive_write_set_passphrase.3.gz \ man/man3/libarchive.3.gz \ man/man3/libarchive_changes.3.gz \ man/man3/libarchive_internals.3.gz \ man/man5/cpio.5.gz \ man/man5/libarchive-formats.5.gz \ man/man5/mtree.5.gz \ man/man5/tar.5.gz CFLAGS+= "-I${LOCALBASE}/include" CPPFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= "-L${LOCALBASE}/lib" LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 LZO_CONFIGURE_WITH= lzo2 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZ4_CONFIGURE_WITH= lz4 NETTLE_LIB_DEPENDS= libnettle.so:security/nettle NETTLE_CONFIGURE_WITH= nettle NETTLE_CONFIGURE_ON= --without-openssl NETTLE_USES_OFF= ssl NETTLE_CONFIGURE_OFF= --with-openssl .include .if ${SSL_DEFAULT:Mopenssl-devel} BROKEN= Does not build with openssl-devel .endif .if empty(ICONV_LIB) CONFIGURE_ENV+= ac_cv_header_localcharset_h=no \ ac_cv_func_locale_charset=no \ ac_cv_lib_charset_locale_charset=no .endif check: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check) .include diff --git a/archivers/libarchive/distinfo b/archivers/libarchive/distinfo index 00a324dcf08a..3080e3ddf611 100644 --- a/archivers/libarchive/distinfo +++ b/archivers/libarchive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1477363506 -SHA256 (libarchive-3.2.2.tar.gz) = 691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f -SIZE (libarchive-3.2.2.tar.gz) = 5458241 +TIMESTAMP = 1489875854 +SHA256 (libarchive-3.3.1.tar.gz) = 29ca5bd1624ca5a007aa57e16080262ab4379dbf8797f5c52f7ea74a3b0424e7 +SIZE (libarchive-3.3.1.tar.gz) = 6219943 diff --git a/archivers/libarchive/files/libarchive-archive_openssl_evp_private.h b/archivers/libarchive/files/libarchive-archive_openssl_evp_private.h new file mode 100644 index 000000000000..d07b8a0f3277 --- /dev/null +++ b/archivers/libarchive/files/libarchive-archive_openssl_evp_private.h @@ -0,0 +1,11 @@ +--- libarchive/archive_openssl_evp_private.h.orig Sun Jan 29 06:06:27 2017 ++++ libarchive/archive_openssl_evp_private.h Fri Mar 10 12:53:43 2017 +@@ -28,7 +28,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include /* malloc, free */ + #include /* memset */ + static inline EVP_MD_CTX *EVP_MD_CTX_new(void) diff --git a/archivers/libarchive/files/libarchive-archive_openssl_hmac_private.h b/archivers/libarchive/files/libarchive-archive_openssl_hmac_private.h new file mode 100644 index 000000000000..aa87a19c86a4 --- /dev/null +++ b/archivers/libarchive/files/libarchive-archive_openssl_hmac_private.h @@ -0,0 +1,11 @@ +--- libarchive/archive_openssl_hmac_private.h.orig Sun Jan 29 06:06:27 2017 ++++ libarchive/archive_openssl_hmac_private.h Fri Mar 10 12:53:43 2017 +@@ -28,7 +28,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include /* malloc, free */ + #include /* memset */ + static inline HMAC_CTX *HMAC_CTX_new(void)