*/*: sync with upstream

Taken from: HardenedBSD
opnsense2 · Jan 23, 2020 · 69f6ca6 · 69f6ca6
1 parent 0452d79
commit 69f6ca6
Show file tree

Hide file tree

Showing 339 changed files with 2,921 additions and 1,573 deletions.
diff --git a/archivers/rubygem-ruby-xz/Makefile b/archivers/rubygem-ruby-xz/Makefile
@@ -11,8 +11,9 @@ COMMENT=	Ruby bindings for the liblzma library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/biology/py-pysam/Makefile b/biology/py-pysam/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pysam
-DISTVERSION=	0.15.3
+DISTVERSION=	0.15.4
 CATEGORIES=	biology python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

diff --git a/biology/py-pysam/distinfo b/biology/py-pysam/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567266301
-SHA256 (pysam-0.15.3.tar.gz) = a98dd0a164aa664b1ab30a36f653752f00e93c13deeb66868597f4b2a30f7265
-SIZE (pysam-0.15.3.tar.gz) = 3221249
+TIMESTAMP = 1579747726
+SHA256 (pysam-0.15.4.tar.gz) = a535e15cbd6e27f4ab74cabca30ca1df7eea283cb91d3b536d47fe113fee066f
+SIZE (pysam-0.15.4.tar.gz) = 1605385
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calculix
-PORTVERSION=	2.16
+PORTVERSION=	2.16.1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
@@ -24,7 +24,7 @@ USE_GL=		gl glu # uses its own glut
 
 DIST_SOURCES=	cgx_${PORTVERSION}.all${EXTRACT_SUFX}
 DIST_HTM=	cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
-DIST_PDF=	cgx_${PORTVERSION}.pdf
+DIST_PDF=	cgx_2.16.pdf
 DIST_EXAMPLES=	cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/CalculiX
@@ -77,7 +77,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/cgx
 	@(cd ${WRKSRC}/${CGX_VER}/doc/cgx && ${COPYTREE_SHARE} . \
 	  ${STAGEDIR}${DOCSDIR}/cgx)
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cgx_${PORTVERSION}.pdf \
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DIST_PDF} \
 	  ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}

diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1577502634
-SHA256 (calculix/cgx_2.16.all.tar.bz2) = 8389dbe31aa2d371f45f921743f39e91979e8bebb6cf43d5e645331c2f036ca1
-SIZE (calculix/cgx_2.16.all.tar.bz2) = 5500475
-SHA256 (calculix/cgx_2.16.exa.tar.bz2) = 3dedf12eefa72604144229bdda533b29235bbe6dea66a92b2e0127eee52d9dca
-SIZE (calculix/cgx_2.16.exa.tar.bz2) = 3927640
-SHA256 (calculix/cgx_2.16.htm.tar.bz2) = 3755d29c1975c99c575efc64453a6641039831733ffe940d1ba2b48794961177
-SIZE (calculix/cgx_2.16.htm.tar.bz2) = 370067
+TIMESTAMP = 1579642636
+SHA256 (calculix/cgx_2.16.1.all.tar.bz2) = 0125efb8dfe47c920b266d8c6a326677eae3967a113a75c079405c1d9415cb54
+SIZE (calculix/cgx_2.16.1.all.tar.bz2) = 5574753
+SHA256 (calculix/cgx_2.16.1.exa.tar.bz2) = 3bf64df5cc63eef1c2f3bc4a8fed292fe76c5fe2e035857bf51ef8578a04d57f
+SIZE (calculix/cgx_2.16.1.exa.tar.bz2) = 3914261
+SHA256 (calculix/cgx_2.16.1.htm.tar.bz2) = ed0107b6aa6a020ae616a9ffee8f02115a587d9482e6c599d8ab914bc68b4524
+SIZE (calculix/cgx_2.16.1.htm.tar.bz2) = 369390
 SHA256 (calculix/cgx_2.16.pdf) = b6d63ec1cddd1901de758eb18a68e1f123270cf0257042b10a0f364106e509f7
 SIZE (calculix/cgx_2.16.pdf) = 1426769
diff --git a/cad/calculix/files/patch-cgx__VER_src_Makefile b/cad/calculix/files/patch-cgx__VER_src_Makefile
@@ -1,5 +1,5 @@
---- cgx_2.16/src/Makefile.orig	2017-03-11 16:25:39 UTC
-+++ cgx_2.16/src/Makefile
+--- cgx_2.16.1/src/Makefile.orig	2017-03-11 16:25:39 UTC
++++ cgx_2.16.1/src/Makefile
 @@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \
    -I/usr/include/GL \
    -I../../libSNL/src \

diff --git a/cad/calculix/files/patch-cgx__VER_src_cgx.h b/cad/calculix/files/patch-cgx__VER_src_cgx.h
@@ -1,10 +1,10 @@
---- cgx_2.16/src/cgx.h.orig	2017-04-28 10:12:50 UTC
-+++ cgx_2.16/src/cgx.h
+--- cgx_2.16.1/src/cgx.h.orig	2017-04-28 10:12:50 UTC
++++ cgx_2.16.1/src/cgx.h
 @@ -89,8 +89,8 @@ rendering is done in the index-mode.
      "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html",\
-     "/usr/local/CalculiX/cgx_2.16/doc/aflib/aflib.pdf"}
+     "/usr/local/CalculiX/cgx_2.16.1/doc/aflib/aflib.pdf"}
  #else
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.16/doc/cgx/cgx.html",\
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.16.1/doc/cgx/cgx.html",\
 -    "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html"}
 +  #define     HELPFILE        {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\
 +    "/usr/local/share/doc/CalculiX/ccx/ccx.html"}

diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
@@ -1,5 +1,4 @@
 bin/cgx
-%%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.aux
@@ -230,6 +229,8 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node260.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node261.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node262.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node263.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node29.html

diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pdf2djvu
 PORTVERSION=	0.9.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters
 MASTER_SITES=	https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/
 

diff --git a/converters/pdf2djvu/files/patch-pdf-backend.cc b/converters/pdf2djvu/files/patch-pdf-backend.cc
@@ -0,0 +1,26 @@
+--- pdf-backend.cc.orig	2019-06-10 17:06:44 UTC
++++ pdf-backend.cc
+@@ -103,7 +103,7 @@ static void poppler_error_handler(void *data, ErrorCat
+
+ pdf::Environment::Environment()
+ {
+-  globalParams = new GlobalParams();
++  globalParams = std::unique_ptr<GlobalParams>(new GlobalParams);
+   setErrorCallback(poppler_error_handler, nullptr);
+ }
+
+@@ -499,12 +499,11 @@ bool pdf::get_glyph(splash::Splash *splash, splash::Fo
+ void pdf::Renderer::convert_path(pdf::gfx::State *state, splash::Path &splash_path)
+ {
+   /* Source was copied from <poppler/SplashOutputDev.c>. */
+-  pdf::gfx::Subpath *subpath;
+-  pdf::gfx::Path *path = state->getPath();
++  auto path = state->getPath();
+   int n_subpaths = path->getNumSubpaths();
+   for (int i = 0; i < n_subpaths; i++)
+   {
+-    subpath = path->getSubpath(i);
++    auto subpath = path->getSubpath(i);
+     if (subpath->getNumPoints() > 0)
+     {
+       double x1, y1, x2, y2, x3, y3;
diff --git a/converters/pecl-igbinary/Makefile b/converters/pecl-igbinary/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	igbinary
-PORTVERSION=	3.1.1
+PORTVERSION=	3.1.2
 CATEGORIES=	converters
 
 MAINTAINER=	[email protected]

diff --git a/converters/pecl-igbinary/distinfo b/converters/pecl-igbinary/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579273462
-SHA256 (PECL/igbinary-3.1.1.tgz) = a81e0c4d61854c5f148018ebf62b66f9610c0ada923de3b80c09f51aecb1c128
-SIZE (PECL/igbinary-3.1.1.tgz) = 71897
+TIMESTAMP = 1579684142
+SHA256 (PECL/igbinary-3.1.2.tgz) = e78b327dad5397ed42f7b0c6fe017eddcde8c3c24ab8b59562cb691c411fa90b
+SIZE (PECL/igbinary-3.1.2.tgz) = 71862
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kbibtex
 DISTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	databases kde
 MASTER_SITES=	KDE/stable/KBibTeX/${DISTVERSION}
 

diff --git a/databases/postgresql-tds_fdw/Makefile b/databases/postgresql-tds_fdw/Makefile
@@ -3,18 +3,19 @@
 
 PORTNAME=	tds_fdw
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.0-alpha.3
+PORTVERSION=	2.0.1
 CATEGORIES=	databases
-PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
+PKGNAMEPREFIX=	postgresql${PGSQL_VER:S|.||}-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PostgreSQL foreign data wrapper to connect to TDS databases
 
 LICENSE=	PostgreSQL
 
 LIB_DEPENDS=	libsybdb.so:databases/freetds
 
 USES=		gmake pgsql:9.2+
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	tds-fdw
 

diff --git a/databases/postgresql-tds_fdw/distinfo b/databases/postgresql-tds_fdw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564904679
-SHA256 (tds-fdw-tds_fdw-v2.0.0-alpha.3_GH0.tar.gz) = fcba4722171631332e06a91f22e0c22fbfd088e00abaf735be4d8c5512b14aa2
-SIZE (tds-fdw-tds_fdw-v2.0.0-alpha.3_GH0.tar.gz) = 58656
+TIMESTAMP = 1579684136
+SHA256 (tds-fdw-tds_fdw-v2.0.1_GH0.tar.gz) = 031147a980ed502b3e095fda449e3eed65ef1bb97b2bb445217559d10bc0bdc5
+SIZE (tds-fdw-tds_fdw-v2.0.1_GH0.tar.gz) = 62848
diff --git a/databases/postgresql-tds_fdw/pkg-descr b/databases/postgresql-tds_fdw/pkg-descr
@@ -1,7 +1,13 @@
 Tds_fdw is a PostgreSQL foreign data wrapper that can connect to databases that
 use the Tabular Data Stream (TDS) protocol, such as Sybase databases and
-Microsoft SQL server. The current version does not yet support JOIN push-down, 
-or write operations. It does support WHERE and column pushdowns when
-match_column_names is enabled.
+Microsoft SQL server.
+
+This foreign data wrapper requires a library that implements the DB-Library
+interface, such as FreeTDS. This has been tested with FreeTDS, but not the
+proprietary implementations of DB-Library.
+
+The current version does not yet support JOIN push-down, or write operations.
+
+It does support WHERE and column pushdowns when match_column_names is enabled.
 
 WWW: https://github.com/tds-fdw/tds_fdw
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	calibre
 PORTVERSION=	4.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 

diff --git a/deskutils/cfiles/Makefile b/deskutils/cfiles/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	cfiles
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	[email protected]

diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gourmet
 PORTVERSION=	0.17.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	deskutils gnome
 
 MAINTAINER=	[email protected]

diff --git a/deskutils/lumina-pdf/Makefile b/deskutils/lumina-pdf/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lumina-pdf
 DISTVERSION=	1.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 
 MAINTAINER=	[email protected]

diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	recoll
 DISTVERSION=	1.25.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	https://www.lesbonscomptes.com/recoll/
 

diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tumbler
 PORTVERSION=	0.2.8
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE
 PKGNAMEPREFIX=	xfce4-

diff --git a/devel/Makefile b/devel/Makefile
@@ -5852,6 +5852,7 @@
     SUBDIR += rubygem-faker
     SUBDIR += rubygem-faraday-cookie_jar
     SUBDIR += rubygem-faraday_middleware-aws-signers-v4
+    SUBDIR += rubygem-faraday_middleware-aws-sigv4
     SUBDIR += rubygem-faraday_middleware-multi_json
     SUBDIR += rubygem-fast-stemmer
     SUBDIR += rubygem-fast_blank
@@ -6181,6 +6182,7 @@
     SUBDIR += rubygem-re2
     SUBDIR += rubygem-react-rails
     SUBDIR += rubygem-react-rails-rails5
+    SUBDIR += rubygem-readline-ext
     SUBDIR += rubygem-readwritesettings
     SUBDIR += rubygem-recaptcha
     SUBDIR += rubygem-recursive-open-struct

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	binutils
 PORTVERSION=	2.33.1
 PORTEPOCH?=	1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	devel
 MASTER_SITES=	SOURCEWARE/binutils/releases
 
@@ -108,7 +108,7 @@ MAKE_ARGS+=	LIBDL=""
 .include <bsd.port.pre.mk>
 
 # Actual earliest version may differ slightly
-.if ${ARCH} != sparc64 && ${ARCH} != mips && ${ARCH} != mips64 && ${ARCH} != powerpc && ${ARCH} != powerpc64 && ${ARCH} != powerpcspe && !defined(PKGNAMEPREFIX)
+.if (${ARCH} != sparc64 && ${ARCH} != mips && ${ARCH} != mips64 && ${ARCH} != powerpcspe && !defined(PKGNAMEPREFIX)) || ((${ARCH} == powerpc || ${ARCH} == powerpc64) && ${CHOSEN_COMPILER_TYPE} == clang && !defined(PKGNAMEPREFIX))
 CONFIGURE_ARGS+=	--enable-gold --enable-plugins
 CXXFLAGS+=	-Wno-c++11-narrowing
 PLIST_SUB+=	GOLD=""