Date: Tue, 17 Sep 2024 13:46:55 GMT From: Dan Langille <dvl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7ebb2c9f2a6b - main - sysutils/bacula15-server: patch to fix upgrade script Message-ID: <202409171346.48HDktxU042354@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ebb2c9f2a6b891374686f5ca137ab4cc5db73e7 commit 7ebb2c9f2a6b891374686f5ca137ab4cc5db73e7 Author: Dan Langille <dvl@FreeBSD.org> AuthorDate: 2024-09-17 13:40:50 +0000 Commit: Dan Langille <dvl@FreeBSD.org> CommitDate: 2024-09-17 13:46:48 +0000 sysutils/bacula15-server: patch to fix upgrade script With upcoming removal of bacula9 and bacula11, let's make this work. These patches have been submitted upstream but not released: * https://github.com/dlangille/bacula-community/commit/0200b1461310b4f5d4cdb89aedaa2ca9c1e1ad77 * https://github.com/dlangille/bacula-community/commit/716952b15b71be44f152bfb522666514422acc95 While here, remove Makefile.old committed during 9df94c4d9d1c50f758e9be67e51060a14527e2cc PR: 281542 --- sysutils/bacula15-server/Makefile | 2 +- sysutils/bacula15-server/Makefile.old | 207 --------------------- .../patch-src_cats_update__postgresql__tables.in | 50 +++++ 3 files changed, 51 insertions(+), 208 deletions(-) diff --git a/sysutils/bacula15-server/Makefile b/sysutils/bacula15-server/Makefile index 10c7bef762aa..907b6148fdb3 100644 --- a/sysutils/bacula15-server/Makefile +++ b/sysutils/bacula15-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula DISTVERSION= 15.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${DISTVERSION} PKGNAMEPREFIX?= # diff --git a/sysutils/bacula15-server/Makefile.old b/sysutils/bacula15-server/Makefile.old deleted file mode 100644 index a9d84c4720a0..000000000000 --- a/sysutils/bacula15-server/Makefile.old +++ /dev/null @@ -1,207 +0,0 @@ -PORTNAME= bacula -DISTVERSION= 15.0.2 -PORTREVISION= 2 -CATEGORIES?= sysutils -MASTER_SITES= SF/bacula/bacula/${DISTVERSION} -PKGNAMEPREFIX?= # -PKGNAMESUFFIX?= 15-server - -MAINTAINER= dvl@FreeBSD.org -COMMENT?= Network backup solution (server) -WWW= https://www.bacula.org/ - -LICENSE= AGPLv3 -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES+= cpe libtool localbase python:env readline shebangfix ssl - -SHEBANG_FILES= scripts/get_malware_abuse.ch scripts/key-manager.py.in \ - scripts/md5tobase64.py src/cats/make_catalog_backup.pl.in -#scripts/baculabackupreport.in - -CONFLICTS?= bacula13-server bacula11-server bacula9-server - -LIB_DEPENDS+= liblzo2.so:archivers/lzo2 - -USERS= bacula -GROUPS= ${USERS} - -LIB_VERSION= ${DISTVERSION} - -PLIST_SUB+= LIB_VERSION=${LIB_VERSION} - -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -USE_LDCONFIG= yes - -OPTIONS_DEFINE?= IPV6 MTX NLS S3 -MTX_DESC= Install mtx for control of autochanger devices -S3_DESC= Install S3 plugin - -.if ${PKGNAMESUFFIX} == "15-server" -OPTIONS_MULTI= BACKEND -OPTIONS_MULTI_BACKEND= MYSQL PGSQL SQLITE3 -OPTIONS_DEFAULT+= PGSQL -.endif - -OPTIONS_SUB= yes - -.if ${PKGNAMESUFFIX} == "15-client" || ${PKGNAMESUFFIX} == "15-server" #Till end of the file - -.if !defined(WITH_CLIENT_ONLY) -LIB_DEPENDS+= libbac-${LIB_VERSION}.so:sysutils/bacula15-client -USE_RC_SUBR?= bacula-dir bacula-sd -.endif - -.if defined(WITH_CLIENT_ONLY) -SUB_FILES+= pkg-deinstall.client pkg-install.client pkg-message.client -.else -SUB_FILES+= pkg-message.server -.endif - -CONFIGURE_ARGS+= --disable-conio \ - --enable-batch-insert \ - --enable-smartalloc \ - --sysconfdir=${ETCDIR} \ - --with-baseport=9101 \ - --with-db-name=bacula \ - --with-db-user=bacula \ - --with-dump-email=root@localhost \ - --with-job-email=root@localhost \ - --with-logdir=/var/log \ - --with-plugindir=${PREFIX}/lib \ - --with-readline=${LOCALBASE} \ - --with-sbin-perm=755 \ - --with-scriptdir=${PREFIX}/share/${PORTNAME} \ - --with-tcp-wrappers=/usr/lib \ - --with-working-dir=${BACULA_DIR} - -.if defined(WITH_CLIENT_ONLY) -CONFIGURE_ARGS+= --with-fd-group=wheel \ - --with-fd-user=root -.else -CONFIGURE_ARGS+= --with-dir-group=${BACULA_GROUP} \ - --with-dir-user=${BACULA_USER} \ - --with-sd-group=operator \ - --with-sd-user=${BACULA_USER} -.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_DIR=${BACULA_DIR} \ - BACULA_GID=${BACULA_GID} \ - BACULA_GROUP=${BACULA_GROUP} \ - BACULA_UID=${BACULA_UID} \ - BACULA_USER=${BACULA_USER} - -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 - -S3_CONFIGURE_ARGS= --enable-s3 -S3_LIB_DEPENDS= libs3.so:sysutils/bacula-libs3 - -.include <bsd.port.pre.mk> - -.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+= MAN1="${MP1}" \ - MAN8="${MP8}" - -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-${LIB_VERSION}.so - ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac.so - ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg-${LIB_VERSION}.so - ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg.so - ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbacfind-${LIB_VERSION}.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 # 15-client and 15-server are defined - -.include <bsd.port.post.mk> diff --git a/sysutils/bacula15-server/files/patch-src_cats_update__postgresql__tables.in b/sysutils/bacula15-server/files/patch-src_cats_update__postgresql__tables.in new file mode 100644 index 000000000000..6a0e5629a6aa --- /dev/null +++ b/sysutils/bacula15-server/files/patch-src_cats_update__postgresql__tables.in @@ -0,0 +1,50 @@ +--- src/cats/update_postgresql_tables.in.orig 2024-09-16 19:41:23 UTC ++++ src/cats/update_postgresql_tables.in +@@ -186,7 +186,7 @@ if [ "$DBVERSION" -eq 15 -o "$DBVERSION" -eq 16 ]; the + echo " doesn't have write permission on the current directory," + echo " or if the system doesn't have enough space to store a" + echo " compressed export of the File table" +- psql --set ON_ERROR_STOP=1 -d ${db_name} $* -c "set work_mem='$WORKMEM';"'set enable_mergejoin to off ; set enable_hashjoin to off; copy (SELECT FileId, FileIndex, JobId, PathId, Filename.Name, DeltaSeq, MarkId, LStat, Md5 FROM File JOIN Filename USING (FilenameId)) TO STDOUT' | $COMP -1 -c > file1017.data ++ psql -q --set ON_ERROR_STOP=1 -d ${db_name} $* -c "set work_mem='$WORKMEM';"'set enable_mergejoin to off ; set enable_hashjoin to off; copy (SELECT FileId, FileIndex, JobId, PathId, Filename.Name, DeltaSeq, MarkId, LStat, Md5 FROM File JOIN Filename USING (FilenameId)) TO STDOUT' | $COMP -1 -c > file1017.data + + if [ $? -ne 0 ]; then + echo "Error while dumping file table to $PWD/file1017.data" +@@ -219,12 +219,12 @@ EOF + exit 1 + fi + +- echo "Loading the File table from $PWD/file.$$.data..." ++ echo "Loading the File table from $PWD/file1017.data..." + # we do everything in the same commit to avoid creating WALs on this operation + cat file1017.data | $COMP -d | psql --set ON_ERROR_STOP=1 -d ${db_name} $* -c "BEGIN; TRUNCATE File; COPY File FROM STDIN; set maintenance_work_mem='2000MB'; CREATE INDEX file_jpfid_idx on File (JobId, PathId, Filename text_pattern_ops); ALTER TABLE ONLY File ADD CONSTRAINT file_pkey PRIMARY KEY (FileId); COMMIT;" + + if [ $? -ne 0 ]; then +- echo "Inserting File data from file.$$.data failed." ++ echo "Inserting File data from file1017.data failed." + exit 1 + fi + +@@ -285,7 +285,7 @@ if [ "$STOP1015" = "" -a "$DBVERSION" -eq 1015 ]; then + echo " doesn't have write permission on the current directory," + echo " or if the system doesn't have enough space to store a" + echo " compressed export of the File table" +- psql --set ON_ERROR_STOP=1 -d ${db_name} $* -c "set work_mem='$WORKMEM';"'set enable_mergejoin to off ; set enable_hashjoin to off; copy (SELECT FileId, FileIndex, JobId, PathId, Filename.Name, DeltaSeq, MarkId, LStat, Md5 FROM File JOIN Filename USING (FilenameId)) TO STDOUT' | $COMP -1 -c > file1016.data ++ psql -q --set ON_ERROR_STOP=1 -d ${db_name} $* -c "set work_mem='$WORKMEM';"'set enable_mergejoin to off ; set enable_hashjoin to off; copy (SELECT FileId, FileIndex, JobId, PathId, Filename.Name, DeltaSeq, MarkId, LStat, Md5 FROM File JOIN Filename USING (FilenameId)) TO STDOUT' | $COMP -1 -c > file1016.data + + if [ $? -ne 0 ]; then + echo "Error while dumping file table to $PWD/file1016.data" +@@ -318,12 +318,12 @@ EOF + exit 1 + fi + +- echo "Loading the File table from $PWD/file.$$.data..." ++ echo "Loading the File table from $PWD/file1016.data..." + # we do everything in the same commit to avoid creating WALs on this operation + cat file1016.data | $COMP -d | psql --set ON_ERROR_STOP=1 -d ${db_name} $* -c "BEGIN; TRUNCATE File; COPY File FROM STDIN; set maintenance_work_mem='2000MB'; CREATE INDEX file_jpfid_idx on File (JobId, PathId, Filename text_pattern_ops); ALTER TABLE ONLY File ADD CONSTRAINT file_pkey PRIMARY KEY (FileId); COMMIT;" + + if [ $? -ne 0 ]; then +- echo "Inserting File data from file.$$.data failed." ++ echo "Inserting File data from file1016.data failed." + exit 1 + fi +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409171346.48HDktxU042354>