*/*: sync with upstream

Taken from: HardenedBSD
opnsense2 · Jun 17, 2021 · a1c51b4 · a1c51b4
1 parent fb5a936
commit a1c51b4
Show file tree

Hide file tree

Showing 278 changed files with 29,469 additions and 928 deletions.
diff --git a/archivers/py-lzma/Makefile b/archivers/py-lzma/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python binding for the LZMA compression library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
 USES=		dos2unix python:3.6+
 USE_PYTHON=	concurrent distutils autoplist
 

diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	astrometry
 PORTVERSION=	0.85
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://astrometry.net/downloads/
 DISTNAME=	${PORTNAME}.net-${PORTVERSION}

diff --git a/astro/gnuastro/Makefile b/astro/gnuastro/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gnuastro
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	GNU
 

diff --git a/astro/siril/Makefile b/astro/siril/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	siril
 DISTVERSION=	0.99.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro graphics
 MASTER_SITES=	https://free-astro.org/download/
 

diff --git a/astro/stellarsolver/Makefile b/astro/stellarsolver/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	stellarsolver
 DISTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	astro
 
 MAINTAINER=	[email protected]

diff --git a/audio/plasma5-plasma-pa/distinfo b/audio/plasma5-plasma-pa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622813545
-SHA256 (KDE/plasma/5.22.0/plasma-pa-5.22.0.tar.xz) = 6d6f3ba2303c6f640fa2c8c3c648e10021651a00f5ab10d5d78dc7e3ed9d4741
-SIZE (KDE/plasma/5.22.0/plasma-pa-5.22.0.tar.xz) = 127228
+TIMESTAMP = 1623866570
+SHA256 (KDE/plasma/5.22.1/plasma-pa-5.22.1.tar.xz) = bd8d5655ae3e188b1c48ac3c0019a0c303b95060576836f70232448b5955e9f2
+SIZE (KDE/plasma/5.22.1/plasma-pa-5.22.1.tar.xz) = 127304
diff --git a/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc b/audio/sfizz/files/patch-external_abseil-cpp_absl_base_internal_unscaledcycleclock.cc
@@ -0,0 +1,14 @@
+--- external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc.orig	2021-06-16 13:17:13 UTC
++++ external/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
+@@ -24,8 +24,10 @@
+ #ifdef __GLIBC__
+ #include <sys/platform/ppc.h>
+ #elif defined(__FreeBSD__)
+-#include <sys/sysctl.h>
++#include "absl/base/call_once.h"
+ #include <sys/types.h>
++#include <sys/sysctl.h>
++#include <threads.h>
+ #endif
+ #endif
+
diff --git a/audio/sfizz/files/patch-src_external_atomic__queue_defs.h b/audio/sfizz/files/patch-src_external_atomic__queue_defs.h
@@ -1,4 +1,4 @@
---- src/external/atomic_queue/defs.h.orig	2020-04-20 01:14:22 UTC
+--- src/external/atomic_queue/defs.h.orig	2020-07-23 22:01:34 UTC
 +++ src/external/atomic_queue/defs.h
 @@ -6,11 +6,15 @@
 
@@ -26,3 +26,14 @@
  static inline void spin_loop_pause() noexcept {
  #if (defined(__ARM_ARCH_6K__) || \
       defined(__ARM_ARCH_6Z__) || \
+@@ -37,6 +41,10 @@ static inline void spin_loop_pause() noexcept {
+ #endif
+ }
+ } // namespace atomic_queue
++#elif defined(__powerpc__)
++static inline void spin_loop_pause() noexcept {
++    asm volatile("ori 0,0,0" ::: "memory");
++}
+ #else
+ #error "Unknown CPU architecture."
+ #endif
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	snd
 PORTVERSION=	21.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://ccrma.stanford.edu/software/snd/ \
 		SF

diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	soundtracker
-DISTVERSION=	1.0.2
-PORTREVISION=	1
+DISTVERSION=	1.0.2.1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/
 
@@ -12,6 +11,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libsndfile.so:audio/libsndfile
 RUN_DEPENDS=	bash:shells/bash
 

diff --git a/audio/soundtracker/distinfo b/audio/soundtracker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621198694
-SHA256 (soundtracker-1.0.2.tar.xz) = 9dd09efd06f9794ca52b00d778e885124b73e343dfac87d7ba3e62b059878fcb
-SIZE (soundtracker-1.0.2.tar.xz) = 754884
+TIMESTAMP = 1623870946
+SHA256 (soundtracker-1.0.2.1.tar.xz) = 0275b7f38243e2cc2474ae892c88ae486bf815dd0658830101ac518b3e6f005a
+SIZE (soundtracker-1.0.2.1.tar.xz) = 754976
diff --git a/audio/soundtracker/files/patch-app_audio-subs.c b/audio/soundtracker/files/patch-app_audio-subs.c
diff --git a/audio/soundtracker/files/patch-app_gui-subs.h b/audio/soundtracker/files/patch-app_gui-subs.h
diff --git a/audio/soundtracker/files/patch-app_keys.c b/audio/soundtracker/files/patch-app_keys.c
diff --git a/audio/spectacle-lv2/files/patch-thirdparty_spin__mutex_src_SpinLoopPause.h b/audio/spectacle-lv2/files/patch-thirdparty_spin__mutex_src_SpinLoopPause.h
@@ -4,7 +4,7 @@
      asm volatile ("nop" ::: "memory");
  #endif
  }
-+#elif defined(__powerpc64__)
++#elif defined(__powerpc__)
 +static inline void spin_loop_pause() noexcept {
 +    asm volatile("ori 0,0,0" ::: "memory");
 +}

diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
@@ -6,13 +6,11 @@ CATEGORIES+=	audio
 MASTER_SITES=	SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}
 DISTNAME=	TiMidity++-${PORTVERSION}
 
-MAINTAINER?=	[email protected]
+MAINTAINER?=	[email protected]
 COMMENT?=	Software MIDI player
 
 LICENSE=	GPLv2+
 
-BROKEN_riscv64=	fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h
-
 LIB_DEPENDS=	libarc.so:archivers/libarc
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \

diff --git a/audio/timidity++/files/patch-timidity_timidity.c b/audio/timidity++/files/patch-timidity_timidity.c
@@ -0,0 +1,12 @@
+--- timidity/timidity.c.orig	2018-08-28 23:33:39 UTC
++++ timidity/timidity.c
+@@ -5393,7 +5393,8 @@ MAIN_INTERFACE void timidity_start_initialize(void)
+     fp_except fpexp;
+ #endif
+
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(FP_X_INV) && defined(FP_X_DZ) && \
++  (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+     fpexp = fpgetmask();
+     fpsetmask(fpexp & ~(FP_X_INV|FP_X_DZ));
+ #endif
diff --git a/benchmarks/flowgrind/Makefile b/benchmarks/flowgrind/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	flowgrind
 PORTVERSION=	0.8.2
 DISTVERSIONPREFIX=	${PORTNAME}-
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 
 MAINTAINER=	[email protected]

diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	sipp
 PORTVERSION=	3.5.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	benchmarks net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
 

diff --git a/biology/bcftools/Makefile b/biology/bcftools/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	bcftools
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	biology
 
 MAINTAINER=	[email protected]

diff --git a/biology/gemma/Makefile b/biology/gemma/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gemma
 DISTVERSION=	0.98.3
+PORTREVISION=	1
 CATEGORIES=	biology
 
 MAINTAINER=	[email protected]

diff --git a/biology/viennarna/Makefile b/biology/viennarna/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	viennarna
 DISTVERSION=	2.4.18
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/
 DISTNAME=	ViennaRNA-${DISTVERSION}

diff --git a/cad/graywolf/Makefile b/cad/graywolf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	graywolf
 DISTVERSION=	0.1.6-4
 DISTVERSIONSUFFIX=	-gf47937b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/

diff --git a/chinese/Makefile b/chinese/Makefile
@@ -66,6 +66,7 @@
     SUBDIR += libreoffice-zh_TW
     SUBDIR += librime
     SUBDIR += libtabe
+    SUBDIR += linux-wps-office-zh_CN
     SUBDIR += lunar
     SUBDIR += moettf
     SUBDIR += muni

diff --git a/chinese/linux-wps-office-zh_CN/Makefile b/chinese/linux-wps-office-zh_CN/Makefile
@@ -0,0 +1,64 @@
+PORTNAME=	wps-office
+DISTVERSION=	11.1.0.10161
+DISTVERSIONSUFFIX=	-zh_CN
+CATEGORIES=	chinese editors linux
+MASTER_SITES=	https://wdl1.cache.wps.cn/wps/download/ep/Linux2019/10161/
+PKGNAMEPREFIX=	linux-
+PKGNAMESUFFIX=	-zh_CN
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.x86_64
+EXTRACT_SUFX=   .rpm
+
+MAINTAINER=	[email protected]
+COMMENT=	Complete office suite with PDF editor
+
+LICENSE=	commercial
+LICENSE_NAME=	End User License Agreement
+LICENSE_TEXT=	See: https://www.wps.cn/privacy/full_useragreement/
+LICENSE_PERMS=	no-auto-accept no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
+
+ONLY_FOR_ARCHS= amd64
+
+CONFLICTS_INSTALL=	linux-wps-office
+
+USES=		desktop-file-utils linux shebangfix
+INSTALLS_ICONS=	yes
+USE_LINUX=	png pulseaudio-libs xorglibs
+
+SHEBANG_FILES= 	usr/bin/et \
+		usr/bin/wpp \
+		usr/bin/wps \
+		usr/bin/wpspdf
+
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+PLIST_SUB=	LINUXBASE=${LINUXBASE}
+
+WPS_BINS=	et wpp wps wpspdf
+WPS_DESK=	et wpp wps pdf prometheus
+
+post-patch:
+.for d in ${WPS_DESK}
+	@${REINPLACE_CMD} -i '' -e 's|/usr/bin|${PREFIX}/bin|' ${WRKSRC}/opt/kingsoft/${PORTNAME}/desktops/${PORTNAME}-${d}.desktop
+.endfor
+.for b in ${WPS_BINS}
+	@${REINPLACE_CMD} -e 's|gInstallPath=/opt|gInstallPath=${LINUXBASE}/opt|' ${WRKSRC}/usr/bin/${b}
+.endfor
+
+do-install:
+.for s in 16 20 24 32 40 48 60 64 72 80 96 128 256 512
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
+	${INSTALL_DATA} ${WRKSRC}/usr/share/icons/hicolor/${s}x${s}/mimetypes/*.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/
+.endfor
+.for d in ${WPS_DESK}
+	${INSTALL_DATA} ${WRKSRC}/opt/kingsoft/${PORTNAME}/desktops/${PORTNAME}-${d}.desktop \
+		${STAGEDIR}${DESKTOPDIR}
+.endfor
+	${MKDIR} ${STAGEDIR}${LINUXBASE}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} opt ${STAGEDIR}${LINUXBASE})
+.for b in ${WPS_BINS}
+	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/${b} ${STAGEDIR}${PREFIX}/bin
+	${CHMOD} +x ${STAGEDIR}${LINUXBASE}/opt/kingsoft/wps-office/office6/${b}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/chinese/linux-wps-office-zh_CN/distinfo b/chinese/linux-wps-office-zh_CN/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1623407631
+SHA256 (wps-office-11.1.0.10161-1.x86_64.rpm) = 412499704caf2963c078b1c3079de98569c45db46782b0fc6d02f9027cd7b681
+SIZE (wps-office-11.1.0.10161-1.x86_64.rpm) = 317769106
diff --git a/chinese/linux-wps-office-zh_CN/pkg-descr b/chinese/linux-wps-office-zh_CN/pkg-descr
@@ -0,0 +1,8 @@
+WPS Office is a free productivity office suite. WPS Office contains
+four major functional modules: WPS Word, WPS PDF, WPS Excel, and WPS
+Presentation. It is accessible and compatible with doc, xls, ppt, and
+other file formats. You can directly save and open Microsoft Word,
+Excel, and PowerPoint files. You can also easily edit WPS files with
+Microsoft Office 365.
+
+WWW: https://www.wps.cn/