View | Details | Raw Unified | Return to bug 143214 | Differences between
and this patch

Collapse All | Expand All

(-)bacula-server/Makefile (-32 / +4 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	bacula
8
PORTNAME=	bacula
9
DISTVERSION=	3.0.3
9
DISTVERSION=	5.0.0
10
CATEGORIES?=	sysutils
10
CATEGORIES?=	sysutils
11
MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
11
MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
12
12
Lines 60-66 Link Here
60
		--disable-conio \
60
		--disable-conio \
61
		--enable-batch-insert \
61
		--enable-batch-insert \
62
		--with-plugindir=${LOCALBASE}/lib \
62
		--with-plugindir=${LOCALBASE}/lib \
63
		--with-libdir=${PREFIX}lib/bacula \
64
		--with-dump-email=root@localhost \
63
		--with-dump-email=root@localhost \
65
		--with-job-email=root@localhost \
64
		--with-job-email=root@localhost \
66
		--with-db-name=bacula \
65
		--with-db-name=bacula \
Lines 94-100 Link Here
94
93
95
.if defined(WITH_CLIENT_ONLY)
94
.if defined(WITH_CLIENT_ONLY)
96
OPTIONS=	WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
95
OPTIONS=	WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
97
OPTIONS+=	GNOMECONSOLE "Build with GNOME based GUI console: deprecated" off
98
OPTIONS+=	SFDAEMON "Build with staticly compiled file daemon" off
96
OPTIONS+=	SFDAEMON "Build with staticly compiled file daemon" off
99
.elif defined(WITH_BAT)
97
.elif defined(WITH_BAT)
100
OPTIONS=	
98
OPTIONS=	
Lines 108-120 Link Here
108
OPTIONS+=	NLS "Native Language Support via gettext utilities" on
106
OPTIONS+=	NLS "Native Language Support via gettext utilities" on
109
OPTIONS+=	OPENSSL "Enable OpenSSL for encrypted communication" off
107
OPTIONS+=	OPENSSL "Enable OpenSSL for encrypted communication" off
110
108
111
# Prepare if bgnome-console is selected this must be happen before
112
# include of bsd.port.pre.mk!
113
WANT_GNOME=	yes
114
.if defined(WITH_GNOMECONSOLE)
115
USE_GNOME=	libgnome gnomelibs libgnomeui
116
.endif
117
118
.if !defined(WITH_BAT)
109
.if !defined(WITH_BAT)
119
PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
110
PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
120
.endif
111
.endif
Lines 146-160 Link Here
146
.else
137
.else
147
PLIST_SUB+=	SFDAEMON="@comment "
138
PLIST_SUB+=	SFDAEMON="@comment "
148
.endif
139
.endif
149
# Build bgnome-console
150
.if defined(WITH_GNOMECONSOLE)
151
CONFIGURE_ARGS+=	--enable-gnome
152
PLIST_SUB+=		GNOMECONS=""
153
.else
154
# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
155
WITHOUT_GNOME=		yes
156
PLIST_SUB+=		GNOMECONS="@comment "
157
.endif
158
# Build bwx-console
140
# Build bwx-console
159
.if defined(WITH_WXCONSOLE)
141
.if defined(WITH_WXCONSOLE)
160
USE_WX=			2.4
142
USE_WX=			2.4
Lines 162-174 Link Here
162
CONFIGURE_ENV+=		WXCONFIG="${WX_CONFIG}"
144
CONFIGURE_ENV+=		WXCONFIG="${WX_CONFIG}"
163
PLIST_SUB+=		WXCONS=""
145
PLIST_SUB+=		WXCONS=""
164
.else
146
.else
165
# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
166
WITHOUT_GNOME=		yes
167
PLIST_SUB+=	 	WXCONS="@comment "
147
PLIST_SUB+=	 	WXCONS="@comment "
168
.endif
148
.endif
169
.else
149
.else
170
# Server only Options
150
# Server only Options
171
PLIST_SUB+=		GNOMECONS="@comment "
172
PLIST_SUB+=	 	WXCONS="@comment "
151
PLIST_SUB+=	 	WXCONS="@comment "
173
CONFFILES=		sd dir
152
CONFFILES=		sd dir
174
.if defined(WITH_MYSQL)
153
.if defined(WITH_MYSQL)
Lines 207-213 Link Here
207
MAN8=bacula-fd.8 bconsole.8
186
MAN8=bacula-fd.8 bconsole.8
208
.else
187
.else
209
MAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8
188
MAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8
210
MAN1=bsmtp.1 bacula-bgnome-console.1 bacula-tray-monitor.1 bacula-bwxconsole.1
189
MAN1=bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
211
.endif
190
.endif
212
.endif
191
.endif
213
192
Lines 220-226 Link Here
220
	@${ECHO_MSG} ""
199
	@${ECHO_MSG} ""
221
	@${ECHO_MSG} "  WITH_CLIENT_ONLY=yes	if you only want the file daemon."
200
	@${ECHO_MSG} "  WITH_CLIENT_ONLY=yes	if you only want the file daemon."
222
	@${ECHO_MSG} "  WITH_WXCONSOLE=yes	if you only want a wxGTK based GUI console."
201
	@${ECHO_MSG} "  WITH_WXCONSOLE=yes	if you only want a wxGTK based GUI console."
223
	@${ECHO_MSG} "  WITH_GNOMECONSOLE=yes	if you only want a GNOME based GUI console."
224
	@${ECHO_MSG} "  WITH_MTX=yes		if you want to use mtx instead of chio for autochanger control."
202
	@${ECHO_MSG} "  WITH_MTX=yes		if you want to use mtx instead of chio for autochanger control."
225
	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SqLite-3 instead of SqLite-2 as the database."
203
	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SqLite-3 instead of SqLite-2 as the database."
226
	@${ECHO_MSG} "  WITH_SFDAEMON=yes  if you want staticly compiled file daemon (client)."
204
	@${ECHO_MSG} "  WITH_SFDAEMON=yes  if you want staticly compiled file daemon (client)."
Lines 292-305 Link Here
292
		${ECHO_CMD} "etc/bwx-console.conf.sample" >> ${TMPPLIST}; \
270
		${ECHO_CMD} "etc/bwx-console.conf.sample" >> ${TMPPLIST}; \
293
	fi
271
	fi
294
.endif
272
.endif
295
.if defined(WITH_GNOMECONSOLE)
296
	if [ -f ${PREFIX}/etc/bgnome-console.conf.new ]; then \
297
		${ECHO_CMD} "etc/bgnome-console.conf.new" >> ${TMPPLIST}; \
298
	elif [ -f ${PREFIX}/etc/bgnome-console.conf ]; then \
299
		${MV} ${PREFIX}/etc/bgnome-console.conf ${PREFIX}/etc/bgnome-console.conf.sample; \
300
		${ECHO_CMD} "etc/bgnome-console.conf.sample" >> ${TMPPLIST}; \
301
	fi
302
.endif
303
273
304
#	ensure that users in the bacula group can run bconsole
274
#	ensure that users in the bacula group can run bconsole
305
	${CHGRP} bacula ${PREFIX}/sbin/bconsole
275
	${CHGRP} bacula ${PREFIX}/sbin/bconsole
Lines 316-321 Link Here
316
# 	chmod of bsmtp program so bacula can use it with dropped down permissions
286
# 	chmod of bsmtp program so bacula can use it with dropped down permissions
317
	${CHMOD} o+x ${PREFIX}/sbin/bsmtp
287
	${CHMOD} o+x ${PREFIX}/sbin/bsmtp
318
	${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula
288
	${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula
289
	${CHGRP} bacula ${PREFIX}/etc/bacula-dir.conf.new
290
	${CHGRP} bacula ${PREFIX}/sbin/dbcheck
319
291
320
.endif
292
.endif
321
# 	Install leaves existing conf files untouched. Respect this here!
293
# 	Install leaves existing conf files untouched. Respect this here!
(-)bacula-server/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (bacula-3.0.3.tar.gz) = feba58691b674b12056359d459ad6940
1
MD5 (bacula-5.0.0.tar.gz) = 68e008d2578a6d9a50af60439db17dcb
2
SHA256 (bacula-3.0.3.tar.gz) = 3592cf532a3d34ac88afd3c9ada255d9c5b10259c216e5ff4293bba71441e966
2
SHA256 (bacula-5.0.0.tar.gz) = 4c6344807769d1b6b61f9cbddc0a5dc1160c3eb51744b23c790fcb57947ac294
3
SIZE (bacula-3.0.3.tar.gz) = 3903085
3
SIZE (bacula-5.0.0.tar.gz) = 4075825
(-)bacula-server/files/patch-src-dird-ua_prune.c (+11 lines)
Line 0 Link Here
1
--- /var/ports/usr/home/dan/src/sysutils/bacula-server/work/bacula-5.0.0/src/dird/ua_prune.c~	2010-01-25 07:56:28.000000000 +0000
2
+++ /var/ports/usr/home/dan/src/sysutils/bacula-server/work/bacula-5.0.0/src/dird/ua_prune.c	2010-01-26 13:31:52.000000000 +0000
3
@@ -389,7 +389,7 @@
4
     * Select all files that are older than the JobRetention period
5
     *  and stuff them into the "DeletionCandidates" table.
6
     */
7
-   edit_utime(now-period, ed1, sizeof(ed1));
8
+   edit_utime(period, ed1, sizeof(ed1));
9
    Jmsg(ua->jcr, M_INFO, 0, _("Begin pruning Jobs older than %s.\n"), ed1);
10
    edit_int64(now - period, ed1);
11
    Mmsg(query, insert_delcand, (char)JobType, ed1, 
(-)bacula-server/files/pkg-message.server.in (-2 / +10 lines)
Lines 55-62 Link Here
55
55
56
IMPORTANT UPGRADE NOTES FOR THIS RELEASE:
56
IMPORTANT UPGRADE NOTES FOR THIS RELEASE:
57
57
58
- bacula-client and bacula-server do not need to be simultaneously 
58
As always, both the Director and Storage daemon must be upgraded at
59
upgraded.
59
the same time, and on any given machine, you must run only one version
60
of Bacula. This means that on the Director and Storage daemon machines,
61
you *must* upgrade your File daemon as well.
62
63
New database Catalog format in version 5.0.0 (3.1.9 or later).
64
65
If upgrading to 5.x from < 5.x, you must run the update_bacula_tables
66
script.  Afterwards, check the ownership on any new tables
67
and make sure they are consisten with existing tables.
60
68
61
Read the ReleaseNotes for further information.
69
Read the ReleaseNotes for further information.
62
70
(-)bacula-server/pkg-plist (-3 / +3 lines)
Lines 1-4 Link Here
1
lib/bpipe-fd.so
2
lib/libbac.la
1
lib/libbac.la
3
lib/libbac.so
2
lib/libbac.so
4
lib/libbac.so.1
3
lib/libbac.so.1
Lines 32-40 Link Here
32
%%DATADIR%%/bacula-ctl-dir
31
%%DATADIR%%/bacula-ctl-dir
33
%%DATADIR%%/bacula-ctl-fd
32
%%DATADIR%%/bacula-ctl-fd
34
%%DATADIR%%/bacula-ctl-sd
33
%%DATADIR%%/bacula-ctl-sd
34
%%DATADIR%%/bacula_config
35
%%DATADIR%%/bconsole
35
%%DATADIR%%/bconsole
36
%%DATADIR%%/btraceback.gdb
37
%%DATADIR%%/btraceback.dbx
36
%%DATADIR%%/btraceback.dbx
37
%%DATADIR%%/btraceback.gdb
38
%%DATADIR%%/create_bacula_database
38
%%DATADIR%%/create_bacula_database
39
%%DATADIR%%/create_%%DBTYPE%%_database
39
%%DATADIR%%/create_%%DBTYPE%%_database
40
%%DATADIR%%/delete_catalog_backup
40
%%DATADIR%%/delete_catalog_backup
Lines 44-54 Link Here
44
%%DATADIR%%/drop_%%DBTYPE%%_database
44
%%DATADIR%%/drop_%%DBTYPE%%_database
45
%%DATADIR%%/drop_%%DBTYPE%%_tables
45
%%DATADIR%%/drop_%%DBTYPE%%_tables
46
%%DATADIR%%/dvd-handler
46
%%DATADIR%%/dvd-handler
47
%%DATADIR%%/gconsole
48
%%DATADIR%%/grant_bacula_privileges
47
%%DATADIR%%/grant_bacula_privileges
49
%%DATADIR%%/grant_%%DBTYPE%%_privileges
48
%%DATADIR%%/grant_%%DBTYPE%%_privileges
50
%%DATADIR%%/make_bacula_tables
49
%%DATADIR%%/make_bacula_tables
51
%%DATADIR%%/make_catalog_backup
50
%%DATADIR%%/make_catalog_backup
51
%%DATADIR%%/make_catalog_backup.pl
52
%%DATADIR%%/make_%%DBTYPE%%_tables
52
%%DATADIR%%/make_%%DBTYPE%%_tables
53
%%DATADIR%%/mtx-changer
53
%%DATADIR%%/mtx-changer
54
%%DATADIR%%/mtx-changer.conf
54
%%DATADIR%%/mtx-changer.conf
(-)bacula-server/pkg-plist.client (-1 lines)
Lines 14-20 Link Here
14
%%SFDAEMON%%sbin/static-bacula-fd
14
%%SFDAEMON%%sbin/static-bacula-fd
15
sbin/bacula-fd
15
sbin/bacula-fd
16
sbin/bconsole
16
sbin/bconsole
17
%%GNOMECONS%%sbin/gnome-console
18
%%WXCONS%%sbin/bwx-console
17
%%WXCONS%%sbin/bwx-console
19
@unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true
18
@unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true
20
@exec mkdir -p %%BACULA_DIR%%
19
@exec mkdir -p %%BACULA_DIR%%

Return to bug 143214