ports/103064: [MAINTAINER-UPDATE] sysutils/bacula-server upgrade to 1.39.22-20060908
Dan Langille
dan at langille.org
Sat Sep 9 12:30:23 UTC 2006
>Number: 103064
>Category: ports
>Synopsis: [MAINTAINER-UPDATE] sysutils/bacula-server upgrade to 1.39.22-20060908
>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: Sat Sep 09 12:30:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Dan Langille
>Release: FreeBSD 4.9-STABLE i386
>Organization:
The FreeBSD Diary
>Environment:
System: FreeBSD xeon.unixathome.org 4.9-STABLE FreeBSD 4.9-STABLE #2: Wed Mar 3 08:16:24 EST 2004 dan at polo.unixathome.org:/usr/obj/usr/src/sys/XEON i386
>Description:
>How-To-Repeat:
>Fix:
--- patch.bacula-server-devel begins here ---
diff -ruN /usr/ports/sysutils/bacula-server-devel/Makefile bacula-server-devel/Makefile
--- /usr/ports/sysutils/bacula-server-devel/Makefile Sun Jun 11 10:21:49 2006
+++ bacula-server-devel/Makefile Sat Sep 9 08:04:55 2006
@@ -6,7 +6,8 @@
#
PORTNAME= bacula
-DISTVERSION= 1.38.10-beta1-20060606
+DISTVERSION= 1.39.22-20060908
+
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bacula
@@ -21,6 +22,8 @@
USE_RC_SUBR?= bacula-dir.sh bacula-sd.sh
+SUB_FILES+= pkg-message
+
# The user/group IDs below are registered, see
# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
#
@@ -84,8 +87,6 @@
PLIST_SUB+= BACULA_DIR=${BACULA_DIR}
-MAN8= bacula.8
-
.include <bsd.port.pre.mk>
#DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz
@@ -160,7 +161,18 @@
.endif
.if defined(WITH_CLIENT_ONLY)
-MAN8=bacula.8
+MAN8=bacula-fd.8 bconsole.8
+.else
+MAN8=bacula-dir.8 bacula-sd.8 bacula.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 dbcheck.8
+MAN1=bsmtp.1
+.endif
+
+.if defined(WITH_GNOMECONSOLE)
+ MAN1+=bacula-console-gnome.1
+.endif
+
+.if defined(WITH_WXCONSOLE)
+ MAN1+=bacula-wxconsole.1
.endif
pre-everything::
@@ -220,6 +232,18 @@
.endif
post-install:
+.if defined(MAN8)
+. for manpage in ${MAN8}
+ ${INSTALL_MAN} ${WRKSRC}/manpages/${manpage} ${PREFIX}/man/man8/${manpage}
+. endfor
+.endif
+
+.if defined(MAN1)
+. for manpage in ${MAN1}
+ ${INSTALL_MAN} ${WRKSRC}/manpages/${manpage} ${PREFIX}/man/man1/${manpage}
+. endfor
+.endif
+
.if defined(WITH_CLIENT_ONLY)
# Extend only /etc/services
@ ${SETENV} PKG_PREFIX=${PREFIX} \
@@ -227,8 +251,10 @@
# Console stuff
if [ -f ${PREFIX}/etc/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}; \
fi
.if defined(WITH_WXCONSOLE)
@@ -248,12 +274,8 @@
fi
.endif
-.if defined(WITH_CLIENT_ONLY)
- ${INSTALL_MAN} ${WRKSRC}/scripts/bacula.man ${PREFIX}/man/man8/bacula.8
-.endif
-
# Documentation is only installed in -client port
-.if defined(WITH_DOCS)
+.if !defined(NOPORTDOCS) && defined(WITH_DOCS)
for na in manual bacula-web; do \
${MKDIR} ${DOCSDIR}/$$na ;\
cd ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION} && ${FIND} $$na | \
@@ -265,6 +287,8 @@
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/kernstodo ${DOCSDIR}
.endif
+# ensure that users in the bacula group can run bconsole
+ ${CHGRP} bacula ${PREFIX}/sbin/bconsole
.else
# Install config files and preserve existing ones
${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${PREFIX}/sbin
@@ -278,6 +302,7 @@
# 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
+
.endif
# Install leaves existing conf files untouched. Respect this here!
for na in ${CONFFILES}; do \
@@ -339,14 +364,10 @@
@${ECHO_MSG} "For USB support read the bacula manual!! It could be necessary"
@${ECHO_MSG} "to configure/compile a new kernel!"
@${ECHO_MSG} ""
- @${ECHO_MSG} "Look at $PREFIX/share/bacula/update_bacula_tables for"
+ @${ECHO_MSG} "Look at ${PREFIX}/share/bacula/update_bacula_tables for"
@${ECHO_MSG} "database update procedure. Details can be found in the"
@${ECHO_MSG} "ReleaseNotes"
.endif
@${ECHO_MSG} "*********************************************************************"
-
-.if !defined(WITH_CLIENT_ONLY)
- ${CAT} pkg-message
-.endif
.include <bsd.port.post.mk>
diff -ruN /usr/ports/sysutils/bacula-server-devel/distinfo bacula-server-devel/distinfo
--- /usr/ports/sysutils/bacula-server-devel/distinfo Sun Jun 11 10:21:49 2006
+++ bacula-server-devel/distinfo Sat Sep 9 08:05:41 2006
@@ -1,3 +1,3 @@
-MD5 (bacula-1.38.10-beta1-20060606.tar.gz) = 2b13e72f29b7e266ffc20df53845752c
-SHA256 (bacula-1.38.10-beta1-20060606.tar.gz) = cf0edbdbf48ce57890d1e29987b6055e11517ed84af9cc8b9278f1114929c086
-SIZE (bacula-1.38.10-beta1-20060606.tar.gz) = 2071197
+MD5 (bacula-1.39.22-20060908.tar.gz) = 9ec36e6c22f8baf086a54407aa18d8e5
+SHA256 (bacula-1.39.22-20060908.tar.gz) = bc6269751d99dcb9a3f2cca8e707b0b2ead85f7282182edce595160d39f02b45
+SIZE (bacula-1.39.22-20060908.tar.gz) = 2359307
diff -ruN /usr/ports/sysutils/bacula-server-devel/files/bacula-dir.sh.in bacula-server-devel/files/bacula-dir.sh.in
--- /usr/ports/sysutils/bacula-server-devel/files/bacula-dir.sh.in Sat Apr 8 05:18:06 2006
+++ bacula-server-devel/files/bacula-dir.sh.in Sat Sep 9 08:04:17 2006
@@ -19,9 +19,10 @@
name="bacula_dir"
rcvar=${name}_enable
command=%%PREFIX%%/sbin/bacula-dir
-pidfile="${bacula_dir_pidfile}"
load_rc_config $name
+
+pidfile="${bacula_dir_pidfile}"
: ${bacula_dir_enable="NO"}
: ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-dir.conf"}
diff -ruN /usr/ports/sysutils/bacula-server-devel/files/bacula-fd.sh.in bacula-server-devel/files/bacula-fd.sh.in
--- /usr/ports/sysutils/bacula-server-devel/files/bacula-fd.sh.in Sat Apr 1 18:06:24 2006
+++ bacula-server-devel/files/bacula-fd.sh.in Sat Sep 9 08:04:17 2006
@@ -19,9 +19,10 @@
name="bacula_fd"
rcvar=${name}_enable
command=/usr/local/sbin/bacula-fd
-pidfile="${bacula_fd_pidfile}"
load_rc_config $name
+
+pidfile="${bacula_fd_pidfile}"
: ${bacula_fd_enable="NO"}
: ${bacula_fd_flags=" -u root -g wheel -v -c /usr/local/etc/bacula-fd.conf"}
diff -ruN /usr/ports/sysutils/bacula-server-devel/files/bacula-sd.sh.in bacula-server-devel/files/bacula-sd.sh.in
--- /usr/ports/sysutils/bacula-server-devel/files/bacula-sd.sh.in Sat Apr 8 05:18:06 2006
+++ bacula-server-devel/files/bacula-sd.sh.in Sat Sep 9 08:04:17 2006
@@ -19,12 +19,13 @@
name="bacula_sd"
rcvar=`set_rcvar`
command=/usr/local/sbin/bacula-sd
-pidfile="${bacula_sd_pidfile}"
load_rc_config $name
+pidfile="${bacula_sd_pidfile}"
+
: ${bacula_sd_enable="NO"}
-: ${bacula_sd_flags=" -u bacula -g operator -v -c /usr/local/etc/bacula-sd.conf"}
+: ${bacula_sd_flags=" -u bacula -g bacula -v -c /usr/local/etc/bacula-sd.conf"}
: ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
run_rc_command "$1"
diff -ruN /usr/ports/sysutils/bacula-server-devel/files/patch-configure bacula-server-devel/files/patch-configure
--- /usr/ports/sysutils/bacula-server-devel/files/patch-configure Wed Mar 15 05:22:09 2006
+++ bacula-server-devel/files/patch-configure Wed Dec 31 19:00:00 1969
@@ -1,21 +0,0 @@
-*** configure.org Sun Mar 6 16:46:54 2005
---- configure Sun Mar 6 16:49:20 2005
-***************
-*** 29490,29497 ****
- DISTVER=`uname -a |awk '{print $3}'`
- VER=`echo $DISTVER | cut -c 1`
- if test x$VER = x4 ; then
-! PTHREAD_LIB="-pthread"
-! CFLAGS="${CFLAGS} -pthread"
- fi
- lld="qd"
- llu="qu"
---- 21037,21044 ----
- DISTVER=`uname -a |awk '{print $3}'`
- VER=`echo $DISTVER | cut -c 1`
- if test x$VER = x4 ; then
-! PTHREAD_LIB="${PTHREAD_LIBS}"
-! CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
- fi
- lld="qd"
- llu="qu"
diff -ruN /usr/ports/sysutils/bacula-server-devel/files/patch-scripts-Makefile.in bacula-server-devel/files/patch-scripts-Makefile.in
--- /usr/ports/sysutils/bacula-server-devel/files/patch-scripts-Makefile.in Thu Mar 30 16:47:54 2006
+++ bacula-server-devel/files/patch-scripts-Makefile.in Wed Dec 31 19:00:00 1969
@@ -1,33 +0,0 @@
---- scripts/Makefile.in.orig Sat Mar 25 10:37:41 2006
-+++ scripts/Makefile.in Thu Mar 30 13:01:21 2006
-@@ -33,14 +33,6 @@
- $(MKDIR) $(DESTDIR)$(mandir)
-
- install: installdirs
-- $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
-- $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
-- $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
-- $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
-- $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula
-- $(INSTALL_SCRIPT) bacula-ctl-dir $(DESTDIR)$(scriptdir)/bacula-ctl-dir
-- $(INSTALL_SCRIPT) bacula-ctl-fd $(DESTDIR)$(scriptdir)/bacula-ctl-fd
-- $(INSTALL_SCRIPT) bacula-ctl-sd $(DESTDIR)$(scriptdir)/bacula-ctl-sd
- @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \
- echo " ==> Saving existing mtx-changer to mtx-changer.old"; \
- $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \
-@@ -56,14 +48,7 @@
- $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \
- fi
- $(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler
-- $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
-- $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
-- chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
-- $(DESTDIR)$(scriptdir)/btraceback.dbx
-- $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
-- gzip <bacula.man >bacula.8.gz
-- $(INSTALL_DATA) bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
-- @rm -f bacula.8.gz
-+ $(INSTALL_DATA) bacula.man $(DESTDIR)$(mandir)/bacula.8
-
-
- uninstall:
diff -ruN /usr/ports/sysutils/bacula-server-devel/files/patch-src-lib-jcr.c bacula-server-devel/files/patch-src-lib-jcr.c
--- /usr/ports/sysutils/bacula-server-devel/files/patch-src-lib-jcr.c Wed Mar 22 10:43:26 2006
+++ bacula-server-devel/files/patch-src-lib-jcr.c Wed Dec 31 19:00:00 1969
@@ -1,12 +0,0 @@
---- src/lib/jcr.c.org 14 Mar 2006 21:41:41 -0000 1.75.2.6
-+++ src/lib/jcr.c 21 Mar 2006 11:33:43 -0000 1.75.2.7
-@@ -229,8 +229,8 @@
- jcr->job_end_push.init(1, false);
- jcr->sched_time = time(NULL);
- jcr->daemon_free_jcr = daemon_free_jcr; /* plug daemon free routine */
-- jcr->inc_use_count();
- jcr->init_mutex();
-+ jcr->inc_use_count();
- jcr->JobStatus = JS_Created; /* ready to run */
- jcr->VolumeName = get_pool_memory(PM_FNAME);
- jcr->VolumeName[0] = 0;
diff -ruN /usr/ports/sysutils/bacula-server-devel/files/pkg-message.in bacula-server-devel/files/pkg-message.in
--- /usr/ports/sysutils/bacula-server-devel/files/pkg-message.in Wed Dec 31 19:00:00 1969
+++ bacula-server-devel/files/pkg-message.in Sat Sep 9 08:04:17 2006
@@ -0,0 +1,24 @@
+################################################################################
+ Please read this file:
+
+ %%DOCSDIR%%/ReleaseNotes
+
+ for the upgrade procedure!
+
+ IF YOU IGNORE THIS you may !! LOSE DATA !!
+
+IMPORTANT UPGRADE NOTES:
+
+- A database upgrade is required.
+- Your Director and SD must be simultaneously upgraded.
+- The "Accept Any Volume" directive has been removed.
+
+- Lots of new features
+
+Read the ReleaseNotes for further information.
+
+ Please note that bacula-server no longer installs the client
+ and that the documentation can be optionally installed with the
+ client port (sysutils/bacula-client).
+
+################################################################################
diff -ruN /usr/ports/sysutils/bacula-server-devel/pkg-message bacula-server-devel/pkg-message
--- /usr/ports/sysutils/bacula-server-devel/pkg-message Thu Mar 30 16:47:54 2006
+++ bacula-server-devel/pkg-message Wed Dec 31 19:00:00 1969
@@ -1,17 +0,0 @@
-################################################################################
- Please read the file"
-
- ${DOCSDIR}/ReleaseNotes"
-
- for the upgrade procedure!
-
- IF YOU IGNORE THIS you may !! LOSE DATA !!
-
- For USB support read the manual. It could be necessary
- to configure/compile a new kernel!
-
- Please note that bacula-server-devel no longer installs the client
- and that the documentation could be optional installed with the
- client port (see port sysutils/bacula-client-devel)!
-
-################################################################################
diff -ruN /usr/ports/sysutils/bacula-server-devel/pkg-plist bacula-server-devel/pkg-plist
--- /usr/ports/sysutils/bacula-server-devel/pkg-plist Sun Jun 11 10:21:49 2006
+++ bacula-server-devel/pkg-plist Sat Sep 9 08:04:17 2006
@@ -1,5 +1,3 @@
-%%DATADIR%%/query.sql
-sbin/chio-bacula
sbin/bacula-dir
sbin/bacula-sd
sbin/bcopy
@@ -7,31 +5,40 @@
sbin/bls
sbin/bregex
sbin/bscan
+sbin/bsmtp
sbin/btape
+sbin/btraceback
sbin/bwild
-%%WXCONS%%sbin/wx-console
-%%GNOMECONS%%sbin/gnome-console
+sbin/chio-bacula
sbin/dbcheck
-sbin/bsmtp
- at unexec if cmp -s %D/share/bacula/mtx-changer.old %D/share/bacula/mtx-changer; then rm -f %D/share/bacula/mtx-changer.old; fi
- at unexec if cmp -s %D/share/bacula/disk-changer.old %D/share/bacula/disk-changer; then rm -f %D/share/bacula/disk-changer.old; fi
-%%DATADIR%%/mtx-changer
+%%DATADIR%%/bacula
+%%DATADIR%%/bacula-ctl-dir
+%%DATADIR%%/bacula-ctl-fd
+%%DATADIR%%/bacula-ctl-sd
+%%DATADIR%%/bconsole
+%%DATADIR%%/btraceback.gdb
+%%DATADIR%%/btraceback.dbx
%%DATADIR%%/create_bacula_database
%%DATADIR%%/create_%%DBTYPE%%_database
+%%DATADIR%%/delete_catalog_backup
+%%DATADIR%%/disk-changer
%%DATADIR%%/drop_bacula_database
-%%DATADIR%%/drop_%%DBTYPE%%_database
%%DATADIR%%/drop_bacula_tables
+%%DATADIR%%/drop_%%DBTYPE%%_database
%%DATADIR%%/drop_%%DBTYPE%%_tables
+%%DATADIR%%/dvd-handler
+%%DATADIR%%/gconsole
%%DATADIR%%/grant_bacula_privileges
%%DATADIR%%/grant_%%DBTYPE%%_privileges
%%DATADIR%%/make_bacula_tables
+%%DATADIR%%/make_catalog_backup
%%DATADIR%%/make_%%DBTYPE%%_tables
+%%DATADIR%%/mtx-changer
+%%DATADIR%%/query.sql
+%%DATADIR%%/startmysql
+%%DATADIR%%/stopmysql
%%DATADIR%%/update_bacula_tables
%%DATADIR%%/update_%%DBTYPE%%_tables
-%%DATADIR%%/delete_catalog_backup
-%%DATADIR%%/make_catalog_backup
-%%DATADIR%%/dvd-handler
-%%DATADIR%%/disk-changer
@dirrm %%DATADIR%%
@unexec /usr/bin/killall bacula-sd > /dev/null 2>&1 || true
--- patch.bacula-server-devel ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list