From nobody Mon Feb 12 23:02:36 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TYg3043Gqz5984Y; Mon, 12 Feb 2024 23:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYg303VSBz4VHM; Mon, 12 Feb 2024 23:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707778956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgRMcZtVn90Toe0bySHQjqMmYRHgxo7lvCSeAJqOEyo=; b=shCZDQZs6sf1WCv1+hBDhyTcm0b6iwtyUMiq0S7P2o6FSY9zGbMdef/nPolrogvEEGDQN2 t7eh5ikfPXPw5p5QUdcMjgVvXSe3mG8KI3pYOsxJVRx2Rylnm9mlAvBjNWwBDNHfCN6J5X Yir7ecTggZxYy9dbAuV4PN2amiRqMgqeRNWFA0TBk19+WSZWEjOXNHGgFQDac9jYrR3i14 AuOL9/VbCBHJqpNpbRSSFKfMiuP8hluKX1B86r6uTtzRnNE+IJoIwugW/OCsqx9y7xo/jO Epv4t4TSpYVHcuzMDE/n70Q4dFb37lfac9xo9gsHkNnfjsqtvg/mzfx1BLyljQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707778956; a=rsa-sha256; cv=none; b=nUaB59g9Kaw3AMs8SL/b76WamADX8E0fgQZp0OyaD8tTUgytFzmcySQVMFGDsKu2x+WjaZ ZVC9j6rAEB9ycAhW1Nji1TZ9tk4kEJb0yNNsrK4lOTWOk2cgdILQJeB30rA4yA2jfv+gR0 w9UQPjCpmiBeGg1kplovD/oZIYyg06lI/WRt7hfXAz8b013WIYh4537MvLuHr6ZucJwXKN YH3/XCJ/ie0scPf6PLdSWO3II2Bo2GzCUH24zUR9apybuhuipvl/momCGJcmwob20VKQDg cg2whOLlTBv9XXdAarJmMPupoBF+MjmxPsLlh9ACIRfduarKeOnzZWWVPezLRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707778956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgRMcZtVn90Toe0bySHQjqMmYRHgxo7lvCSeAJqOEyo=; b=Ao1XtUXBQoHqpDiv11Z2k8EclN3BaT46xEACIeUXDA7QMInCppTnCnhnSLzIcoAWYSsNBB 8XVp1HK9eezRAMmLMMbJzl1ryxsAsVKRwdKeuZISbvcaGc3zlfrt+jwY28qzOYwtpHv1WT 5yQB9lmnoORgUXP6OGWL+x3kmM0z6NiEZfsqOhT60YRL3ET4eo6MbD5ZxoY7p3XlKB/W/U pMHQ5vAGoncl3BIAmJGm+9jnX6GknUH9PB8b/oEtP/YI54g8McoUae4ZWG8DCww4noIEbf fr32StOnso9zgFpuOzbBpnXIXwE2LliFr4IIzDYZAWj7XAYfagftRkP+y+vgUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYg302YfyzrBl; Mon, 12 Feb 2024 23:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CN2a2K052296; Mon, 12 Feb 2024 23:02:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CN2aJw052293; Mon, 12 Feb 2024 23:02:36 GMT (envelope-from git) Date: Mon, 12 Feb 2024 23:02:36 GMT Message-Id: <202402122302.41CN2aJw052293@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: b5425aa1feaf - main - sysutils/bacula13-server: Update to 13.0.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5425aa1feaf494985606b9857d31772461aa264 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5425aa1feaf494985606b9857d31772461aa264 commit b5425aa1feaf494985606b9857d31772461aa264 Author: Dan Langille AuthorDate: 2024-02-12 22:59:16 +0000 Commit: Dan Langille CommitDate: 2024-02-12 23:02:34 +0000 sysutils/bacula13-server: Update to 13.0.4 This release incorporates recently added local patches. If you have bacula-fd < 13 in use, this is a highly recommended update. re: https://sourceforge.net/p/bacula/mailman/message/58736860/ --- sysutils/bacula13-server/Makefile | 5 +-- sysutils/bacula13-server/distinfo | 6 +-- ...c => DISABLED-patch-src_filed_bxattr_freebsd.c} | 6 ++- .../files/patch-src_dird_fd__cmds.c | 46 ---------------------- .../bacula13-server/files/patch-src_dird_getmsg.c | 17 -------- sysutils/bacula13-server/files/patch-src_jcr.h | 10 ----- 6 files changed, 9 insertions(+), 81 deletions(-) diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile index 6d239e2ed9a1..995599ad9ca5 100644 --- a/sysutils/bacula13-server/Makefile +++ b/sysutils/bacula13-server/Makefile @@ -1,6 +1,5 @@ PORTNAME= bacula -DISTVERSION= 13.0.3 -PORTREVISION= 1 +DISTVERSION= 13.0.4 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -14,7 +13,7 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe libtool readline shebangfix ssl -SHEBANG_FILES= src/cats/make_catalog_backup.pl.in scripts/baculabackupreport.in +SHEBANG_FILES= src/cats/make_catalog_backup.pl.in scripts/baculabackupreport CONFLICTS?= bacula11-server bacula9-server bacula-server diff --git a/sysutils/bacula13-server/distinfo b/sysutils/bacula13-server/distinfo index 536a365f414a..7da61e39e60a 100644 --- a/sysutils/bacula13-server/distinfo +++ b/sysutils/bacula13-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697660943 -SHA256 (bacula-13.0.3.tar.gz) = 0949c32be1090585e88e4c01d828002e87603136d87c598a29dff42bb3ed2a40 -SIZE (bacula-13.0.3.tar.gz) = 6235649 +TIMESTAMP = 1707775300 +SHA256 (bacula-13.0.4.tar.gz) = 14e4c62d381a1008422e3fd14aad19b2614103d89078926d7337f850e3b473dc +SIZE (bacula-13.0.4.tar.gz) = 6227040 diff --git a/sysutils/bacula13-server/files/patch-src_filed_bxattr__freebsd.c b/sysutils/bacula13-server/files/DISABLED-patch-src_filed_bxattr_freebsd.c similarity index 59% rename from sysutils/bacula13-server/files/patch-src_filed_bxattr__freebsd.c rename to sysutils/bacula13-server/files/DISABLED-patch-src_filed_bxattr_freebsd.c index 874bdeb6c32b..deb04f453f87 100644 --- a/sysutils/bacula13-server/files/patch-src_filed_bxattr__freebsd.c +++ b/sysutils/bacula13-server/files/DISABLED-patch-src_filed_bxattr_freebsd.c @@ -1,6 +1,8 @@ ---- src/filed/bxattr_freebsd.c.orig 2023-10-18 20:41:39 UTC +diff --git a/bacula/src/filed/bxattr_freebsd.c b/bacula/src/filed/bxattr_freebsd.c +index b83331fc578ebc6caf74ff1bf5e67e49329394be..ed2efad02cf2b4f1d1437b25962d28a4d326b873 100644 +--- src/filed/bxattr_freebsd.c +++ src/filed/bxattr_freebsd.c -@@ -103,7 +103,7 @@ bRC_BXATTR BXATTR_FreeBSD::os_backup_xattr (JCR *jcr, +@@ -103,7 +103,7 @@ bRC_BXATTR BXATTR_FreeBSD::os_backup_xattr (JCR *jcr, FF_PKT *ff_pkt){ case bRC_BXATTR_skip: case bRC_BXATTR_cont: /* no xattr available, so skip rest of it */ diff --git a/sysutils/bacula13-server/files/patch-src_dird_fd__cmds.c b/sysutils/bacula13-server/files/patch-src_dird_fd__cmds.c deleted file mode 100644 index ecd0a9ddbb04..000000000000 --- a/sysutils/bacula13-server/files/patch-src_dird_fd__cmds.c +++ /dev/null @@ -1,46 +0,0 @@ ---- src/dird/fd_cmds.c.orig 2023-05-02 09:50:49 UTC -+++ src/dird/fd_cmds.c -@@ -72,6 +72,34 @@ static void delete_bsock_end_cb(JCR *jcr, void *ctx) - free_bsock(socket); - } - -+/* 16.0.10 (12Jan24) x86_64-pc-linux-gnu,ubuntu,20.04 -> 160010 */ -+static uint64_t scan_version(char *str) -+{ -+ Enter(0); -+ uint64_t version = 0; -+ -+ regex_t r1; -+ regmatch_t pmatch[16]; -+ regcomp(&r1, "^([0-9]+)\\.([0-9]+)\\.([0-9]+)", REG_EXTENDED); -+ if (regexec(&r1, str, 4, pmatch, 0) == 0 && -+ pmatch[1].rm_so == 0 && pmatch[1].rm_eo > 0 && pmatch[1].rm_eo < 50 && -+ pmatch[2].rm_so > 0 && pmatch[2].rm_eo > 0 && (pmatch[2].rm_eo - pmatch[2].rm_so) < 50 && -+ pmatch[3].rm_so > 0 && pmatch[3].rm_eo > 0 && (pmatch[3].rm_eo - pmatch[3].rm_so) < 50) -+ { -+ char buf[50]; -+ bstrncpy(buf, str + pmatch[1].rm_so, pmatch[1].rm_eo - pmatch[1].rm_so + 1); -+ version = str_to_uint64(buf) * 10000; -+ -+ bstrncpy(buf, str + pmatch[2].rm_so, pmatch[2].rm_eo - pmatch[2].rm_so + 1); -+ version += str_to_uint64(buf) * 100; -+ -+ bstrncpy(buf, str + pmatch[3].rm_so, pmatch[3].rm_eo - pmatch[3].rm_so + 1); -+ version += str_to_uint64(buf); -+ } -+ regfree(&r1); -+ return version; -+} -+ - /* - * Open connection with File daemon. - * Try connecting every retry_interval (default 10 sec), and -@@ -195,6 +223,8 @@ int connect_to_file_daemon(JCR *jcr, int retry_interva - cr.FileRetention = jcr->client->FileRetention; - cr.JobRetention = jcr->client->JobRetention; - bstrncpy(cr.Uname, fd->msg+strlen(OKjob)+1, sizeof(cr.Uname)); -+ jcr->client_version = scan_version(cr.Uname); -+ - if (!db_update_client_record(jcr, jcr->db, &cr)) { - Jmsg(jcr, M_WARNING, 0, _("Error updating Client record. ERR=%s\n"), - db_strerror(jcr->db)); diff --git a/sysutils/bacula13-server/files/patch-src_dird_getmsg.c b/sysutils/bacula13-server/files/patch-src_dird_getmsg.c deleted file mode 100644 index 2ee3adae7320..000000000000 --- a/sysutils/bacula13-server/files/patch-src_dird_getmsg.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/dird/getmsg.c.orig 2023-05-02 09:50:49 UTC -+++ src/dird/getmsg.c -@@ -251,6 +251,14 @@ int bget_dirmsg(JCR *jcr, BSOCK *bs, BSOCK_CLIENT_TYPE - if (*msg == ' ') { - msg++; /* skip leading space */ - } -+ /* Fix to support old FDs */ -+ if (role == BSOCK_TYPE_FD && jcr->client_version > 0 && jcr->client_version < 130000) { -+ type = type + 1; /* Adding M_EVENTS pushed all old events by 1, we fix it automatically here */ -+ } -+ if (type == M_ABORT) { // not allowed here -+ Jmsg1(jcr, M_ERROR, 0, _("Malformed message: %s\n"), bs->msg); -+ continue; -+ } - Dmsg1(900, "Dispatch msg: %s", msg); - dispatch_message(jcr, type, mtime, msg); - continue; diff --git a/sysutils/bacula13-server/files/patch-src_jcr.h b/sysutils/bacula13-server/files/patch-src_jcr.h deleted file mode 100644 index 10d7432088b2..000000000000 --- a/sysutils/bacula13-server/files/patch-src_jcr.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/jcr.h.orig 2023-05-02 09:50:49 UTC -+++ src/jcr.h -@@ -399,6 +399,7 @@ class JCR { (public) - int32_t FDVersion; /* File daemon version number */ - int32_t SDVersion; /* Storage daemon version number */ - int64_t spool_size; /* Spool size for this job */ -+ uint64_t client_version; /* Client version as a number */ - utime_t snapshot_retention; /* Snapshot retention (from Client/Job resource) */ - volatile bool sd_msg_thread_done; /* Set when Storage message thread done */ - bool wasVirtualFull; /* set if job was VirtualFull */