diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile index 1fcc10f551ee..6d239e2ed9a1 100644 --- a/sysutils/bacula13-server/Makefile +++ b/sysutils/bacula13-server/Makefile @@ -1,210 +1,211 @@ PORTNAME= bacula DISTVERSION= 13.0.3 +PORTREVISION= 1 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # PKGNAMESUFFIX?= 13-server MAINTAINER= dvl@FreeBSD.org COMMENT?= Network backup solution (server) WWW= https://www.bacula.org/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in scripts/baculabackupreport.in CONFLICTS?= bacula11-server bacula9-server bacula-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 USERS= bacula GROUPS= ${USERS} PLIST_SUB+= LIB_VERSION=${PORTVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE?= MTX NLS IPV6 S3 MTX_DESC= Install mtx for control of autochanger devices S3_DESC= Install S3 plugin .if ${PKGNAMESUFFIX} == "13-server" OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= SQLITE3 MYSQL PGSQL OPTIONS_DEFAULT+= PGSQL .endif OPTIONS_SUB= yes .if ${PKGNAMESUFFIX} == "13-client" || ${PKGNAMESUFFIX} == "13-server" #Till end of the file .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbac-${PORTVERSION}.so:sysutils/bacula13-client USE_RC_SUBR?= bacula-dir bacula-sd .endif .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else SUB_FILES+= pkg-message.server .endif CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \ --enable-smartalloc \ --sysconfdir=${ETCDIR} \ --with-working-dir=${BACULA_DIR} \ --with-scriptdir=${PREFIX}/share/${PORTNAME} \ --disable-conio \ --enable-batch-insert \ --with-plugindir=${PREFIX}/lib \ --with-dump-email=root@localhost \ --with-job-email=root@localhost \ --with-db-name=bacula \ --with-sbin-perm=755 \ --with-db-user=bacula \ --with-logdir=/var/log \ --with-baseport=9101 .if defined(WITH_CLIENT_ONLY) CONFIGURE_ARGS+=--with-fd-user=root \ --with-fd-group=wheel .else CONFIGURE_ARGS+=--with-dir-user=${BACULA_USER} \ --with-dir-group=${BACULA_GROUP} \ --with-sd-user=${BACULA_USER} \ --with-sd-group=operator .endif # The user/group IDs below are registered, see # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#users-and-groups # BACULA_USER?= bacula BACULA_GROUP?= ${BACULA_USER} BACULA_UID?= bacula BACULA_GID?= ${BACULA_UID} BACULA_DIR?= /var/db/bacula PLIST_SUB+= BACULA_DIR=${BACULA_DIR} SUB_LIST+= BACULA_USER=${BACULA_USER} \ BACULA_GROUP=${BACULA_GROUP} \ BACULA_UID=${BACULA_UID} \ BACULA_GID=${BACULA_GID} \ BACULA_DIR=${BACULA_DIR} NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CONFIGURE_ARGS+= --enable-client-only PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client PKGINSTALL= ${FILESDIR}/pkg-install.client .else # Server only Options CONFFILES= sd dir # Server default database MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql MYSQL_SUB_LIST= REQ_MYSQL=mysql MYSQL_SUB_LIST_OFF= REQ_MYSQL="" SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_USES= sqlite:3 PGSQL_CONFIGURE_ON= --with-postgresql=yes PGSQL_USES= pgsql PGSQL_SUB_LIST= REQ_PGSQL=postgresql PGSQL_SUB_LIST_OFF= REQ_PGSQL="" MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .endif .include .if ${PORT_OPTIONS:MS3} CONFIGURE_ARGS+= --enable-s3 LIB_DEPENDS+= libs3.so:sysutils/bacula-libs3 .endif # if IPv6 is not in the kernel, it generates many errors .if ! ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --disable-ipv6 .endif CONFIGURE_ARGS+= --with-readline=${LOCALBASE} .if defined(WITH_CLIENT_ONLY) MP8+= bacula.8 bacula-fd.8 bconsole.8 .else MP8+= bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8 MP1+= bsmtp.1 bacula-tray-monitor.1 .endif MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: # This port does not install docs. See bacula-docs for that @${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in # Change $(ECHO) to echo in some Makefile.in files @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' \ ${WRKSRC}/src/filed/Makefile.in \ ${WRKSRC}/src/console/Makefile.in \ ${WRKSRC}/src/cats/Makefile.in \ ${WRKSRC}/src/dird/Makefile.in \ ${WRKSRC}/src/stored/Makefile.in \ ${WRKSRC}/src/tools/Makefile.in # Default bconsole.conf is in ${ETCDIR} @${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in .if defined(WITH_CLIENT_ONLY) # In client port only install startup script out of script dir (see below post-install) # Dont mkdir ${PREFIX}/share/bacula cause it's empty @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in .else # In server port don't install filed @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \ ${WRKSRC}/Makefile.in .endif .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample ${INSTALL_DATA} ${WRKSRC}/examples/sample-query.sql ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample # bacula-dir attempts to install query.sql as bpart of bacula-server, but that should only installed by bacula-client. ${RM} ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql #the following are installed by the -CLIENT port, and I (ler@lerctr.org) #don't know how to remove them from being built for the -SERVER port. ${RM} ${STAGEDIR}${LOCALBASE}/lib/bpipe-fd.so ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac-${PORTVERSION}.so ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac.so ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg-${PORTVERSION}.so ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg.so ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbacfind-${PORTVERSION}.so ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbacfind.so .endif for na in ${CONFFILES}; do \ ${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \ done .endif .else .include "${MASTERDIR}/Makefile.common" .endif # 13-client and 13-server are defined .include diff --git a/sysutils/bacula13-server/files/patch-src_dird_fd__cmds.c b/sysutils/bacula13-server/files/patch-src_dird_fd__cmds.c new file mode 100644 index 000000000000..ecd0a9ddbb04 --- /dev/null +++ b/sysutils/bacula13-server/files/patch-src_dird_fd__cmds.c @@ -0,0 +1,46 @@ +--- 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 new file mode 100644 index 000000000000..2ee3adae7320 --- /dev/null +++ b/sysutils/bacula13-server/files/patch-src_dird_getmsg.c @@ -0,0 +1,17 @@ +--- 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 new file mode 100644 index 000000000000..10d7432088b2 --- /dev/null +++ b/sysutils/bacula13-server/files/patch-src_jcr.h @@ -0,0 +1,10 @@ +--- 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 */