*/*: sync with upstream

Taken from: HardenedBSD
opnsense2 · Jun 11, 2019 · a126d67 · a126d67
1 parent b0bdf7f
commit a126d67
Show file tree

Hide file tree

Showing 72 changed files with 781 additions and 479 deletions.
diff --git a/archivers/py-lz4/Makefile b/archivers/py-lz4/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	lz4
-PORTVERSION=	2.1.9
+PORTVERSION=	2.1.10
 CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

diff --git a/archivers/py-lz4/distinfo b/archivers/py-lz4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559661276
-SHA256 (lz4-2.1.9.tar.gz) = d59166050fec4cc2331b9c1279a59b69c169b52533cf35fe7fca26d662382cd2
-SIZE (lz4-2.1.9.tar.gz) = 137989
+TIMESTAMP = 1560176121
+SHA256 (lz4-2.1.10.tar.gz) = db4ac5a9b54d6d6b5bb0d6f9b77790f1460e2aeb37cd8ec76c96fe78aaf4a2a8
+SIZE (lz4-2.1.10.tar.gz) = 138372
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libshout
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	https://downloads.xiph.org/releases/libshout/ \
 		https://svn.xiph.org/releases/libshout/ \
@@ -34,7 +35,7 @@ THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^DATA = / s| $$(ckport_DATA)||; /^install-data-am:/ s| install-ckportDATA||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's| -ffast-math||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's| -ffast-math||g; /libssl/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^AM_CPPFLAGS = / s|^\(.*\) \(@XIPH_CPPFLAGS@\) \(.*\)$$|\1 \3 \2|' ${WRKSRC}/examples/Makefile.in
 	@${REINPLACE_CMD} -e 's|#ifdef IPV6_V6ONLY|#if defined(__BSD_VISIBLE) \&\& defined(IPV6_V6ONLY)|' ${WRKSRC}/src/common/net/sock.c
 

diff --git a/databases/pgroonga/Makefile b/databases/pgroonga/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pgroonga
-PORTVERSION=	2.1.9
+PORTVERSION=	2.2.0
 CATEGORIES=	databases textproc
 MASTER_SITES=	http://packages.groonga.org/source/pgroonga/
 

diff --git a/databases/pgroonga/distinfo b/databases/pgroonga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557304527
-SHA256 (pgroonga-2.1.9.tar.gz) = dcae46cebdd6e518e52097ea142c533363acc6a3b56b005570b69088dfe97195
-SIZE (pgroonga-2.1.9.tar.gz) = 335611
+TIMESTAMP = 1560021884
+SHA256 (pgroonga-2.2.0.tar.gz) = 0b89264cfa1a5144cf9bc334c3f97314e3274841903c2f8eb3a8cf982f9b56b1
+SIZE (pgroonga-2.2.0.tar.gz) = 336817
diff --git a/databases/pgroonga/pkg-plist b/databases/pgroonga/pkg-plist
@@ -44,7 +44,8 @@ share/postgresql/extension/pgroonga--2.1.5--2.1.6.sql
 share/postgresql/extension/pgroonga--2.1.6--2.1.7.sql
 share/postgresql/extension/pgroonga--2.1.7--2.1.8.sql
 share/postgresql/extension/pgroonga--2.1.8--2.1.9.sql
-share/postgresql/extension/pgroonga--2.1.9.sql
-share/postgresql/extension/pgroonga_database--2.1.9.sql
+share/postgresql/extension/pgroonga--2.1.9--2.2.0.sql
+share/postgresql/extension/pgroonga--2.2.0.sql
+share/postgresql/extension/pgroonga_database--2.2.0.sql
 share/postgresql/extension/pgroonga_database.control
 share/postgresql/extension/pgroonga.control
diff --git a/databases/py-tableschema/Makefile b/databases/py-tableschema/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tableschema
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.5:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc3986>=1.1.0:www/py-rfc3986@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tabulator>=1.3:devel/py-tabulator@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tabulator>=1.20:devel/py-tabulator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.14:devel/py-unicodecsv@${PY_FLAVOR}
 
 USES=		python

diff --git a/databases/py-tableschema/distinfo b/databases/py-tableschema/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559944329
-SHA256 (tableschema-1.5.1.tar.gz) = 7c95dd4cafcff39a554e25d3802cc91efd4c52e83bf71629d3303c73a5f27d84
-SIZE (tableschema-1.5.1.tar.gz) = 65639
+TIMESTAMP = 1560176053
+SHA256 (tableschema-1.5.2.tar.gz) = 50532bf25fdfe4e7d031a3da5b5e404bfb6b7eff0a17220262bc931dd22c4480
+SIZE (tableschema-1.5.2.tar.gz) = 65656
diff --git a/devel/arduino-bsd-mk/Makefile b/devel/arduino-bsd-mk/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	arduino-bsd-mk
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2
 CATEGORIES=	devel
 MASTER_SITES=	https://xse.com/leres/arduino/arduino-bsd-mk/ \
 		LOCAL/leres/arduino-bsd-mk
@@ -16,7 +15,7 @@ LICENSE=	BSD2CLAUSE
 RUN_DEPENDS=	arduino:devel/arduino \
 		avr-gcc:devel/avr-gcc
 
-USES=		python:2.7,run shebangfix
+USES=		python:3.5+,run shebangfix
 
 SHEBANG_FILES=	arduino-boards.py
 

diff --git a/devel/arduino-bsd-mk/distinfo b/devel/arduino-bsd-mk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519625135
-SHA256 (arduino-bsd-mk-1.1.tar.gz) = a83178c072c268ae8d6693e487185dcfe97f2e40191e888d5b057f2f77ac547a
-SIZE (arduino-bsd-mk-1.1.tar.gz) = 9434
+TIMESTAMP = 1560189339
+SHA256 (arduino-bsd-mk-1.2.tar.gz) = da16c4be6571c0218bd2fc3959969938aa7b3a4d6966056d6d85427e1c51539f
+SIZE (arduino-bsd-mk-1.2.tar.gz) = 9505
diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile
@@ -89,7 +89,7 @@ PORTVERSION=	3.7.1
 
 .if defined(WITH_CCACHE_BUILD) && empty(OPTIONS_SLAVE:MMEMCACHED)
 .if !empty(BUILD_DEPENDS)
-.error MAINTAINER NOTE: Cannot have any BUILD_DEPENDS for default ccache packages
+.error MAINTAINER NOTE: Cannot have any BUILD_DEPENDS for default ccache packages: ${BUILD_DEPENDS}
 .endif
 .endif
 

diff --git a/devel/libgrading/Makefile b/devel/libgrading/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libgrading
-PORTVERSION=	0.1.7
+PORTVERSION=	0.1.8
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 

diff --git a/devel/libgrading/distinfo b/devel/libgrading/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549652024
-SHA256 (trombonehero-libgrading-v0.1.7_GH0.tar.gz) = a8bc5bc1e042a8fb80628bf7abecd01b5a3a63ec501034eb46aca606bd52efc2
-SIZE (trombonehero-libgrading-v0.1.7_GH0.tar.gz) = 48711
+TIMESTAMP = 1559923367
+SHA256 (trombonehero-libgrading-v0.1.8_GH0.tar.gz) = 2a65c2ec9ed35d8f2035844c71004dbf42eec9827204e9a31b9addbcd0456763
+SIZE (trombonehero-libgrading-v0.1.8_GH0.tar.gz) = 48933
diff --git a/devel/liblpm/Makefile b/devel/liblpm/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Longest Prefix Match library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-USES=		gmake libtool:build
+USES=		compiler gmake libtool:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rmind
@@ -29,4 +29,10 @@ PLIST_FILES=	include/lpm.h \
 		lib/liblpm.so.1 \
 		lib/liblpm.so.1.0.0
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/liblpm/files/extra-patch-Makefile b/devel/liblpm/files/extra-patch-Makefile
@@ -0,0 +1,16 @@
+--- Makefile.orig	2019-05-18 16:55:32 UTC
++++ Makefile
+@@ -11,13 +11,10 @@ CFLAGS+=	-D_GNU_SOURCE -D_DEFAULT_SOURCE
+ #
+ # Extended warning flags.
+ #
+-CFLAGS+=	-Wno-unknown-warning-option # gcc vs clang
+-
+ CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
+ CFLAGS+=	-Wmissing-declarations -Wredundant-decls -Wnested-externs
+ CFLAGS+=	-Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
+ CFLAGS+=	-Wold-style-definition
+-CFLAGS+=	-Wsuggest-attribute=noreturn -Wjump-misses-init
+
+ # New GCC 6/7 flags:
+ #CFLAGS+=	-Wduplicated-cond -Wmisleading-indentation -Wnull-dereference
diff --git a/devel/libthmap/Makefile b/devel/libthmap/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Concurrent trie-hash map library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-USES=		gmake libtool:build
+USES=		compiler:c11 gmake libtool:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rmind

diff --git a/devel/py-medikit/Makefile b/devel/py-medikit/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	medikit
-PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTVERSION=	0.7.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

diff --git a/devel/py-medikit/distinfo b/devel/py-medikit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552911262
-SHA256 (medikit-0.7.1.tar.gz) = 301b81bf7ab033c26fb471b1ccadd590446b7853d8ee298de814bc54e2e7b7be
-SIZE (medikit-0.7.1.tar.gz) = 39437
+TIMESTAMP = 1560176057
+SHA256 (medikit-0.7.2.tar.gz) = 5df6a5555dc535416bfbf93405a12181131f1ae3c4443d1b5a09d4a6e518e6d8
+SIZE (medikit-0.7.2.tar.gz) = 39475
diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	citra
-PORTVERSION=	s20190608
+PORTVERSION=	s20190610
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	boost-libs>=1.66:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	citra-emu
-GH_TAGNAME=	75ebf1fdf
+GH_TAGNAME=	73bf92fb3
 GH_TUPLE=	citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
 		citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
 		MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \

diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1560021871
-SHA256 (citra-emu-citra-s20190608-75ebf1fdf_GH0.tar.gz) = 8468e995b3a788a1161d5c8575072242f12132ba54287dca4e9bc663ac125581
-SIZE (citra-emu-citra-s20190608-75ebf1fdf_GH0.tar.gz) = 5044274
+TIMESTAMP = 1560175412
+SHA256 (citra-emu-citra-s20190610-73bf92fb3_GH0.tar.gz) = e6d26c3b595574e1ede4fcb3c4ed236fc6795f3d9332819c4845781e9ff3783e
+SIZE (citra-emu-citra-s20190610-73bf92fb3_GH0.tar.gz) = 5044723
 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3
 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942
 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c

diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.6-8196 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g2bc0ea37a
+DISTVERSION=	0.0.6-8205 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-gb3513cd7f
 CATEGORIES=	emulators
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -47,6 +47,11 @@ CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS
 CXXFLAGS+=	-Wno-macro-redefined # __STDC_*_MACROS sys/cdefs.h vs. llvm-config
 LDFLAGS+=	-Wl,--as-needed # GLU
 
+# XXX Remove after FreeBSD 11.2/12.0 reach EOL i.e., around 2020-02-01
+.if !exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so)
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-revert-f9ad6358563b
+.endif
+
 OPTIONS_DEFINE=	ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN
 OPTIONS_DEFAULT=ALSA LLVM VULKAN
 

diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1560011695
-SHA256 (RPCS3-rpcs3-v0.0.6-8196-g2bc0ea37a_GH0.tar.gz) = 51b0f4b56e03da1d860004016ea7868ab356e4efec96031e29b61592bfc19955
-SIZE (RPCS3-rpcs3-v0.0.6-8196-g2bc0ea37a_GH0.tar.gz) = 5390668
+TIMESTAMP = 1560203291
+SHA256 (RPCS3-rpcs3-v0.0.6-8205-gb3513cd7f_GH0.tar.gz) = a7702c05bde3c01844aa6d682014ab8458550e7d0f9ee21db90e20cd814c3daa
+SIZE (RPCS3-rpcs3-v0.0.6-8205-gb3513cd7f_GH0.tar.gz) = 5436746
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
 SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e