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

Collapse All | Expand All

(-)sysutils/bacula-server/Makefile (-36 / +21 lines)
Lines 2-28 Link Here
2
# Date created:				24 February 2003
2
# Date created:				24 February 2003
3
# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
3
# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
4
#
4
#
5
# $FreeBSD: ports/sysutils/bacula-server/Makefile,v 1.124 2010/05/31 02:00:55 ade Exp $
5
# $FreeBSD: ports/sysutils/bacula-server/Makefile,v 1.123 2010/02/12 14:20:04 miwi Exp $
6
#
6
#
7
7
8
PORTNAME=	bacula
8
PORTNAME=	bacula
9
DISTVERSION=	5.0.0
9
DISTVERSION=	5.0.2
10
PORTREVISION=	1
11
CATEGORIES?=	sysutils
10
CATEGORIES?=	sysutils
12
MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
11
MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
13
12
14
MAINTAINER=	dan@langille.org
13
MAINTAINER=	dan@langille.org
15
COMMENT?=	The network backup solution (server)
14
COMMENT?=	The network backup solution (server)
16
15
17
PKGNAMESUFFIX?=	-server
18
19
CONFLICTS=	bacula-server-devel-[0-9]* bacula-client-devel-[0-9]* bacula-docs-devel-[0-9]*
16
CONFLICTS=	bacula-server-devel-[0-9]* bacula-client-devel-[0-9]* bacula-docs-devel-[0-9]*
20
17
21
UNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX}
18
UNIQUENAME?=	${PORTNAME}${PKGNAMESUFFIX}
22
19
23
DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
20
PLIST_SUB+=	MAJOR=${PORTVERSION:R:R}
21
22
GNU_CONFIGURE=	yes
23
24
CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
25
		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
26
		PTHREAD_LIBS="${PTHREAD_LIBS}"
27
28
.if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY)  #Till end of the file
29
PKGNAMESUFFIX?=	-server
24
30
25
.if !defined(WITH_BAT)
26
PORTDOCS=	VERIFYING \
31
PORTDOCS=	VERIFYING \
27
		technotes \
32
		technotes \
28
		ChangeLog \
33
		ChangeLog \
Lines 30-38 Link Here
30
		ReleaseNotes \
35
		ReleaseNotes \
31
		LICENSE \
36
		LICENSE \
32
		INSTALL
37
		INSTALL
33
.endif
34
38
35
.if !defined(WITH_BAT)
36
.if !defined(WITH_CLIENT_ONLY)
39
.if !defined(WITH_CLIENT_ONLY)
37
USE_RC_SUBR?=	bacula-dir bacula-sd
40
USE_RC_SUBR?=	bacula-dir bacula-sd
38
.endif
41
.endif
Lines 42-48 Link Here
42
.else
45
.else
43
SUB_FILES+=	pkg-message.server
46
SUB_FILES+=	pkg-message.server
44
.endif
47
.endif
45
.endif
46
48
47
# The user/group IDs below are registered, see
49
# The user/group IDs below are registered, see
48
# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
50
# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
Lines 50-56 Link Here
50
BACULA_DIR?=/var/db/bacula
52
BACULA_DIR?=/var/db/bacula
51
#
53
#
52
MANCOMPRESSED=	yes
54
MANCOMPRESSED=	yes
53
GNU_CONFIGURE=	yes
54
CONFIGURE_ARGS+=	--with-tcp-wrappers=/usr/lib \
55
CONFIGURE_ARGS+=	--with-tcp-wrappers=/usr/lib \
55
		--enable-smartalloc \
56
		--enable-smartalloc \
56
		--with-working-dir=${BACULA_DIR} \
57
		--with-working-dir=${BACULA_DIR} \
Lines 64-69 Link Here
64
		--with-dump-email=root@localhost \
65
		--with-dump-email=root@localhost \
65
		--with-job-email=root@localhost \
66
		--with-job-email=root@localhost \
66
		--with-db-name=bacula \
67
		--with-db-name=bacula \
68
		--with-sbin-perm=755 \
67
		--with-db-user=bacula \
69
		--with-db-user=bacula \
68
		--with-baseport=9101
70
		--with-baseport=9101
69
71
Lines 77-115 Link Here
77
		--with-sd-group=operator
79
		--with-sd-group=operator
78
.endif
80
.endif
79
81
80
CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
81
		LDFLAGS="-L${LOCALBASE}/lib" \
82
		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
83
		PTHREAD_LIBS="${PTHREAD_LIBS}"
84
85
.for opt in ${ALL_OPTIONS}
86
.if defined(WITH_${opt})
87
BATCH=	yes
88
.endif
89
.endfor
90
91
.if !defined(BATCH)
92
IS_INTERACTIVE=	yes
93
.endif
94
95
.if defined(WITH_CLIENT_ONLY)
82
.if defined(WITH_CLIENT_ONLY)
96
OPTIONS=	WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
83
OPTIONS=	WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
97
OPTIONS+=	SFDAEMON "Build with staticly compiled file daemon" off
84
OPTIONS+=	SFDAEMON "Build with staticly compiled file daemon" off
98
.elif defined(WITH_BAT)
99
OPTIONS=	
100
.else
85
.else
101
OPTIONS=	SQLITE3 "Use SqLite-3 database instead of SqLite-2" off
86
OPTIONS=	SQLITE3 "Use SqLite-3 database instead of SqLite-2" off
102
OPTIONS+=	MYSQL "Use MySQL database instead of SqLite" off
87
OPTIONS+=	MYSQL "Use MySQL database instead of SqLite" off
103
OPTIONS+=	POSTGRESQL "Use PostgreSQL database instead of SqLite" off
88
OPTIONS+=	POSTGRESQL "Use PostgreSQL database instead of SqLite" off
104
OPTIONS+=	MTX "Install mtx for control of autochanger devices" off
89
OPTIONS+=	MTX "Install mtx for control of autochanger devices" off
105
.endif
90
.endif
106
107
OPTIONS+=	NLS "Native Language Support via gettext utilities" on
91
OPTIONS+=	NLS "Native Language Support via gettext utilities" on
108
OPTIONS+=	OPENSSL "Enable OpenSSL for encrypted communication" off
92
OPTIONS+=	OPENSSL "Enable OpenSSL for encrypted communication" off
109
93
110
.if !defined(WITH_BAT)
111
PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
94
PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
112
.endif
113
95
114
.include <bsd.port.pre.mk>
96
.include <bsd.port.pre.mk>
115
97
Lines 134-142 Link Here
134
# Build a static fd binary.
116
# Build a static fd binary.
135
.if defined(WITH_SFDAEMON)
117
.if defined(WITH_SFDAEMON)
136
CONFIGURE_ARGS+=	--enable-static-fd
118
CONFIGURE_ARGS+=	--enable-static-fd
119
CONFIGURE_ARGS+=	--disable-libtool
137
PLIST_SUB+=	SFDAEMON=""
120
PLIST_SUB+=	SFDAEMON=""
121
PLIST_SUB+=	NOSF="@comment "
138
.else
122
.else
139
PLIST_SUB+=	SFDAEMON="@comment "
123
PLIST_SUB+=	SFDAEMON="@comment "
124
PLIST_SUB+=	NOSF=""
140
.endif
125
.endif
141
# Build bwx-console
126
# Build bwx-console
142
.if defined(WITH_WXCONSOLE)
127
.if defined(WITH_WXCONSOLE)
Lines 178-204 Link Here
178
CONFIGURE_ARGS+=	--with-openssl
163
CONFIGURE_ARGS+=	--with-openssl
179
.endif
164
.endif
180
165
181
.if !defined(WITH_BAT)
182
.if defined(WITH_CLIENT_ONLY)
166
.if defined(WITH_CLIENT_ONLY)
183
MAN8=bacula-fd.8 bconsole.8
167
MAN8=bacula-fd.8 bconsole.8
184
.else
168
.else
185
MAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8
169
MAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8
186
MAN1=bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
170
MAN1=bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
187
.endif
171
.endif
188
.endif
189
172
190
MAKE_ARGS+=	-E MAN8 -E MAN1
173
MAKE_ARGS+=	-E MAN8 -E MAN1
191
MAKE_ENV+=	MAN8="${MAN8}" MAN1="${MAN1}"
174
MAKE_ENV+=	MAN8="${MAN8}" MAN1="${MAN1}"
192
175
193
pre-everything::
176
pre-everything::
194
.if !defined(WITH_CLIENT_ONLY)
177
.if !defined(WITH_CLIENT_ONLY) 
195
	@${ECHO_MSG} "You may use the following build options (or make config):"
178
	@${ECHO_MSG} "You may use the following build options (or make config):"
196
	@${ECHO_MSG} ""
179
	@${ECHO_MSG} ""
197
	@${ECHO_MSG} "  WITH_CLIENT_ONLY=yes	if you only want the file daemon."
180
	@${ECHO_MSG} "  WITH_CLIENT_ONLY=yes	if you only want the file daemon."
198
	@${ECHO_MSG} "  WITH_WXCONSOLE=yes	if you only want a wxGTK based GUI console."
181
	@${ECHO_MSG} "  WITH_WXCONSOLE=yes	if you only want a wxGTK based GUI console."
199
	@${ECHO_MSG} "  WITH_MTX=yes		if you want to use mtx instead of chio for autochanger control."
182
	@${ECHO_MSG} "  WITH_MTX=yes		if you want to use mtx instead of chio for autochanger control."
200
	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SqLite-3 instead of SqLite-2 as the database."
183
	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SqLite-3 instead of SqLite-2 as the database."
201
	@${ECHO_MSG} "  WITH_SFDAEMON=yes  if you want staticly compiled file daemon (client)."
202
.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
184
.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
203
	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL instead of SqLite as the database."
185
	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL instead of SqLite as the database."
204
	@${ECHO_MSG} "  WITH_POSTGRESQL=yes	if you want PostgreSQL instead of SqLite as the database."
186
	@${ECHO_MSG} "  WITH_POSTGRESQL=yes	if you want PostgreSQL instead of SqLite as the database."
Lines 210-215 Link Here
210
	@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
192
	@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
211
	@${ECHO_MSG} ""
193
	@${ECHO_MSG} ""
212
.else
194
.else
195
	@${ECHO_MSG} "You may use the following build options (or make config):"
196
	@${ECHO_MSG} "  WITH_SFDAEMON=yes	if you want staticly compiled file daemon (client)."
213
	@${ECHO_MSG} "===> Building file daemon only."
197
	@${ECHO_MSG} "===> Building file daemon only."
214
.endif
198
.endif
215
199
Lines 308-310 Link Here
308
.endif
292
.endif
309
293
310
.include <bsd.port.post.mk>
294
.include <bsd.port.post.mk>
295
.endif # if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY)
(-)sysutils/bacula-server/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (bacula-5.0.0.tar.gz) = 68e008d2578a6d9a50af60439db17dcb
1
MD5 (bacula-5.0.2.tar.gz) = e9204d2e772f12662de28da3327853de
2
SHA256 (bacula-5.0.0.tar.gz) = 4c6344807769d1b6b61f9cbddc0a5dc1160c3eb51744b23c790fcb57947ac294
2
SHA256 (bacula-5.0.2.tar.gz) = c465d00dd968832d129ba68eea59714357605a461d745cef7e802978c453c3fb
3
SIZE (bacula-5.0.0.tar.gz) = 4075825
3
SIZE (bacula-5.0.2.tar.gz) = 4189272
(-)sysutils/bacula-server/files/patch-bacula-src-cats-make_catalog_backup.pl.in (-14 lines)
Lines 1-14 Link Here
1
--- src/cats/make_catalog_backup.pl.in
2
+++ src/cats/make_catalog_backup.pl.in
3
@@ -89,7 +89,7 @@ sub dump_pgsql
4
 sub dump_mysql
5
 {
6
     my %args = @_;
7
-    umask(0700);
8
+    umask(0077);
9
     unlink("$wd/.my.cnf");
10
     open(MY, ">$wd/.my.cnf") 
11
         or die "Can't open $wd/.my.cnf for writing $@";
12
-- 
13
1.6.3
14
(-)sysutils/bacula-server/files/patch-configure (+11 lines)
Line 0 Link Here
1
--- configure.orig	2010-05-20 20:25:58.000000000 +0300
2
+++ configure	2010-05-20 20:26:30.000000000 +0300
3
@@ -47193,7 +47193,7 @@
4
    { (exit 1); exit 1; }; }
5
    fi
6
 
7
-   QMAKEBIN="qmake"
8
+   QMAKEBIN="$QMAKE"
9
    cd src/qt-console
10
    echo "Creating bat Makefile"
11
    touch bat
(-)sysutils/bacula-server/files/patch-src-cats-Makefile.in (+11 lines)
Line 0 Link Here
1
--- src/cats/Makefile.in.orig	2010-05-19 17:13:07.000000000 +0300
2
+++ src/cats/Makefile.in	2010-05-19 17:15:47.000000000 +0300
3
@@ -69,7 +69,7 @@
4
 
5
 libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
6
 	@echo "Making $@ ..."	  
7
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_CURRENT).$(LIBBACSQL_LT_REVISION).$(LIBBACSQL_LT_AGE) $(DB_LIBS)
8
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_CURRENT):$(LIBBACSQL_LT_REVISION):$(LIBBACSQL_LT_AGE) $(DB_LIBS)
9
 
10
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
11
 	cd $(topdir) \
(-)sysutils/bacula-server/files/patch-src-cats-update_postgresql_tables.in (-11 lines)
Lines 1-11 Link Here
1
--- src/cats/update_postgresql_tables.in
2
+++ src/cats/update_postgresql_tables.in
3
@@ -9,7 +9,7 @@ echo " Standard version 3.0 to 5.0"
4
 echo " "
5
 
6
 bindir=@SQL_BINDIR@
7
-export PATH="$bindir:$PATH"
8
+PATH="$bindir:$PATH"
9
 db_name=@db_name@
10
 
11
 if psql -f - -d ${db_name} $* <<END-OF-DATA
(-)sysutils/bacula-server/files/patch-src-dird-ua_prune.c (-11 lines)
Lines 1-11 Link Here
1
--- src/dird/ua_prune.c~	2010-01-25 07:56:28.000000000 +0000
2
+++ 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, 
(-)sysutils/bacula-server/files/patch-src-findlib-Makefile.in (+11 lines)
Line 0 Link Here
1
--- src/findlib/Makefile.in.orig	2010-05-19 17:13:20.000000000 +0300
2
+++ src/findlib/Makefile.in	2010-05-19 17:15:21.000000000 +0300
3
@@ -59,7 +59,7 @@
4
 
5
 libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
6
 	@echo "Making $@ ..."
7
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE)
8
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_CURRENT):$(LIBBACFIND_LT_REVISION):$(LIBBACFIND_LT_AGE)
9
 
10
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
11
 	cd $(topdir) \
(-)sysutils/bacula-server/files/patch-src-lib-Makefile.in (+29 lines)
Line 0 Link Here
1
--- src/lib/Makefile.in.orig	2010-05-19 14:26:03.000000000 +0300
2
+++ src/lib/Makefile.in	2010-05-19 17:14:18.000000000 +0300
3
@@ -126,7 +126,7 @@
4
 
5
 libbac.la: Makefile $(LIBBAC_LOBJS)
6
 	@echo "Making $@ ..."
7
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
8
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_CURRENT):$(LIBBAC_LT_REVISION):$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
9
 
10
 libbaccfg.a: $(LIBBACCFG_OBJS) 
11
 	@echo "Making $@ ..."
12
@@ -135,7 +135,7 @@
13
 
14
 libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
15
 	@echo "Making $@ ..."
16
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE)
17
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE)
18
 
19
 libbacpy.a: $(LIBBACPY_OBJS) 
20
 	@echo "Making $@ ..."
21
@@ -144,7 +144,7 @@
22
 
23
 libbacpy.la: Makefile $(LIBBACPY_LOBJS) 
24
 	@echo "Making $@ ..."
25
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_CURRENT).$(LIBBACPY_LT_REVISION).$(LIBBACPY_LT_AGE) $(PYTHON_LIBS)
26
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_CURRENT):$(LIBBACPY_LT_REVISION):$(LIBBACPY_LT_AGE) $(PYTHON_LIBS)
27
 
28
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
29
 	cd $(topdir) \
(-)sysutils/bacula-server/files/patch-src-lib-crypto.c (+25 lines)
Line 0 Link Here
1
--- src/lib/crypto.c.orig	2010-05-20 20:15:22.000000000 +0300
2
+++ src/lib/crypto.c	2010-05-20 20:16:39.000000000 +0300
3
@@ -316,7 +316,11 @@
4
  */
5
 static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
6
    X509_EXTENSION *ext;
7
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
8
    const X509V3_EXT_METHOD *method;
9
+#else
10
+   const X509V3_EXT_METHOD *method;
11
+#endif
12
    ASN1_OCTET_STRING *keyid;
13
    int i;
14
 #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
15
@@ -980,6 +984,10 @@
16
    free (sig);
17
 }
18
 
19
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
20
+#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
21
+#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
22
+#endif
23
 /*
24
  * Create a new encryption session.
25
  *  Returns: A pointer to a CRYPTO_SESSION object on success.
(-)sysutils/bacula-server/files/patch-src-lib-tls.c (+11 lines)
Line 0 Link Here
1
--- src/lib/tls.c.orig	2010-05-20 20:34:49.000000000 +0300
2
+++ src/lib/tls.c	2010-05-20 20:35:19.000000000 +0300
3
@@ -315,7 +315,7 @@
4
          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
5
 
6
          if (strcmp(extname, "subjectAltName") == 0) {
7
-#ifdef HAVE_OPENSSLv1
8
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
9
             const X509V3_EXT_METHOD *method;
10
 #else
11
             X509V3_EXT_METHOD *method;
(-)sysutils/bacula-server/files/pkg-message.server.in (-1 / +15 lines)
Lines 60-71 Link Here
60
of Bacula. This means that on the Director and Storage daemon machines,
60
of Bacula. This means that on the Director and Storage daemon machines,
61
you *must* upgrade your File daemon as well.
61
you *must* upgrade your File daemon as well.
62
62
63
New database Catalog format in version 5.0.0 (3.1.9 or later).
63
New database Catalog format in version 5.0.2 (3.1.9 or later).
64
64
65
If upgrading to 5.x from < 5.x, you must run the update_bacula_tables
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
66
script.  Afterwards, check the ownership on any new tables
67
and make sure they are consisten with existing tables.
67
and make sure they are consisten with existing tables.
68
68
69
!!!!!!!!!!!!!!! NOTE FOR 5.0.0 USERS !!!!!!!!!!!!!!!!!!!!
70
The Allow Duplicate Jobs directive has been significantly-
71
reworked, and the default value has changed. See below.
72
73
Truncate On Purge has been totally rewritten. See the new
74
features section of the manual.
75
76
When Volume Poll Interval is set in the SD DEVICE configuration,
77
(default 5 mins), after a certain number of polling tries (approx
78
10) polling will stop and the operator will be asked to
79
resolve the problem.  Previously there was no limit, and an
80
error message could be produced at each poll attempt.
81
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
82
69
Read the ReleaseNotes for further information.
83
Read the ReleaseNotes for further information.
70
84
71
If you are using sqlite you need to run the make_sqlite_tables script as
85
If you are using sqlite you need to run the make_sqlite_tables script as
(-)sysutils/bacula-server/pkg-plist (-6 / +5 lines)
Lines 1-19 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.%%MAJOR%%
5
lib/libbaccfg.la
4
lib/libbaccfg.la
6
lib/libbaccfg.so
5
lib/libbaccfg.so
7
lib/libbaccfg.so.1
6
lib/libbaccfg.so.%%MAJOR%%
8
lib/libbacfind.la
7
lib/libbacfind.la
9
lib/libbacfind.so
8
lib/libbacfind.so
10
lib/libbacfind.so.1
9
lib/libbacfind.so.%%MAJOR%%
11
lib/libbacpy.la
10
lib/libbacpy.la
12
lib/libbacpy.so
11
lib/libbacpy.so
13
lib/libbacpy.so.1
12
lib/libbacpy.so.%%MAJOR%%
14
lib/libbacsql.la
13
lib/libbacsql.la
15
lib/libbacsql.so
14
lib/libbacsql.so
16
lib/libbacsql.so.1
15
lib/libbacsql.so.%%MAJOR%%
17
sbin/bacula
16
sbin/bacula
18
sbin/bacula-dir
17
sbin/bacula-dir
19
sbin/bacula-sd
18
sbin/bacula-sd
(-)sysutils/bacula-server/pkg-plist.client (-13 / +12 lines)
Lines 1-16 Link Here
1
lib/bpipe-fd.so
1
%%NOSF%%lib/libbac.la
2
lib/libbac.la
2
%%NOSF%%lib/libbac.so
3
lib/libbac.so
3
%%NOSF%%lib/libbac.so.%%MAJOR%%
4
lib/libbac.so.1
4
%%NOSF%%lib/libbaccfg.la
5
lib/libbaccfg.la
5
%%NOSF%%lib/libbaccfg.so
6
lib/libbaccfg.so
6
%%NOSF%%lib/libbaccfg.so.%%MAJOR%%
7
lib/libbaccfg.so.1
7
%%NOSF%%lib/libbacfind.la
8
lib/libbacfind.la
8
%%NOSF%%lib/libbacfind.so
9
lib/libbacfind.so
9
%%NOSF%%lib/libbacfind.so.%%MAJOR%%
10
lib/libbacfind.so.1
10
%%NOSF%%lib/libbacpy.la
11
lib/libbacpy.la
11
%%NOSF%%lib/libbacpy.so
12
lib/libbacpy.so
12
%%NOSF%%lib/libbacpy.so.%%MAJOR%%
13
lib/libbacpy.so.1
14
%%SFDAEMON%%sbin/static-bacula-fd
13
%%SFDAEMON%%sbin/static-bacula-fd
15
sbin/bacula-fd
14
sbin/bacula-fd
16
sbin/bconsole
15
sbin/bconsole
(-)sysutils/bacula-bat/Makefile (-14 / +30 lines)
Lines 10-17 Link Here
10
10
11
COMMENT=	The network backup solution (GUI)
11
COMMENT=	The network backup solution (GUI)
12
12
13
LIB_DEPENDS+=	qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
13
LIB_DEPENDS+=	qwt.5:${PORTSDIR}/x11-toolkits/qwt5 
14
		bac.1:${PORTSDIR}/sysutils/bacula-client
15
14
16
USE_QT_VER=	4
15
USE_QT_VER=	4
17
QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build
16
QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build
Lines 32-52 Link Here
32
		--disable-build-stored \
31
		--disable-build-stored \
33
		--enable-client-only
32
		--enable-client-only
34
33
35
pre-install:
34
.include "${MASTERDIR}/Makefile"
36
	# override master
35
.include <bsd.port.pre.mk>
36
37
.if exists(${LOCALBASE}/lib/libbac.so.${PORTVERSION:R:R}) && exists(${LOCALBASE}/lib/libbaccfg.so.${PORTVERSION:R:R})
38
LIB_DEPENDS+=	bac.${PORTVERSION:R:R}:${PORTSDIR}/sysutils/bacula-client
39
PLIST_SUB+=	INDEP="@comment "
40
41
.elif exists(${LOCALBASE}/lib/libbac.so.1) || exists(${LOCALBASE}/lib/libbaccfg.so.1)
42
# To prevent build with old libraries
43
IGNORE=		Please update sysutils/bacula-client first
44
45
.else
46
WITH_LIBS=	YES
47
PLIST_SUB+=	INDEP=""
48
.endif
37
49
38
post-install:
50
pre-everything::
39
	# override master
51
	@${ECHO_MSG} "===> Building bat the GUI interface for Bacula."
40
52
41
do-install:
53
do-install:
42
	# Install config files and preserve existing ones
54
	# Install config files and preserve existing ones
43
	@if [ -f ${WRKSRC}/src/qt-console/bat ]; then \
44
		${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin; \
45
	else \
46
		${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin; \
47
	fi
48
	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bat.conf.sample
55
	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bat.conf.sample
49
	${GZIP_CMD} ${WRKSRC}/manpages/bat.1
56
	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${PREFIX}/man/man1/
50
	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1.gz          ${PREFIX}/man/man1/
57
.if defined(WITH_LIBS)
58
	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin
59
	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.${PORTVERSION:R:R} \
60
	    ${PREFIX}/lib
61
	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbaccfg.so.${PORTVERSION:R:R} \
62
	    ${PREFIX}/lib
63
.else
64
	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin
65
.endif
66
67
.include <bsd.port.post.mk>
51
68
52
.include "${MASTERDIR}/Makefile"
(-)sysutils/bacula-bat/pkg-plist (+2 lines)
Lines 1-2 Link Here
1
etc/bat.conf.sample
1
etc/bat.conf.sample
2
sbin/bat
2
sbin/bat
3
%%INDEP%%lib/libbac.so.%%MAJOR%%
4
%%INDEP%%lib/libbaccfg.so.%%MAJOR%%
(-)net-mgmt/nagios-check_bacula/Makefile (-12 / +28 lines)
Lines 5-38 Link Here
5
# $FreeBSD: ports/net-mgmt/nagios-check_bacula/Makefile,v 1.8 2010/04/14 00:31:39 wen Exp $
5
# $FreeBSD: ports/net-mgmt/nagios-check_bacula/Makefile,v 1.8 2010/04/14 00:31:39 wen Exp $
6
#
6
#
7
7
8
PORTNAME=	check_bacula
8
PORTNAME=	bacula
9
PORTVERSION=	5.0.0
9
PKGNAMEPREFIX=  nagios-check_
10
CATEGORIES=	net-mgmt
10
CATEGORIES=	net-mgmt
11
MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
11
UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}
12
PKGNAMEPREFIX=	nagios-
13
DISTNAME=	bacula-${PORTVERSION}
14
12
15
MAINTAINER=	freebsd@troback.com
13
MAINTAINER=	freebsd@troback.com
16
COMMENT=	Nagios plugin for Bacula
14
COMMENT=	Nagios plugin for Bacula
17
15
18
WRKSRC=		${WRKDIR}/bacula-${PORTVERSION}
16
WITH_NAGIOS_CHECK_ONLY=	yes
17
MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
18
PLIST=		${.CURDIR}/pkg-plist
19
19
CONFIGURE_ARGS=	--enable-client-only \
20
CONFIGURE_ARGS=	--enable-client-only \
20
		--disable-build-dird \
21
		--disable-build-dird \
21
		--disable-build-stored \
22
		--disable-build-stored \
22
		--disable-nls
23
		--disable-nls \
23
GNU_CONFIGURE=	yes
24
		--disable-xatt
24
USE_LDCONFIG=	yes
25
26
.include "${MASTERDIR}/Makefile"
25
27
26
.include <bsd.port.pre.mk>
28
.include <bsd.port.pre.mk>
27
29
30
.if exists(${LOCALBASE}/lib/libbac.so.${PORTVERSION:R:R})
31
LIB_DEPENDS+=	bac.${PORTVERSION:R:R}:${PORTSDIR}/sysutils/bacula-client
32
WITHOUT_LIBBAC=	YES
33
PLIST_SUB+=	INDEP="@comment "
34
.else
35
PLIST_SUB+=	INDEP=""
36
.endif
37
38
pre-everything::
39
	@${ECHO_MSG} "===> Building nagios check only."
40
28
post-build:
41
post-build:
29
	${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula
42
	${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula
30
43
31
do-install:
44
do-install:
32
	@${MKDIR} ${PREFIX}/libexec/nagios
45
	@${MKDIR} ${PREFIX}/libexec/nagios
33
	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/.libs/check_bacula \
46
	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/.libs/check_bacula \
34
		${PREFIX}/libexec/nagios/
47
	    ${PREFIX}/libexec/nagios
35
	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.1 \
48
.if !defined(WITHOUT_LIBBAC)
36
		${PREFIX}/lib
49
	@${ECHO_MSG} "===> Installing libbac.so.${PORTVERSION:R:R} "
50
	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.${PORTVERSION:R:R} \
51
	    ${PREFIX}/lib
52
.endif
37
53
38
.include <bsd.port.post.mk>
54
.include <bsd.port.post.mk>
(-)net-mgmt/nagios-check_bacula/distinfo (-3 lines)
Lines 1-3 Link Here
1
MD5 (bacula-5.0.0.tar.gz) = 68e008d2578a6d9a50af60439db17dcb
2
SHA256 (bacula-5.0.0.tar.gz) = 4c6344807769d1b6b61f9cbddc0a5dc1160c3eb51744b23c790fcb57947ac294
3
SIZE (bacula-5.0.0.tar.gz) = 4075825
(-)net-mgmt/nagios-check_bacula/pkg-plist (-1 / +1 lines)
Lines 1-3 Link Here
1
libexec/nagios/check_bacula
1
libexec/nagios/check_bacula
2
lib/libbac.so.1
2
%%INDEP%%lib/libbac.so.%%MAJOR%%
3
@dirrmtry libexec/nagios
3
@dirrmtry libexec/nagios

Return to bug 146766