Date: Sun, 12 Apr 2009 03:01:53 +0100 (BST) From: Dan Langille <dan@langille.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Dan Langille <dan@langille.org> Subject: ports/133631: [MAINTAINER-UPDATE] sysutils/bacula-server upgrade to latest version Message-ID: <20090412020153.CD285B8CF@bast.unixathome.org> Resent-Message-ID: <200904120210.n3C2A3f4019364@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133631 >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 Apr 12 02:10:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dan Langille >Release: FreeBSD 6.2-STABLE i386 >Organization: The FreeBSD Diary >Environment: System: FreeBSD bast.example.org 6.2-STABLE FreeBSD 6.2-STABLE #3: Wed Feb 28 22:21:12 EST 2007 dan@bast.example.org:/usr/obj/usr/src/sys/BAST i386 >Description: Upgrade to 3.0.0 Full details: http://marc.info/?l=bacula-announce&m=123930971903892&w=2 There are quite a number of new features in this release, and upgrading requires a database upgrade. Please read the release notes carefully (included below) and the documentation for the new features at: http://www.bacula.org/manuals/en/concepts/concepts/New_Features.html >How-To-Repeat: >Fix: --- bacula-server.diff begins here --- diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile --- /usr/ports/sysutils/bacula-server/Makefile Sun Mar 8 19:05:43 2009 +++ bacula-server/Makefile Sat Apr 11 21:18:35 2009 @@ -6,8 +6,7 @@ # PORTNAME= bacula -DISTVERSION= 2.4.4 -PORTREVISION= 1 +DISTVERSION= 3.0.0 CATEGORIES?= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula @@ -46,9 +45,18 @@ --enable-smartalloc \ --with-working-dir=${BACULA_DIR} \ --with-scriptdir=${PREFIX}/share/${PORTNAME} \ + --docdir=${DOCSDIR} \ + --htmldir=${DOCSDIR} \ --with-readline=yes \ --disable-conio \ - --enable-batch-insert + --enable-batch-insert \ + --with-plugindir=${LOCALBASE}/lib \ + --with-libdir=${PREFIX}lib/bacula \ + --with-dump-email=root@localhost \ + --with-job-email=root@localhost \ + --with-db-name=bacula \ + --with-db-user=bacula \ + --with-baseport=9101 .if defined(WITH_CLIENT_ONLY) CONFIGURE_ARGS+= --with-fd-user=root \ @@ -152,7 +160,7 @@ DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif defined(WITH_POSTGRESQL) -DEFAULT_PGSQL_VER?= 82 +DEFAULT_PGSQL_VER?= 83 USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=yes DBTYPE= postgresql diff -ruN /usr/ports/sysutils/bacula-server/distinfo bacula-server/distinfo --- /usr/ports/sysutils/bacula-server/distinfo Tue Jan 6 10:32:47 2009 +++ bacula-server/distinfo Sat Apr 11 21:18:59 2009 @@ -1,3 +1,3 @@ -MD5 (bacula-2.4.4.tar.gz) = 4eb6155b45611018af03002d37a2ffde -SHA256 (bacula-2.4.4.tar.gz) = 3a698bdf0fd3f55733a6a4aabe8c3dc2b1ed1ad5ca7fab000f6e0f804a9d3d38 -SIZE (bacula-2.4.4.tar.gz) = 3145564 +MD5 (bacula-3.0.0.tar.gz) = 5ea5294c4f66f0d8ba1414f1ca9dc79b +SHA256 (bacula-3.0.0.tar.gz) = cafcf9e9682662d2efcef84a6d90ee09230c60c7ed15a7051b70a30f2966d45c +SIZE (bacula-3.0.0.tar.gz) = 3834280 diff -ruN /usr/ports/sysutils/bacula-server/files/patch-scripts-Makefile.in bacula-server/files/patch-scripts-Makefile.in --- /usr/ports/sysutils/bacula-server/files/patch-scripts-Makefile.in Thu Jan 4 18:22:30 2007 +++ bacula-server/files/patch-scripts-Makefile.in Sat Apr 11 21:35:21 2009 @@ -1,6 +1,6 @@ --- scripts/Makefile.in.orig Tue Sep 12 12:03:08 2006 +++ scripts/Makefile.in Tue Sep 12 12:03:08 2006 -@@ -33,8 +33,6 @@ +@@ -139,8 +139,6 @@ $(MKDIR) $(DESTDIR)$(mandir) install: installdirs diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src-console-Makefile.in bacula-server/files/patch-src-console-Makefile.in --- /usr/ports/sysutils/bacula-server/files/patch-src-console-Makefile.in Mon May 10 15:26:29 2004 +++ bacula-server/files/patch-src-console-Makefile.in Wed Dec 31 19:00:00 1969 @@ -1,19 +0,0 @@ -*** src/console/Makefile.in.org Sat Apr 3 20:40:26 2004 ---- src/console/Makefile.in Sat May 8 14:01:49 2004 -*************** -*** 89,95 **** - destconf=$$srcconf; \ - if test -f ${DESTDIR}${sysconfdir}/console.conf; then \ - echo "Existing console.conf moved to bconsole.conf"; \ -! @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \ - destconf=$$srcconf.new; \ - fi; \ - fi; \ ---- 89,95 ---- - destconf=$$srcconf; \ - if test -f ${DESTDIR}${sysconfdir}/console.conf; then \ - echo "Existing console.conf moved to bconsole.conf"; \ -! $(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \ - destconf=$$srcconf.new; \ - fi; \ - fi; \ diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src-qt-console-build-depkgs-qt-console bacula-server/files/patch-src-qt-console-build-depkgs-qt-console --- /usr/ports/sysutils/bacula-server/files/patch-src-qt-console-build-depkgs-qt-console Sun Sep 23 23:05:51 2007 +++ bacula-server/files/patch-src-qt-console-build-depkgs-qt-console Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- src/qt-console/build-depkgs-qt-console.orig Sat Sep 15 12:11:32 2007 -+++ src/qt-console/build-depkgs-qt-console Sat Sep 15 12:11:32 2007 -@@ -147,7 +147,7 @@ - echo " INSTALLBASE = ${TOP_DIR}/qwt" >>${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri - echo "}" >>${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri - cat ${TOP_DIR}/qwtconfig.pri >>${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri -- qmake >make.log -+ ${QMAKE} >make.log - do_make Makefile >>make.log - do_make Makefile install >>make.log - echo "In case of problems see: `pwd`/make.log" diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src-stored-acquire.c bacula-server/files/patch-src-stored-acquire.c --- /usr/ports/sysutils/bacula-server/files/patch-src-stored-acquire.c Sun Mar 8 19:05:43 2009 +++ bacula-server/files/patch-src-stored-acquire.c Wed Dec 31 19:00:00 1969 @@ -1,23 +0,0 @@ -Index: src/stored/acquire.c -=================================================================== ---- src/stored/acquire.c (revision 8426) -+++ src/stored/acquire.c (working copy) -@@ -1,7 +1,7 @@ - /* - Bacula® - The Network Backup Solution - -- Copyright (C) 2002-2008 Free Software Foundation Europe e.V. -+ Copyright (C) 2002-2009 Free Software Foundation Europe e.V. - - The main author of Bacula is Kern Sibbald, with contributions from - many others, a complete list can be found in the file AUTHORS. -@@ -647,8 +647,8 @@ - - /* Detach this dcr only if attached */ - if (dcr->attached_to_dev && dev) { -+ dev->dlock(); - dcr->unreserve_device(); -- dev->dlock(); - dcr->dev->attached_dcrs->remove(dcr); /* detach dcr from device */ - dcr->attached_to_dev = false; - // remove_dcr_from_dcrs(dcr); /* remove dcr from jcr list */ diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src-stored-reserve.c bacula-server/files/patch-src-stored-reserve.c --- /usr/ports/sysutils/bacula-server/files/patch-src-stored-reserve.c Sun Mar 8 19:05:43 2009 +++ bacula-server/files/patch-src-stored-reserve.c Wed Dec 31 19:00:00 1969 @@ -1,28 +0,0 @@ -Index: src/stored/reserve.c -=================================================================== ---- src/stored/reserve.c (revision 8426) -+++ src/stored/reserve.c (working copy) -@@ -1,7 +1,7 @@ - /* - Bacula® - The Network Backup Solution - -- Copyright (C) 2000-2008 Free Software Foundation Europe e.V. -+ Copyright (C) 2000-2009 Free Software Foundation Europe e.V. - - The main author of Bacula is Kern Sibbald, with contributions from - many others, a complete list can be found in the file AUTHORS. -@@ -498,7 +498,6 @@ - void DCR::unreserve_device() - { - lock_volumes(); -- dev->dlock(); - if (is_reserved()) { - clear_reserved(); - reserved_volume = false; -@@ -514,7 +513,6 @@ - volume_unused(this); - } - } -- dev->dunlock(); - unlock_volumes(); - } diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src_cats_sql.c bacula-server/files/patch-src_cats_sql.c --- /usr/ports/sysutils/bacula-server/files/patch-src_cats_sql.c Wed Dec 31 19:00:00 1969 +++ bacula-server/files/patch-src_cats_sql.c Sat Apr 11 21:17:58 2009 @@ -0,0 +1,18 @@ +Index: files/patch-src_cats_sql.c +=================================================================== +RCS file: files/patch-src_cats_sql.c +diff -N files/patch-src_cats_sql.c +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ files/patch-src_cats_sql.c 12 Apr 2009 00:35:46 -0000 +@@ -0,0 +1,11 @@ ++--- src/cats/sql.c.orig 2008-11-11 09:33:46.000000000 -0500 +++++ src/cats/sql.c 2009-04-11 20:35:41.171024520 -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 ++ } ++ } diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src_lib_jcr.c bacula-server/files/patch-src_lib_jcr.c --- /usr/ports/sysutils/bacula-server/files/patch-src_lib_jcr.c Wed Dec 31 19:00:00 1969 +++ bacula-server/files/patch-src_lib_jcr.c Sat Apr 11 21:18:04 2009 @@ -0,0 +1,20 @@ +Index: files/patch-src_lib_jcr.c +=================================================================== +RCS file: files/patch-src_lib_jcr.c +diff -N files/patch-src_lib_jcr.c +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ files/patch-src_lib_jcr.c 12 Apr 2009 00:35:09 -0000 +@@ -0,0 +1,13 @@ ++--- src/lib/jcr.c.orig 2009-03-06 15:00:47.000000000 -0500 +++++ src/lib/jcr.c 2009-04-11 20:34:50.407999331 -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()); diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist bacula-server/pkg-plist --- /usr/ports/sysutils/bacula-server/pkg-plist Thu Jan 4 18:22:30 2007 +++ bacula-server/pkg-plist Sat Apr 11 21:32:31 2009 @@ -1,3 +1,19 @@ +lib/bpipe-fd.so +lib/libbac.la +lib/libbac.so +lib/libbac.so.1 +lib/libbaccfg.la +lib/libbaccfg.so +lib/libbaccfg.so.1 +lib/libbacfind.la +lib/libbacfind.so +lib/libbacfind.so.1 +lib/libbacpy.la +lib/libbacpy.so +lib/libbacpy.so.1 +lib/libbacsql.la +lib/libbacsql.so +lib/libbacsql.so.1 sbin/bacula-dir sbin/bacula-sd sbin/bcopy @@ -34,6 +50,7 @@ %%DATADIR%%/make_catalog_backup %%DATADIR%%/make_%%DBTYPE%%_tables %%DATADIR%%/mtx-changer +%%DATADIR%%/mtx-changer.conf %%DATADIR%%/query.sql %%DATADIR%%/update_bacula_tables %%DATADIR%%/update_%%DBTYPE%%_tables diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist.client bacula-server/pkg-plist.client --- /usr/ports/sysutils/bacula-server/pkg-plist.client Wed Aug 15 05:45:33 2007 +++ bacula-server/pkg-plist.client Sat Apr 11 21:52:40 2009 @@ -1,7 +1,7 @@ sbin/bacula-fd sbin/bconsole %%GNOMECONS%%sbin/gnome-console -%%WXCONS%%sbin/wx-console +%%WXCONS%%sbin/bwx-console @unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true @exec mkdir -p %%BACULA_DIR%% @dirrmtry %%BACULA_DIR%% --- bacula-server.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090412020153.CD285B8CF>