diff options
author | miwi <miwi@FreeBSD.org> | 2010-02-12 22:20:04 +0800 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2010-02-12 22:20:04 +0800 |
commit | 9d8d76538d36cc854c756522f4b0356cb817df59 (patch) | |
tree | 28f4a6a9202b9bf631d020cafd2934a37dfea969 /sysutils | |
parent | 3278ff18510d6191653f306dcb74e20545aaf707 (diff) | |
download | freebsd-ports-gnome-9d8d76538d36cc854c756522f4b0356cb817df59.tar.gz freebsd-ports-gnome-9d8d76538d36cc854c756522f4b0356cb817df59.tar.zst freebsd-ports-gnome-9d8d76538d36cc854c756522f4b0356cb817df59.zip |
- Update to 5.0.0
PR: 143214
Submitted by: Dan Langille <dan@langille.org> (maintainer)
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/bacula-server/Makefile | 49 | ||||
-rw-r--r-- | sysutils/bacula-server/distinfo | 6 | ||||
-rw-r--r-- | sysutils/bacula-server/files/patch-bacula-src-cats-make_catalog_backup.pl.in | 14 | ||||
-rw-r--r-- | sysutils/bacula-server/files/patch-src-cats-update_postgresql_tables.in | 11 | ||||
-rw-r--r-- | sysutils/bacula-server/files/patch-src-dird-ua_prune.c | 11 | ||||
-rw-r--r-- | sysutils/bacula-server/files/pkg-message.server.in | 12 | ||||
-rw-r--r-- | sysutils/bacula-server/pkg-plist | 5 | ||||
-rw-r--r-- | sysutils/bacula-server/pkg-plist.client | 1 |
8 files changed, 64 insertions, 45 deletions
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index adca57c429fa..ecd1e5d79688 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bacula -DISTVERSION= 3.0.3 +DISTVERSION= 5.0.0 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} @@ -60,7 +60,6 @@ CONFIGURE_ARGS+= --with-tcp-wrappers=/usr/lib \ --disable-conio \ --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 \ @@ -94,7 +93,6 @@ IS_INTERACTIVE= yes .if defined(WITH_CLIENT_ONLY) OPTIONS= WXCONSOLE "Build with wxGTK based GUI console: deprecated" off -OPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console: deprecated" off OPTIONS+= SFDAEMON "Build with staticly compiled file daemon" off .elif defined(WITH_BAT) OPTIONS= @@ -108,13 +106,6 @@ OPTIONS+= MTX "Install mtx for control of autochanger devices" off OPTIONS+= NLS "Native Language Support via gettext utilities" on OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" off -# Prepare if bgnome-console is selected this must be happen before -# include of bsd.port.pre.mk! -WANT_GNOME= yes -.if defined(WITH_GNOMECONSOLE) -USE_GNOME= libgnome gnomelibs libgnomeui -.endif - .if !defined(WITH_BAT) PLIST_SUB+= BACULA_DIR=${BACULA_DIR} .endif @@ -146,15 +137,6 @@ PLIST_SUB+= SFDAEMON="" .else PLIST_SUB+= SFDAEMON="@comment " .endif -# Build bgnome-console -.if defined(WITH_GNOMECONSOLE) -CONFIGURE_ARGS+= --enable-gnome -PLIST_SUB+= GNOMECONS="" -.else -# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) -WITHOUT_GNOME= yes -PLIST_SUB+= GNOMECONS="@comment " -.endif # Build bwx-console .if defined(WITH_WXCONSOLE) USE_WX= 2.4 @@ -162,13 +144,10 @@ CONFIGURE_ARGS+= --enable-bwx-console CONFIGURE_ENV+= WXCONFIG="${WX_CONFIG}" PLIST_SUB+= WXCONS="" .else -# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) -WITHOUT_GNOME= yes PLIST_SUB+= WXCONS="@comment " .endif .else # Server only Options -PLIST_SUB+= GNOMECONS="@comment " PLIST_SUB+= WXCONS="@comment " CONFFILES= sd dir .if defined(WITH_MYSQL) @@ -182,14 +161,10 @@ USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=yes DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql -.elif defined(WITH_SQLITE3) +.else CONFIGURE_ARGS+= --with-sqlite3=yes LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 DBTYPE= sqlite3 -.else -CONFIGURE_ARGS+= --with-sqlite=yes -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 -DBTYPE= sqlite .endif PLIST_SUB+= DBTYPE=${DBTYPE} # Install mtx @@ -207,7 +182,7 @@ CONFIGURE_ARGS+= --with-openssl MAN8=bacula-fd.8 bconsole.8 .else MAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8 -MAN1=bsmtp.1 bacula-bgnome-console.1 bacula-tray-monitor.1 bacula-bwxconsole.1 +MAN1=bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1 .endif .endif @@ -220,7 +195,6 @@ pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon." @${ECHO_MSG} " WITH_WXCONSOLE=yes if you only want a wxGTK based GUI console." - @${ECHO_MSG} " WITH_GNOMECONSOLE=yes if you only want a GNOME based GUI console." @${ECHO_MSG} " WITH_MTX=yes if you want to use mtx instead of chio for autochanger control." @${ECHO_MSG} " WITH_SQLITE3=yes if you want SqLite-3 instead of SqLite-2 as the database." @${ECHO_MSG} " WITH_SFDAEMON=yes if you want staticly compiled file daemon (client)." @@ -292,14 +266,6 @@ post-install: ${ECHO_CMD} "etc/bwx-console.conf.sample" >> ${TMPPLIST}; \ fi .endif -.if defined(WITH_GNOMECONSOLE) - if [ -f ${PREFIX}/etc/bgnome-console.conf.new ]; then \ - ${ECHO_CMD} "etc/bgnome-console.conf.new" >> ${TMPPLIST}; \ - elif [ -f ${PREFIX}/etc/bgnome-console.conf ]; then \ - ${MV} ${PREFIX}/etc/bgnome-console.conf ${PREFIX}/etc/bgnome-console.conf.sample; \ - ${ECHO_CMD} "etc/bgnome-console.conf.sample" >> ${TMPPLIST}; \ - fi -.endif # ensure that users in the bacula group can run bconsole ${CHGRP} bacula ${PREFIX}/sbin/bconsole @@ -316,6 +282,15 @@ post-install: # 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; \ + else \ + ${CHGRP} bacula ${PREFIX}/etc/bacula-dir.conf; \ + fi + + ${CHGRP} bacula ${PREFIX}/sbin/dbcheck .endif # Install leaves existing conf files untouched. Respect this here! diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo index 29975cdfebc0..e3ac724929c8 100644 --- a/sysutils/bacula-server/distinfo +++ b/sysutils/bacula-server/distinfo @@ -1,3 +1,3 @@ -MD5 (bacula-3.0.3.tar.gz) = feba58691b674b12056359d459ad6940 -SHA256 (bacula-3.0.3.tar.gz) = 3592cf532a3d34ac88afd3c9ada255d9c5b10259c216e5ff4293bba71441e966 -SIZE (bacula-3.0.3.tar.gz) = 3903085 +MD5 (bacula-5.0.0.tar.gz) = 68e008d2578a6d9a50af60439db17dcb +SHA256 (bacula-5.0.0.tar.gz) = 4c6344807769d1b6b61f9cbddc0a5dc1160c3eb51744b23c790fcb57947ac294 +SIZE (bacula-5.0.0.tar.gz) = 4075825 diff --git a/sysutils/bacula-server/files/patch-bacula-src-cats-make_catalog_backup.pl.in b/sysutils/bacula-server/files/patch-bacula-src-cats-make_catalog_backup.pl.in new file mode 100644 index 000000000000..9d5cbbb0c1d3 --- /dev/null +++ b/sysutils/bacula-server/files/patch-bacula-src-cats-make_catalog_backup.pl.in @@ -0,0 +1,14 @@ +--- src/cats/make_catalog_backup.pl.in ++++ src/cats/make_catalog_backup.pl.in +@@ -89,7 +89,7 @@ sub dump_pgsql + sub dump_mysql + { + my %args = @_; +- umask(0700); ++ umask(0077); + unlink("$wd/.my.cnf"); + open(MY, ">$wd/.my.cnf") + or die "Can't open $wd/.my.cnf for writing $@"; +-- +1.6.3 + diff --git a/sysutils/bacula-server/files/patch-src-cats-update_postgresql_tables.in b/sysutils/bacula-server/files/patch-src-cats-update_postgresql_tables.in new file mode 100644 index 000000000000..3e91b975fda1 --- /dev/null +++ b/sysutils/bacula-server/files/patch-src-cats-update_postgresql_tables.in @@ -0,0 +1,11 @@ +--- src/cats/update_postgresql_tables.in ++++ src/cats/update_postgresql_tables.in +@@ -9,7 +9,7 @@ echo " Standard version 3.0 to 5.0" + echo " " + + bindir=@SQL_BINDIR@ +-export PATH="$bindir:$PATH" ++PATH="$bindir:$PATH" + db_name=@db_name@ + + if psql -f - -d ${db_name} $* <<END-OF-DATA diff --git a/sysutils/bacula-server/files/patch-src-dird-ua_prune.c b/sysutils/bacula-server/files/patch-src-dird-ua_prune.c new file mode 100644 index 000000000000..3ffe4d9f6e08 --- /dev/null +++ b/sysutils/bacula-server/files/patch-src-dird-ua_prune.c @@ -0,0 +1,11 @@ +--- src/dird/ua_prune.c~ 2010-01-25 07:56:28.000000000 +0000 ++++ src/dird/ua_prune.c 2010-01-26 13:31:52.000000000 +0000 +@@ -389,7 +389,7 @@ + * Select all files that are older than the JobRetention period + * and stuff them into the "DeletionCandidates" table. + */ +- edit_utime(now-period, ed1, sizeof(ed1)); ++ edit_utime(period, ed1, sizeof(ed1)); + Jmsg(ua->jcr, M_INFO, 0, _("Begin pruning Jobs older than %s.\n"), ed1); + edit_int64(now - period, ed1); + Mmsg(query, insert_delcand, (char)JobType, ed1, diff --git a/sysutils/bacula-server/files/pkg-message.server.in b/sysutils/bacula-server/files/pkg-message.server.in index fb35d72ef284..ea15da0df2b5 100644 --- a/sysutils/bacula-server/files/pkg-message.server.in +++ b/sysutils/bacula-server/files/pkg-message.server.in @@ -55,8 +55,16 @@ ReleaseNotes IMPORTANT UPGRADE NOTES FOR THIS RELEASE: -- bacula-client and bacula-server do not need to be simultaneously -upgraded. +As always, both the Director and Storage daemon must be upgraded at +the same time, and on any given machine, you must run only one version +of Bacula. This means that on the Director and Storage daemon machines, +you *must* upgrade your File daemon as well. + +New database Catalog format in version 5.0.0 (3.1.9 or later). + +If upgrading to 5.x from < 5.x, you must run the update_bacula_tables +script. Afterwards, check the ownership on any new tables +and make sure they are consisten with existing tables. Read the ReleaseNotes for further information. diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist index 750e9f75779d..1d07f4deface 100644 --- a/sysutils/bacula-server/pkg-plist +++ b/sysutils/bacula-server/pkg-plist @@ -32,9 +32,10 @@ sbin/dbcheck %%DATADIR%%/bacula-ctl-dir %%DATADIR%%/bacula-ctl-fd %%DATADIR%%/bacula-ctl-sd +%%DATADIR%%/bacula_config %%DATADIR%%/bconsole -%%DATADIR%%/btraceback.gdb %%DATADIR%%/btraceback.dbx +%%DATADIR%%/btraceback.gdb %%DATADIR%%/create_bacula_database %%DATADIR%%/create_%%DBTYPE%%_database %%DATADIR%%/delete_catalog_backup @@ -44,11 +45,11 @@ sbin/dbcheck %%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_catalog_backup.pl %%DATADIR%%/make_%%DBTYPE%%_tables %%DATADIR%%/mtx-changer %%DATADIR%%/mtx-changer.conf diff --git a/sysutils/bacula-server/pkg-plist.client b/sysutils/bacula-server/pkg-plist.client index b4ec10f2bc6d..18a1ec36ba10 100644 --- a/sysutils/bacula-server/pkg-plist.client +++ b/sysutils/bacula-server/pkg-plist.client @@ -14,7 +14,6 @@ lib/libbacpy.so.1 %%SFDAEMON%%sbin/static-bacula-fd sbin/bacula-fd sbin/bconsole -%%GNOMECONS%%sbin/gnome-console %%WXCONS%%sbin/bwx-console @unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true @exec mkdir -p %%BACULA_DIR%% |