1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00

- Update to 3.0.2 [1]

- Fix whitespace in pkg-deinstall [2]
- Use %%PREFIX%% in pkg-message [2]
- Document that make_sqlite_tables needs to be run as bacula user [2]

PR:		[1]: ports/137160
		[2]: ports/133818
Submitted by:	[1]: Dan Langille <dan@langille.org> (maintainer)
		[2]: Kostas Voulgaris <voulgaris@ceid.upatras.gr>
Approved by:	[2]: maintainer via IRC
This commit is contained in:
Wesley Shields 2009-08-14 20:00:36 +00:00
parent 35d7b338e4
commit a0ca3434a2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=239554
10 changed files with 14 additions and 47 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= bacula
DISTVERSION= 3.0.1
DISTVERSION= 3.0.2
CATEGORIES?= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bacula
@ -195,7 +195,6 @@ RUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
.endif
.endif
.if defined(WITH_OPENSSL)
CONFIGURE_ARGS+= --with-openssl
.endif
@ -266,7 +265,6 @@ pre-install:
${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
.endif
.if !target(post-install)
post-install:
.if defined(WITH_CLIENT_ONLY)

View File

@ -1,3 +1,3 @@
MD5 (bacula-3.0.1.tar.gz) = 173ef4d07ff10dfdbcc1142d8be21f17
SHA256 (bacula-3.0.1.tar.gz) = 310ad1d9fb97b5eaf78cae6de47219d485a6762b523753415bbced5dca41dd2c
SIZE (bacula-3.0.1.tar.gz) = 3842746
MD5 (bacula-3.0.2.tar.gz) = 52f4bc25d8988dffcff429bb5e1ee81b
SHA256 (bacula-3.0.2.tar.gz) = 8f5e0bf4734c21949f83129209e0109acf054a362b4fce7cb87a87f1815904a5
SIZE (bacula-3.0.2.tar.gz) = 3910414

View File

@ -1,11 +0,0 @@
--- scripts/Makefile.in.orig Tue Sep 12 12:03:08 2006
+++ scripts/Makefile.in Tue Sep 12 12:03:08 2006
@@ -139,8 +139,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

View File

@ -1,11 +0,0 @@
--- src/cats/sql.c.orig 2009-04-12 11:07:46.218959381 -0400
+++ src/cats/sql.c 2009-04-12 11:08:15.509974021 -0400
@@ -759,7 +759,7 @@
if (mdb->lock.valid == RWLOCK_VALID) {
fprintf(fp, "\tRWLOCK=%p w_active=%i w_wait=%i\n", &mdb->lock, mdb->lock.w_active, mdb->lock.w_wait);
#ifndef HAVE_WIN32
- fprintf(fp, "\t\tthreadid=0x%x mutex=%p\n", (int)mdb->lock.writer_id, &mdb->lock.mutex);
+ fprintf(fp, "\t\tthreadid=0x%lx mutex=%p\n", (long)mdb->lock.writer_id, &mdb->lock.mutex);
#endif
}
}

View File

@ -1,13 +0,0 @@
--- src/lib/jcr.c.orig 2009-04-12 11:07:07.079940037 -0400
+++ src/lib/jcr.c 2009-04-12 11:07:20.116947254 -0400
@@ -1063,8 +1063,8 @@
fprintf(fp, "\tuse_count=%i\n",
jcr->use_count());
#else
- fprintf(fp, "\tuse_count=%i threadid=0x%x\n",
- jcr->use_count(), (int)jcr->my_thread_id);
+ fprintf(fp, "\tuse_count=%i threadid=0x%lx\n",
+ jcr->use_count(), (long)jcr->my_thread_id);
#endif
fprintf(fp, "\tJobType=%c JobLevel=%c\n",
jcr->get_JobType(), jcr->get_JobLevel());

View File

@ -25,7 +25,7 @@ case "$2" in
USER=bacula
GROUP=${USER}
if pw usershow "${USER}" 2>/dev/null 1>&2; then
echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
fi
;;

View File

@ -1,7 +1,7 @@
################################################################################
NOTE:
Sample files are installed in ${PREFIX}/etc:
Sample files are installed in %%PREFIX%%/etc:
bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample
Please read this file:

View File

@ -4,12 +4,12 @@ NOTE:
An auto-changer manipulation script based on FreeBSDs
chio command is included and installed at
${PREFIX}/sbin/chio-bacula
%%PREFIX%%/sbin/chio-bacula
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-dir.conf
Take care of correct permissions for changer and
tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e.
@ -43,7 +43,7 @@ the user bacula. Check your permissions.
For USB support read the bacula manual. It could be necessary
to configure/compile a new kernel.
Look at ${PREFIX}/share/bacula/update_bacula_tables for
Look at %%PREFIX%%/share/bacula/update_bacula_tables for
database update procedure. Details can be found in the
ReleaseNotes
@ -60,4 +60,6 @@ upgraded.
Read the ReleaseNotes for further information.
If you are using sqlite you need to run the make_sqlite_tables script as
the bacula user. Do this using 'sudo su -m bacula'.
################################################################################

View File

@ -25,7 +25,7 @@ case "$2" in
USER=bacula
GROUP=${USER}
if pw usershow "${USER}" 2>/dev/null 1>&2; then
echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
fi
;;

View File

@ -53,6 +53,8 @@ sbin/dbcheck
%%DATADIR%%/mtx-changer
%%DATADIR%%/mtx-changer.conf
%%DATADIR%%/query.sql
%%DATADIR%%/startmysql
%%DATADIR%%/stopmysql
%%DATADIR%%/update_bacula_tables
%%DATADIR%%/update_%%DBTYPE%%_tables