ports/177331: [MAINTAINER-UPDATE] sysutils/bacula-server upgrade to latest version
Dan Langille
dan at langille.org
Sun Mar 24 05:10:00 UTC 2013
>Number: 177331
>Category: ports
>Synopsis: [MAINTAINER-UPDATE] sysutils/bacula-server upgrade to latest version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 24 05:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Dan Langille
>Release: FreeBSD 8.2-STABLE i386
>Organization:
The FreeBSD Diary
>Environment:
System: FreeBSD bast.example.org 8.2-STABLE FreeBSD 8.2-STABLE #3: Thu Mar 3 04:52:04 GMT 2011 dan at bast.example.org:/usr/obj/usr/src/sys/BAST i386
>Description:
>How-To-Repeat:
>Fix:
This patch changes the location of bacula configuration files from $PREFIX/etc/ to ETCDIR.
This change has been discussed on the Bacula Users Mailing list: http://marc.info/?l=bacula-users&m=135767351713347&w=2
Also included is an UPDATING patch.
--- etc-bacula.patch begins here ---
diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile
--- /usr/ports/sysutils/bacula-server/Makefile 2013-02-28 10:51:58.000000000 +0000
+++ bacula-server/Makefile 2013-03-24 04:58:14.728238055 +0000
@@ -3,7 +3,7 @@
PORTNAME= bacula
DISTVERSION= 5.2.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= sysutils
MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
PKGNAMEPREFIX?= #
@@ -47,6 +47,7 @@
MANCOMPRESSED= yes
CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
--enable-smartalloc \
+ --sysconfdir=${ETCDIR} \
--with-working-dir=${BACULA_DIR} \
--with-scriptdir=${PREFIX}/share/${PORTNAME} \
--with-readline=yes \
@@ -173,8 +174,8 @@
# 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
-# Default bconsole.conf is ${PREFIX}/etc
- @${REINPLACE_CMD} -e 's|./bconsole.conf|${PREFIX}/etc/bconsole.conf|g' ${WRKSRC}/src/console/console.c
+# Default bconsole.conf is ${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)
@@ -191,6 +192,7 @@
${WRKSRC}/src/tools/bpluginfo.c
.endif
+
.if !target(pre-install)
pre-install:
if [ ! -d "${BACULA_DIR}" ]; then \
@@ -212,13 +214,13 @@
@ ${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGINSTALL} ${PORTNAME}
# Console stuff
- if [ -f ${PREFIX}/etc/bconsole.conf.new ]; then \
+ if [ -f ${ETCDIR}/bconsole.conf.new ]; then \
${ECHO_CMD} "etc/bconsole.conf.new" >> ${TMPPLIST}; \
- ${CHGRP} bacula ${PREFIX}/etc/bconsole.conf.new; \
- elif [ -f ${PREFIX}/etc/bconsole.conf ]; then \
- ${MV} ${PREFIX}/etc/bconsole.conf ${PREFIX}/etc/bconsole.conf.sample; \
- ${CHGRP} bacula ${PREFIX}/etc/bconsole.conf.sample; \
- ${ECHO_CMD} "etc/bconsole.conf.sample" >> ${TMPPLIST}; \
+ ${CHGRP} bacula ${ETCDIR}/bconsole.conf.new; \
+ elif [ -f ${ETCDIR}/bconsole.conf ]; then \
+ ${MV} ${ETCDIR}/bconsole.conf ${ETCDIR}/bconsole.conf.sample; \
+ ${CHGRP} bacula ${ETCDIR}/bconsole.conf.sample; \
+ ${ECHO_CMD} "etc/bacula/bconsole.conf.sample" >> ${TMPPLIST}; \
fi
# ensure that users in the bacula group can run bconsole
@@ -226,22 +228,22 @@
.else
# Install config files and preserve existing ones
${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${PREFIX}/sbin
- if [ -f ${PREFIX}/etc/bacula-barcodes ]; then \
- ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${PREFIX}/etc/bacula-barcodes.new ; \
- ${ECHO_CMD} "etc/bacula-barcodes.new" >> ${TMPPLIST}; \
+ if [ -f ${ETCDIR}/bacula-barcodes ]; then \
+ ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${ETCDIR}/bacula-barcodes.new ; \
+ ${ECHO_CMD} "etc/bacula/bacula-barcodes.new" >> ${TMPPLIST}; \
else \
- ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${PREFIX}/etc/bacula-barcodes.samples ; \
- ${ECHO_CMD} "etc/bacula-barcodes.samples" >> ${TMPPLIST}; \
+ ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${ETCDIR}/bacula-barcodes.samples ; \
+ ${ECHO_CMD} "etc/bacula/bacula-barcodes.samples" >> ${TMPPLIST}; \
fi
# chmod of bsmtp program so bacula can use it with dropped down permissions
${CHMOD} o+x ${PREFIX}/sbin/bsmtp
${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula
# on a fresh install, the .new suffix is not used
- if [ -f ${PREFIX}/etc/bacula-dir.conf.new ]; then \
- ${CHGRP} bacula ${PREFIX}/etc/bacula-dir.conf.new; \
+ if [ -f ${ETCDIR}/bacula-dir.conf.new ]; then \
+ ${CHGRP} bacula ${ETCDIR}/bacula-dir.conf.new; \
else \
- ${CHGRP} bacula ${PREFIX}/etc/bacula-dir.conf; \
+ ${CHGRP} bacula ${ETCDIR}/bacula-dir.conf; \
fi
${CHGRP} bacula ${PREFIX}/sbin/dbcheck
@@ -249,11 +251,11 @@
.endif
# Install leaves existing conf files untouched. Respect this here!
for na in ${CONFFILES}; do \
- if [ -f ${PREFIX}/etc/bacula-$$na.conf.new ]; then \
- ${ECHO_CMD} "etc/bacula-$$na.conf.new" >> ${TMPPLIST}; \
- elif [ -f ${PREFIX}/etc/bacula-$$na.conf ]; then \
- ${MV} ${PREFIX}/etc/bacula-$$na.conf ${PREFIX}/etc/bacula-$$na.conf.sample; \
- ${ECHO_CMD} "etc/bacula-$$na.conf.sample" >> ${TMPPLIST}; \
+ if [ -f ${ETCDIR}/bacula-$$na.conf.new ]; then \
+ ${ECHO_CMD} "etc/bacula/bacula-$$na.conf.new" >> ${TMPPLIST}; \
+ elif [ -f ${ETCDIR}/bacula-$$na.conf ]; then \
+ ${MV} ${ETCDIR}/bacula-$$na.conf ${ETCDIR}/bacula-$$na.conf.sample; \
+ ${ECHO_CMD} "etc/bacula/bacula-$$na.conf.sample" >> ${TMPPLIST}; \
fi; \
done
@@ -265,3 +267,4 @@
.include "${MASTERDIR}/Makefile.common"
.endif # -client and -server are defined
.include <bsd.port.post.mk>
+
diff -ruN /usr/ports/sysutils/bacula-server/Makefile.common bacula-server/Makefile.common
--- /usr/ports/sysutils/bacula-server/Makefile.common 2012-12-16 16:32:45.000000000 +0000
+++ bacula-server/Makefile.common 2013-03-24 04:35:19.271149009 +0000
@@ -48,7 +48,7 @@
do-install:
.if ${PKGNAMESUFFIX} == "-bat"
# Install config files and preserve existing ones
- ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bat.conf.sample
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bacula/bat.conf.sample
${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${PREFIX}/man/man1/
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin
.endif
diff -ruN /usr/ports/sysutils/bacula-server/files/bacula-dir.in bacula-server/files/bacula-dir.in
--- /usr/ports/sysutils/bacula-server/files/bacula-dir.in 2012-12-16 16:32:45.000000000 +0000
+++ bacula-server/files/bacula-dir.in 2013-03-24 04:18:53.176590068 +0000
@@ -23,7 +23,7 @@
load_rc_config $name
: ${bacula_dir_enable="NO"}
-: ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-dir.conf"}
+: ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
: ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
pidfile="${bacula_dir_pidfile}"
diff -ruN /usr/ports/sysutils/bacula-server/files/bacula-fd.in bacula-server/files/bacula-fd.in
--- /usr/ports/sysutils/bacula-server/files/bacula-fd.in 2012-12-16 16:32:45.000000000 +0000
+++ bacula-server/files/bacula-fd.in 2013-03-24 04:18:59.606900756 +0000
@@ -23,7 +23,7 @@
load_rc_config $name
: ${bacula_fd_enable="NO"}
-: ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula-fd.conf"}
+: ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"}
: ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
pidfile="${bacula_fd_pidfile}"
diff -ruN /usr/ports/sysutils/bacula-server/files/bacula-sd.in bacula-server/files/bacula-sd.in
--- /usr/ports/sysutils/bacula-server/files/bacula-sd.in 2012-12-16 16:32:45.000000000 +0000
+++ bacula-server/files/bacula-sd.in 2013-03-24 04:19:11.411458587 +0000
@@ -23,7 +23,7 @@
load_rc_config $name
: ${bacula_sd_enable="NO"}
-: ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-sd.conf"}
+: ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
: ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
pidfile="${bacula_sd_pidfile}"
diff -ruN /usr/ports/sysutils/bacula-server/files/chio-bacula bacula-server/files/chio-bacula
--- /usr/ports/sysutils/bacula-server/files/chio-bacula 2012-07-14 14:29:18.000000000 +0000
+++ bacula-server/files/chio-bacula 2013-03-24 04:18:39.265940716 +0000
@@ -39,7 +39,7 @@
# This simulates a barcode reader in the changer.
# The labes of the virtual barcode reader are located in the BARCODE_FILE
SIMULATE_BARCODE=true
-BARCODE_FILE=/usr/local/etc/bacula-barcodes
+BARCODE_FILE=/usr/local/etc/bacula/bacula-barcodes
MTX=/bin/chio
# Set default values (see case statement below for
# free mapping of drive index and tape device
diff -ruN /usr/ports/sysutils/bacula-server/files/pkg-message.client.in bacula-server/files/pkg-message.client.in
--- /usr/ports/sysutils/bacula-server/files/pkg-message.client.in 2012-07-14 14:29:18.000000000 +0000
+++ bacula-server/files/pkg-message.client.in 2013-03-24 04:19:06.687229441 +0000
@@ -1,7 +1,7 @@
################################################################################
NOTE:
-Sample files are installed in %%PREFIX%%/etc:
+Sample files are installed in %%PREFIX%%/etc/bacula:
bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample
Please read this file:
diff -ruN /usr/ports/sysutils/bacula-server/files/pkg-message.server.in bacula-server/files/pkg-message.server.in
--- /usr/ports/sysutils/bacula-server/files/pkg-message.server.in 2012-12-16 16:32:45.000000000 +0000
+++ bacula-server/files/pkg-message.server.in 2013-03-24 04:18:44.236180801 +0000
@@ -17,7 +17,7 @@
Please have a look at it if you want to use an
autochanger. You have to configure the usage in
- %%PREFIX%%/etc/bacula-dir.conf
+ %%PREFIX%%/etc/bacula/bacula-dir.conf
Take care of correct permissions for changer and
tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e.
--- etc-bacula.patch ends here ---
--- patch.UPGRADING begins here ---
--- /usr/ports/UPDATING 2013-03-10 04:06:21.000000000 +0000
+++ UPDATING 2013-03-24 05:07:04.001277497 +0000
@@ -5,6 +5,15 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20130324:
+ AFFECTS: users of sysutils/bacula-server, sysutils/bacula-client, sysutils/bat
+ AUTHOR: dvl at FreeBSD.org
+
+ The configuration files for bacula have been moved to PREFIX/bacula
+ Move your existing configuration files to this directory after
+ upgrading.
+
+
20130308:
AFFECTS: users of net-im/folks and devel/libgee
AUTHOR: kwm at FreeBSD.org
--- patch.UPGRADING ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list