From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 5 19:30:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 869F816A4DF for ; Sat, 5 Aug 2006 19:30:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E3E443D45 for ; Sat, 5 Aug 2006 19:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k75JUF9i080239 for ; Sat, 5 Aug 2006 19:30:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k75JUFwI080225; Sat, 5 Aug 2006 19:30:15 GMT (envelope-from gnats) Resent-Date: Sat, 5 Aug 2006 19:30:15 GMT Resent-Message-Id: <200608051930.k75JUFwI080225@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dan Langille Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2F2116A4DD for ; Sat, 5 Aug 2006 19:22:50 +0000 (UTC) (envelope-from dan@xeon.unixathome.org) Received: from havoc.unixathome.org (havoc.unixathome.org [66.154.98.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BDF743D45 for ; Sat, 5 Aug 2006 19:22:50 +0000 (GMT) (envelope-from dan@xeon.unixathome.org) Received: from localhost (localhost [127.0.0.1]) by havoc.unixathome.org (Postfix) with ESMTP id 1203356457 for ; Sat, 5 Aug 2006 12:22:50 -0700 (PDT) Received: from havoc.unixathome.org ([127.0.0.1]) by localhost (havoc.unixathome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fknmcA6ty-+N for ; Sat, 5 Aug 2006 12:22:48 -0700 (PDT) Received: from bast.unixathome.org (bast.unixathome.org [70.26.229.230]) by havoc.unixathome.org (Postfix) with ESMTP id B11DD56428 for ; Sat, 5 Aug 2006 12:22:47 -0700 (PDT) Received: from xeon.unixathome.org (unknown [10.55.0.18]) by bast.unixathome.org (Postfix) with ESMTP id 13749B822 for ; Sat, 5 Aug 2006 15:22:46 -0400 (EDT) Received: by xeon.unixathome.org (Postfix, from userid 1000) id 955B23E8F; Sat, 5 Aug 2006 15:22:46 -0400 (EDT) Message-Id: <20060805192246.955B23E8F@xeon.unixathome.org> Date: Sat, 5 Aug 2006 15:22:46 -0400 (EDT) From: Dan Langille To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Dan Langille Subject: ports/101430: [MAINTAINER-UPDATE] sysutils/bacula-server-devl upgrade to 1.39.18-20060804 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dan Langille List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Aug 2006 19:30:16 -0000 >Number: 101430 >Category: ports >Synopsis: [MAINTAINER-UPDATE] sysutils/bacula-server-devl upgrade to 1.39.18-20060804 >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 Aug 05 19:30:13 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@polo.unixathome.org:/usr/obj/usr/src/sys/XEON i386 >Description: Upgrade to the BETA 1.39.18-20060804 When installing, be sure to run the database upgrade script. >How-To-Repeat: >Fix: Notes to committer: please delete: files/patch-configure files/patch-scripts-Makefile.in files/patch-src-lib-jcr.c pkg-message please add: files/pkg-message.in --- bacula-server-devel begins here --- diff -ruN /usr/ports/sysutils/bacula-server-devel/Makefile /home/dan/src/bacula-server-devel/Makefile --- /usr/ports/sysutils/bacula-server-devel/Makefile Sun Jun 11 10:21:49 2006 +++ /home/dan/src/bacula-server-devel/Makefile Sat Aug 5 13:37:48 2006 @@ -6,7 +6,8 @@ # PORTNAME= bacula -DISTVERSION= 1.38.10-beta1-20060606 +DISTVERSION= 1.39.18-20060804 + 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 #DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz @@ -249,7 +250,7 @@ .endif .if defined(WITH_CLIENT_ONLY) - ${INSTALL_MAN} ${WRKSRC}/scripts/bacula.man ${PREFIX}/man/man8/bacula.8 + ${INSTALL_MAN} ${WRKSRC}/manpages/bacula.8 ${PREFIX}/man/man8/bacula.8 .endif # Documentation is only installed in -client port @@ -344,9 +345,5 @@ @${ECHO_MSG} "ReleaseNotes" .endif @${ECHO_MSG} "*********************************************************************" - -.if !defined(WITH_CLIENT_ONLY) - ${CAT} pkg-message -.endif .include diff -ruN /usr/ports/sysutils/bacula-server-devel/distinfo /home/dan/src/bacula-server-devel/distinfo --- /usr/ports/sysutils/bacula-server-devel/distinfo Sun Jun 11 10:21:49 2006 +++ /home/dan/src/bacula-server-devel/distinfo Sat Aug 5 09:50:40 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.18-20060804.tar.gz) = 1cbdd816b13e4fd796e17d8f6024a3ba +SHA256 (bacula-1.39.18-20060804.tar.gz) = 40b4197613dc1f56428b27436ea64b5b98e1f227360a9898b0278c8854ceeb77 +SIZE (bacula-1.39.18-20060804.tar.gz) = 2305863 diff -ruN /usr/ports/sysutils/bacula-server-devel/files/bacula-sd.sh.in /home/dan/src/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 +++ /home/dan/src/bacula-server-devel/files/bacula-sd.sh.in Sat Aug 5 14:19:31 2006 @@ -24,7 +24,7 @@ load_rc_config $name : ${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 /home/dan/src/bacula-server-devel/files/patch-configure --- /usr/ports/sysutils/bacula-server-devel/files/patch-configure Wed Mar 15 05:22:09 2006 +++ /home/dan/src/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 /home/dan/src/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 +++ /home/dan/src/bacula-server-devel/files/patch-scripts-Makefile.in Sat Aug 5 10:19:08 2006 @@ -1,21 +1,6 @@ ---- 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 @@ +--- scripts/Makefile.in.org Sat Aug 5 10:00:42 2006 ++++ scripts/Makefile.in Sat Aug 5 10:00:42 2006 +@@ -48,12 +48,7 @@ $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \ fi $(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler @@ -24,10 +9,8 @@ - chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \ - $(DESTDIR)$(scriptdir)/btraceback.dbx - $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback -- gzip 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 - +- ++# $(INSTALL_DATA) bacula.man $(DESTDIR)$(mandir)/bacula.8 uninstall: + (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) diff -ruN /usr/ports/sysutils/bacula-server-devel/files/patch-src-lib-jcr.c /home/dan/src/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 +++ /home/dan/src/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 /home/dan/src/bacula-server-devel/files/pkg-message.in --- /usr/ports/sysutils/bacula-server-devel/files/pkg-message.in Wed Dec 31 19:00:00 1969 +++ /home/dan/src/bacula-server-devel/files/pkg-message.in Sat Aug 5 12:38:52 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 /home/dan/src/bacula-server-devel/pkg-message --- /usr/ports/sysutils/bacula-server-devel/pkg-message Thu Mar 30 16:47:54 2006 +++ /home/dan/src/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 /home/dan/src/bacula-server-devel/pkg-plist --- /usr/ports/sysutils/bacula-server-devel/pkg-plist Sun Jun 11 10:21:49 2006 +++ /home/dan/src/bacula-server-devel/pkg-plist Sat Aug 5 13:19:45 2006 @@ -1,5 +1,3 @@ -%%DATADIR%%/query.sql -sbin/chio-bacula sbin/bacula-dir sbin/bacula-sd sbin/bcopy @@ -7,31 +5,37 @@ sbin/bls sbin/bregex sbin/bscan +sbin/bsmtp sbin/btape sbin/bwild -%%WXCONS%%sbin/wx-console -%%GNOMECONS%%sbin/gnome-console +sbin/chio-bacula sbin/dbcheck -sbin/bsmtp -@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 -@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%%/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 --- bacula-server-devel ends here --- >Release-Note: >Audit-Trail: >Unformatted: