opensourcemirror
/
opnsense-ports
mirror of https://github.com/opnsense/ports.git
1
0
Fork 0
Code Issues Releases Wiki Activity

*/*: sync with upstream 

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2022-09-28 08:45:30 +02:00
parent f39447fd27
commit 91954d7932
109 changed files with 1226 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cad/freecad/Makefile
View File

@ -41,8 +41,8 @@ USE_GITHUB= yes
USE_XORG= ice sm x11 xext xt
USE_GL= gl glu
USE_QT= buildtools concurrent core declarative gui location network \
opengl printsupport qmake:build svg webchannel webengine \
widgets xml xmlpatterns
opengl printsupport qmake:build svg webchannel widgets xml \
xmlpatterns
USE_LDCONFIG= yes
CPE_VENDOR= freecad_project
@ -78,6 +78,14 @@ COLLADA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${
DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \
${PORTNAME} "Graphics;Engineering;" false
.include <bsd.port.options.mk>
.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
USE_QT+= webengine
.else
USE_QT+= webkit
.endif
post-patch:
@${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \
${WRKSRC}/src/Tools/SubWCRev.py

2
devel/aws-sdk-cpp/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= aws-sdk-cpp
DISTVERSION= 1.9.353
DISTVERSION= 1.9.355
CATEGORIES= devel
MAINTAINER= eduardo@FreeBSD.org

6
devel/aws-sdk-cpp/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1664145141
SHA256 (aws-aws-sdk-cpp-1.9.353_GH0.tar.gz) = bb3942fe790d02515fc5dae5a11476238b6cb64944031f4ab83d872140bad93c
SIZE (aws-aws-sdk-cpp-1.9.353_GH0.tar.gz) = 43704486
TIMESTAMP = 1664313810
SHA256 (aws-aws-sdk-cpp-1.9.355_GH0.tar.gz) = f57cb9c70d5b13cca6713d41095907cf6911e5a9e41c06767f431be295af194b
SIZE (aws-aws-sdk-cpp-1.9.355_GH0.tar.gz) = 43850725

2
devel/freebsd-gcc12/Makefile
View File

@ -12,6 +12,8 @@ WWW= https://gcc.gnu.org/
LICENSE= GPLv3 GPLv3RLE
LICENSE_COMB= multi
IGNORE_FreeBSD_12= Not supported on FreeBSD 12
BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} \
objdump:devel/binutils
LIB_DEPENDS= libgmp.so:math/gmp \

3
devel/goswagger/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= goswagger
DISTVERSIONPREFIX= v
DISTVERSION= 0.30.2
PORTREVISION= 1
DISTVERSION= 0.30.3
CATEGORIES= devel
MAINTAINER= dmgk@FreeBSD.org

10
devel/goswagger/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1662151935
SHA256 (go/devel_goswagger/goswagger-v0.30.2/v0.30.2.mod) = 8b05473ed602046ea11fd575e9d19ef5128af81e5028d5f4c5ab6040aa48b6ce
SIZE (go/devel_goswagger/goswagger-v0.30.2/v0.30.2.mod) = 3329
SHA256 (go/devel_goswagger/goswagger-v0.30.2/v0.30.2.zip) = 246cb90cd48a03d4b598d4a8e1ea6c59fa1d4cbec04f8df617d4683caddf91f4
SIZE (go/devel_goswagger/goswagger-v0.30.2/v0.30.2.zip) = 4383927
TIMESTAMP = 1664304351
SHA256 (go/devel_goswagger/goswagger-v0.30.3/v0.30.3.mod) = 8b05473ed602046ea11fd575e9d19ef5128af81e5028d5f4c5ab6040aa48b6ce
SIZE (go/devel_goswagger/goswagger-v0.30.3/v0.30.3.mod) = 3329
SHA256 (go/devel_goswagger/goswagger-v0.30.3/v0.30.3.zip) = 379f6d90243f60c108ee38cc212f56d25357efc59ce7d90e7c90381b4b7a45d2
SIZE (go/devel_goswagger/goswagger-v0.30.3/v0.30.3.zip) = 4386353

1
devel/py-cysignals/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= cysignals
PORTVERSION= 1.11.2
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

2
devel/py-types-PyYAML/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= types-PyYAML
PORTVERSION= 6.0.11
PORTVERSION= 6.0.12
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-types-PyYAML/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1658847719
SHA256 (types-PyYAML-6.0.11.tar.gz) = 7f7da2fd11e9bc1e5e9eb3ea1be84f4849747017a59fc2eee0ea34ed1147c2e0
SIZE (types-PyYAML-6.0.11.tar.gz) = 9801
TIMESTAMP = 1664305130
SHA256 (types-PyYAML-6.0.12.tar.gz) = f6f350418125872f3f0409d96a62a5a5ceb45231af5cc07ee0034ec48a3c82fa
SIZE (types-PyYAML-6.0.12.tar.gz) = 9819

2
devel/py-types-urllib3/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= types-urllib3
PORTVERSION= 1.26.24
PORTVERSION= 1.26.25
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-types-urllib3/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1662663660
SHA256 (types-urllib3-1.26.24.tar.gz) = a1b3aaea7dda3eb1b51699ee723aadd235488e4dc4648e030f09bc429ecff42f
SIZE (types-urllib3-1.26.24.tar.gz) = 10202
TIMESTAMP = 1664305088
SHA256 (types-urllib3-1.26.25.tar.gz) = 5aef0e663724eef924afa8b320b62ffef2c1736c1fa6caecfc9bc6c8ae2c3def
SIZE (types-urllib3-1.26.25.tar.gz) = 10226

3
devel/py-types-xxhash/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= types-xxhash
PORTVERSION= 3.0.4
PORTREVISION= 1
PORTVERSION= 3.0.5
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-types-xxhash/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1658346613
SHA256 (types-xxhash-3.0.4.tar.gz) = ba3760743ee29f9f2334ab1c9b8b81c5727e0d4197febd4484b891bd4342b89b
SIZE (types-xxhash-3.0.4.tar.gz) = 3010
TIMESTAMP = 1664305123
SHA256 (types-xxhash-3.0.5.tar.gz) = 4462bfd69872425374f88da1d129a7506b5344269c44f8ae7a84214a081c5434
SIZE (types-xxhash-3.0.5.tar.gz) = 3028

2
devel/py-yamllint/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= yamllint
PORTVERSION= 1.27.1
PORTVERSION= 1.28.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/py-yamllint/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1657363215
SHA256 (yamllint-1.27.1.tar.gz) = e688324b58560ab68a1a3cff2c0a474e3fed371dfe8da5d1b9817b7df55039ce
SIZE (yamllint-1.27.1.tar.gz) = 129052
TIMESTAMP = 1664301653
SHA256 (yamllint-1.28.0.tar.gz) = 9e3d8ddd16d0583214c5fdffe806c9344086721f107435f68bad990e5a88826b
SIZE (yamllint-1.28.0.tar.gz) = 121934

2
devel/rapidfuzz-cpp/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= rapidfuzz-cpp
DISTVERSIONPREFIX= v
DISTVERSION= 1.6.0
DISTVERSION= 1.7.0
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org

6
devel/rapidfuzz-cpp/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1663387345
SHA256 (maxbachmann-rapidfuzz-cpp-v1.6.0_GH0.tar.gz) = c23066219e0207a9bff77dd9624aeabd09ca58a132a047a7fb67c933c4e1c06f
SIZE (maxbachmann-rapidfuzz-cpp-v1.6.0_GH0.tar.gz) = 250024
TIMESTAMP = 1664325043
SHA256 (maxbachmann-rapidfuzz-cpp-v1.7.0_GH0.tar.gz) = 449350f0e64c8f55f9828eaa90fddb5c98d673ba97e9bfbf48e3aea8d943f541
SIZE (maxbachmann-rapidfuzz-cpp-v1.7.0_GH0.tar.gz) = 252646

1
devel/sdl20/Makefile
View File

@ -91,7 +91,6 @@ JACK_LIB_DEPENDS= libjack.so:audio/jack
JOYSTICK_CONFIGURE_ENABLE= joystick haptic
JOYSTICK_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
JOYSTICK_LIB_DEPENDS= libinotify.so:devel/libinotify
JOYSTICK_BROKEN_OFF= Does not build with JOYSTICK disabled
NAS_CONFIGURE_ENABLE= nas nas-shared
NAS_LIB_DEPENDS= libaudio.so:audio/nas
OSS_CONFIGURE_ENABLE= oss

20
devel/sdl20/files/patch-src_core_linux_SDL__evdev_capabilities.h Normal file
View File

@ -0,0 +1,20 @@
--- src/core/linux/SDL_evdev_capabilities.h.orig 2022-01-08 02:29:52 UTC
+++ src/core/linux/SDL_evdev_capabilities.h
@@ -25,8 +25,6 @@
#ifndef SDL_evdev_capabilities_h_
#define SDL_evdev_capabilities_h_
-#if HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX)
-
#include <linux/input.h>
/* A device can be any combination of these classes */
@@ -52,8 +50,6 @@ extern int SDL_EVDEV_GuessDeviceClass(unsigned long bi
unsigned long bitmask_abs[NBITS(ABS_MAX)],
unsigned long bitmask_key[NBITS(KEY_MAX)],
unsigned long bitmask_rel[NBITS(REL_MAX)]);
-
-#endif /* HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) */
#endif /* SDL_evdev_capabilities_h_ */

6
editors/focuswriter/Makefile
View File

@ -1,12 +1,8 @@
PORTNAME= focuswriter
DISTVERSION= 1.8.2
PORTREVISION= 2
DISTVERSION= 1.8.3
CATEGORIES= editors
MASTER_SITES= https://gottcode.org/${PORTNAME}/
PATCH_SITES= https://github.com/gottcode/${PORTNAME}/commit/
PATCHFILES= 0c642bec1e966b6e3f340d65e30558fb638010d9.patch:-p1 # version fix
MAINTAINER= eduardo@FreeBSD.org
COMMENT= Simple, distraction-free writing environment
WWW= https://gottcode.org/focuswriter/

8
editors/focuswriter/distinfo
View File

@ -1,5 +1,3 @@
TIMESTAMP = 1663359905
SHA256 (focuswriter-1.8.2.tar.bz2) = 9fd6384009a33840218c653bb8d3ab69af5e80de884d7be3cd778500484cb583
SIZE (focuswriter-1.8.2.tar.bz2) = 10342213
SHA256 (0c642bec1e966b6e3f340d65e30558fb638010d9.patch) = ffec476e04b76469c1e7d27761dc99715b314be1431b6a131259f2c00773eb19
SIZE (0c642bec1e966b6e3f340d65e30558fb638010d9.patch) = 1129
TIMESTAMP = 1664300672
SHA256 (focuswriter-1.8.3.tar.bz2) = ca442899085f34334b554414bd9671bc0e9e88cdc9803ab9630ce90bedc8c73f
SIZE (focuswriter-1.8.3.tar.bz2) = 10343187

2
editors/libreoffice/Makefile
View File

@ -350,7 +350,7 @@ CONFIGURE_ARGS+= --disable-skia
CONFIGURE_ARGS+= --enable-gtk3-kde5
.endif
.if ${PORT_OPTIONS:MLTO} && ${CHOSEN_COMPILER_TYPE} == clang
.if ${PORT_OPTIONS:MLTO} && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130
LLVM_DEFAULT= 13
CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}

2
games/njam/Makefile
View File

@ -7,7 +7,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Fast paced multiplayer pac-man clone
WWW= http://njam.sourceforge.net/
WWW= https://web.archive.org/web/20190405231140/http://njam.sourceforge.net/
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING

2
games/wtf/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= wtf
PORTVERSION= 20220909
PORTVERSION= 20220926
CATEGORIES= games
MASTER_SITES= SF/bsdwtf

6
games/wtf/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1662802612
SHA256 (wtf-20220909.tar.gz) = 6556d5ce89997507d6c93532830eae24b97265e2e0b3dd2e95eb27ac3aa5a973
SIZE (wtf-20220909.tar.gz) = 30976
TIMESTAMP = 1664300292
SHA256 (wtf-20220926.tar.gz) = 34cd594b8e8393dd7b3d223a45622652373a3fc4fc00d98d32cc3a57f7f3f294
SIZE (wtf-20220926.tar.gz) = 30988

8
graphics/giblib/Makefile
View File

@ -2,12 +2,14 @@ PORTNAME= giblib
PORTVERSION= 1.2.4
PORTREVISION= 13
CATEGORIES= graphics devel
MASTER_SITES= http://linuxbrit.co.uk/downloads/ \
http://mirror.amdmi3.ru/distfiles/
MASTER_SITES= http://linuxbrit.co.uk/downloads/
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Utility library that includes a wrapper for imlib2
WWW= http://www.linuxbrit.co.uk/giblib/
WWW= https://web.archive.org/web/20090904063608/http://linuxbrit.co.uk/giblib
DEPRECATED= Last release in 2004, abandoned upstream, not used, website disappeared
EXPIRATION_DATE=2022-11-27
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING

5
graphics/luminance-qt5/Makefile
View File

@ -30,7 +30,10 @@ USE_QT= concurrent core declarative gui location network \
buildtools:build linguisttools:build qmake:build
OPTIONS_DEFINE= CFITSIO DOCS HELPBROWSER
OPTIONS_DEFAULT= CFITSIO HELPBROWSER
OPTIONS_DEFAULT= CFITSIO
OPTIONS_DEFAULT_aarch64= HELPBROWSER
OPTIONS_DEFAULT_amd64= HELPBROWSER
OPTIONS_DEFAULT_i386= HELPBROWSER
CFITSIO_LIB_DEPENDS= libcfitsio.so:astro/cfitsio

46
graphics/mesa-dri/files/patch-meson.build Normal file
View File

@ -0,0 +1,46 @@
--- meson.build.orig 2022-03-18 19:26:47 UTC
+++ meson.build
@@ -1414,11 +1414,42 @@ foreach f : ['strtof', 'mkostemp', 'timespec_get', 'me
endforeach
foreach f : ['strtof', 'mkostemp', 'timespec_get', 'memfd_create', 'random_r',
- 'flock', 'strtok_r', 'getrandom', 'qsort_r', 'qsort_s']
+ 'flock', 'strtok_r', 'getrandom', 'qsort_s']
if cc.has_function(f)
pre_args += '-DHAVE_@0@'.format(f.to_upper())
endif
endforeach
+
+if cpp.links('''
+ #define _GNU_SOURCE
+ #include <stdlib.h>
+
+ static int dcomp(const void *l, const void *r, void *t) { return 0; }
+
+ int main(int ac, char **av) {
+ int arr[] = { 1 };
+ void *t = NULL;
+ qsort_r((void*)&arr[0], 1, 1, dcomp, t);
+ return (0);
+ }''',
+ args : pre_args,
+ name : 'GNU qsort_r')
+ pre_args += '-DHAVE_GNU_QSORT_R'
+elif cpp.links('''
+ #include <stdlib.h>
+
+ static int dcomp(void *t, const void *l, const void *r) { return 0; }
+
+ int main(int ac, char **av) {
+ int arr[] = { 1 };
+ void *t = NULL;
+ qsort_r((void*)&arr[0], 1, 1, t, dcomp);
+ return (0);
+ }''',
+ args : pre_args,
+ name : 'BSD qsort_r')
+ pre_args += '-DHAVE_BSD_QSORT_R'
+endif
if cc.has_header_symbol('errno.h', 'program_invocation_name',
args : '-D_GNU_SOURCE')

26
graphics/mesa-dri/files/patch-src_util_u__qsort.h Normal file
View File

@ -0,0 +1,26 @@
--- src/util/u_qsort.h.orig 2022-03-18 19:26:47 UTC
+++ src/util/u_qsort.h
@@ -56,8 +56,10 @@ util_qsort_r(void *base, size_t nmemb, size_t size,
int (*compar)(const void *, const void *, void *),
void *arg)
{
-#if HAVE_QSORT_R
-# if DETECT_OS_APPLE || DETECT_OS_BSD
+#if HAVE_GNU_QSORT_R
+ /* GNU extension added in glibc 2.8 */
+ qsort_r(base, nmemb, size, compar, arg);
+#elif HAVE_BSD_QSORT_R
/* BSD/macOS qsort_r takes "arg" before the comparison function and it
* pass the "arg" before the elements.
*/
@@ -66,10 +68,6 @@ util_qsort_r(void *base, size_t nmemb, size_t size,
arg
};
qsort_r(base, nmemb, size, &data, util_qsort_adapter);
-# else
- /* GNU extension added in glibc 2.8 */
- qsort_r(base, nmemb, size, compar, arg);
-# endif
#elif HAVE_QSORT_S
# ifdef _WIN32
/* MSVC/MinGW qsort_s takes "arg" after the comparison function and it

7
graphics/msl/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= msl
DISTVERSIONPREFIX= v
DISTVERSION= 1.5.5
PORTREVISION= 1
DISTVERSION= 1.6.0
CATEGORIES= graphics
MAINTAINER= yuri@FreeBSD.org
@ -25,8 +24,8 @@ USE_GITHUB= yes
GH_ACCOUNT= akb825
GH_PROJECT= ModularShaderLanguage
GH_TUPLE= akb825:glslang:35ab1219e609c0fa91e04199c458b5379d9c06fd:akb825_glslang/Compile/glslang \
KhronosGroup:SPIRV-Cross:d8d051381f65b9606fb8016c79b7c3bab872eec3:KhronosGroup_SPIRV_Cross/Compile/SPIRV-Cross \
GH_TUPLE= akb825:glslang:ee363ae487621ba836a8ce3ad0759b3dcba5fc90:akb825_glslang/Compile/glslang \
KhronosGroup:SPIRV-Cross:81ba8f78f6646e5635129bd738f25bb3f43bbdb9:KhronosGroup_SPIRV_Cross/Compile/SPIRV-Cross \
akb825:SPIRV-Tools:056da37af83cbb0b0aeaf459ef2e43fc599bb79a:akb825_SPIRV_Tools/Compile/SPIRV-Tools \
KhronosGroup:SPIRV-Headers:4995a2f2723c401eb0ea3e10c81298906bf1422b:KhronosGroup_SPIRV_Headers/Compile/SPIRV-Tools/external/SPIRV-Headers \

14
graphics/msl/distinfo
View File

@ -1,10 +1,10 @@
TIMESTAMP = 1658192565
SHA256 (akb825-ModularShaderLanguage-v1.5.5_GH0.tar.gz) = dc839b64f3a0654739de13b58296e6df5ad5d890a6925d4fb639d4119f6cbc59
SIZE (akb825-ModularShaderLanguage-v1.5.5_GH0.tar.gz) = 256145
SHA256 (akb825-glslang-35ab1219e609c0fa91e04199c458b5379d9c06fd_GH0.tar.gz) = e2d43f61385131a4b339f1b6ec7867bff2232ed82a889b2978b2688a7ea565b2
SIZE (akb825-glslang-35ab1219e609c0fa91e04199c458b5379d9c06fd_GH0.tar.gz) = 3544189
SHA256 (KhronosGroup-SPIRV-Cross-d8d051381f65b9606fb8016c79b7c3bab872eec3_GH0.tar.gz) = effae2746539b1b3a9e7e6b4a0a2a9dc8fa60b5d1fe0a64508a5ba41668962d8
SIZE (KhronosGroup-SPIRV-Cross-d8d051381f65b9606fb8016c79b7c3bab872eec3_GH0.tar.gz) = 1616191
TIMESTAMP = 1664328158
SHA256 (akb825-ModularShaderLanguage-v1.6.0_GH0.tar.gz) = 7e650021a58780ed74b4f5548d5939bddfca1cc87382512fceb3bc70216598ea
SIZE (akb825-ModularShaderLanguage-v1.6.0_GH0.tar.gz) = 257345
SHA256 (akb825-glslang-ee363ae487621ba836a8ce3ad0759b3dcba5fc90_GH0.tar.gz) = 3782be1f94b6738f5521ebfbd29cacad9b133e32ded3e9a8166cde99aea00586
SIZE (akb825-glslang-ee363ae487621ba836a8ce3ad0759b3dcba5fc90_GH0.tar.gz) = 3660801
SHA256 (KhronosGroup-SPIRV-Cross-81ba8f78f6646e5635129bd738f25bb3f43bbdb9_GH0.tar.gz) = 4b7018568128408f0adcc0f32c86eb4bfa20e3d8a366ae82567d1a843483fe10
SIZE (KhronosGroup-SPIRV-Cross-81ba8f78f6646e5635129bd738f25bb3f43bbdb9_GH0.tar.gz) = 1668279
SHA256 (akb825-SPIRV-Tools-056da37af83cbb0b0aeaf459ef2e43fc599bb79a_GH0.tar.gz) = da830ecfe3db09ba70cc989249960b0ecdad2ed03b9ba34bcd5175c7405e58fa
SIZE (akb825-SPIRV-Tools-056da37af83cbb0b0aeaf459ef2e43fc599bb79a_GH0.tar.gz) = 2999457
SHA256 (KhronosGroup-SPIRV-Headers-4995a2f2723c401eb0ea3e10c81298906bf1422b_GH0.tar.gz) = 2c9fe1bbd74a74fdabe40a7ffb322527dfc008c79e1d19d3cf41a5f006d9ab60

8
graphics/msl/pkg-plist
View File

@ -16,6 +16,10 @@ include/MSL/Compile/Types.h
include/MSL/Config.h
lib/cmake/MSL/MSLConfig.cmake
lib/cmake/MSL/MSLConfigVersion.cmake
lib/cmake/MSL/mslb-extract-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/MSL/mslb-extract-targets.cmake
lib/cmake/MSL/mslc-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/MSL/mslc-targets.cmake
lib/cmake/MSLClient/MSLClientConfig.cmake
lib/cmake/MSLClient/MSLClientConfigVersion.cmake
lib/cmake/MSLClient/MSLClientTargets-%%CMAKE_BUILD_TYPE%%.cmake
@ -25,6 +29,6 @@ lib/cmake/MSLCompile/MSLCompileConfigVersion.cmake
lib/cmake/MSLCompile/MSLCompileTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/MSLCompile/MSLCompileTargets.cmake
lib/libmsl_client.so
lib/libmsl_client.so.1.5.5
lib/libmsl_client.so.1.6.0
lib/libmsl_compile.so
lib/libmsl_compile.so.1.5.5
lib/libmsl_compile.so.1.6.0

2
lang/clisp/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= clisp
PORTVERSION= 2.49.93+
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= lang lisp
MAINTAINER= kiri@TrueFC.org

2
math/cimod/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= cimod
DISTVERSIONPREFIX= v
DISTVERSION= 1.4.37
DISTVERSION= 1.4.38
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org

6
math/cimod/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1663386824
SHA256 (OpenJij-cimod-v1.4.37_GH0.tar.gz) = 909a4ce0a448cdfe1f3063d49b0e725e4f576fa320c26665fb828e1da05b85a5
SIZE (OpenJij-cimod-v1.4.37_GH0.tar.gz) = 139681
TIMESTAMP = 1664332039
SHA256 (OpenJij-cimod-v1.4.38_GH0.tar.gz) = 999efb69138f9c730507740daee2d1ca425362e7102616b4dcb1a65357f90dc5
SIZE (OpenJij-cimod-v1.4.38_GH0.tar.gz) = 139667

1
math/cm/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= cm
DISTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://www.multiprecision.org/downloads/

1
math/cmh/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= cmh
DISTVERSION= 1.1.1
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://www.multiprecision.org/downloads/

1
math/eclib/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= eclib
PORTVERSION= 20220621
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= thierry@FreeBSD.org

1
math/giacxcas/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= giacxcas
DISTVERSION= 1.9.0-21
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \
http://cocoa.dima.unige.it/cocoalib/tgz/:cocoa \

14
math/giacxcas/files/patch-src_pari.cc Normal file
View File

@ -0,0 +1,14 @@
- workaroud of the removal of the ANYARG macro in pari-2.15.0
--- src/pari.cc.orig 2022-03-16 11:38:05 UTC
+++ src/pari.cc
@@ -44,6 +44,9 @@ using namespace std;
#include <pthread.h>
#endif
+// workaround for the removal of the ANYARG macro in pari-2.15.0
+#define ANYARG ...
+
static long int abs(long int & l){
if (l<0)
return -l;

1
math/gp2c/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= gp2c
DISTVERSION= 0.0.12
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/GP2C/

1
math/lcalc/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= lcalc
PORTVERSION= 2.0.5
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://ftp.fu-berlin.de/unix/misc/sage/spkg/upstream/lcalc/

5
math/pari/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= pari
DISTVERSION= 2.13.4
PORTEPOCH= 2
DISTVERSION= 2.15.0
CATEGORIES= math
MASTER_SITES= https://pari.math.u-bordeaux.fr/pub/pari/unix/
@ -15,7 +14,7 @@ BROKEN_mips64= fails to link: mpker.c:(.text+0x33bc): relocation truncated to f
LIB_DEPENDS= libgmp.so:math/gmp
USES= perl5 readline
USES= bison perl5 readline
USE_LDCONFIG= yes
USE_PERL5= build run
HAS_CONFIGURE= yes

6
math/pari/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1649311614
SHA256 (pari-2.13.4.tar.gz) = bcde9eceae1592814381c1697cdb7063567b6504201b1be47bb58920f3bce185
SIZE (pari-2.13.4.tar.gz) = 4772735
TIMESTAMP = 1664259213
SHA256 (pari-2.15.0.tar.gz) = e474851e0d16d4e4f9a0d9612c746a2ae7c9a1ec185d04c440b1c74a85755685
SIZE (pari-2.15.0.tar.gz) = 5172089

7
math/pari/pkg-plist
View File

@ -2,12 +2,13 @@ bin/gp
bin/gp-%%GP_VERSION%%
bin/gphelp
bin/tex2mail
include/pari/mpinl.h
include/pari/genpari.h
include/pari/mpinl.h
include/pari/pari.h
include/pari/paricast.h
include/pari/paricfg.h
include/pari/paricom.h
include/pari/paridbglvl.h
include/pari/paridecl.h
include/pari/parierr.h
include/pari/parigen.h
@ -19,9 +20,9 @@ include/pari/paripriv.h
include/pari/paristio.h
include/pari/parisys.h
include/pari/paritune.h
lib/libpari.so.%%PORTVERSION%%
lib/libpari.so.7
lib/libpari.so
lib/libpari.so.%%PORTVERSION%%
lib/libpari.so.8
lib/pari/pari.cfg
man/man1/gp-%%GP_VERSION%%.1.gz
man/man1/gp.1.gz

1
math/pari_elldata/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= elldata
DISTVERSION= 2021-03-21
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= https://pari.math.u-bordeaux.fr/pub/pari/packages/
PKGNAMEPREFIX= pari-

2
math/pari_galdata/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= galdata
DISTVERSION= 2008-04-11
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= https://pari.math.u-bordeaux.fr/pub/pari/packages/
PKGNAMEPREFIX= pari-

2
math/pari_galpol/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= galpol
DISTVERSION= 2018-06-25
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= https://pari.math.u-bordeaux.fr/pub/pari/packages/
PKGNAMEPREFIX= pari-

1
math/pari_nflistdata/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= nflistdata
DISTVERSION= 2022-03-26
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= https://pari.math.u-bordeaux.fr/pub/pari/packages/
PKGNAMEPREFIX= pari-

2
math/pari_nftables/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= nftables
DISTVERSION= 2008-09-29
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= https://pari.math.u-bordeaux.fr/pub/pari/packages/
PKGNAMEPREFIX= pari-

2
math/pari_seadata/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= seadata
DISTVERSION= 2009-06-18
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= https://pari.math.u-bordeaux.fr/pub/pari/packages/
PKGNAMEPREFIX= pari-

2
math/paritwine/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= paritwine
DISTVERSION= 0.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= http://www.multiprecision.org/downloads/

1
math/py-cypari2/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= cypari2
PORTVERSION= 2.1.2
PORTREVISION= 1
CATEGORIES= math python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

1
math/py-fpylll/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= fpylll
PORTVERSION= 0.5.7
PORTREVISION= 1
CATEGORIES= math python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

2
math/py-pplpy/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= pplpy
PORTVERSION= 0.8.7
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= math python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

2
math/py-primecountpy/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= primecountpy
PORTVERSION= 0.1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

2
math/sage/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= sage
PORTVERSION= 9.2
PORTREVISION= 28
PORTREVISION= 29
CATEGORIES= math
MASTER_SITES= https://mirrors.xmission.com/sage/src/ \
http://mirrors.xmission.com/sage/src/ \

2
math/sympow/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= sympow
PORTVERSION= 2.023.6
DISTVERSIONPREFIX= v
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= math
MAINTAINER= thierry@FreeBSD.org

15
misc/cuttlefish/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= cuttlefish
DISTVERSIONPREFIX= v
DISTVERSION= 2.6.2
DISTVERSION= 2.7.0
CATEGORIES= misc
PKGNAMESUFFIX= -texture-compressor
@ -11,6 +11,7 @@ WWW= https://github.com/akb825/Cuttlefish
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libfreeimage.so:graphics/freeimage
TEST_DEPENDS= ispc:devel/ispc
USES= cmake:testing compiler:c++11-lang dos2unix
@ -18,21 +19,19 @@ USES= cmake:testing compiler:c++11-lang dos2unix
USE_GITHUB= yes
GH_ACCOUNT= akb825
GH_PROJECT= Cuttlefish
GH_TUPLE= akb825:freeimage:dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076:akb825_freeimage/lib/FreeImage \
GH_TUPLE= akb825:freeimage:f213e48116964f273412dbd7337b03a32d52ec29:akb825_freeimage/lib/FreeImage \
akb825:etc2comp:10ec1fc4987c5a81c48c6bf6319bb77389a5f23a:akb825_etc2comp/lib/etc2comp \
ARM-software:astc-encoder:f48cc27b2528286126c116f42f2792ed2fa13755:ARM_software_astc_encoder/lib/astc-encoder \
ARM-software:astc-encoder:43d5f57babf0904f9e4222dc3644790d8e41aab4:ARM_software_astc_encoder/lib/astc-encoder \
g-truc:glm:bf71a834948186f4097caa076cd2663c69a10e1e:g_truc_glm/lib/glm \
akb825:PVRTexToolLib:ea50a1c0fb4d8eed2f06ecc47eea80ef291b63b9:akb825_PVRTexToolLib/lib/PVRTexToolLib \
richgel999:bc7enc_rdo:f965c3fd8a39ef91f8bf8cddb7d2eee83a95a1c2:richgel999_bc7enc_rdo/lib/bc7enc_rdo \
GPUOpen-Tools:compressonator:a429164726337b83fd8e20871eb74f5be1d6ef1c:GPUOpen_Tools_compressonator/lib/compressonator \
GameTechDev:ISPCTextureCompressor:14d998c02b71c356ff3a1ec1adc9243a517bbf38:GameTechDev_ISPCTextureCompressor/lib/ISPCTextureCompressor \
richgel999:bc7enc_rdo:e6990bc11829c072d9f9e37296f3335072aab4e4:richgel999_bc7enc_rdo/lib/bc7enc_rdo \
GPUOpen-Tools:compressonator:bab59d4330e64612a1bb0c18dce0f70b48fef395:GPUOpen_Tools_compressonator/lib/compressonator \
GameTechDev:ISPCTextureCompressor:cd0ef2cf78a80db293d7609100f027960f9e7205:GameTechDev_ISPCTextureCompressor/lib/ISPCTextureCompressor \
akb825:libsquish:a9087786ced42a1a4ee137c1ad5bf197dd2d6b72:akb825_libsquish/lib/libsquish \
google:googletest:703bd9caab50b139428cea1aaff9974ebee5742e:google_googletest/lib/astc-encoder/Source/GoogleTest
CMAKE_OFF= CUTTLEFISH_BUILD_DOCS CUTTLEFISH_BUILD_TESTS
CMAKE_ON= CUTTLEFISH_SHARED
CMAKE_TESTING_ON= CUTTLEFISH_BUILD_TESTS
DOS2UNIX_FILES= lib/FreeImage/Source/FreeImage/PluginDDS.cpp \
lib/FreeImage/Source/FreeImage/PluginBMP.cpp
.include <bsd.port.mk>

26
misc/cuttlefish/distinfo
View File

@ -1,22 +1,22 @@
TIMESTAMP = 1658197364
SHA256 (akb825-Cuttlefish-v2.6.2_GH0.tar.gz) = 841ca1f7dcf678f8b93e8b354d72cd18559a179bd51cb2a1719d9b89fcf0dc0a
SIZE (akb825-Cuttlefish-v2.6.2_GH0.tar.gz) = 112752
SHA256 (akb825-freeimage-dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076_GH0.tar.gz) = d0648ffca8a71ff988344285f2c7f29c709b6e62c6fcb8edaaad4a189d9de8dc
SIZE (akb825-freeimage-dae76e95cd4a9fbb58b0a6d635fd3c3f4b222076_GH0.tar.gz) = 7248018
TIMESTAMP = 1664258713
SHA256 (akb825-Cuttlefish-v2.7.0_GH0.tar.gz) = ea28cba1b64ed3413c47a36443fe79ddb1bb2b9b6730bfba2b33b3d962ae6ecb
SIZE (akb825-Cuttlefish-v2.7.0_GH0.tar.gz) = 113003
SHA256 (akb825-freeimage-f213e48116964f273412dbd7337b03a32d52ec29_GH0.tar.gz) = 27298578fec1214a471f521c71b61d5c8a684a050c881a792e4b085ca4c09b0c
SIZE (akb825-freeimage-f213e48116964f273412dbd7337b03a32d52ec29_GH0.tar.gz) = 7031262
SHA256 (akb825-etc2comp-10ec1fc4987c5a81c48c6bf6319bb77389a5f23a_GH0.tar.gz) = 8aae8f87e0f1e79c2bde57254e0b85273d0d036f381f549ce148bc3fbd785b02
SIZE (akb825-etc2comp-10ec1fc4987c5a81c48c6bf6319bb77389a5f23a_GH0.tar.gz) = 152493
SHA256 (ARM-software-astc-encoder-f48cc27b2528286126c116f42f2792ed2fa13755_GH0.tar.gz) = f77d7b966dbb8b6029ab5b5b152b42f2ace4474a82e551dbcdaa49647b8782d9
SIZE (ARM-software-astc-encoder-f48cc27b2528286126c116f42f2792ed2fa13755_GH0.tar.gz) = 36637218
SHA256 (ARM-software-astc-encoder-43d5f57babf0904f9e4222dc3644790d8e41aab4_GH0.tar.gz) = 6d453c5a144bbb1c17e637a540a640f5b57b2e19ff9495223a4266a5181cfcb8
SIZE (ARM-software-astc-encoder-43d5f57babf0904f9e4222dc3644790d8e41aab4_GH0.tar.gz) = 35779296
SHA256 (g-truc-glm-bf71a834948186f4097caa076cd2663c69a10e1e_GH0.tar.gz) = 70ad78e872c145f0164d54da833b651914c184edc65958906937b9739fb8fb1b
SIZE (g-truc-glm-bf71a834948186f4097caa076cd2663c69a10e1e_GH0.tar.gz) = 4369431
SHA256 (akb825-PVRTexToolLib-ea50a1c0fb4d8eed2f06ecc47eea80ef291b63b9_GH0.tar.gz) = 7a9e03dcacb8708bd6ab4f853562a8fc49b9ecd2602373f21ba2b54ee2b11c6b
SIZE (akb825-PVRTexToolLib-ea50a1c0fb4d8eed2f06ecc47eea80ef291b63b9_GH0.tar.gz) = 38251894
SHA256 (richgel999-bc7enc_rdo-f965c3fd8a39ef91f8bf8cddb7d2eee83a95a1c2_GH0.tar.gz) = 0a9ee5571ebcc63f1da901dbd6d6d5ec072ae3ff8e074efae166f776d5ddc7fa
SIZE (richgel999-bc7enc_rdo-f965c3fd8a39ef91f8bf8cddb7d2eee83a95a1c2_GH0.tar.gz) = 15084973
SHA256 (GPUOpen-Tools-compressonator-a429164726337b83fd8e20871eb74f5be1d6ef1c_GH0.tar.gz) = 7eec1130d4695593a0baacb08f6d62d815c505369df0c94dba2f025a2983e9a0
SIZE (GPUOpen-Tools-compressonator-a429164726337b83fd8e20871eb74f5be1d6ef1c_GH0.tar.gz) = 24369618
SHA256 (GameTechDev-ISPCTextureCompressor-14d998c02b71c356ff3a1ec1adc9243a517bbf38_GH0.tar.gz) = a0f6f0537650295b0df66fd55dc888e53b9a6cf5aea576e2c99f2f7959a9931f
SIZE (GameTechDev-ISPCTextureCompressor-14d998c02b71c356ff3a1ec1adc9243a517bbf38_GH0.tar.gz) = 6435886
SHA256 (richgel999-bc7enc_rdo-e6990bc11829c072d9f9e37296f3335072aab4e4_GH0.tar.gz) = cba9fddbf045a0fd9f2118b894bb2a2731e88f728c5717b3b1d4771fb3bd6528
SIZE (richgel999-bc7enc_rdo-e6990bc11829c072d9f9e37296f3335072aab4e4_GH0.tar.gz) = 15084810
SHA256 (GPUOpen-Tools-compressonator-bab59d4330e64612a1bb0c18dce0f70b48fef395_GH0.tar.gz) = 48d4d1fce17e4dda2f5b9b389e5812e7a476b7a02e0d27297ab69dc27de40fa1
SIZE (GPUOpen-Tools-compressonator-bab59d4330e64612a1bb0c18dce0f70b48fef395_GH0.tar.gz) = 24368120
SHA256 (GameTechDev-ISPCTextureCompressor-cd0ef2cf78a80db293d7609100f027960f9e7205_GH0.tar.gz) = 85ab589c6ad2862d4faec9dc18a1c2d2308eb2d60666e243201b29450f90cf72
SIZE (GameTechDev-ISPCTextureCompressor-cd0ef2cf78a80db293d7609100f027960f9e7205_GH0.tar.gz) = 6436876
SHA256 (akb825-libsquish-a9087786ced42a1a4ee137c1ad5bf197dd2d6b72_GH0.tar.gz) = 68d43e6cbc9ab1c05497e76ced54e87f8574986f671befaad06712dcda55eb08
SIZE (akb825-libsquish-a9087786ced42a1a4ee137c1ad5bf197dd2d6b72_GH0.tar.gz) = 59435
SHA256 (google-googletest-703bd9caab50b139428cea1aaff9974ebee5742e_GH0.tar.gz) = d17b1b83a57b3933565a6d0616fe261107326d47de20288d0949ed038e1c342d

29
misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginBMP.cpp
View File

@ -1,29 +0,0 @@
--- lib/FreeImage/Source/FreeImage/PluginBMP.cpp.orig 2022-09-12 21:40:45 UTC
+++ lib/FreeImage/Source/FreeImage/PluginBMP.cpp
@@ -1419,7 +1419,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
free(buffer);
#ifdef FREEIMAGE_BIGENDIAN
- } else if (bpp == 16) {
+ } else if (dst_bpp == 16) {
int padding = dst_pitch - dst_width * sizeof(WORD);
WORD pad = 0;
WORD pixel;
@@ -1440,7 +1440,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
}
#endif
#if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB
- } else if (bpp == 24) {
+ } else if (dst_bpp == 24) {
int padding = dst_pitch - dst_width * sizeof(FILE_BGR);
DWORD pad = 0;
FILE_BGR bgr;
@@ -1461,7 +1461,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle,
}
}
}
- } else if (bpp == 32) {
+ } else if (dst_bpp == 32) {
FILE_BGRA bgra;
for(unsigned y = 0; y < dst_height; y++) {
BYTE *line = FreeImage_GetScanLine(dib, y);

25
misc/cuttlefish/files/patch-lib_FreeImage_Source_FreeImage_PluginDDS.cpp
View File

@ -1,25 +0,0 @@
--- lib/FreeImage/Source/FreeImage/PluginDDS.cpp.orig 2022-09-12 21:40:59 UTC
+++ lib/FreeImage/Source/FreeImage/PluginDDS.cpp
@@ -356,14 +356,14 @@ SwapHeader(DDSHEADER *header) {
for(int i=0; i<11; i++) {
SwapLong(&header->surfaceDesc.dwReserved1[i]);
}
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwSize);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFlags);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFourCC);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBBitCount);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRBitMask);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwGBitMask);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwBBitMask);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask);
+ SwapLong(&header->surfaceDesc.ddspf.dwSize);
+ SwapLong(&header->surfaceDesc.ddspf.dwFlags);
+ SwapLong(&header->surfaceDesc.ddspf.dwFourCC);
+ SwapLong(&header->surfaceDesc.ddspf.dwRGBBitCount);
+ SwapLong(&header->surfaceDesc.ddspf.dwRBitMask);
+ SwapLong(&header->surfaceDesc.ddspf.dwGBitMask);
+ SwapLong(&header->surfaceDesc.ddspf.dwBBitMask);
+ SwapLong(&header->surfaceDesc.ddspf.dwRGBAlphaBitMask);
SwapLong(&header->surfaceDesc.ddsCaps.dwCaps1);
SwapLong(&header->surfaceDesc.ddsCaps.dwCaps2);
SwapLong(&header->surfaceDesc.ddsCaps.dwReserved[0]);

9
misc/cuttlefish/pkg-plist
View File

@ -6,7 +6,10 @@ include/cuttlefish/Image.h
include/cuttlefish/Texture.h
lib/cmake/Cuttlefish/CuttlefishConfig.cmake
lib/cmake/Cuttlefish/CuttlefishConfigVersion.cmake
lib/cmake/Cuttlefish/CuttlefishTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Cuttlefish/CuttlefishTargets.cmake
lib/cmake/Cuttlefish/cuttlefish-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Cuttlefish/cuttlefish-targets.cmake
lib/cmake/Cuttlefish/cuttlefish_lib-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Cuttlefish/cuttlefish_lib-targets.cmake
lib/libcuttlefish.so
lib/libcuttlefish.so.2.6.2
lib/libcuttlefish.so.2.7
lib/libcuttlefish.so.2.7.0

8
misc/far2l/Makefile
View File

@ -1,12 +1,8 @@
PORTNAME= far2l
PORTVERSION= 2.4.0
PORTVERSION= 2.4.1
DISTVERSIONPREFIX= v_
PORTREVISION= 1
CATEGORIES= misc
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES= f49e2475f7eba50d3d5c.patch:-p1 c99fbdb382250828d974.patch:-p1
MAINTAINER= danfe@FreeBSD.org
COMMENT= Port of FAR v2 to Unix-like systems
WWW= https://github.com/elfmz/far2l
@ -47,7 +43,7 @@ WXGTK_USE= WX=3.0+
X11_DESC= Build with TTY X11 extensions
X11_CMAKE_OFF= -DTTYX:BOOL=OFF
X11_USES= xorg
X11_USE= XORG=ice,sm,x11,xext
X11_USE= XORG=ice,sm,x11,xext,xi
post-patch:
@${GREP} -Rl --null --include=\*.cpp /bin/bash ${WRKSRC} | ${XARGS} \

10
misc/far2l/distinfo
View File

@ -1,7 +1,3 @@
TIMESTAMP = 1641943318
SHA256 (elfmz-far2l-v_2.4.0_GH0.tar.gz) = a595f7f2b48aaf6cfd61c1539bb52207f8f985576ee928915f54b675666e9f88
SIZE (elfmz-far2l-v_2.4.0_GH0.tar.gz) = 6223889
SHA256 (f49e2475f7eba50d3d5c.patch) = 127f43c5b85a2737c5280e5db1511f2d9b3d5363bc43f265b48c98a79aa9da13
SIZE (f49e2475f7eba50d3d5c.patch) = 1859
SHA256 (c99fbdb382250828d974.patch) = 5b3c326a38f2e9fe3826c70b68c6cfb5da1fd6813f5cca74b0f3f220d63698dd
SIZE (c99fbdb382250828d974.patch) = 5299
TIMESTAMP = 1664131165
SHA256 (elfmz-far2l-v_2.4.1_GH0.tar.gz) = e52920fd6de077e912b3b80cee3a22a2845a140727fe4e14e5ca73c6e81bbf13
SIZE (elfmz-far2l-v_2.4.1_GH0.tar.gz) = 6322292

5
misc/far2l/pkg-plist
View File

@ -33,6 +33,8 @@ share/applications/far2l.desktop
%%DATADIR%%/FarRus.hlf
%%DATADIR%%/FarRus.lng
%%DATADIR%%/FarSpa.lng
%%DATADIR%%/FarUkr.hlf
%%DATADIR%%/FarUkr.lng
%%DATADIR%%/Plugins/NetRocks/plug/eng.lng
%%DATADIR%%/Plugins/NetRocks/plug/helpe.hlf
%%DATADIR%%/Plugins/NetRocks/plug/rus.lng
@ -482,7 +484,7 @@ share/applications/far2l.desktop
%%DATADIR%%/Plugins/incsrch/plug/isrcrus.lng
%%DATADIR%%/Plugins/inside/plug/config.ini
%%DATADIR%%/Plugins/inside/plug/eng.lng
%%DATADIR%%/Plugins/inside/plug/rus.kng
%%DATADIR%%/Plugins/inside/plug/rus.lng
%%DATADIR%%/Plugins/multiarc/plug/arceng.hlf
%%DATADIR%%/Plugins/multiarc/plug/arceng.lng
%%DATADIR%%/Plugins/multiarc/plug/arcrus.hlf
@ -500,6 +502,7 @@ share/applications/far2l.desktop
%%DATADIR%%/ps.sh
%%DATADIR%%/trash.sh
%%DATADIR%%/view.sh
%%DATADIR%%/xlats.ini
share/icons/far2l.svg
share/icons/hicolor/1024x1024/apps/far2l.svg
share/icons/hicolor/128x128/apps/far2l.svg

6
misc/vfc/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= vfc
DISTVERSIONPREFIX= v
DISTVERSION= 2.0.4
DISTVERSION= 2.1.0
CATEGORIES= misc
MAINTAINER= yuri@FreeBSD.org
@ -12,13 +12,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
TEST_DEPENDS= googletest>0:devel/googletest
USES= cmake:testing compiler:c++11-lang
USES= cmake:testing compiler:c++14-lang
USE_GITHUB= yes
GH_ACCOUNT= akb825
GH_PROJECT= VertexFormatConvert
GH_TUPLE= g-truc:glm:bf71a834948186f4097caa076cd2663c69a10e1e:g_truc_glm/lib/glm \
Tencent:rapidjson:232389d4f1012dddec4ef84861face2d2ba85709:Tencent_rapidjson/tool/rapidjson
Tencent:rapidjson:06d58b9e848c650114556a23294d0b6440078c61:Tencent_rapidjson/tool/rapidjson
CMAKE_ON= VFC_SHARED
CMAKE_OFF= VFC_BUILD_TESTS

12
misc/vfc/distinfo
View File

@ -1,9 +1,7 @@
TIMESTAMP = 1655768587
SHA256 (akb825-VertexFormatConvert-v2.0.4_GH0.tar.gz) = 3ee79af97e7a246d1c00eb8115c6341a71321cce8f08e02b920ce976b3c5f4cf
SIZE (akb825-VertexFormatConvert-v2.0.4_GH0.tar.gz) = 83772
TIMESTAMP = 1664332944
SHA256 (akb825-VertexFormatConvert-v2.1.0_GH0.tar.gz) = 978fdb18cc60785296bbf97c6171a2f066715061240fb8bdf80b85fa6dce051b
SIZE (akb825-VertexFormatConvert-v2.1.0_GH0.tar.gz) = 83307
SHA256 (g-truc-glm-bf71a834948186f4097caa076cd2663c69a10e1e_GH0.tar.gz) = 70ad78e872c145f0164d54da833b651914c184edc65958906937b9739fb8fb1b
SIZE (g-truc-glm-bf71a834948186f4097caa076cd2663c69a10e1e_GH0.tar.gz) = 4369431
SHA256 (Tencent-rapidjson-232389d4f1012dddec4ef84861face2d2ba85709_GH0.tar.gz) = b9290a9a6d444c8e049bd589ab804e0ccf2b05dc5984a19ed5ae75d090064806
SIZE (Tencent-rapidjson-232389d4f1012dddec4ef84861face2d2ba85709_GH0.tar.gz) = 1107967
SHA256 (google-googletest-ba96d0b1161f540656efdaed035b3c062b60e006_GH0.tar.gz) = 949c556896cf31ed52e53449e17a1276b8b26d3ee5932f5ca49ee929f4b35c51
SIZE (google-googletest-ba96d0b1161f540656efdaed035b3c062b60e006_GH0.tar.gz) = 987370
SHA256 (Tencent-rapidjson-06d58b9e848c650114556a23294d0b6440078c61_GH0.tar.gz) = 30d28bbe0bfff9d8dc5d3cf62799b6ee550499cc1520e44bdece81e002480d19
SIZE (Tencent-rapidjson-06d58b9e848c650114556a23294d0b6440078c61_GH0.tar.gz) = 1107982

8
misc/vfc/pkg-plist
View File

@ -7,7 +7,9 @@ include/VFC/VertexFormat.h
include/VFC/VertexValue.h
lib/cmake/VFC/VFCConfig.cmake
lib/cmake/VFC/VFCConfigVersion.cmake
lib/cmake/VFC/VFCTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/VFC/VFCTargets.cmake
lib/cmake/VFC/vfc-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/VFC/vfc-targets.cmake
lib/cmake/VFC/vfc_lib-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/VFC/vfc_lib-targets.cmake
lib/libvfc.so
lib/libvfc.so.2.0.4
lib/libvfc.so.2.1.0

16
multimedia/opentimelineio/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= opentimelineio
DISTVERSIONPREFIX= v
DISTVERSION= 0.14.1
DISTVERSION= 0.15
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
@ -10,18 +10,20 @@ WWW= https://github.com/PixarAnimationStudios/OpenTimelineIO
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= cmake compiler:c++14-lang
LIB_DEPENDS= libImath-3_1.so:math/Imath
USES= cmake:testing compiler:c++14-lang
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= PixarAnimationStudios
GH_PROJECT= OpenTimelineIO
GH_TUPLE= google:googletest:ba96d0b1161f540656efdaed035b3c062b60e006:google_googletest/src/deps/rapidjson/thirdparty/gtest \
martinmoene:optional-lite:a006f229a77b3b2dacf927e4029b8c1c60c86b52:martinmoene_optional_lite/src/deps/optional-lite \
pybind:pybind11:e7e2c79f3f520f78ffc39fcb34f7919003102733:pybind_pybind11/src/deps/pybind11 \
Tencent:rapidjson:4d6cb08189cf7336821f04090b612baa2ca6a90d:Tencent_rapidjson/src/deps/rapidjson \
thelink2012:any:f67bd5f8bbf7eb628bf38206d4ac5cb22438e6bb:thelink2012_any/src/deps/any
GH_TUPLE= martinmoene:optional-lite:5e4b7760aac85ea73a5b9b91c726fc36cbd4149b:martinmoene_optional_lite/src/deps/optional-lite \
Tencent:rapidjson:06d58b9e848c650114556a23294d0b6440078c61:Tencent_rapidjson/src/deps/rapidjson \
thelink2012:any:bfc77f2e4be6e9a093dd645ef3f1aa30620c9205:thelink2012_any/src/deps/any
CMAKE_ON= OTIO_FIND_IMATH
PORTSCOUT= ignore:v0.91 # erroneously labeled tag

22
multimedia/opentimelineio/distinfo
View File

@ -1,13 +1,9 @@
TIMESTAMP = 1643482587
SHA256 (PixarAnimationStudios-OpenTimelineIO-v0.14.1_GH0.tar.gz) = 04c0a5c2f0639a0a1e9745d40cdb9e86f966c85f19880e8ca614699175a93554
SIZE (PixarAnimationStudios-OpenTimelineIO-v0.14.1_GH0.tar.gz) = 4484522
SHA256 (google-googletest-ba96d0b1161f540656efdaed035b3c062b60e006_GH0.tar.gz) = 949c556896cf31ed52e53449e17a1276b8b26d3ee5932f5ca49ee929f4b35c51
SIZE (google-googletest-ba96d0b1161f540656efdaed035b3c062b60e006_GH0.tar.gz) = 987370
SHA256 (martinmoene-optional-lite-a006f229a77b3b2dacf927e4029b8c1c60c86b52_GH0.tar.gz) = de62d23971dd9c4ba77c633559f9e3840f6a57c39b81306b89395f917e71ccc4
SIZE (martinmoene-optional-lite-a006f229a77b3b2dacf927e4029b8c1c60c86b52_GH0.tar.gz) = 52439
SHA256 (pybind-pybind11-e7e2c79f3f520f78ffc39fcb34f7919003102733_GH0.tar.gz) = 87de6f079bed8e74e1a5baa8dbc03c8f12367ab9bb4f32a98ee15a15255accdb
SIZE (pybind-pybind11-e7e2c79f3f520f78ffc39fcb34f7919003102733_GH0.tar.gz) = 693012
SHA256 (Tencent-rapidjson-4d6cb08189cf7336821f04090b612baa2ca6a90d_GH0.tar.gz) = 6d5547998e51a6f8a7fb261ee7ff1551b833968e8b855c22c662705c2dc9ccac
SIZE (Tencent-rapidjson-4d6cb08189cf7336821f04090b612baa2ca6a90d_GH0.tar.gz) = 1107475
SHA256 (thelink2012-any-f67bd5f8bbf7eb628bf38206d4ac5cb22438e6bb_GH0.tar.gz) = 1cd121a2fb27936213397ff4ff94fe4d6d4e28cabc13894cc4512eb046d71be8
SIZE (thelink2012-any-f67bd5f8bbf7eb628bf38206d4ac5cb22438e6bb_GH0.tar.gz) = 9123
TIMESTAMP = 1664334848
SHA256 (PixarAnimationStudios-OpenTimelineIO-v0.15_GH0.tar.gz) = 66814703f088749578ac69902526468b4aec185bdbbced8e1a1bbb4609144961
SIZE (PixarAnimationStudios-OpenTimelineIO-v0.15_GH0.tar.gz) = 4781447
SHA256 (martinmoene-optional-lite-5e4b7760aac85ea73a5b9b91c726fc36cbd4149b_GH0.tar.gz) = e191c7b8d448c7a9c19a8a548ff8d87dc7cf8f17f9c6634ea9402743d9f9499e
SIZE (martinmoene-optional-lite-5e4b7760aac85ea73a5b9b91c726fc36cbd4149b_GH0.tar.gz) = 52456
SHA256 (Tencent-rapidjson-06d58b9e848c650114556a23294d0b6440078c61_GH0.tar.gz) = 30d28bbe0bfff9d8dc5d3cf62799b6ee550499cc1520e44bdece81e002480d19
SIZE (Tencent-rapidjson-06d58b9e848c650114556a23294d0b6440078c61_GH0.tar.gz) = 1107982
SHA256 (thelink2012-any-bfc77f2e4be6e9a093dd645ef3f1aa30620c9205_GH0.tar.gz) = 04547fce8e86b33ecd784a67a2153368bb63d0e8e4549c42c63074db9b19f3a9
SIZE (thelink2012-any-bfc77f2e4be6e9a093dd645ef3f1aa30620c9205_GH0.tar.gz) = 9130

12
multimedia/opentimelineio/files/patch-src_deps_any_any.hpp
View File

@ -1,12 +0,0 @@
- workaround for https://github.com/thelink2012/any/issues/16
--- src/deps/any/any.hpp.orig 2022-01-31 22:48:38 UTC
+++ src/deps/any/any.hpp
@@ -19,6 +19,7 @@
#include <typeinfo>
#include <type_traits>
#include <stdexcept>
+#include <utility>
#if defined(PARTICLE)

11
multimedia/py-opentimelineio/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= opentimelineio
DISTVERSIONPREFIX= v
DISTVERSION= 0.14.1
DISTVERSION= 0.15
CATEGORIES= multimedia
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -12,6 +12,8 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= cmake:devel/cmake-core
LIB_DEPENDS= libImath-3_1.so:math/Imath
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
USES= compiler:c++14-lang python
USE_PYTHON= distutils concurrent # autoplist is broken, see https://github.com/PixarAnimationStudios/OpenTimelineIO/issues/1205
@ -20,11 +22,10 @@ USE_GITHUB= yes
GH_ACCOUNT= PixarAnimationStudios
GH_PROJECT= OpenTimelineIO
GH_TUPLE= google:googletest:ba96d0b1161f540656efdaed035b3c062b60e006:google_googletest/src/deps/rapidjson/thirdparty/gtest \
martinmoene:optional-lite:a006f229a77b3b2dacf927e4029b8c1c60c86b52:martinmoene_optional_lite/src/deps/optional-lite \
GH_TUPLE= martinmoene:optional-lite:5e4b7760aac85ea73a5b9b91c726fc36cbd4149b:martinmoene_optional_lite/src/deps/optional-lite \
pybind:pybind11:e7e2c79f3f520f78ffc39fcb34f7919003102733:pybind_pybind11/src/deps/pybind11 \
Tencent:rapidjson:4d6cb08189cf7336821f04090b612baa2ca6a90d:Tencent_rapidjson/src/deps/rapidjson \
thelink2012:any:f67bd5f8bbf7eb628bf38206d4ac5cb22438e6bb:thelink2012_any/src/deps/any
Tencent:rapidjson:06d58b9e848c650114556a23294d0b6440078c61:Tencent_rapidjson/src/deps/rapidjson \
thelink2012:any:bfc77f2e4be6e9a093dd645ef3f1aa30620c9205:thelink2012_any/src/deps/any
PORTSCOUT= ignore:v0.91,last_pure_python # erroneously labeled tag

20
multimedia/py-opentimelineio/distinfo
View File

@ -1,13 +1,11 @@
TIMESTAMP = 1643482587
SHA256 (PixarAnimationStudios-OpenTimelineIO-v0.14.1_GH0.tar.gz) = 04c0a5c2f0639a0a1e9745d40cdb9e86f966c85f19880e8ca614699175a93554
SIZE (PixarAnimationStudios-OpenTimelineIO-v0.14.1_GH0.tar.gz) = 4484522
SHA256 (google-googletest-ba96d0b1161f540656efdaed035b3c062b60e006_GH0.tar.gz) = 949c556896cf31ed52e53449e17a1276b8b26d3ee5932f5ca49ee929f4b35c51
SIZE (google-googletest-ba96d0b1161f540656efdaed035b3c062b60e006_GH0.tar.gz) = 987370
SHA256 (martinmoene-optional-lite-a006f229a77b3b2dacf927e4029b8c1c60c86b52_GH0.tar.gz) = de62d23971dd9c4ba77c633559f9e3840f6a57c39b81306b89395f917e71ccc4
SIZE (martinmoene-optional-lite-a006f229a77b3b2dacf927e4029b8c1c60c86b52_GH0.tar.gz) = 52439
TIMESTAMP = 1664335137
SHA256 (PixarAnimationStudios-OpenTimelineIO-v0.15_GH0.tar.gz) = 66814703f088749578ac69902526468b4aec185bdbbced8e1a1bbb4609144961
SIZE (PixarAnimationStudios-OpenTimelineIO-v0.15_GH0.tar.gz) = 4781447
SHA256 (martinmoene-optional-lite-5e4b7760aac85ea73a5b9b91c726fc36cbd4149b_GH0.tar.gz) = e191c7b8d448c7a9c19a8a548ff8d87dc7cf8f17f9c6634ea9402743d9f9499e
SIZE (martinmoene-optional-lite-5e4b7760aac85ea73a5b9b91c726fc36cbd4149b_GH0.tar.gz) = 52456
SHA256 (pybind-pybind11-e7e2c79f3f520f78ffc39fcb34f7919003102733_GH0.tar.gz) = 87de6f079bed8e74e1a5baa8dbc03c8f12367ab9bb4f32a98ee15a15255accdb
SIZE (pybind-pybind11-e7e2c79f3f520f78ffc39fcb34f7919003102733_GH0.tar.gz) = 693012
SHA256 (Tencent-rapidjson-4d6cb08189cf7336821f04090b612baa2ca6a90d_GH0.tar.gz) = 6d5547998e51a6f8a7fb261ee7ff1551b833968e8b855c22c662705c2dc9ccac
SIZE (Tencent-rapidjson-4d6cb08189cf7336821f04090b612baa2ca6a90d_GH0.tar.gz) = 1107475
SHA256 (thelink2012-any-f67bd5f8bbf7eb628bf38206d4ac5cb22438e6bb_GH0.tar.gz) = 1cd121a2fb27936213397ff4ff94fe4d6d4e28cabc13894cc4512eb046d71be8
SIZE (thelink2012-any-f67bd5f8bbf7eb628bf38206d4ac5cb22438e6bb_GH0.tar.gz) = 9123
SHA256 (Tencent-rapidjson-06d58b9e848c650114556a23294d0b6440078c61_GH0.tar.gz) = 30d28bbe0bfff9d8dc5d3cf62799b6ee550499cc1520e44bdece81e002480d19
SIZE (Tencent-rapidjson-06d58b9e848c650114556a23294d0b6440078c61_GH0.tar.gz) = 1107982
SHA256 (thelink2012-any-bfc77f2e4be6e9a093dd645ef3f1aa30620c9205_GH0.tar.gz) = 04547fce8e86b33ecd784a67a2153368bb63d0e8e4549c42c63074db9b19f3a9
SIZE (thelink2012-any-bfc77f2e4be6e9a093dd645ef3f1aa30620c9205_GH0.tar.gz) = 9130

10
multimedia/py-opentimelineio/files/patch-setup.py Normal file
View File

@ -0,0 +1,10 @@
--- setup.py.orig 2022-09-28 03:22:02 UTC
+++ setup.py
@@ -104,6 +104,7 @@ class OTIO_build_ext(setuptools.command.build_ext.buil
'-DBUILD_TESTING:BOOL=OFF',
# Python modules wil be installed by setuptools.
'-DOTIO_INSTALL_PYTHON_MODULES:BOOL=OFF',
+ '-DOTIO_FIND_IMATH:BOOL=ON',
]
if self.is_windows():
if self.is_mingw():

12
multimedia/py-opentimelineio/files/patch-src_deps_any_any.hpp
View File

@ -1,12 +0,0 @@
- workaround for https://github.com/thelink2012/any/issues/16
--- src/deps/any/any.hpp.orig 2022-01-31 22:48:38 UTC
+++ src/deps/any/any.hpp
@@ -19,6 +19,7 @@
#include <typeinfo>
#include <type_traits>
#include <stdexcept>
+#include <utility>
#if defined(PARTICLE)

76
multimedia/py-opentimelineio/pkg-plist
View File

@ -3,14 +3,15 @@ bin/otiocat
bin/otioconvert
bin/otiopluginfo
bin/otiostat
bin/otiotool
bin/otioview
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.14.1-py%%PYTHON_VER%%.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.14.1-py%%PYTHON_VER%%.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.14.1-py%%PYTHON_VER%%.egg-info/dependency_links.txt
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.14.1-py%%PYTHON_VER%%.egg-info/entry_points.txt
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.14.1-py%%PYTHON_VER%%.egg-info/not-zip-safe
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.14.1-py%%PYTHON_VER%%.egg-info/requires.txt
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.14.1-py%%PYTHON_VER%%.egg-info/top_level.txt
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.15.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.15.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.15.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.15.0-py%%PYTHON_VER%%.egg-info/entry_points.txt
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.15.0-py%%PYTHON_VER%%.egg-info/not-zip-safe
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.15.0-py%%PYTHON_VER%%.egg-info/requires.txt
%%PYTHON_SITELIBDIR%%/OpenTimelineIO-0.15.0-py%%PYTHON_VER%%.egg-info/top_level.txt
%%PYTHON_SITELIBDIR%%/opentimelineio/__init__.py
%%PYTHON_SITELIBDIR%%/opentimelineio/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@ -26,6 +27,8 @@ bin/otioview
%%PYTHON_SITELIBDIR%%/opentimelineio/__pycache__/test_utils%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/__pycache__/url_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/__pycache__/url_utils%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/__pycache__/versioning%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/__pycache__/versioning%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/_opentime%%PYTHON_EXT_SUFFIX%%.so
%%PYTHON_SITELIBDIR%%/opentimelineio/_otio%%PYTHON_EXT_SUFFIX%%.so
%%PYTHON_SITELIBDIR%%/opentimelineio/adapters/__init__.py
@ -78,6 +81,8 @@ bin/otioview
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/autogen_plugin_documentation%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/autogen_serialized_datamodel%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/autogen_serialized_datamodel%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/autogen_version_map%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/autogen_version_map%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/console_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/console_utils%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/otiocat%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@ -88,13 +93,17 @@ bin/otioview
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/otiopluginfo%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/otiostat%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/otiostat%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/otiotool%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/__pycache__/otiotool%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/console/autogen_plugin_documentation.py
%%PYTHON_SITELIBDIR%%/opentimelineio/console/autogen_serialized_datamodel.py
%%PYTHON_SITELIBDIR%%/opentimelineio/console/autogen_version_map.py
%%PYTHON_SITELIBDIR%%/opentimelineio/console/console_utils.py
%%PYTHON_SITELIBDIR%%/opentimelineio/console/otiocat.py
%%PYTHON_SITELIBDIR%%/opentimelineio/console/otioconvert.py
%%PYTHON_SITELIBDIR%%/opentimelineio/console/otiopluginfo.py
%%PYTHON_SITELIBDIR%%/opentimelineio/console/otiostat.py
%%PYTHON_SITELIBDIR%%/opentimelineio/console/otiotool.py
%%PYTHON_SITELIBDIR%%/opentimelineio/core/__init__.py
%%PYTHON_SITELIBDIR%%/opentimelineio/core/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/core/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@ -129,14 +138,14 @@ bin/otioview
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__init__.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/box2d%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/box2d%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/clip%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/clip%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/effect%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/effect%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/external_reference%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/external_reference%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/foo%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/foo%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/generator_reference%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/generator_reference%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/image_sequence_reference%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@ -155,10 +164,12 @@ bin/otioview
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/track%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/transition%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/transition%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/v2d%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/__pycache__/v2d%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/box2d.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/clip.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/effect.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/external_reference.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/foo.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/generator_reference.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/image_sequence_reference.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/marker.py
@ -168,11 +179,13 @@ bin/otioview
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/timeline.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/track.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/transition.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schema/v2d.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schemadef/__init__.py
%%PYTHON_SITELIBDIR%%/opentimelineio/schemadef/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/schemadef/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio/test_utils.py
%%PYTHON_SITELIBDIR%%/opentimelineio/url_utils.py
%%PYTHON_SITELIBDIR%%/opentimelineio/versioning.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/__init__.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@ -221,50 +234,7 @@ bin/otioview
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/kdenlive.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/maya_sequencer.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/rv.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__init__.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_aaf_adapter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_aaf_adapter%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_ale_adapter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_ale_adapter%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_burnins%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_burnins%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_fcpx_adapter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_fcpx_adapter%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_hls_playlist_adapter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_hls_playlist_adapter%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_kdenlive_adapter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_kdenlive_adapter%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_maya_sequencer%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_maya_sequencer%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_rvsession%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/test_rvsession%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/tests_xges_adapter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/__pycache__/tests_xges_adapter%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/test_aaf_adapter.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/test_ale_adapter.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/test_burnins.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/test_fcpx_adapter.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/test_hls_playlist_adapter.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/test_kdenlive_adapter.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/test_rvsession.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/tests/tests_xges_adapter.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/adapters/xges.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/rv/example_otio_reader/PACKAGE
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/rv/example_otio_reader/__pycache__/example_otio_reader_plugin%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/rv/example_otio_reader/__pycache__/example_otio_reader_plugin%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/rv/example_otio_reader/__pycache__/otio_reader%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/rv/example_otio_reader/__pycache__/otio_reader%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/rv/example_otio_reader/example_otio_reader_plugin.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/rv/example_otio_reader/otio_reader.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/tests/__init__.py
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/tests/__pycache__/test_rv_reader%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/tests/__pycache__/test_rv_reader%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/opentimelineio_contrib/application_plugins/tests/test_rv_reader.py
%%PYTHON_SITELIBDIR%%/opentimelineview/__init__.py
%%PYTHON_SITELIBDIR%%/opentimelineview/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/opentimelineview/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc

10
net/libdaq/Makefile
View File

@ -1,8 +1,12 @@
PORTNAME= libdaq
DISTVERSIONPREFIX= v
DISTVERSION= 3.0.9
PORTREVISION= 1
CATEGORIES= net
PATCH_SITES= https://github.com/glebius/${PORTNAME}/commit/
PATCHFILES= c0f3283ad42a1d8e70ee699271b91168b14ec357.patch:-p1
MAINTAINER= bofh@FreeBSD.org
COMMENT= Data Acquisition abstraction library for snort 3.0+
WWW= https://www.snort.org/
@ -14,13 +18,15 @@ LIB_DEPENDS= libpcap.so:net/libpcap # avoid base libpcap
USES= autoreconf compiler:c++11-lang libtool pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= snort3
USE_LDCONFIG= yes
GH_ACCOUNT= snort3
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
CONFLICTS= daq-2*

4
net/libdaq/distinfo
View File

@ -1,3 +1,5 @@
TIMESTAMP = 1661954275
TIMESTAMP = 1664305246
SHA256 (snort3-libdaq-v3.0.9_GH0.tar.gz) = c0e8535533720a6df05ab884b7c8f5fb4222f3aac12bdc11829e08c79716d338
SIZE (snort3-libdaq-v3.0.9_GH0.tar.gz) = 167739
SHA256 (c0f3283ad42a1d8e70ee699271b91168b14ec357.patch) = df4e9e3bb00cebb7d215dc681896552e7458ae266852b7ba65ef9eca0436d9ea
SIZE (c0f3283ad42a1d8e70ee699271b91168b14ec357.patch) = 1951

2
net/netatalk3/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= netatalk
PORTVERSION= 3.1.13
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF

4
net/netatalk3/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig 2016-09-12 09:54:34 UTC
--- configure.orig 2022-03-22 04:51:09 UTC
+++ configure
@@ -17360,7 +17360,7 @@ if test "x$bdb_required" = "xyes"; then
@@ -17368,7 +17368,7 @@ if test "x$bdb_required" = "xyes"; then
trybdbdir=""
dobdbsearch=yes
bdb_search_dirs="/usr/local /usr"

53
net/netatalk3/files/patch-etc_afpd_directory.c Normal file
View File

@ -0,0 +1,53 @@
--- etc/afpd/directory.c.orig 2022-02-28 13:32:06 UTC
+++ etc/afpd/directory.c
@@ -1426,6 +1426,7 @@ int getdirparams(const AFPObj *obj,
struct maccess ma;
struct adouble ad;
char *data, *l_nameoff = NULL, *utf_nameoff = NULL;
+ char *ade = NULL;
int bit = 0, isad = 0;
uint32_t aint;
uint16_t ashort;
@@ -1520,7 +1521,10 @@ int getdirparams(const AFPObj *obj,
case DIRPBIT_FINFO :
if ( isad ) {
- memcpy( data, ad_entry( &ad, ADEID_FINDERI ), 32 );
+ ade = ad_entry(&ad, ADEID_FINDERI);
+ AFP_ASSERT(ade != NULL);
+
+ memcpy( data, ade, 32 );
} else { /* no appledouble */
memset( data, 0, 32 );
/* dot files are by default visible */
@@ -1744,6 +1748,7 @@ int setdirparams(struct vol *vol, struct path *path, u
struct timeval tv;
char *upath;
+ char *ade = NULL;
struct dir *dir;
int bit, isad = 0;
int cdate, bdate;
@@ -1905,6 +1910,8 @@ int setdirparams(struct vol *vol, struct path *path, u
fflags &= htons(~FINDERINFO_ISHARED);
memcpy(finder_buf + FINDERINFO_FRFLAGOFF, &fflags, sizeof(uint16_t));
/* #2802236 end */
+ ade = ad_entry(&ad, ADEID_FINDERI);
+ AFP_ASSERT(ade != NULL);
if ( dir->d_did == DIRDID_ROOT ) {
/*
@@ -1915,10 +1922,10 @@ int setdirparams(struct vol *vol, struct path *path, u
* behavior one sees when mounting above another mount
* point.
*/
- memcpy( ad_entry( &ad, ADEID_FINDERI ), finder_buf, 10 );
- memcpy( ad_entry( &ad, ADEID_FINDERI ) + 14, finder_buf + 14, 18 );
+ memcpy( ade, finder_buf, 10 );
+ memcpy( ade + 14, finder_buf + 14, 18 );
} else {
- memcpy( ad_entry( &ad, ADEID_FINDERI ), finder_buf, 32 );
+ memcpy( ade, finder_buf, 32 );
}
}
break;

127
net/netatalk3/files/patch-etc_afpd_file.c Normal file
View File

@ -0,0 +1,127 @@
--- etc/afpd/file.c.orig 2022-02-28 13:32:06 UTC
+++ etc/afpd/file.c
@@ -296,6 +296,7 @@ int getmetadata(const AFPObj *obj,
{
char *data, *l_nameoff = NULL, *upath;
char *utf_nameoff = NULL;
+ char *ade = NULL;
int bit = 0;
uint32_t aint;
cnid_t id = 0;
@@ -497,8 +498,11 @@ int getmetadata(const AFPObj *obj,
}
else {
if ( adp ) {
- memcpy(fdType, ad_entry( adp, ADEID_FINDERI ), 4 );
+ ade = ad_entry(adp, ADEID_FINDERI);
+ AFP_ASSERT(ade != NULL);
+ memcpy(fdType, ade, 4);
+
if ( memcmp( fdType, "TEXT", 4 ) == 0 ) {
achar = '\x04';
ashort = 0x0000;
@@ -576,8 +580,19 @@ int getmetadata(const AFPObj *obj,
10.3 clients freak out. */
aint = st->st_mode;
- if (adp) {
- memcpy(fdType, ad_entry( adp, ADEID_FINDERI ), 4 );
+ /*
+ * ad_open() does not initialize adouble header
+ * for symlinks. Hence this should be skipped to
+ * avoid AFP_ASSERT here. Decision was made to
+ * not alter ad_open() behavior so that
+ * improper ops on symlink adoubles will be
+ * more visible (assert).
+ */
+ if (adp && (ad_meta_fileno(adp) != AD_SYMLINK)) {
+ ade = ad_entry(adp, ADEID_FINDERI);
+ AFP_ASSERT(ade != NULL);
+
+ memcpy(fdType, ade, 4);
if ( memcmp( fdType, "slnk", 4 ) == 0 ) {
aint |= S_IFLNK;
}
@@ -839,6 +854,7 @@ int setfilparams(const AFPObj *obj, struct vol *vol,
struct extmap *em;
int bit, isad = 1, err = AFP_OK;
char *upath;
+ char *ade = NULL;
u_char achar, *fdType, xyy[4]; /* uninitialized, OK 310105 */
uint16_t ashort, bshort, oshort;
uint32_t aint;
@@ -989,7 +1005,7 @@ int setfilparams(const AFPObj *obj, struct vol *vol,
/* second try with adouble open
*/
if (ad_open(adp, upath, ADFLAGS_HF | ADFLAGS_RDWR | ADFLAGS_CREATE, 0666) < 0) {
- LOG(log_debug, logtype_afpd, "setfilparams: ad_open_metadata error");
+ LOG(log_debug, logtype_afpd, "setfilparams: ad_open_metadata error: %s", strerror(errno));
/*
* For some things, we don't need an adouble header:
* - change of modification date
@@ -1021,6 +1037,9 @@ int setfilparams(const AFPObj *obj, struct vol *vol,
switch( bit ) {
case FILPBIT_ATTR :
+ if (isad == 0) {
+ break;
+ }
ad_getattr(adp, &bshort);
oshort = bshort;
if ( ntohs( ashort ) & ATTRBIT_SETCLR ) {
@@ -1034,15 +1053,26 @@ int setfilparams(const AFPObj *obj, struct vol *vol,
ad_setattr(adp, bshort);
break;
case FILPBIT_CDATE :
+ if (isad == 0) {
+ break;
+ }
ad_setdate(adp, AD_DATE_CREATE, cdate);
break;
case FILPBIT_MDATE :
break;
case FILPBIT_BDATE :
+ if (isad == 0) {
+ break;
+ }
ad_setdate(adp, AD_DATE_BACKUP, bdate);
break;
case FILPBIT_FINFO :
- if (default_type( ad_entry( adp, ADEID_FINDERI ))
+ if (isad == 0) {
+ break;
+ }
+ ade = ad_entry(adp, ADEID_FINDERI);
+ AFP_ASSERT(ade != NULL);
+ if (default_type(ade)
&& (
((em = getextmap( path->m_name )) &&
!memcmp(finder_buf, em->em_type, sizeof( em->em_type )) &&
@@ -1053,7 +1083,7 @@ int setfilparams(const AFPObj *obj, struct vol *vol,
)) {
memcpy(finder_buf, ufinderi, 8 );
}
- memcpy(ad_entry( adp, ADEID_FINDERI ), finder_buf, 32 );
+ memcpy(ade, finder_buf, 32 );
break;
case FILPBIT_UNIXPR :
if (upriv_bit) {
@@ -1061,9 +1091,15 @@ int setfilparams(const AFPObj *obj, struct vol *vol,
}
break;
case FILPBIT_PDINFO :
+ if (isad == 0) {
+ break;
+ }
+ ade = ad_entry(adp, ADEID_FINDERI);
+ AFP_ASSERT(ade != NULL);
+
if (obj->afp_version < 30) { /* else it's UTF8 name */
- memcpy(ad_entry( adp, ADEID_FINDERI ), fdType, 4 );
- memcpy(ad_entry( adp, ADEID_FINDERI ) + 4, "pdos", 4 );
+ memcpy(ade, fdType, 4 );
+ memcpy(ade + 4, "pdos", 4 );
break;
}
/* fallthrough */

37
net/netatalk3/files/patch-etc_afpd_volume.c
View File

@ -1,20 +1,23 @@
--- etc/afpd/volume.c.orig 2020-11-17 04:41:20 UTC
--- etc/afpd/volume.c.orig 2022-03-22 04:50:23 UTC
+++ etc/afpd/volume.c
@@ -183,6 +183,7 @@ static int get_tm_used(struct vol * restrict vol)
if ((bandsize = get_tm_bandsize(cfrombstr(infoplist))) == -1) {
bdestroy(infoplist);
+ infoplist = NULL;
continue;
}
@@ -305,6 +305,7 @@ static int getvolparams(const AFPObj *obj, uint16_t bi
VolSpace xbfree, xbtotal; /* extended bytes */
char *data, *nameoff = NULL;
char *slash;
+ char *ade = NULL;
@@ -190,7 +191,9 @@ static int get_tm_used(struct vol * restrict vol)
if ((links = get_tm_bands(cfrombstr(bandsdir))) == -1) {
bdestroy(infoplist);
+ infoplist = NULL;
bdestroy(bandsdir);
+ bandsdir = NULL;
continue;
}
LOG(log_debug, logtype_afpd, "getvolparams: Volume '%s'", vol->v_localname);
@@ -328,8 +329,10 @@ static int getvolparams(const AFPObj *obj, uint16_t bi
slash = vol->v_path;
if (ad_getentryoff(&ad, ADEID_NAME)) {
ad_setentrylen( &ad, ADEID_NAME, strlen( slash ));
- memcpy(ad_entry( &ad, ADEID_NAME ), slash,
- ad_getentrylen( &ad, ADEID_NAME ));
+ ade = ad_entry(&ad, ADEID_NAME);
+ AFP_ASSERT(ade != NULL);
+
+ memcpy(ade, slash, ad_getentrylen( &ad, ADEID_NAME ));
}
vol_setdate(vol->v_vid, &ad, st->st_mtime);
ad_flush(&ad);

25
net/netatalk3/files/patch-etc_cnid__dbd_cmd__dbd__scanvol.c Normal file
View File

@ -0,0 +1,25 @@
--- etc/cnid_dbd/cmd_dbd_scanvol.c.orig 2022-02-28 13:32:06 UTC
+++ etc/cnid_dbd/cmd_dbd_scanvol.c
@@ -560,6 +560,7 @@ static int read_addir(void)
static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfile_ok)
{
int adflags = ADFLAGS_HF;
+ int err;
cnid_t db_cnid, ad_cnid;
struct adouble ad;
@@ -602,7 +603,13 @@ static cnid_t check_cnid(const char *name, cnid_t did,
cwdbuf, name, strerror(errno));
return CNID_INVALID;
}
- ad_setid( &ad, st->st_dev, st->st_ino, db_cnid, did, stamp);
+ err = ad_setid( &ad, st->st_dev, st->st_ino, db_cnid, did, stamp);
+ if (err == -1) {
+ dbd_log(LOGSTD, "Error setting new CNID, malformed adouble: '%s/%s'",
+ cwdbuf, name);
+ ad_close(&ad, ADFLAGS_HF);
+ return CNID_INVALID;
+ }
ad_flush(&ad);
ad_close(&ad, ADFLAGS_HF);
}

234
net/netatalk3/files/patch-libatalk_adouble_ad__attr.c Normal file
View File

@ -0,0 +1,234 @@
--- libatalk/adouble/ad_attr.c.orig 2022-02-28 13:32:06 UTC
+++ libatalk/adouble/ad_attr.c
@@ -2,8 +2,10 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
+#include <stdlib.h>
#include <string.h>
#include <arpa/inet.h>
+#include <atalk/util.h>
#include <atalk/adouble.h>
#include <atalk/logger.h>
@@ -22,10 +24,17 @@ int ad_getattr(const struct adouble *ad, uint16_t *att
*attr = 0;
if (ad_getentryoff(ad, ADEID_AFPFILEI)) {
- memcpy(attr, ad_entry(ad, ADEID_AFPFILEI) + AFPFILEIOFF_ATTR, 2);
+ char *adp = NULL;
+ adp = ad_entry(ad, ADEID_AFPFILEI);
+ AFP_ASSERT(adp != NULL);
+ memcpy(attr, adp + AFPFILEIOFF_ATTR, 2);
+
/* Now get opaque flags from FinderInfo */
- memcpy(&fflags, ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, 2);
+ adp = ad_entry(ad, ADEID_FINDERI);
+ AFP_ASSERT(adp != NULL);
+ memcpy(&fflags, adp + FINDERINFO_FRFLAGOFF, 2);
+
if (fflags & htons(FINDERINFO_INVISIBLE))
*attr |= htons(ATTRBIT_INVISIBLE);
else
@@ -61,10 +70,15 @@ int ad_setattr(const struct adouble *ad, const uint16_
attr &= ~(ATTRBIT_MULTIUSER | ATTRBIT_NOWRITE | ATTRBIT_NOCOPY);
if (ad_getentryoff(ad, ADEID_AFPFILEI) && ad_getentryoff(ad, ADEID_FINDERI)) {
- memcpy(ad_entry(ad, ADEID_AFPFILEI) + AFPFILEIOFF_ATTR, &attr, sizeof(attr));
+ char *adp = NULL;
+
+ adp = ad_entry(ad, ADEID_FINDERI);
+ AFP_ASSERT(adp != NULL);
+
+ memcpy(adp + AFPFILEIOFF_ATTR, &attr, sizeof(attr));
/* Now set opaque flags in FinderInfo too */
- memcpy(&fflags, ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, 2);
+ memcpy(&fflags, adp + FINDERINFO_FRFLAGOFF, 2);
if (attr & htons(ATTRBIT_INVISIBLE))
fflags |= htons(FINDERINFO_INVISIBLE);
else
@@ -77,7 +91,7 @@ int ad_setattr(const struct adouble *ad, const uint16_
} else
fflags &= htons(~FINDERINFO_ISHARED);
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &fflags, 2);
+ memcpy(adp + FINDERINFO_FRFLAGOFF, &fflags, 2);
}
return 0;
@@ -86,54 +100,114 @@ int ad_setattr(const struct adouble *ad, const uint16_
/* --------------
* save file/folder ID in AppleDoubleV2 netatalk private parameters
* return 1 if resource fork has been modified
+ * return -1 on error.
*/
int ad_setid (struct adouble *adp, const dev_t dev, const ino_t ino , const uint32_t id, const cnid_t did, const void *stamp)
{
uint32_t tmp;
+ char *ade = NULL;
ad_setentrylen( adp, ADEID_PRIVID, sizeof(id));
tmp = id;
if (adp->ad_vers == AD_VERSION_EA)
tmp = htonl(tmp);
- memcpy(ad_entry( adp, ADEID_PRIVID ), &tmp, sizeof(tmp));
+ ade = ad_entry(adp, ADEID_PRIVID);
+ if (ade == NULL) {
+ LOG(log_warning, logtype_ad, "ad_setid: failed to set ADEID_PRIVID\n");
+ return -1;
+ }
+ memcpy(ade, &tmp, sizeof(tmp));
+
ad_setentrylen( adp, ADEID_PRIVDEV, sizeof(dev_t));
+ ade = ad_entry(adp, ADEID_PRIVDEV);
+ if (ade == NULL) {
+ LOG(log_warning, logtype_ad, "ad_setid: failed to set ADEID_PRIVDEV\n");
+ return -1;
+ }
+
if ((adp->ad_options & ADVOL_NODEV)) {
- memset(ad_entry( adp, ADEID_PRIVDEV ), 0, sizeof(dev_t));
+ memset(ade, 0, sizeof(dev_t));
} else {
- memcpy(ad_entry( adp, ADEID_PRIVDEV ), &dev, sizeof(dev_t));
+ memcpy(ade, &dev, sizeof(dev_t));
}
ad_setentrylen( adp, ADEID_PRIVINO, sizeof(ino_t));
- memcpy(ad_entry( adp, ADEID_PRIVINO ), &ino, sizeof(ino_t));
- ad_setentrylen( adp, ADEID_DID, sizeof(did));
- memcpy(ad_entry( adp, ADEID_DID ), &did, sizeof(did));
+ ade = ad_entry(adp, ADEID_PRIVINO);
+ if (ade == NULL) {
+ LOG(log_warning, logtype_ad, "ad_setid: failed to set ADEID_PRIVINO\n");
+ return -1;
+ }
+ memcpy(ade, &ino, sizeof(ino_t));
+ if (adp->ad_vers != AD_VERSION_EA) {
+ ad_setentrylen( adp, ADEID_DID, sizeof(did));
+
+ ade = ad_entry(adp, ADEID_DID);
+ if (ade == NULL) {
+ LOG(log_warning, logtype_ad, "ad_setid: failed to set ADEID_DID\n");
+ return -1;
+ }
+ memcpy(ade, &did, sizeof(did));
+ }
+
ad_setentrylen( adp, ADEID_PRIVSYN, ADEDLEN_PRIVSYN);
- memcpy(ad_entry( adp, ADEID_PRIVSYN ), stamp, ADEDLEN_PRIVSYN);
+ ade = ad_entry(adp, ADEID_PRIVSYN);
+ if (ade == NULL) {
+ LOG(log_warning, logtype_ad, "ad_setid: failed to set ADEID_PRIVSYN\n");
+ return -1;
+ }
+ memcpy(ade, stamp, ADEDLEN_PRIVSYN);
return 1;
}
-/* ----------------------------- */
+/*
+ * Retrieve stored file / folder. Callers should treat a return of CNID_INVALID (0) as an invalid value.
+ */
uint32_t ad_getid (struct adouble *adp, const dev_t st_dev, const ino_t st_ino , const cnid_t did, const void *stamp _U_)
{
uint32_t aint = 0;
dev_t dev;
ino_t ino;
- cnid_t a_did;
+ cnid_t a_did = 0;
if (adp) {
if (sizeof(dev_t) == ad_getentrylen(adp, ADEID_PRIVDEV)) {
- memcpy(&dev, ad_entry(adp, ADEID_PRIVDEV), sizeof(dev_t));
- memcpy(&ino, ad_entry(adp, ADEID_PRIVINO), sizeof(ino_t));
- memcpy(&a_did, ad_entry(adp, ADEID_DID), sizeof(cnid_t));
+ char *ade = NULL;
+ ade = ad_entry(adp, ADEID_PRIVDEV);
+ if (ade == NULL) {
+ LOG(log_warning, logtype_ad, "ad_getid: failed to retrieve ADEID_PRIVDEV\n");
+ return CNID_INVALID;
+ }
+ memcpy(&dev, ade, sizeof(dev_t));
+ ade = ad_entry(adp, ADEID_PRIVINO);
+ if (ade == NULL) {
+ LOG(log_warning, logtype_ad, "ad_getid: failed to retrieve ADEID_PRIVINO\n");
+ return CNID_INVALID;
+ }
+ memcpy(&ino, ade, sizeof(ino_t));
+ if (adp->ad_vers != AD_VERSION_EA) {
+ /* ADEID_DID is not stored for AD_VERSION_EA */
+ ade = ad_entry(adp, ADEID_DID);
+ if (ade == NULL) {
+ LOG(log_warning, logtype_ad, "ad_getid: failed to retrieve ADEID_DID\n");
+ return CNID_INVALID;
+ }
+ memcpy(&a_did, ade, sizeof(cnid_t));
+ }
+
if (((adp->ad_options & ADVOL_NODEV) || (dev == st_dev))
&& ino == st_ino
- && (!did || a_did == did) ) {
- memcpy(&aint, ad_entry(adp, ADEID_PRIVID), sizeof(aint));
+ && (!did || a_did == 0 || a_did == did) ) {
+ ade = ad_entry(adp, ADEID_PRIVID);
+ if (ade == NULL) {
+ LOG(log_warning, logtype_ad, "ad_getid: failed to retrieve ADEID_PRIVID\n");
+ return CNID_INVALID;
+ }
+ memcpy(&aint, ade, sizeof(aint));
if (adp->ad_vers == AD_VERSION2)
return aint;
else
@@ -141,7 +215,7 @@ uint32_t ad_getid (struct adouble *adp, const dev_t st
}
}
}
- return 0;
+ return CNID_INVALID;
}
/* ----------------------------- */
@@ -150,13 +224,18 @@ uint32_t ad_forcegetid (struct adouble *adp)
uint32_t aint = 0;
if (adp) {
- memcpy(&aint, ad_entry(adp, ADEID_PRIVID), sizeof(aint));
+ char *ade = NULL;
+ ade = ad_entry(adp, ADEID_PRIVID);
+ if (ade == NULL) {
+ return CNID_INVALID;
+ }
+ memcpy(&aint, ade, sizeof(aint));
if (adp->ad_vers == AD_VERSION2)
return aint;
else
return ntohl(aint);
}
- return 0;
+ return CNID_INVALID;
}
/* -----------------
@@ -168,8 +247,13 @@ int ad_setname(struct adouble *ad, const char *path)
if ((len = strlen(path)) > ADEDLEN_NAME)
len = ADEDLEN_NAME;
if (path && ad_getentryoff(ad, ADEID_NAME)) {
+ char *ade = NULL;
ad_setentrylen( ad, ADEID_NAME, len);
- memcpy(ad_entry( ad, ADEID_NAME ), path, len);
+ ade = ad_entry(ad, ADEID_NAME);
+ if (ade == NULL) {
+ return -1;
+ }
+ memcpy(ade, path, len);
return 1;
}
return 0;

27
net/netatalk3/files/patch-libatalk_adouble_ad__conv.c Normal file
View File

@ -0,0 +1,27 @@
--- libatalk/adouble/ad_conv.c.orig 2022-02-28 13:32:06 UTC
+++ libatalk/adouble/ad_conv.c
@@ -93,6 +93,7 @@ static int ad_conv_v22ea_hf(const char *path, const st
goto copy;
if (ad_getentryoff(&adv2, ADEID_FINDERI)
&& (ad_getentrylen(&adv2, ADEID_FINDERI) == ADEDLEN_FINDERI)
+ && (ad_entry(&adv2, ADEID_FINDERI) != NULL)
&& (memcmp(ad_entry(&adv2, ADEID_FINDERI), emptyad, ADEDLEN_FINDERI) != 0))
goto copy;
if (ad_getentryoff(&adv2, ADEID_FILEDATESI)) {
@@ -101,7 +102,7 @@ static int ad_conv_v22ea_hf(const char *path, const st
if ((ctime != mtime) || (mtime != sp->st_mtime))
goto copy;
}
- if (ad_getentryoff(&adv2, ADEID_AFPFILEI)) {
+ if (ad_getentryoff(&adv2, ADEID_AFPFILEI) && (ad_entry(&adv2, ADEID_AFPFILEI) != NULL)) {
if (memcmp(ad_entry(&adv2, ADEID_AFPFILEI), &afpinfo, ADEDLEN_AFPFILEI) != 0)
goto copy;
}
@@ -115,6 +116,7 @@ copy:
EC_ZERO_LOGSTR( ad_open(&adea, path, adflags | ADFLAGS_HF | ADFLAGS_RDWR | ADFLAGS_CREATE),
"ad_conv_v22ea_hf(\"%s\"): error creating metadata EA: %s",
fullpathname(path), strerror(errno));
+ AFP_ASSERT(ad_refresh(path, &adea) == 0);
EC_ZERO_LOG( ad_copy_header(&adea, &adv2) );
ad_flush(&adea);

48
net/netatalk3/files/patch-libatalk_adouble_ad__date.c Normal file
View File

@ -0,0 +1,48 @@
--- libatalk/adouble/ad_date.c.orig 2022-02-28 13:32:06 UTC
+++ libatalk/adouble/ad_date.c
@@ -10,6 +10,7 @@ int ad_setdate(struct adouble *ad,
unsigned int dateoff, uint32_t date)
{
int xlate = (dateoff & AD_DATE_UNIX);
+ char *ade = NULL;
dateoff &= AD_DATE_MASK;
if (xlate)
@@ -20,8 +21,13 @@ int ad_setdate(struct adouble *ad,
if (dateoff > AD_DATE_ACCESS)
return -1;
- memcpy(ad_entry(ad, ADEID_FILEDATESI) + dateoff, &date, sizeof(date));
+ ade = ad_entry(ad, ADEID_FILEDATESI);
+ if (ade == NULL) {
+ return -1;
+ }
+ memcpy(ade + dateoff, &date, sizeof(date));
+
return 0;
}
@@ -29,6 +35,7 @@ int ad_getdate(const struct adouble *ad,
unsigned int dateoff, uint32_t *date)
{
int xlate = (dateoff & AD_DATE_UNIX);
+ char *ade = NULL;
dateoff &= AD_DATE_MASK;
if (!ad_getentryoff(ad, ADEID_FILEDATESI))
@@ -36,7 +43,13 @@ int ad_getdate(const struct adouble *ad,
if (dateoff > AD_DATE_ACCESS)
return -1;
- memcpy(date, ad_entry(ad, ADEID_FILEDATESI) + dateoff, sizeof(uint32_t));
+
+
+ ade = ad_entry(ad, ADEID_FILEDATESI);
+ if (ade == NULL) {
+ return -1;
+ }
+ memcpy(date, ade + dateoff, sizeof(uint32_t));
if (xlate)
*date = AD_DATE_TO_UNIX(*date);

68
net/netatalk3/files/patch-libatalk_adouble_ad__flush.c Normal file
View File

@ -0,0 +1,68 @@
--- libatalk/adouble/ad_flush.c.orig 2022-03-22 04:50:23 UTC
+++ libatalk/adouble/ad_flush.c
@@ -151,6 +151,7 @@ int ad_rebuild_adouble_header_osx(struct adouble *ad,
uint32_t temp;
uint16_t nent;
char *buf;
+ char *ade = NULL;
LOG(log_debug, logtype_ad, "ad_rebuild_adouble_header_osx");
@@ -184,8 +185,11 @@ int ad_rebuild_adouble_header_osx(struct adouble *ad,
memcpy(buf, &temp, sizeof( temp ));
buf += sizeof( temp );
- memcpy(adbuf + ADEDOFF_FINDERI_OSX, ad_entry(ad, ADEID_FINDERI), ADEDLEN_FINDERI);
+ ade = ad_entry(ad, ADEID_FINDERI);
+ AFP_ASSERT(ade != NULL);
+ memcpy(adbuf + ADEDOFF_FINDERI_OSX, ade, ADEDLEN_FINDERI);
+
/* rfork */
temp = htonl( EID_DISK(ADEID_RFORK) );
memcpy(buf, &temp, sizeof( temp ));
@@ -211,8 +215,12 @@ int ad_copy_header(struct adouble *add, struct adouble
{
uint32_t eid;
uint32_t len;
+ char *src = NULL;
+ char *dst = NULL;
for ( eid = 0; eid < ADEID_MAX; eid++ ) {
+ src = dst = NULL;
+
if ( ads->ad_eid[ eid ].ade_off == 0 || add->ad_eid[ eid ].ade_off == 0 )
continue;
@@ -226,17 +234,28 @@ int ad_copy_header(struct adouble *add, struct adouble
continue;
default:
ad_setentrylen( add, eid, len );
- memcpy( ad_entry( add, eid ), ad_entry( ads, eid ), len );
+ dst = ad_entry(add, eid);
+ AFP_ASSERT(dst != NULL);
+
+ src = ad_entry(ads, eid);
+ AFP_ASSERT(src != NULL);
+
+ memcpy( dst, src, len );
}
}
add->ad_rlen = ads->ad_rlen;
if (((ads->ad_vers == AD_VERSION2) && (add->ad_vers == AD_VERSION_EA))
|| ((ads->ad_vers == AD_VERSION_EA) && (add->ad_vers == AD_VERSION2))) {
+ src = dst = NULL;
cnid_t id;
- memcpy(&id, ad_entry(add, ADEID_PRIVID), sizeof(cnid_t));
+
+ dst = ad_entry(add, ADEID_PRIVID);
+ AFP_ASSERT(dst != NULL);
+
+ memcpy(&id, dst, sizeof(cnid_t));
id = htonl(id);
- memcpy(ad_entry(add, ADEID_PRIVID), &id, sizeof(cnid_t));
+ memcpy(dst, &id, sizeof(cnid_t));
}
return 0;
}

167
net/netatalk3/files/patch-libatalk_adouble_ad__open.c
View File

@ -1,84 +1,97 @@
--- libatalk/adouble/ad_open.c.orig 2022-03-22 04:44:25 UTC
+++ libatalk/adouble/ad_open.c
@@ -1574,6 +1574,8 @@ static bool ad_entry_check_size(uint32_t eid,
uint32_t required_len;
@@ -140,17 +140,17 @@ static struct adouble_fops ad_adouble_ea = {
if (eid >= ADEID_MAX) {
+ LOG(log_error, logtype_ad, "ad_entry_check_size %d is greater than %d",
+ eid, ADEID_MAX);
return false;
}
if (got_len == 0) {
@@ -1585,6 +1587,7 @@ static bool ad_entry_check_size(uint32_t eid,
* Shouldn't happen: implicitly initialized to zero because
* explicit initializer missing.
*/
+ LOG(log_error, logtype_ad, "ad_entry_check_size explicit initializer missing");
return false;
}
if (ad_checks[eid].expected_len == -1) {
@@ -1594,6 +1597,8 @@ static bool ad_entry_check_size(uint32_t eid,
if (ad_checks[eid].fixed_size) {
if (ad_checks[eid].expected_len != got_len) {
/* Wrong size fo fixed size entry. */
+ LOG(log_error, logtype_ad, "ad_entry_check_size wrong size to fixed size entry (%d != %d)",
+ ad_checks[eid].expected_len, got_len);
return false;
}
required_len = got_len;
@@ -1604,12 +1609,16 @@ static bool ad_entry_check_size(uint32_t eid,
* Too small for variable sized entry with
* minimum size.
*/
+ LOG(log_error, logtype_ad, "ad_entry_check_size too small for variable sized entry (%d < %d)",
+ got_len, ad_checks[eid].expected_len);
return false;
}
required_len = got_len;
} else {
if (got_len > ad_checks[eid].expected_len) {
/* Too big for variable sized entry. */
+ LOG(log_error, logtype_ad, "ad_entry_check_size too big for variable sized entry (%d > %d)",
+ got_len, ad_checks[eid].expected_len);
return false;
}
/*
@@ -1621,10 +1630,14 @@ static bool ad_entry_check_size(uint32_t eid,
}
if (off + required_len < off) {
/* wrap around */
+ LOG(log_error, logtype_ad, "ad_entry_check_size wrap around (%d + %d < %d)",
+ off, required_len, off);
return false;
}
if (off + required_len > bufsize) {
/* overflow */
+ LOG(log_error, logtype_ad, "ad_entry_check_size overflow (%d + %d > %d)",
+ off, required_len, bufsize);
return false;
}
return true;
@@ -1637,14 +1650,21 @@ void *ad_entry(const struct adouble *ad, int eid)
size_t len = ad_getentrylen(ad, eid);
bool valid;
static const struct entry entry_order2[ADEID_NUM_V2 + 1] = {
{ADEID_NAME, ADEDOFF_NAME_V2, ADEDLEN_INIT},
- {ADEID_COMMENT, ADEDOFF_COMMENT_V2, ADEDLEN_INIT},
+ {ADEID_COMMENT, ADEDOFF_COMMENT_V2, ADEDLEN_COMMENT},
{ADEID_FILEDATESI, ADEDOFF_FILEDATESI, ADEDLEN_FILEDATESI},
{ADEID_FINDERI, ADEDOFF_FINDERI_V2, ADEDLEN_FINDERI},
{ADEID_DID, ADEDOFF_DID, ADEDLEN_DID},
{ADEID_AFPFILEI, ADEDOFF_AFPFILEI, ADEDLEN_AFPFILEI},
{ADEID_SHORTNAME, ADEDOFF_SHORTNAME, ADEDLEN_INIT},
{ADEID_PRODOSFILEI, ADEDOFF_PRODOSFILEI, ADEDLEN_PRODOSFILEI},
- {ADEID_PRIVDEV, ADEDOFF_PRIVDEV, ADEDLEN_INIT},
- {ADEID_PRIVINO, ADEDOFF_PRIVINO, ADEDLEN_INIT},
- {ADEID_PRIVSYN, ADEDOFF_PRIVSYN, ADEDLEN_INIT},
- {ADEID_PRIVID, ADEDOFF_PRIVID, ADEDLEN_INIT},
+ {ADEID_PRIVDEV, ADEDOFF_PRIVDEV, ADEDLEN_PRIVDEV},
+ {ADEID_PRIVINO, ADEDOFF_PRIVINO, ADEDLEN_PRIVINO},
+ {ADEID_PRIVSYN, ADEDOFF_PRIVSYN, ADEDLEN_PRIVSYN},
+ {ADEID_PRIVID, ADEDOFF_PRIVID, ADEDLEN_PRIVID},
{ADEID_RFORK, ADEDOFF_RFORK_V2, ADEDLEN_INIT},
{0, 0, 0}
};
@@ -158,13 +158,13 @@ static const struct entry entry_order2[ADEID_NUM_V2 +
/* Using Extended Attributes */
static const struct entry entry_order_ea[ADEID_NUM_EA + 1] = {
{ADEID_FINDERI, ADEDOFF_FINDERI_EA, ADEDLEN_FINDERI},
- {ADEID_COMMENT, ADEDOFF_COMMENT_EA, ADEDLEN_INIT},
+ {ADEID_COMMENT, ADEDOFF_COMMENT_EA, ADEDLEN_COMMENT},
{ADEID_FILEDATESI, ADEDOFF_FILEDATESI_EA, ADEDLEN_FILEDATESI},
{ADEID_AFPFILEI, ADEDOFF_AFPFILEI_EA, ADEDLEN_AFPFILEI},
- {ADEID_PRIVDEV, ADEDOFF_PRIVDEV_EA, ADEDLEN_INIT},
- {ADEID_PRIVINO, ADEDOFF_PRIVINO_EA, ADEDLEN_INIT},
- {ADEID_PRIVSYN, ADEDOFF_PRIVSYN_EA, ADEDLEN_INIT},
- {ADEID_PRIVID, ADEDOFF_PRIVID_EA, ADEDLEN_INIT},
+ {ADEID_PRIVDEV, ADEDOFF_PRIVDEV_EA, ADEDLEN_PRIVDEV},
+ {ADEID_PRIVINO, ADEDOFF_PRIVINO_EA, ADEDLEN_PRIVINO},
+ {ADEID_PRIVSYN, ADEDOFF_PRIVSYN_EA, ADEDLEN_PRIVSYN},
+ {ADEID_PRIVID, ADEDOFF_PRIVID_EA, ADEDLEN_PRIVID},
{0, 0, 0}
};
+ if (bufsize == 0) {
+ bufsize = sizeof(ad->ad_data) - (off + len);
+ }
@@ -360,15 +360,22 @@ static int new_ad_header(struct adouble *ad, const cha
const struct entry *eid;
uint16_t ashort;
struct stat st;
+ char *adp = NULL;
LOG(log_debug, logtype_ad, "new_ad_header(\"%s\")", path);
if (ad_init_offsets(ad) != 0)
return -1;
+ if (ad->valid_data_len == 0) {
+ ad->valid_data_len = ad->ad_vers == AD_VERSION_EA ? AD_DATASZ_EA : AD_DATASZ2;
+ }
+ adp = ad_entry(ad, ADEID_FINDERI);
+ AFP_ASSERT(adp != NULL);
+
valid = ad_entry_check_size(eid, bufsize, off, len);
if (!valid) {
+ LOG(log_error, logtype_ad, "ad_entry: not valid");
return NULL;
}
/* set default creator/type fields */
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4);
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4);
+ memcpy(adp + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4);
+ memcpy(adp + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4);
- if (off == 0 || len == 0) {
+ /*if (off == 0 || len == 0) {
+ LOG(log_error, logtype_ad, "ad_entry: off or len is 0 (off: %d, len: %d)",
+ off, len);
return NULL;
- }
+ }*/
/* make things invisible */
if ((ad->ad_options & ADVOL_INVDOTS)
@@ -378,14 +385,16 @@ static int new_ad_header(struct adouble *ad, const cha
ashort = htons(ATTRBIT_INVISIBLE);
ad_setattr(ad, ashort);
ashort = htons(FINDERINFO_INVISIBLE);
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort));
+ memcpy(adp + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort));
}
return ((struct adouble *)ad)->ad_data + off;
}
/* put something sane in the date fields */
if (stp == NULL) {
stp = &st;
- if (lstat(path, &st) != 0)
+ if (lstat(path, &st) != 0) {
+ ad->valid_data_len = 0;
return -1;
+ }
}
ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, stp->st_mtime);
ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, stp->st_mtime);
@@ -417,7 +426,7 @@ static int parse_entries(struct adouble *ad, uint16_t
if (!eid
|| eid > ADEID_MAX
- || off >= valid_data_len
+ || ((eid != ADEID_RFORK) && (off >= valid_data_len))
|| ((eid != ADEID_RFORK) && (off + len > valid_data_len)))
{
LOG(log_warning, logtype_ad, "parse_entries: bogus eid: %u, off: %u, len: %u",

4
security/apkid/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= APKiD
PORTVERSION= 2.1.3
PORTVERSION= 2.1.4
DISTVERSIONPREFIX= v
CATEGORIES= security
@ -16,7 +16,7 @@ LICENSE_PERMS_RedNaga= pkg-mirror pkg-sell
USE_GITHUB= yes
GH_ACCOUNT= rednaga
USES= python:3.7+
USES= pytest python:3.7+
USE_PYTHON= distutils
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yara-python-dex>0:security/py-yara-python-dex@${PY_FLAVOR}

6
security/apkid/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1649784250
SHA256 (rednaga-APKiD-v2.1.3_GH0.tar.gz) = ca459365c3c02374691bc3c6dc42bd4c6cda2567cb9f34ea71b75ef94ba248ab
SIZE (rednaga-APKiD-v2.1.3_GH0.tar.gz) = 59856
TIMESTAMP = 1664308364
SHA256 (rednaga-APKiD-v2.1.4_GH0.tar.gz) = 1ad2fe1f6340672a09310836707173a2b6c8cf9be323ff5fd5a50524f243b829
SIZE (rednaga-APKiD-v2.1.4_GH0.tar.gz) = 63213

11
security/apkid/files/patch-apkid_____init____.py Normal file
View File

@ -0,0 +1,11 @@
--- apkid/__init__.py.orig 2022-09-23 16:48:51 UTC
+++ apkid/__init__.py
@@ -26,7 +26,7 @@
"""
__title__ = 'apkid'
-__version__ = '2.1.3'
+__version__ = '2.1.4'
__author__ = 'Caleb Fenton & Tim Strazzere'
__license__ = 'GPL & Commercial'
__copyright__ = 'Copyright (C) 2022 RedNaga'

2
security/gopass/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= gopass
DISTVERSIONPREFIX= v
DISTVERSION= 1.14.7
DISTVERSION= 1.14.8
CATEGORIES= security
MAINTAINER= eduardo@FreeBSD.org

14
security/gopass/distinfo
View File

@ -1,7 +1,7 @@
TIMESTAMP = 1663707251
SHA256 (go/security_gopass/gopass-v1.14.7/v1.14.7.mod) = c48de6bdee48199ffce26db3887cdc8d047a04baf9a70e0d6297b773697a196f
SIZE (go/security_gopass/gopass-v1.14.7/v1.14.7.mod) = 2922
SHA256 (go/security_gopass/gopass-v1.14.7/v1.14.7.zip) = 1a7fd3e98080748df7099a8acdaff2d0fc77f767de0baa408aa4671548970a73
SIZE (go/security_gopass/gopass-v1.14.7/v1.14.7.zip) = 2483370
SHA256 (go/security_gopass/gopass-v1.14.7/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = e2866f4749e844ea9f7d31386f971dd8bbf19acab2c0a06fe7c4e99462eda1c5
SIZE (go/security_gopass/gopass-v1.14.7/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = 1392
TIMESTAMP = 1664324380
SHA256 (go/security_gopass/gopass-v1.14.8/v1.14.8.mod) = b95bc71d2fe6ef49cb3861fdbea9449fd1f19829ac05c97e278128bc9666bb10
SIZE (go/security_gopass/gopass-v1.14.8/v1.14.8.mod) = 3107
SHA256 (go/security_gopass/gopass-v1.14.8/v1.14.8.zip) = 8a15a77bda30802c9512458707d7c973931dc4eef7687d1dabb41542dabe460d
SIZE (go/security_gopass/gopass-v1.14.8/v1.14.8.zip) = 2486439
SHA256 (go/security_gopass/gopass-v1.14.8/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = e2866f4749e844ea9f7d31386f971dd8bbf19acab2c0a06fe7c4e99462eda1c5
SIZE (go/security_gopass/gopass-v1.14.8/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = 1392

3
security/nebula/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= nebula
DISTVERSIONPREFIX= v
DISTVERSION= 1.6.0
PORTREVISION= 3
DISTVERSION= 1.6.1
CATEGORIES= security
MAINTAINER= ashish@FreeBSD.org

10
security/nebula/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1656763727
SHA256 (go/security_nebula/nebula-v1.6.0/v1.6.0.mod) = b555f4be50246ff2d5373474de23bffccbea76514879dc2400fc5031cde73c3c
SIZE (go/security_nebula/nebula-v1.6.0/v1.6.0.mod) = 2042
SHA256 (go/security_nebula/nebula-v1.6.0/v1.6.0.zip) = afb52280dad6fe143d0b3b8dd21ab95cc9e9d8a7f4df2a66e72e1fbcfcbf06ec
SIZE (go/security_nebula/nebula-v1.6.0/v1.6.0.zip) = 1057825
TIMESTAMP = 1664250466
SHA256 (go/security_nebula/nebula-v1.6.1/v1.6.1.mod) = b555f4be50246ff2d5373474de23bffccbea76514879dc2400fc5031cde73c3c
SIZE (go/security_nebula/nebula-v1.6.1/v1.6.1.mod) = 2042
SHA256 (go/security_nebula/nebula-v1.6.1/v1.6.1.zip) = d0e28bf9e41484276be9da78530b1ba97b87fdd6b624fe4fd31505c4c12d0afe
SIZE (go/security_nebula/nebula-v1.6.1/v1.6.1.zip) = 1059841

2
security/s2n-tls/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= s2n-tls
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.22
DISTVERSION= 1.3.23
PORTEPOCH= 1
CATEGORIES= security

6
security/s2n-tls/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1663855817
SHA256 (aws-s2n-tls-v1.3.22_GH0.tar.gz) = bac109210a365834d9c66659c851f16dfe2760caffad409bcc39c9cefc725817
SIZE (aws-s2n-tls-v1.3.22_GH0.tar.gz) = 4462934
TIMESTAMP = 1664298686
SHA256 (aws-s2n-tls-v1.3.23_GH0.tar.gz) = 6cc65c621c31ecfcb472ea151f5bd1feba48ae837f8a5bd6fd54fb22d2a84638
SIZE (aws-s2n-tls-v1.3.23_GH0.tar.gz) = 4467143

4
security/tcpcrypt/Makefile
View File

@ -1,8 +1,12 @@
PORTNAME= tcpcrypt
PORTVERSION= 0.5
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= security net
PATCH_SITES= https://github.com/glebius/${PORTNAME}/commit/
PATCHFILES= 8c7d4abf2ca1d795651cf8cc73994b18419487d7.patch:-p1
MAINTAINER= jmg@FreeBSD.org
COMMENT= TCPCrypt userland divert daemon
WWW= http://www.tcpcrypt.org/

Some files were not shown because too many files have changed in this diff Show More