Date: Tue, 03 Feb 2026 06:35:58 +0000 From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 43930fac6403 - main - sysutils/bareos24-*: Remove BROKEN Message-ID: <6981974e.247d1.592aca75@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=43930fac6403751ff60310e3b0237623954d08c7 commit 43930fac6403751ff60310e3b0237623954d08c7 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2026-02-03 06:32:17 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2026-02-03 06:35:50 +0000 sysutils/bareos24-*: Remove BROKEN - server: Define ONLY_FOR_ARCHS to aarch64 and amd64 - Remove CONFLICTS to bareos22* - Bump PORTREVISION --- sysutils/bareos24-server/Makefile | 8 +- .../files/patch-core-src-include_baconfig.h | 18 +++ ...atch-core-src-stored-backends_chunked_device.cc | 163 +++++++++++++++++++++ 3 files changed, 185 insertions(+), 4 deletions(-) diff --git a/sysutils/bareos24-server/Makefile b/sysutils/bareos24-server/Makefile index 720e0b801bc3..04db614e4ece 100644 --- a/sysutils/bareos24-server/Makefile +++ b/sysutils/bareos24-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ DISTVERSION= 24.0.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= 24-server @@ -13,9 +13,7 @@ WWW= https://www.bareos.org/ LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -BROKEN= data type bugs, "core/src/stored/backends/chunked_device.cc:685:13: error: comparison of integers of different signs: 'ssize_t' (aka 'int') and 'uint32_t' (aka 'unsigned int')" - -CONFLICTS?= bareos22-server bareos23-server bareos-server +CONFLICTS?= bareos23-server bareos-server BUILD_DEPENDS+= utf8cpp>0:devel/utf8cpp \ microsoft-gsl>0:devel/microsoft-gsl \ @@ -55,6 +53,8 @@ NDMP_DESC= Enable build of NDMP support SCSICRYPTO_DESC= Build LTO AME crypto plugin .if ${PKGNAMESUFFIX} == "24-server" +ONLY_FOR_ARCHS= aarch64 amd64 + OPTIONS_DEFINE= MTX PYTHON LMDB NDMP NLS SCSICRYPTO OPTIONS_DEFAULT+= LMDB PGSQL SCSICRYPTO OPTIONS_SINGLE_DATABASE= PGSQL diff --git a/sysutils/bareos24-server/files/patch-core-src-include_baconfig.h b/sysutils/bareos24-server/files/patch-core-src-include_baconfig.h new file mode 100644 index 000000000000..041f89a74229 --- /dev/null +++ b/sysutils/bareos24-server/files/patch-core-src-include_baconfig.h @@ -0,0 +1,18 @@ +--- core/src/include/baconfig.h 2026-02-02 17:47:37.319878000 -0800 ++++ core/src/include/baconfig.h 2026-02-02 17:47:52.554519000 -0800 +@@ -560,4 +560,15 @@ + # define Leave(lvl) + #endif + ++#if defined(HAVE_WIN32) ++// mingw/windows does not understand "%zu/%zi" by default ++# define PRIuz PRIu64 ++# define PRIiz PRIi64 ++# define PRItime "lld" ++#else ++# define PRIuz "zu" ++# define PRIiz "zi" ++# define PRItime "ld" ++#endif ++ + #endif // BAREOS_INCLUDE_BACONFIG_H_ diff --git a/sysutils/bareos24-server/files/patch-core-src-stored-backends_chunked_device.cc b/sysutils/bareos24-server/files/patch-core-src-stored-backends_chunked_device.cc new file mode 100644 index 000000000000..acb35c4253ea --- /dev/null +++ b/sysutils/bareos24-server/files/patch-core-src-stored-backends_chunked_device.cc @@ -0,0 +1,163 @@ +--- core/src/stored/backends/chunked_device.cc 2025-12-04 05:21:37.000000000 -0800 ++++ core/src/stored/backends/chunked_device.cc 2026-02-02 17:56:28.052130000 -0800 +@@ -103,7 +103,7 @@ + { + char* buffer = (char*)malloc(current_chunk_->chunk_size); + +- Dmsg2(100, "New allocated buffer of %d bytes at %p\n", ++ Dmsg2(100, "New allocated buffer of %" PRIuz " bytes at %p\n", + current_chunk_->chunk_size, buffer); + + return buffer; +@@ -112,7 +112,7 @@ + // Free a chunk buffer. + void ChunkedDevice::FreeChunkbuffer(char* buffer) + { +- Dmsg2(100, "Freeing buffer of %d bytes at %p\n", current_chunk_->chunk_size, ++ Dmsg2(100, "Freeing buffer of %" PRIuz " bytes at %p\n", current_chunk_->chunk_size, + buffer); + + free(buffer); +@@ -121,7 +121,7 @@ + // Free a chunk_io_request. + void ChunkedDevice::FreeChunkIoRequest(chunk_io_request* request) + { +- Dmsg2(100, "Freeing chunk io request of %d bytes at %p\n", ++ Dmsg2(100, "Freeing chunk io request of %" PRIuz " bytes at %p\n", + sizeof(chunk_io_request), request); + + if (request->release) { FreeChunkbuffer(request->buffer); } +@@ -358,7 +358,7 @@ + new_request->tries = 0; + new_request->release = request->release; + +- Dmsg2(100, "Allocated chunk io request of %d bytes at %p\n", ++ Dmsg2(100, "Allocated chunk io request of %" PRIuz " bytes at %p\n", + sizeof(chunk_io_request), new_request); + + /* Enqueue the item onto the ordered circular buffer. +@@ -433,7 +433,7 @@ + "%d tries, setting device %s readonly\n"), + new_request->chunk, new_request->volname, new_request->tries, + print_name()); +- Emsg0(M_ERROR, 0, errmsg); ++ Emsg0(M_ERROR, 0, "%s", errmsg); + readonly_ = true; + goto bail_out; + } +@@ -682,8 +682,8 @@ + wanted_offset = (offset_ % current_chunk_->chunk_size); + + bytes_left +- = MIN((ssize_t)count, (current_chunk_->buflen - wanted_offset)); +- Dmsg2(200, "Reading complete %d byte read-request from chunk offset %d\n", ++ = MIN((ssize_t)count, ((ssize_t)current_chunk_->buflen - wanted_offset)); ++ Dmsg2(200, "Reading complete %" PRIuz " byte read-request from chunk offset %" PRIuz "\n", + bytes_left, wanted_offset); + + if (bytes_left < 0) { +@@ -709,13 +709,13 @@ + // See how much is left in this chunk. + if (offset_ <= current_chunk_->end_offset) { + wanted_offset = (offset_ % current_chunk_->chunk_size); +- bytes_left = MIN((ssize_t)(count - offset), +- (ssize_t)(current_chunk_->buflen - wanted_offset)); ++ bytes_left = MIN(((ssize_t)count - offset), ++ ((ssize_t)current_chunk_->buflen - wanted_offset)); + + if (bytes_left > 0) { + Dmsg2(200, +- "Reading %d bytes of %d byte read-request from end of chunk " +- "at offset %d\n", ++ "Reading %" PRIuz " bytes of %" PRIuz " byte read-request from end of chunk " ++ "at offset %" PRIuz "\n", + bytes_left, count, wanted_offset); + + memcpy(((char*)buffer + offset), +@@ -743,12 +743,12 @@ + } else { + /* Calculate how much data we can read from the just freshly read + * chunk. */ +- bytes_left = MIN((ssize_t)(count - offset), +- (ssize_t)(current_chunk_->buflen)); ++ bytes_left = MIN(((ssize_t)count - offset), ++ (ssize_t)current_chunk_->buflen); + + if (bytes_left > 0) { + Dmsg2(200, +- "Reading %d bytes of %d byte read-request from next chunk\n", ++ "Reading %" PRIuz " bytes of %" PRIuz " byte read-request from next chunk\n", + bytes_left, count); + + memcpy(((char*)buffer + offset), current_chunk_->buffer, +@@ -805,7 +805,7 @@ + && current_chunk_->end_offset >= (boffset_t)((offset_ + count) - 1)) { + wanted_offset = (offset_ % current_chunk_->chunk_size); + +- Dmsg2(200, "Writing complete %d byte write-request to chunk offset %d\n", ++ Dmsg2(200, "Writing complete %" PRIuz " byte write-request to chunk offset %" PRIuz "\n", + count, wanted_offset); + + memcpy(current_chunk_->buffer + wanted_offset, buffer, count); +@@ -836,14 +836,14 @@ + + if (bytes_left > 0) { + Dmsg2(200, +- "Writing %d bytes of %d byte write-request to end of chunk " +- "at offset %d\n", ++ "Writing %" PRIuz " bytes of %" PRIuz " byte write-request to end of chunk " ++ "at offset %" PRIuz "\n", + bytes_left, count, wanted_offset); + + memcpy(current_chunk_->buffer + wanted_offset, + ((char*)buffer + offset), bytes_left); + offset_ += bytes_left; +- if ((wanted_offset + bytes_left) > current_chunk_->buflen) { ++ if ((wanted_offset + bytes_left) > (ssize_t)current_chunk_->buflen) { + current_chunk_->buflen = wanted_offset + bytes_left; + } + current_chunk_->need_flushing = true; +@@ -860,13 +860,13 @@ + + /* Calculate how much data we can fit into the just freshly created + * chunk. */ +- bytes_left = MIN((ssize_t)(count - offset), ++ bytes_left = MIN(((ssize_t)count - offset), + (ssize_t)((current_chunk_->end_offset + - current_chunk_->start_offset) + + 1)); + if (bytes_left > 0) { + Dmsg2(200, +- "Writing %d bytes of %d byte write-request to next chunk\n", ++ "Writing %" PRIuz " bytes of %" PRIuz " byte write-request to next chunk\n", + bytes_left, count); + + memcpy(current_chunk_->buffer, ((char*)buffer + offset), bytes_left); +@@ -1089,14 +1089,14 @@ + /* compare expected to written volume size */ + size_t remote_volume_size = RemoteVolumeSize(); + Dmsg3(100, +- "volume: %s, RemoteVolumeSize = %lld, VolCatInfo.VolCatBytes " +- "= %lld\n", ++ "volume: %s, RemoteVolumeSize = %" PRIuz ", VolCatInfo.VolCatBytes " ++ "= %" PRIuz "\n", + current_volname_, remote_volume_size, VolCatInfo.VolCatBytes); + + if (remote_volume_size < VolCatInfo.VolCatBytes) { + Dmsg3(100, +- "volume %s is pending, as 'remote volume size' = %lld < 'catalog " +- "volume size' = %lld\n", ++ "volume %s is pending, as 'remote volume size' = %" PRIuz " < 'catalog " ++ "volume size' = %" PRIuz "\n", + current_volname_, remote_volume_size, VolCatInfo.VolCatBytes); + return false; + } +@@ -1248,7 +1248,7 @@ + DeviceStatusInformation* dst = (DeviceStatusInformation*)data; + PoolMem status(PM_MESSAGE); + +- status.bsprintf(" /%s/%04d - %ld (try=%d)\n", io_request->volname, ++ status.bsprintf(" /%s/%04d - %" PRIuz " (try=%d)\n", io_request->volname, + io_request->chunk, io_request->wbuflen, io_request->tries); + dst->status_length = PmStrcat(dst->status, status.c_str()); +home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6981974e.247d1.592aca75>