UPDATE borgbackup-1.2.8
Simple diff below updates borgbackup to 1.2.8, which is a maintenance release. Changelog: https://github.com/borgbackup/borg/blob/1.2.8/docs/changes.rst#version-128-2024-03-29 'make test' passes all tests. Run tested on amd64 against an existing borg repository. Tests, comments and OKs welcome. Index: Makefile === RCS file: /cvs/ports/sysutils/borgbackup/1.2/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile5 Jan 2024 06:57:21 - 1.18 +++ Makefile30 Mar 2024 04:50:02 - @@ -1,4 +1,4 @@ -MODPY_EGG_VERSION =1.2.7 +MODPY_EGG_VERSION =1.2.8 WANTLIB = crypto Index: distinfo === RCS file: /cvs/ports/sysutils/borgbackup/1.2/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo2 Dec 2023 16:45:57 - 1.8 +++ distinfo30 Mar 2024 04:50:02 - @@ -1,2 +1,2 @@ -SHA256 (borgbackup-1.2.7.tar.gz) = 9j8oozg8BBlxzsh7BhyjmoFbX9RF2ySqgXLKxBfZQRo= -SIZE (borgbackup-1.2.7.tar.gz) = 4370372 +SHA256 (borgbackup-1.2.8.tar.gz) = 050isNLLdFWE1oYIoXm2x197QOSW6W/reJ5B00mR9Ko= +SIZE (borgbackup-1.2.8.tar.gz) = 4369117
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/29 22:31:12 Modified files: net/samba : Makefile distinfo net/samba/patches: patch-buildtools_wafsamba_samba_abi_py patch-buildtools_wafsamba_samba_autoconf_py patch-buildtools_wafsamba_wafsamba_py patch-lib_ldb_wscript patch-python_samba_provision___init___py patch-source3_wscript patch-source4_dsdb_samdb_ldb_modules_acl_c net/samba/pkg : PLIST-main Log message: Update to samba-4.20.0 Release notes: https://www.samba.org/samba/history/samba-4.20.0.html Test and OK Ian McWilliam (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/29 22:30:18 Modified files: devel/libtalloc: Makefile distinfo devel/libtalloc/patches: patch-buildtools_wafsamba_wafsamba_py Log message: Update to libtalloc-2.4.2 Needed for samba-4.20.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2024/03/29 22:29:55 Modified files: databases/tdb : Makefile distinfo databases/tdb/patches: patch-buildtools_wafsamba_wafsamba_py Log message: Update to tdb-1.4.10 Needed for samba-4.20.0
Re: archivers/xz: update to 5.6.1
El Fri, 29 Mar 2024 22:55:26 +0100 Christian Weisgerber escribió: > Christian Weisgerber: > > > > It sounds like a backdoor made it into the upstream repository: > > > https://www.openwall.com/lists/oss-security/2024/03/29/4 > > > > Yes, I just learned. I am investigating. > > The xz 5.6.1 update hasn't been committed yet, so this mostly > concerns only me anyway. > > * A malicious m4/build-to-host.m4 has been inserted and its code > is used in the generated configure script. > > * This extracts and executes a shell script from > tests/files/bad-3-corrupt_lzma2.xz. > That script aborts if $(uname) is not Linux. <=== IT ENDS HERE. > If the script continued, it would fail because it uses "head -c" > and "tail -c" which are a nonstandard extension that the > corresponding OpenBSD commands don't support. > > * The script extracts the next stage shell script from > tests/files/good-large_compressed.lzma. > This stage aborts again early when $(uname) is not Linux. > It then proceeds to manipulate the build in some way I won't waste > my time to figure out. > > In short, it's a supply chain attack on Linux that doesn't concern > OpenBSD. > > > PS: > If anybody wants to compare build-to-host.m4, here's the GNU upstream: > https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=m4/build-to-host.m4;h=f928e9ab403b3633e3d1d974abcf478e65d4b0aa;hb=HEAD > Good to know! Thanks for this analysis! -- * Dios en su cielo, todo bien en la Tierra
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2024/03/29 17:49:11 Modified files: devel/py-test-asyncio: Makefile distinfo Log message: update py-test-asyncio to 0.23.5 ok lraab@
Re: archivers/xz: update to 5.6.1
Christian Weisgerber: > If the script continued, it would fail because it uses "head -c" > and "tail -c" which are a nonstandard extension that the corresponding > OpenBSD commands don't support. Actually, "tail -c" is in POSIX and available on OpenBSD. Still would fail for "head -c", though. -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2024/03/29 17:06:18 Modified files: www/p5-URI : Makefile distinfo Log message: update p5-URI to 5.28
Re: [update] www/redlib to 0.31.2
On Sun, Mar 17, 2024 at 09:47:03PM +, Lucas Raab wrote: > Hello, > > New version of redlib which has been working fine the past few days. > > changelog: > https://github.com/redlib-org/redlib/releases/tag/v0.31.1 > > 0.32.2 bumps the version number which was missed for the tagged 0.31.1 > release. > > Thanks, > Lucas I'll plan to commit this over the weekend unless anyone has objections/negative tests? diff refs/heads/master refs/heads/redlib commit - 794b750a83b26dc381ef8172b188a8ce2e2cb05d commit + 90b8dff4f3953eef832ea37e463949c60392 blob - d6bf113c603b7ad5413a4412612df0dfea8a38db blob + d2ab60adbcc267bfbac5a2b00fd9794c3a2b37de --- www/redlib/Makefile +++ www/redlib/Makefile @@ -2,7 +2,7 @@ COMMENT = alternative private front-end to Reddit GH_ACCOUNT = redlib-org GH_PROJECT = redlib -GH_TAGNAME = v0.31.0 +GH_TAGNAME = v0.31.2 CATEGORIES = www blob - 23331f957e8954fd725acca891559a51d0b93912 blob + 5a6f48a11489e4f21402880c88af93ae108e8296 --- www/redlib/crates.inc +++ www/redlib/crates.inc @@ -1,54 +1,53 @@ MODCARGO_CRATES += addr2line 0.21.0 # Apache-2.0 OR MIT MODCARGO_CRATES += adler 1.0.2 # 0BSD OR MIT OR Apache-2.0 MODCARGO_CRATES += adler32 1.2.0 # Zlib -MODCARGO_CRATES += ahash 0.8.6 # MIT OR Apache-2.0 +MODCARGO_CRATES += ahash 0.8.11 # MIT OR Apache-2.0 MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT MODCARGO_CRATES += alloc-no-stdlib 2.0.4 # BSD-3-Clause MODCARGO_CRATES += alloc-stdlib0.2.2 # BSD-3-Clause MODCARGO_CRATES += allocator-api2 0.2.16 # MIT OR Apache-2.0 -MODCARGO_CRATES += anstyle 1.0.4 # MIT OR Apache-2.0 -MODCARGO_CRATES += askama 0.11.1 # MIT OR Apache-2.0 -MODCARGO_CRATES += askama_derive 0.11.2 # MIT/Apache-2.0 +MODCARGO_CRATES += anstyle 1.0.6 # MIT OR Apache-2.0 +MODCARGO_CRATES += askama 0.12.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += askama_derive 0.12.5 # MIT/Apache-2.0 MODCARGO_CRATES += askama_escape 0.10.3 # MIT OR Apache-2.0 -MODCARGO_CRATES += askama_shared 0.12.2 # MIT/Apache-2.0 -MODCARGO_CRATES += async-trait 0.1.75 # MIT OR Apache-2.0 +MODCARGO_CRATES += askama_parser 0.2.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += async-trait 0.1.77 # MIT OR Apache-2.0 MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT MODCARGO_CRATES += backtrace 0.3.69 # MIT OR Apache-2.0 -MODCARGO_CRATES += base64 0.21.5 # MIT OR Apache-2.0 +MODCARGO_CRATES += base64 0.21.7 # MIT OR Apache-2.0 MODCARGO_CRATES += bitflags1.3.2 # MIT/Apache-2.0 -MODCARGO_CRATES += bitflags2.4.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += bitflags2.4.2 # MIT OR Apache-2.0 MODCARGO_CRATES += block-buffer0.10.4 # MIT OR Apache-2.0 MODCARGO_CRATES += brotli 3.4.0 # BSD-3-Clause/MIT MODCARGO_CRATES += brotli-decompressor 2.5.1 # BSD-3-Clause/MIT -MODCARGO_CRATES += bstr1.8.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += bstr1.9.1 # MIT OR Apache-2.0 MODCARGO_CRATES += build_html 2.4.0 # MIT MODCARGO_CRATES += bytes 1.5.0 # MIT -MODCARGO_CRATES += cached 0.46.1 # MIT -MODCARGO_CRATES += cached_proc_macro 0.18.1 # MIT -MODCARGO_CRATES += cached_proc_macro_types 0.1.0 # MIT -MODCARGO_CRATES += cc 1.0.83 # MIT OR Apache-2.0 +MODCARGO_CRATES += cached 0.48.1 # MIT +MODCARGO_CRATES += cached_proc_macro 0.19.1 # MIT +MODCARGO_CRATES += cached_proc_macro_types 0.1.1 # MIT +MODCARGO_CRATES += cc 1.0.89 # MIT OR Apache-2.0 MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0 -MODCARGO_CRATES += clap4.4.11 # MIT OR Apache-2.0 -MODCARGO_CRATES += clap_builder4.4.11 # MIT OR Apache-2.0 -MODCARGO_CRATES += clap_lex0.6.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap4.5.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap_builder4.5.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap_lex0.7.0 # MIT OR Apache-2.0 MODCARGO_CRATES += cookie 0.18.0 # MIT OR Apache-2.0 MODCARGO_CRATES += core-foundation 0.9.4 # MIT OR Apache-2.0 MODCARGO_CRATES += core-foundation-sys 0.8.6 # MIT OR Apache-2.0 MODCARGO_CRATES += core2 0.4.0 # Apache-2.0 OR MIT -MODCARGO_CRATES += cpufeatures 0.2.11 # MIT OR Apache-2.0 -MODCARGO_CRATES += crc32fast 1.3.2 # MIT OR Apache-2.0 +MODCARGO_CRATES += cpufeatures 0.2.12 # MIT OR Apache-2.0 +MODCARGO_CRATES += crc32fast 1.4.0 # MIT OR Apache-2.0 MODCARGO_CRATES += crypto-common 0.1.6 # MIT OR Apache-2.0 MODCARGO_CRATES += darling 0.14.4 # MIT MODCARGO_CRATES += darling_core0.14.4 # MIT MODCARGO_CRATES += darling_macro 0.14.4 # MIT MODCARGO_CRATES += dary_heap 0.3.6 # MIT OR Apache-2.0 -MODCARGO_CRATES += deranged0.3.10 # MIT OR
Re: archivers/xz: update to 5.6.1
Christian Weisgerber: > > It sounds like a backdoor made it into the upstream repository: > > https://www.openwall.com/lists/oss-security/2024/03/29/4 > > Yes, I just learned. I am investigating. The xz 5.6.1 update hasn't been committed yet, so this mostly concerns only me anyway. * A malicious m4/build-to-host.m4 has been inserted and its code is used in the generated configure script. * This extracts and executes a shell script from tests/files/bad-3-corrupt_lzma2.xz. That script aborts if $(uname) is not Linux. <=== IT ENDS HERE. If the script continued, it would fail because it uses "head -c" and "tail -c" which are a nonstandard extension that the corresponding OpenBSD commands don't support. * The script extracts the next stage shell script from tests/files/good-large_compressed.lzma. This stage aborts again early when $(uname) is not Linux. It then proceeds to manipulate the build in some way I won't waste my time to figure out. In short, it's a supply chain attack on Linux that doesn't concern OpenBSD. PS: If anybody wants to compare build-to-host.m4, here's the GNU upstream: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=m4/build-to-host.m4;h=f928e9ab403b3633e3d1d974abcf478e65d4b0aa;hb=HEAD -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/29 15:12:13 Modified files: devel/harfbuzz : Makefile distinfo Log message: Update to harfbuzz-8.4.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/29 15:01:13 Modified files: x11/gnome/file-roller: Makefile distinfo x11/gnome/file-roller/pkg: PLIST-main Log message: Update to file-roller-44.
Re: archivers/xz: update to 5.6.1
Thanks, Christian! On Fri, Mar 29, 2024 at 4:35 PM Christian Weisgerber wrote: > Jesse Darrone: > > > I hate to raise the alarm, but it looks like this should be scrutinized. > > > > It sounds like a backdoor made it into the upstream repository: > > https://www.openwall.com/lists/oss-security/2024/03/29/4 > > Yes, I just learned. I am investigating. > > FWIW, I did look over the complete 5.4.5 -> 5.6.1 diff as part of > my regular update procedure, but didn't catch this in the 144028-line > diff. > > -- > Christian "naddy" Weisgerber na...@mips.inka.de >
Re: archivers/xz: update to 5.6.1
Jesse Darrone: > I hate to raise the alarm, but it looks like this should be scrutinized. > > It sounds like a backdoor made it into the upstream repository: > https://www.openwall.com/lists/oss-security/2024/03/29/4 Yes, I just learned. I am investigating. FWIW, I did look over the complete 5.4.5 -> 5.6.1 diff as part of my regular update procedure, but didn't catch this in the 144028-line diff. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: archivers/xz: update to 5.6.1
Hello,
I hate to raise the alarm, but it looks like this should be scrutinized.
It sounds like a backdoor made it into the upstream repository:
https://www.openwall.com/lists/oss-security/2024/03/29/4
On Mon, Mar 18, 2024 at 4:15 AM Christian Weisgerber
wrote:
> archivers/xz: update to 5.6.1
>
> * Multithreaded mode is now the default.
> * New command line options to set filter chains using the liblzma filter
> string syntax.
> * Significant speed optimizations to the LZMA decoder.
>
>
> I have added runtime detection code to check for CRC32 instructions
> to speed up CRC32 integrity checks on arm64. I intend to submit
> this upstream, so if anybody has comments on that, let me know.
> (xz defaults to CRC64 anyway, so this has little practical value,
> but it is supported on other operating systems.)
>
> Upstream has added pledge() support to xzdec, rendering our previous
> patch obsolete.
>
> ok?
>
>
> diff d65615b6802f8ddeb4536c340034d07be3df3483
> 41fabc9987fb853589f2dd0de774d8f5cdbd0b69
> commit - d65615b6802f8ddeb4536c340034d07be3df3483
> commit + 41fabc9987fb853589f2dd0de774d8f5cdbd0b69
> blob - d1f7ac3fc25e3152944c4efae9a179e35ab504dc
> blob + 40addd5d055828107dd9fdb477184ffa605b5fd1
> --- archivers/xz/Makefile
> +++ archivers/xz/Makefile
> @@ -1,18 +1,19 @@
> COMMENT= library and tools for XZ and LZMA compressed files
>
> -DISTNAME= xz-5.4.5
> -SHARED_LIBS= lzma 2.2 # 9.4
> +VERSION= 5.6.1
> +DISTNAME= xz-${VERSION}
> +SHARED_LIBS= lzma 2.3 # 11.1
> CATEGORIES=archivers
> DPB_PROPERTIES=parallel
>
> -HOMEPAGE= https://tukaani.org/xz/
> +HOMEPAGE= https://xz.tukaani.org/xz-utils/
>
> MAINTAINER=Christian Weisgerber
>
> # GPLv2+
> PERMIT_PACKAGE=Yes
>
> -SITES= ${SITE_SOURCEFORGE:=lzmautils/}
> +SITES=
> https://github.com/tukaani-project/xz/releases/download/v${VERSION}/
>
> # uses pledge()
> WANTLIB= c pthread
> blob - 98b88e2abbfec958489da8fba87fb00df54b8532
> blob + 83ae5ae9b49b503f0bcb1672db69e161dbb814b0
> --- archivers/xz/distinfo
> +++ archivers/xz/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (xz-5.4.5.tar.gz) = E1yQuTSu6PvA1Gfeh6Bctw1ifaNqvlGMNXqHNwnlt9Y=
> -SIZE (xz-5.4.5.tar.gz) = 2884510
> +SHA256 (xz-5.6.1.tar.gz) = I5j0qOUzRTJfRL3Z8Mx0Ab2QJdc2xtQ7Ny9N6ne/dbg=
> +SIZE (xz-5.6.1.tar.gz) = 3045434
> blob - 6061c7f3c22f7e992a2b66ff5cd7082eb1ffd5c8 (mode 644)
> blob + /dev/null
> --- archivers/xz/patches/patch-config_h_in
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Index: config.h.in
> config.h.in.orig
> -+++ config.h.in
> -@@ -409,7 +409,11 @@
> -
> - /* Define to 1 if the system supports fast unaligned access to 16-bit,
> 32-bit,
> -and 64-bit integers. */
> --#undef TUKLIB_FAST_UNALIGNED_ACCESS
> -+#include
> -+#if !defined(__STRICT_ALIGNMENT)
> -+#define \
> -+TUKLIB_FAST_UNALIGNED_ACCESS 1
> -+#endif
> -
> - /* Define to 1 if the amount of physical memory can be detected with
> -_system_configuration.physmem. */
> blob - /dev/null
> blob + a4b473567a4e085aa4ae0b4af893e51eed1e2014 (mode 644)
> --- /dev/null
> +++ archivers/xz/patches/patch-src_liblzma_check_crc32_arm64_h
> @@ -0,0 +1,30 @@
> +Index: src/liblzma/check/crc32_arm64.h
> +--- src/liblzma/check/crc32_arm64.h.orig
> src/liblzma/check/crc32_arm64.h
> +@@ -28,6 +28,11 @@
> + # include
> + # elif defined(__APPLE__) && defined(HAVE_SYSCTLBYNAME)
> + # include
> ++# elif defined(__OpenBSD__)
> ++# include
> ++# include
> ++# include
> ++# include
> + # endif
> + #endif
> +
> +@@ -103,6 +108,14 @@ is_arch_extension_supported(void)
> + , NULL, 0);
> +
> + return !err && has_crc32;
> ++
> ++#elif defined(__OpenBSD__)
> ++ const int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
> ++ uint64_t isar0;
> ++ size_t len = sizeof(isar0);
> ++
> ++ return sysctl(isar0_mib, 2, , , NULL, 0) != -1 &&
> ++ ID_AA64ISAR0_CRC32(isar0) >= ID_AA64ISAR0_CRC32_BASE;
> +
> + #else
> + // If a runtime detection method cannot be found, then this must
> blob - 399cb3be7c7e9134963d36b0858d09da5dc0e3ff (mode 644)
> blob + /dev/null
> --- archivers/xz/patches/patch-src_xzdec_xzdec_c
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Index: src/xzdec/xzdec.c
> src/xzdec/xzdec.c.orig
> -+++ src/xzdec/xzdec.c
> -@@ -295,9 +295,17 @@ main(int argc, char **argv)
> -
> - if (optind == argc) {
> - // No filenames given, decode from stdin.
> -+ if (pledge("stdio", NULL) == -1) {
> -+ my_errorf("pledge");
> -+ exit(EXIT_FAILURE);
> -+ }
> - uncompress(, stdin, "(stdin)");
> - } else {
> - // Loop through the filenames given on the command line.
> -+ if (pledge("stdio rpath", NULL) == -1) {
> -+ my_errorf("pledge");
> -+
UPDATE: libcares 1.28
Here is an update to libcares 1.28.0.
## c-ares version 1.28.0 - Mar 29 2024
This is a feature and bugfix release.
Features:
* Emit warnings when deprecated c-ares functions are used. This can be
disabled by passing a compiler definition of `CARES_NO_DEPRECATED`.
[PR #732](https://github.com/c-ares/c-ares/pull/732)
* Add function `ares_search_dnrec()` to search for records using the new DNS
record data structures. [PR #719](https://github.com/c-ares/c-ares/pull/719)
* Rework internals to pass around `ares_dns_record_t` instead of binary data,
this introduces new public functions of `ares_query_dnsrec()` and
`ares_send_dnsrec()`. [PR #730](https://github.com/c-ares/c-ares/pull/730)
Changes:
* tests: when performing simulated queries, reduce timeouts to make tests run
faster
* Replace configuration file parsers with memory-safe parser.
[PR #725](https://github.com/c-ares/c-ares/pull/725)
* Remove `acountry` completely, the manpage might still get installed otherwise.
[Issue #718](https://github.com/c-ares/c-ares/pull/718)
Bugfixes:
* CMake: don't overwrite global required libraries/definitions/includes which
could cause build errors for projects chain building c-ares.
[Issue #729](https://github.com/c-ares/c-ares/issues/729)
* On some platforms, `netinet6/in6.h` is not included by `netinet/in.h`
and needs to be included separately.
[PR #728](https://github.com/c-ares/c-ares/pull/728)
* Fix a potential memory leak in `ares_init()`.
[Issue #724](https://github.com/c-ares/c-ares/issues/724)
* Some platforms don't have the `isascii()` function. Implement as a macro.
[PR #721](https://github.com/c-ares/c-ares/pull/721)
* CMake: Fix Chain building if CMAKE runtime paths not set
* NDots configuration should allow a value of zero.
[PR #735](https://github.com/c-ares/c-ares/pull/735)
Index: Makefile
===
RCS file: /cvs/ports/net/libcares/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile23 Feb 2024 20:42:46 - 1.27
+++ Makefile29 Mar 2024 18:53:50 -
@@ -1,12 +1,12 @@
COMMENT= asynchronous resolver library
-V= 1.27.0
+V= 1.28.0
DISTNAME= c-ares-${V}
PKGNAME= libcares-${V}
CATEGORIES=net devel
SITES= ${HOMEPAGE}download/
-SHARED_LIBS += cares3.5 # 8.1.6
+SHARED_LIBS += cares3.6 # 8.1.6
HOMEPAGE= https://c-ares.haxx.se/
@@ -19,7 +19,13 @@ WANTLIB+=pthread
MODULES= devel/cmake
-CONFIGURE_ARGS+=-DCARES_BUILD_TOOLS=OFF \
+# C++
+COMPILER= base-clang ports-gcc
+
+BUILD_DEPENDS+=devel/gtest
+
+CONFIGURE_ARGS+=-DCARES_BUILD_TESTS=ON \
+ -DCARES_BUILD_TOOLS=OFF \
-DCARES_STATIC=ON \
-DCARES_SYMBOL_HIDING=ON
Index: distinfo
===
RCS file: /cvs/ports/net/libcares/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo23 Feb 2024 20:42:46 - 1.15
+++ distinfo29 Mar 2024 18:53:50 -
@@ -1,2 +1,2 @@
-SHA256 (c-ares-1.27.0.tar.gz) = CnK+ZpWZVcQ+KvL70DQY6Cor1UZGBOyaYhR+N6zrQgs=
-SIZE (c-ares-1.27.0.tar.gz) = 1301440
+SHA256 (c-ares-1.28.0.tar.gz) = PJL+u969/p3qDgNwg/VTV3ReDfNCQ/lmDu2HV9thdDA=
+SIZE (c-ares-1.28.0.tar.gz) = 1311900
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/libcares/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 PLIST
--- pkg/PLIST 23 Feb 2024 20:42:46 - 1.14
+++ pkg/PLIST 29 Mar 2024 18:53:50 -
@@ -37,6 +37,7 @@ lib/pkgconfig/libcares.pc
@man man/man3/ares_dns_record.3
@man man/man3/ares_dns_record_create.3
@man man/man3/ares_dns_record_destroy.3
+@man man/man3/ares_dns_record_duplicate.3
@man man/man3/ares_dns_record_get_flags.3
@man man/man3/ares_dns_record_get_id.3
@man man/man3/ares_dns_record_get_opcode.3
@@ -44,10 +45,13 @@ lib/pkgconfig/libcares.pc
@man man/man3/ares_dns_record_query_add.3
@man man/man3/ares_dns_record_query_cnt.3
@man man/man3/ares_dns_record_query_get.3
+@man man/man3/ares_dns_record_query_set_name.3
+@man man/man3/ares_dns_record_query_set_type.3
@man man/man3/ares_dns_record_rr_add.3
@man man/man3/ares_dns_record_rr_cnt.3
@man man/man3/ares_dns_record_rr_del.3
@man man/man3/ares_dns_record_rr_get.3
+@man man/man3/ares_dns_record_rr_get_const.3
@man man/man3/ares_dns_rr.3
@man man/man3/ares_dns_rr_get_addr.3
@man man/man3/ares_dns_rr_get_addr6.3
@@ -119,10 +123,16 @@ lib/pkgconfig/libcares.pc
@man man/man3/ares_parse_uri_reply.3
@man man/man3/ares_process.3
@man man/man3/ares_query.3
+@man man/man3/ares_query_dnsrec.3
+@man man/man3/ares_queue.3
+@man man/man3/ares_queue_active_queries.3
+@man man/man3/ares_queue_wait_empty.3
@man man/man3/ares_reinit.3
@man man/man3/ares_save_options.3
@man man/man3/ares_search.3
+@man
UPDATE: cad/prusaslicer-2.7.3
Here is a diff updating cad/prusaslicer to 2.7.3.
Removed patches:
- cad/prusaslicer/patches/patch-src_libslic3r_CMakeLists_txt
diff --git a/cad/prusaslicer/Makefile b/cad/prusaslicer/Makefile
index c921e919917..8e59f16b744 100644
--- a/cad/prusaslicer/Makefile
+++ b/cad/prusaslicer/Makefile
@@ -2,7 +2,7 @@ COMMENT = g-code generator for 3D printers
ONLY_FOR_ARCHS = ${LP64_ARCHS}
DPB_PROPERTIES = parallel
-V = 2.7.2
+V = 2.7.3
PKGNAME = prusaslicer-${V}
GH_ACCOUNT = prusa3d
@@ -30,8 +30,8 @@ WANTLIB += curl dbus-1 execinfo expat fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmp gmpxx gobject-2.0
WANTLIB += gtk-3 harfbuzz hidapi-libusb intl jpeg m mpfr nlopt
WANTLIB += openvdb pango-1.0 pangocairo-1.0 png qhull_r tbb tbbmalloc
-WANTLIB += tiff wx_baseu-3.2 wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2
-WANTLIB += wx_gtk3u_html-3.2 z
+WANTLIB += tiff wayland-client wayland-egl wx_baseu-3.2 wx_gtk3u_core-3.2
+WANTLIB += wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 z
FIX_CRLF_FILES = src/libslic3r/Point.hpp src/slic3r/GUI/GLCanvas3D.cpp
@@ -62,10 +62,12 @@ LIB_DEPENDS = cad/opencascade \
math/nlopt \
math/qhull \
net/curl \
+ wayland/wayland \
x11/dbus \
x11/wxWidgets
-CONFIGURE_ARGS += -DCMAKE_MODULE_PATH=${PREFIX}/lib/cmake/OpenVDB \
+CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_MODULE_PATH=${PREFIX}/lib/cmake/OpenVDB \
-DSLIC3R_FHS=1 \
-DSLIC3R_GTK=3 \
-DSLIC3R_PCH=OFF
diff --git a/cad/prusaslicer/distinfo b/cad/prusaslicer/distinfo
index d12bc897523..bd4836cb623 100644
--- a/cad/prusaslicer/distinfo
+++ b/cad/prusaslicer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PrusaSlicer-version_2.7.2.tar.gz) = Cvirg60zzevB0T032O07ISXYRTLrS8p2GMQiv3ZI6+4=
-SIZE (PrusaSlicer-version_2.7.2.tar.gz) = 64915607
+SHA256 (PrusaSlicer-version_2.7.3.tar.gz) = mXN9GJwSEG8dSV4ceNO8Z/QmEHV5o+vP3FjkoIdFB7c=
+SIZE (PrusaSlicer-version_2.7.3.tar.gz) = 65398513
diff --git a/cad/prusaslicer/patches/patch-src_CMakeLists_txt b/cad/prusaslicer/patches/patch-src_CMakeLists_txt
index 68b506b807f..10a71007640 100644
--- a/cad/prusaslicer/patches/patch-src_CMakeLists_txt
+++ b/cad/prusaslicer/patches/patch-src_CMakeLists_txt
@@ -1,50 +1,18 @@
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
-@@ -33,8 +33,13 @@ endif ()
+@@ -33,8 +33,8 @@ endif ()
if (SLIC3R_GUI)
add_subdirectory(imgui)
-add_subdirectory(hidapi)
-include_directories(hidapi/include)
-+if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-+pkg_check_modules(HIDAPI REQUIRED hidapi-libusb)
-+include_directories(${HIDAPI_INCLUDE_DIRS})
-+else ()
-+add_subdirectory(hidapi)
-+include_directories(hidapi/include)
-+endif ()
++pkg_check_modules(HIDAPI REQUIRED hidapi-libusb)
++include_directories(${HIDAPI_INCLUDE_DIRS})
if(WIN32)
message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
-@@ -85,7 +90,7 @@ if (SLIC3R_GUI)
- string(REGEX MATCH "wxexpat" WX_EXPAT_BUILTIN ${wxWidgets_LIBRARIES})
- if (EXPAT_FOUND AND NOT WX_EXPAT_BUILTIN)
- list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX expat)
--list(APPEND wxWidgets_LIBRARIES libexpat)
-+list(APPEND wxWidgets_LIBRARIES ${EXPAT_LIBRARIES})
- endif ()
-
- # This is an issue in the new wxWidgets cmake build, doesn't deal with librt
-@@ -100,7 +105,7 @@ if (SLIC3R_GUI)
- list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX OpenGL)
-
- if (UNIX AND NOT APPLE)
--list(APPEND wxWidgets_LIBRARIES X11 wayland-client wayland-egl EGL)
-+list(APPEND wxWidgets_LIBRARIES X11 EGL)
- endif ()
- #list(REMOVE_ITEM wxWidgets_LIBRARIES oleacc)
- message(STATUS "wx libs: ${wxWidgets_LIBRARIES}")
-@@ -131,7 +136,7 @@ if (NOT WIN32 AND NOT APPLE)
- set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
- endif ()
-
--target_link_libraries(PrusaSlicer libslic3r libcereal)
-+target_link_libraries(PrusaSlicer libslic3r)
-
- if (APPLE)
- #add_compile_options(-stdlib=libc++)
-@@ -158,6 +163,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
+@@ -158,6 +158,8 @@ target_link_libraries(PrusaSlicer libslic3r_gui)
target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi)
elseif (APPLE)
target_link_libraries(PrusaSlicer "-framework OpenGL")
diff --git a/cad/prusaslicer/patches/patch-src_hints_HintsToPot_cpp b/cad/prusaslicer/patches/patch-src_hints_HintsToPot_cpp
index bb9dc7afc43..17d0e4f64d6 100644
--- a/cad/prusaslicer/patches/patch-src_hints_HintsToPot_cpp
+++ b/cad/prusaslicer/patches/patch-src_hints_HintsToPot_cpp
@@ -1,13 +1,11 @@
Index: src/hints/HintsToPot.cpp
--- src/hints/HintsToPot.cpp.orig
+++ src/hints/HintsToPot.cpp
-@@ -2,6 +2,9 @@
+@@ -2,6 +2,7 @@
#include
#include
#include
-+#ifdef __OpenBSD__
-+# include
-+#endif
++#include
#include
#include
#include
diff --git
UPDATE: net/nextcloudclient-3.12.3
Hi.
Update for net/nextcloudclient v3.12.3
Changelog:
https://github.com/nextcloud/desktop/releases/v3.12.[stable-3.12]
- use the proper name when reading system exclude config file by
@backportbot in #6586
- Bugfix/fix explorer crash windows by @backportbot in #6585
- context menu: do not recursively check pin and availability states
by @backportbot in #6587
- properly compute if a folder is top level or child extern mounted by
@backportbot in #6590
- adjust AppImage build script to the new build image by @backportbot
in #65913
Obrigado!
--
Adriano
Index: Makefile
===
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile23 Mar 2024 09:23:05 - 1.60
+++ Makefile29 Mar 2024 16:19:16 -
@@ -2,7 +2,7 @@ USE_WXNEEDED = Yes
COMMENT = desktop sync client for Nextcloud
-V =3.12.2
+V =3.12.3
DISTNAME = nextcloudclient-${V}
GH_ACCOUNT = nextcloud
@@ -13,9 +13,9 @@ CATEGORIES = net
HOMEPAGE = https://nextcloud.com
-SHARED_LIBS += nextcloudsync 18.0 # 3.12.2
-SHARED_LIBS += nextcloud_csync 8.2 # 3.12.2
-SHARED_LIBS += nextcloudsync_vfs_suffix 2.0 # 3.10.2
+SHARED_LIBS += nextcloudsync 19.0 # 3.12.3
+SHARED_LIBS += nextcloud_csync 9.0 # 3.12.3
+SHARED_LIBS += nextcloudsync_vfs_suffix 3.0 # 3.12.3
MAINTAINER = Adriano Barbosa
Index: distinfo
===
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo23 Mar 2024 09:23:05 - 1.49
+++ distinfo29 Mar 2024 16:19:16 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.12.2.tar.gz) =
9XbLcJ2qfctZY7zuJPLTFUKp9Jo0LtukBiWk3oBslb8=
-SIZE (nextcloudclient-3.12.2.tar.gz) = 13645095
+SHA256 (nextcloudclient-3.12.3.tar.gz) =
lGar/GY90SvZ/I5oEv2cPvmmhcdzpHNTIpTGOMRgwAs=
+SIZE (nextcloudclient-3.12.3.tar.gz) = 13642292
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-CMakeLists_txt,v
retrieving revision 1.14
diff -u -p -r1.14 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt23 Mar 2024 09:23:05 - 1.14
+++ patches/patch-CMakeLists_txt29 Mar 2024 16:19:16 -
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -68,7 +68,7 @@ if (NOT DEFINED PACKAGE)
+@@ -63,7 +63,7 @@ if (NOT DEFINED PACKAGE)
set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
endif()
@@ -10,7 +10,7 @@ Index: CMakeLists.txt
include(ECMCoverageOption)
-@@ -311,4 +311,4 @@ elseif(BUILD_CLIENT)
+@@ -306,4 +306,4 @@ elseif(BUILD_CLIENT)
configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
endif()
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2024/03/29 09:02:00 Modified files: benchmarks/udpbench: Makefile distinfo Log message: update udpbench to 1.10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2024/03/29 05:55:13 Modified files: net/matterhorn : Makefile Added files: net/matterhorn/patches: patch-Hclip-3_0_0_4_System_Hclip_hs Log message: Make "copy to clipboard" functionality work.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2024/03/29 05:54:07 ports/net/matterhorn/patches Update of /cvs/ports/net/matterhorn/patches In directory cvs.openbsd.org:/tmp/cvs-serv61450/patches Log Message: Directory /cvs/ports/net/matterhorn/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/29 05:31:06 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-470.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2024/03/29 05:27:06 Modified files: www/gitea : Makefile distinfo www/gitea/pkg : PLIST Log message: Update gitea 1.21.9 - > 1.21.10 Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.21.10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2024/03/29 05:26:40 Modified files: sysutils/ansible: Makefile distinfo sysutils/ansible/pkg: PLIST Log message: Update ansible 9.3.0 -> 9.4.0 Changelog: https://github.com/ansible-community/ansible-build-data/blob/main/9/CHANGELOG-v9.rst#v940
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2024/03/29 05:26:07 Modified files: sysutils/ansible-core: Makefile distinfo Log message: Update ansible-core 2.16.4 -> 2.16.5 Changelog: https://github.com/ansible/ansible/blob/stable-2.16/changelogs/CHANGELOG-v2.16.rst#v2165
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/03/29 03:33:24 Modified files: devel/jenkins/devel: Makefile devel/jenkins/stable: Makefile Log message: backout previous incomplete commit, it might just need a distinfo sync but I can't test the update and as things are now it's just noise for all bulk builders
Re: CVS: cvs.openbsd.org: ports
On Fri, Mar 29, 2024 at 09:23:40AM +0100, Antoine Jacoutot wrote: > On Thu, 2024-03-28 at 18:23 -0600, Theo Buehler wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: t...@cvs.openbsd.org2024/03/28 18:23:05 > > > > Modified files: > > security/rust-openssl-tests: Makefile distinfo > > > > Log message: > > Update to rust-openssl-tests 20240329 > > > > Hello. > > Does not patch. cvs is too hard. fixed, thanks > > [modcargo] Removing libsrc for openssl-src-300.2.3+3.2.1 > ===> Patching for rust-openssl-tests-20240329 > ===> Applying OpenBSD patch patch-openssl-sys_build_main_rs > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -- > |The LibreSSL version in -current isn't explicitly supported. > | > |Index: openssl-sys/build/main.rs > |--- openssl-sys/build/main.rs.orig > |+++ openssl-sys/build/main.rs > -- > Patching file openssl-sys/build/main.rs using Plan A... > Hunk #1 failed at 303. > 1 out of 1 hunks failed--saving rejects to openssl-sys/build/main.rs.rej > done > ***> patch-openssl-sys_build_main_rs did not apply cleanly > ===> Failed patches: > patch-openssl-sys_build_main_rs > > -- > Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2024/03/29 02:25:18 Removed files: security/rust-openssl-tests/patches: patch-openssl-sys_build_main_rs Log message: remove patch; found by aja
Re: CVS: cvs.openbsd.org: ports
On Thu, 2024-03-28 at 18:23 -0600, Theo Buehler wrote: > CVSROOT: /cvs > Module name: ports > Changes by: t...@cvs.openbsd.org2024/03/28 18:23:05 > > Modified files: > security/rust-openssl-tests: Makefile distinfo > > Log message: > Update to rust-openssl-tests 20240329 > Hello. Does not patch. [modcargo] Removing libsrc for openssl-src-300.2.3+3.2.1 ===> Patching for rust-openssl-tests-20240329 ===> Applying OpenBSD patch patch-openssl-sys_build_main_rs Hmm... Looks like a unified diff to me... The text leading up to this was: -- |The LibreSSL version in -current isn't explicitly supported. | |Index: openssl-sys/build/main.rs |--- openssl-sys/build/main.rs.orig |+++ openssl-sys/build/main.rs -- Patching file openssl-sys/build/main.rs using Plan A... Hunk #1 failed at 303. 1 out of 1 hunks failed--saving rejects to openssl-sys/build/main.rs.rej done ***> patch-openssl-sys_build_main_rs did not apply cleanly ===> Failed patches: patch-openssl-sys_build_main_rs -- Antoine
Re: CVS: cvs.openbsd.org: ports
On Thu, 2024-03-28 at 04:31 -0600, Robert Nagy wrote: > CVSROOT: /cvs > Module name: ports > Changes by: rob...@cvs.openbsd.org 2024/03/28 04:31:39 > > Modified files: > mail/grommunio/web: distinfo > mail/grommunio/web/pkg: PLIST > > Log message: > fixup plist > Cannot fetch :-) ===> Checking files for grommunio-web-3.7 >> Fetch >> https://nerd.hu/distfiles/d30c5373ec8715cf4e51c453a661b6d8478ba254.tar.gz d30c5373ec8715cf4e51c4... 100% |***| 32611 KB00:10 >> Size does not match for grommunio/grommunio-web-3.7-d30c5373.tar.gz >> Fetch >> http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles/grommunio/grommunio-web-3.7-d30c5373.tar.gz ftp: Error retrieving http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles/grommunio/grommunio-web-3.7-d30c5373.tar.gz: 404 Not Found *** Error 1 in . (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:3304 '/exopi-cvs/ports/distfiles/grommunio/grommunio- web-3.7-d30c5373.tar.gz') *** Error 2 in . (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2578 '_internal-fetch': @cd /exopi- cvs/ports/mail/grommunio/web && PKGPATH=...) *** Error 2 in /exopi-cvs/ports/mail/grommunio/web (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2704 'fetch': @lock=grommunio-web-3.7; e...) -- Antoine
Re: UPDATE: OpenImageIO 2.5.9
On 2024/03/28 21:51, Brad Smith wrote:
> On Thu, Mar 28, 2024 at 04:12:55PM +, Stuart Henderson wrote:
> > On 2024/03/25 23:07, Brad Smith wrote:
> > > Here is an update to OpenImageIO 2.5.9.
> >
> > 2.4.17.0 is broken on i386 - 2.5.9 doesn't fix it
>
> I noticed a package missing on amd64 for the last two bulk builds but
> haven't seen anything from naddy@ yet. It builds for me on my amd64
> build host.
That will have been due to the problem with the cmake update and
tiff - it built on amd64 in the current bulk.
> This appears to have something to do with the last commit to strutil_test.cpp.
> Try the following..
Will do.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/openimageio/Makefile,v
> retrieving revision 1.69
> diff -u -p -u -p -r1.69 Makefile
> --- Makefile 22 Mar 2024 12:25:32 - 1.69
> +++ Makefile 29 Mar 2024 01:33:57 -
> @@ -7,6 +7,7 @@ GH_ACCOUNT = AcademySoftwareFoundation
> GH_PROJECT = OpenImageIO
> GH_TAGNAME = v2.4.17.0
> PKGNAME =${DISTNAME:L}
> +REVISION = 0
>
> SHARED_LIBS += OpenImageIO 14.0 # 2.4.10
> SHARED_LIBS += OpenImageIO_Util9.0 # 2.4.10
> Index: patches/patch-src_include_OpenImageIO_detail_farmhash_h
> ===
> RCS file: patches/patch-src_include_OpenImageIO_detail_farmhash_h
> diff -N patches/patch-src_include_OpenImageIO_detail_farmhash_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_include_OpenImageIO_detail_farmhash_h 29 Mar 2024
> 01:33:57 -
> @@ -0,0 +1,92 @@
> +Revert fix(strutil.h): ensure proper constexpr of string hashing (#3901)
> +8e8dab1215f584ff940ea6240768abecd5c63f07
> +
> +Index: src/include/OpenImageIO/detail/farmhash.h
> +--- src/include/OpenImageIO/detail/farmhash.h.orig
> src/include/OpenImageIO/detail/farmhash.h
> +@@ -244,77 +244,21 @@ STATIC_INLINE uint32_t Fetch32(const char *p) {
> +
> + #else
> +
> +-#if defined(__cpp_lib_bit_cast) && __cpp_lib_bit_cast >= 201806L
> +-// C++20 compiler with constexpr support std::bitcast
> +-STATIC_INLINE uint64_t Fetch64(const char *p) {
> +- struct BlockOfBytes {
> +-char bytes[8];
> +- };
> +- BlockOfBytes bob{p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]};
> +- return std::bit_cast(bob);
> ++template
> ++STATIC_INLINE T FetchType(const char *p) {
> ++ T result = 0;
> ++ for (size_t i = 0; i < sizeof(T); i++)
> ++ reinterpret_cast()[i] = p[i];
> ++ return result;
> + }
> +-STATIC_INLINE uint32_t Fetch32(const char *p) {
> +- struct BlockOfBytes {
> +-char bytes[4];
> +- };
> +- BlockOfBytes bob{p[0],p[1],p[2],p[3]};
> +- return std::bit_cast(bob);
> +-}
> +
> +-#else
> +-
> +-// constexpr supported for C++14,17 versions that manually load bytes and
> +-// bitshift into proper order for the unsigned integer.
> +-// NOTE: bigendian untested
> + STATIC_INLINE uint64_t Fetch64(const char *p) {
> +-// Favor letting uint8_t construction to handle
> +-// signed to unsigned conversion vs. uint64_t(p[0]&0xff)
> +-uint8_t b0 = p[0];
> +-uint8_t b1 = p[1];
> +-uint8_t b2 = p[2];
> +-uint8_t b3 = p[3];
> +-uint8_t b4 = p[4];
> +-uint8_t b5 = p[5];
> +-uint8_t b6 = p[6];
> +-uint8_t b7 = p[7];
> +-return littleendian() ?
> +-(uint64_t(b0)) | // LSB
> +-(uint64_t(b1) << 8) |
> +-(uint64_t(b2) << 16) |
> +-(uint64_t(b3) << 24) |
> +-(uint64_t(b4) << 32) |
> +-(uint64_t(b5) << 40) |
> +-(uint64_t(b6) << 48) |
> +-(uint64_t(b7) << 56) // MSB
> +- : // Big Endian byte order
> +-(uint64_t(b0) << 56) | // MSB
> +-(uint64_t(b1) << 48) |
> +-(uint64_t(b2) << 40) |
> +-(uint64_t(b3) << 32) |
> +-(uint64_t(b4) << 24) |
> +-(uint64_t(b5) << 16) |
> +-(uint64_t(b6) << 8) |
> +-(uint64_t(b7)) ; // LSB
> ++ return FetchType(p);
> + }
> +
> + STATIC_INLINE uint32_t Fetch32(const char *p) {
> +-uint8_t b0 = p[0];
> +-uint8_t b1 = p[1];
> +-uint8_t b2 = p[2];
> +-uint8_t b3 = p[3];
> +-return littleendian() ?
> +-(uint32_t(b0)) | // LSB
> +-(uint32_t(b1) << 8) |
> +-(uint32_t(b2) << 16) |
> +-(uint32_t(b3) << 24) // MSB
> +- : // Big Endian byte order
> +-(uint32_t(b0) << 24) | // MSB
> +-(uint32_t(b1) << 16) |
> +-(uint32_t(b2) << 8) |
> +-(uint32_t(b3));// LSB
> ++ return FetchType(p);
> + }
> +-#endif
> +-
> +
> + // devices don't seem to have bswap_64() or bswap_32()
> + template
> Index: patches/patch-src_include_OpenImageIO_string_view_h
> ===
> RCS file: patches/patch-src_include_OpenImageIO_string_view_h
> diff -N
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2024/03/29 01:36:57 Modified files: x11/gnome/gedit-plugins: Makefile Added files: x11/gnome/gedit-plugins/patches: patch-plugins_bookmarks_gedit-bookmarks-plugin_c Log message: Unbreak (from upstream).
