Attachment #106212 for bug #146766




#

PORTNAME=	bacula
DISTVERSION=	5.0.2
CATEGORIES?=	sysutils
MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}

MAINTAINER=	dan@langille.org
COMMENT?=	The network backup solution (server)

PKGNAMESUFFIX?=	-server

CONFLICTS=	bacula-server-devel-[0-9]* bacula-client-devel-[0-9]* bacula-docs-devel-[0-9]*

UNIQUENAME?=	${PORTNAME}${PKGNAMESUFFIX}

PLIST_SUB+=	MAJOR=${PORTVERSION:R:R}

GNU_CONFIGURE=	yes

CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}"

.if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY)  #Till end of the file
PKGNAMESUFFIX?=	-server

.if !defined(WITH_BAT)
PORTDOCS=	VERIFYING \
		technotes \
		ChangeLog \

		ReleaseNotes \
		LICENSE \
		INSTALL
.endif

.if !defined(WITH_BAT)
.if !defined(WITH_CLIENT_ONLY)
USE_RC_SUBR?=	bacula-dir bacula-sd
.endif

.else
SUB_FILES+=	pkg-message.server
.endif
.endif

# The user/group IDs below are registered, see
# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID

BACULA_DIR?=/var/db/bacula
#
MANCOMPRESSED=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=	--with-tcp-wrappers=/usr/lib \
		--enable-smartalloc \
		--with-working-dir=${BACULA_DIR} \

		--with-dump-email=root@localhost \
		--with-job-email=root@localhost \
		--with-db-name=bacula \
		--with-sbin-perm=755 \
		--with-db-user=bacula \
		--with-baseport=9101


		--with-sd-group=operator
.endif

CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib" \
		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}"

.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt})
BATCH=	yes
.endif
.endfor

.if !defined(BATCH)
IS_INTERACTIVE=	yes
.endif

.if defined(WITH_CLIENT_ONLY)
OPTIONS=	WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
OPTIONS+=	SFDAEMON "Build with staticly compiled file daemon" off
.elif defined(WITH_BAT)
OPTIONS=	
.else
OPTIONS=	SQLITE3 "Use SqLite-3 database instead of SqLite-2" off
OPTIONS+=	MYSQL "Use MySQL database instead of SqLite" off
OPTIONS+=	POSTGRESQL "Use PostgreSQL database instead of SqLite" off
OPTIONS+=	MTX "Install mtx for control of autochanger devices" off
.endif

OPTIONS+=	NLS "Native Language Support via gettext utilities" on
OPTIONS+=	OPENSSL "Enable OpenSSL for encrypted communication" off

.if !defined(WITH_BAT)
PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
.endif

.include <bsd.port.pre.mk>


# Build a static fd binary.
.if defined(WITH_SFDAEMON)
CONFIGURE_ARGS+=	--enable-static-fd
CONFIGURE_ARGS+=	--disable-libtool
PLIST_SUB+=	SFDAEMON=""
PLIST_SUB+=	NOSF="@comment "
.else
PLIST_SUB+=	SFDAEMON="@comment "
PLIST_SUB+=	NOSF=""
.endif
# Build bwx-console
.if defined(WITH_WXCONSOLE)

CONFIGURE_ARGS+=	--with-openssl
.endif

.if !defined(WITH_BAT)
.if defined(WITH_CLIENT_ONLY)
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-tray-monitor.1 bacula-bwxconsole.1
.endif
.endif

MAKE_ARGS+=	-E MAN8 -E MAN1
MAKE_ENV+=	MAN8="${MAN8}" MAN1="${MAN1}"

pre-everything::
.if !defined(WITH_CLIENT_ONLY) 
	@${ECHO_MSG} "You may use the following build options (or make config):"
	@${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_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)."
.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL instead of SqLite as the database."
	@${ECHO_MSG} "  WITH_POSTGRESQL=yes	if you want PostgreSQL instead of SqLite as the database."

	@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
	@${ECHO_MSG} ""
.else
	@${ECHO_MSG} "You may use the following build options (or make config):"
	@${ECHO_MSG} "  WITH_SFDAEMON=yes	if you want staticly compiled file daemon (client)."
	@${ECHO_MSG} "===> Building file daemon only."
.endif


.endif

.include <bsd.port.post.mk>
.endif # if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY)

Lines 1-3 Link Here

(-)sysutils/bacula-server/distinfo (-3 / +3 lines)
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




--- 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


Line 0 Link Here

(-)sysutils/bacula-server/files/patch-configure (+11 lines)
	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

Line 0 Link Here

(-)sysutils/bacula-server/files/patch-src-cats-Makefile.in (+11 lines)
	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) \

Lines 1-11 Link Here

(-)sysutils/bacula-server/files/patch-src-cats-update_postgresql_tables.in (-11 lines)
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

Lines 1-11 Link Here

(-)sysutils/bacula-server/files/patch-src-dird-ua_prune.c (-11 lines)
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,

Line 0 Link Here

(-)sysutils/bacula-server/files/patch-src-findlib-Makefile.in (+11 lines)
	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) \




--- src/lib/Makefile.in.orig	2010-05-19 14:26:03.000000000 +0300
+++ src/lib/Makefile.in	2010-05-19 17:14:18.000000000 +0300
@@ -126,7 +126,7 @@
 
 libbac.la: Makefile $(LIBBAC_LOBJS)
 	@echo "Making $@ ..."
-	$(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)
+	$(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)
 
 libbaccfg.a: $(LIBBACCFG_OBJS) 
 	@echo "Making $@ ..."
@@ -135,7 +135,7 @@
 
 libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE)
 
 libbacpy.a: $(LIBBACPY_OBJS) 
 	@echo "Making $@ ..."
@@ -144,7 +144,7 @@
 
 libbacpy.la: Makefile $(LIBBACPY_LOBJS) 
 	@echo "Making $@ ..."
-	$(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)
+	$(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)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \




--- src/lib/crypto.c.orig	2010-05-20 20:15:22.000000000 +0300
+++ src/lib/crypto.c	2010-05-20 20:16:39.000000000 +0300
@@ -316,7 +316,11 @@
  */
 static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
    X509_EXTENSION *ext;
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
    const X509V3_EXT_METHOD *method;
+#else
+   const X509V3_EXT_METHOD *method;
+#endif
    ASN1_OCTET_STRING *keyid;
    int i;
 #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
@@ -980,6 +984,10 @@
    free (sig);
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
+#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
+#endif
 /*
  * Create a new encryption session.
  *  Returns: A pointer to a CRYPTO_SESSION object on success.

Line 0 Link Here

(-)sysutils/bacula-server/files/patch-src-lib-tls.c (+11 lines)
	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;




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.2 (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.

!!!!!!!!!!!!!!! NOTE FOR 5.0.0 USERS !!!!!!!!!!!!!!!!!!!!
The Allow Duplicate Jobs directive has been significantly-
reworked, and the default value has changed. See below.

Truncate On Purge has been totally rewritten. See the new
features section of the manual.

When Volume Poll Interval is set in the SD DEVICE configuration,
(default 5 mins), after a certain number of polling tries (approx
10) polling will stop and the operator will be asked to
resolve the problem.  Previously there was no limit, and an
error message could be produced at each poll attempt.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

Read the ReleaseNotes for further information.

If you are using sqlite you need to run the make_sqlite_tables script as




lib/bpipe-fd.so
lib/libbac.la
lib/libbac.so
lib/libbac.so.%%MAJOR%%
lib/libbaccfg.la
lib/libbaccfg.so
lib/libbaccfg.so.%%MAJOR%%
lib/libbacfind.la
lib/libbacfind.so
lib/libbacfind.so.%%MAJOR%%
lib/libbacpy.la
lib/libbacpy.so
lib/libbacpy.so.%%MAJOR%%
lib/libbacsql.la
lib/libbacsql.so
lib/libbacsql.so.%%MAJOR%%
sbin/bacula
sbin/bacula-dir
sbin/bacula-sd




%%NOSF%%lib/libbac.la
%%NOSF%%lib/libbac.so
%%NOSF%%lib/libbac.so.%%MAJOR%%
%%NOSF%%lib/libbaccfg.la
%%NOSF%%lib/libbaccfg.so
%%NOSF%%lib/libbaccfg.so.%%MAJOR%%
%%NOSF%%lib/libbacfind.la
%%NOSF%%lib/libbacfind.so
%%NOSF%%lib/libbacfind.so.%%MAJOR%%
%%NOSF%%lib/libbacpy.la
%%NOSF%%lib/libbacpy.so
%%NOSF%%lib/libbacpy.so.%%MAJOR%%
lib/libbacpy.so.1
%%SFDAEMON%%sbin/static-bacula-fd
sbin/bacula-fd
sbin/bconsole

Return to bug 146766

Lines 6-27 Link Here

(-)sysutils/bacula-server/Makefile (-34 / +20 lines)
6	#	6	#
7		7
8	PORTNAME= bacula	8	PORTNAME= bacula
9	DISTVERSION= 5.0.0	9	DISTVERSION= 5.0.2
10	CATEGORIES?= sysutils	10	CATEGORIES?= sysutils
11	MASTER_SITES= SF/bacula/bacula/${PORTVERSION}	11	MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
12		12
13	MAINTAINER= dan@langille.org	13	MAINTAINER= dan@langille.org
14	COMMENT?= The network backup solution (server)	14	COMMENT?= The network backup solution (server)
15		15
16	PKGNAMESUFFIX?= -server
17
18	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]*
19		17
20	UNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX}	18	UNIQUENAME?= ${PORTNAME}${PKGNAMESUFFIX}
21		19
22	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
23		30
24	.if !defined(WITH_BAT)
25	PORTDOCS= VERIFYING \	31	PORTDOCS= VERIFYING \
26	technotes \	32	technotes \
27	ChangeLog \	33	ChangeLog \
Lines 29-37 Link Here
29	ReleaseNotes \	35	ReleaseNotes \
30	LICENSE \	36	LICENSE \
31	INSTALL	37	INSTALL
32	.endif
33		38
34	.if !defined(WITH_BAT)
35	.if !defined(WITH_CLIENT_ONLY)	39	.if !defined(WITH_CLIENT_ONLY)
36	USE_RC_SUBR?= bacula-dir bacula-sd	40	USE_RC_SUBR?= bacula-dir bacula-sd
37	.endif	41	.endif
Lines 41-47 Link Here
41	.else	45	.else
42	SUB_FILES+= pkg-message.server	46	SUB_FILES+= pkg-message.server
43	.endif	47	.endif
44	.endif
45		48
46	# The user/group IDs below are registered, see	49	# The user/group IDs below are registered, see
47	# 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 49-55 Link Here
49	BACULA_DIR?=/var/db/bacula	52	BACULA_DIR?=/var/db/bacula
50	#	53	#
51	MANCOMPRESSED= yes	54	MANCOMPRESSED= yes
52	GNU_CONFIGURE= yes
53	CONFIGURE_ARGS+= --with-tcp-wrappers=/usr/lib \	55	CONFIGURE_ARGS+= --with-tcp-wrappers=/usr/lib \
54	--enable-smartalloc \	56	--enable-smartalloc \
55	--with-working-dir=${BACULA_DIR} \	57	--with-working-dir=${BACULA_DIR} \
Lines 63-68 Link Here
63	--with-dump-email=root@localhost \	65	--with-dump-email=root@localhost \
64	--with-job-email=root@localhost \	66	--with-job-email=root@localhost \
65	--with-db-name=bacula \	67	--with-db-name=bacula \
		68	--with-sbin-perm=755 \
66	--with-db-user=bacula \	69	--with-db-user=bacula \
67	--with-baseport=9101	70	--with-baseport=9101
68		71
Lines 76-114 Link Here
76	--with-sd-group=operator	79	--with-sd-group=operator
77	.endif	80	.endif
78		81
79	CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
80	LDFLAGS="-L${LOCALBASE}/lib" \
81	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
82	PTHREAD_LIBS="${PTHREAD_LIBS}"
83
84	.for opt in ${ALL_OPTIONS}
85	.if defined(WITH_${opt})
86	BATCH= yes
87	.endif
88	.endfor
89
90	.if !defined(BATCH)
91	IS_INTERACTIVE= yes
92	.endif
93
94	.if defined(WITH_CLIENT_ONLY)	82	.if defined(WITH_CLIENT_ONLY)
95	OPTIONS= WXCONSOLE "Build with wxGTK based GUI console: deprecated" off	83	OPTIONS= WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
96	OPTIONS+= SFDAEMON "Build with staticly compiled file daemon" off	84	OPTIONS+= SFDAEMON "Build with staticly compiled file daemon" off
97	.elif defined(WITH_BAT)
98	OPTIONS=
99	.else	85	.else
100	OPTIONS= SQLITE3 "Use SqLite-3 database instead of SqLite-2" off	86	OPTIONS= SQLITE3 "Use SqLite-3 database instead of SqLite-2" off
101	OPTIONS+= MYSQL "Use MySQL database instead of SqLite" off	87	OPTIONS+= MYSQL "Use MySQL database instead of SqLite" off
102	OPTIONS+= POSTGRESQL "Use PostgreSQL database instead of SqLite" off	88	OPTIONS+= POSTGRESQL "Use PostgreSQL database instead of SqLite" off
103	OPTIONS+= MTX "Install mtx for control of autochanger devices" off	89	OPTIONS+= MTX "Install mtx for control of autochanger devices" off
104	.endif	90	.endif
105
106	OPTIONS+= NLS "Native Language Support via gettext utilities" on	91	OPTIONS+= NLS "Native Language Support via gettext utilities" on
107	OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" off	92	OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" off
108		93
109	.if !defined(WITH_BAT)
110	PLIST_SUB+= BACULA_DIR=${BACULA_DIR}	94	PLIST_SUB+= BACULA_DIR=${BACULA_DIR}
111	.endif
112		95
113	.include <bsd.port.pre.mk>	96	.include <bsd.port.pre.mk>
114		97
Lines 133-141 Link Here
133	# Build a static fd binary.	116	# Build a static fd binary.
134	.if defined(WITH_SFDAEMON)	117	.if defined(WITH_SFDAEMON)
135	CONFIGURE_ARGS+= --enable-static-fd	118	CONFIGURE_ARGS+= --enable-static-fd
		119	CONFIGURE_ARGS+= --disable-libtool
136	PLIST_SUB+= SFDAEMON=""	120	PLIST_SUB+= SFDAEMON=""
		121	PLIST_SUB+= NOSF="@comment "
137	.else	122	.else
138	PLIST_SUB+= SFDAEMON="@comment "	123	PLIST_SUB+= SFDAEMON="@comment "
		124	PLIST_SUB+= NOSF=""
139	.endif	125	.endif
140	# Build bwx-console	126	# Build bwx-console
141	.if defined(WITH_WXCONSOLE)	127	.if defined(WITH_WXCONSOLE)
Lines 177-203 Link Here
177	CONFIGURE_ARGS+= --with-openssl	163	CONFIGURE_ARGS+= --with-openssl
178	.endif	164	.endif
179		165
180	.if !defined(WITH_BAT)
181	.if defined(WITH_CLIENT_ONLY)	166	.if defined(WITH_CLIENT_ONLY)
182	MAN8=bacula-fd.8 bconsole.8	167	MAN8=bacula-fd.8 bconsole.8
183	.else	168	.else
184	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
185	MAN1=bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1	170	MAN1=bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
186	.endif	171	.endif
187	.endif
188		172
189	MAKE_ARGS+= -E MAN8 -E MAN1	173	MAKE_ARGS+= -E MAN8 -E MAN1
190	MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}"	174	MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}"
191		175
192	pre-everything::	176	pre-everything::
193	.if !defined(WITH_CLIENT_ONLY)	177	.if !defined(WITH_CLIENT_ONLY)
194	@${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):"
195	@${ECHO_MSG} ""	179	@${ECHO_MSG} ""
196	@${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."
197	@${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."
198	@${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."
199	@${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."
200	@${ECHO_MSG} " WITH_SFDAEMON=yes if you want staticly compiled file daemon (client)."
201	.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)	184	.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
202	@${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."
203	@${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 209-214 Link Here
209	@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."	192	@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
210	@${ECHO_MSG} ""	193	@${ECHO_MSG} ""
211	.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)."
212	@${ECHO_MSG} "===> Building file daemon only."	197	@${ECHO_MSG} "===> Building file daemon only."
213	.endif	198	.endif
214		199
Lines 307-309 Link Here
307	.endif	292	.endif
308		293
309	.include <bsd.port.post.mk>	294	.include <bsd.port.post.mk>
		295	.endif # if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY)

Lines 1-14 Link Here

(-)sysutils/bacula-server/files/patch-bacula-src-cats-make_catalog_backup.pl.in (-14 lines)
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

Line 0 Link Here

(-)sysutils/bacula-server/files/patch-src-lib-Makefile.in (+29 lines)
	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) \

Line 0 Link Here

(-)sysutils/bacula-server/files/patch-src-lib-crypto.c (+25 lines)
	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.

Lines 60-71 Link Here

(-)sysutils/bacula-server/files/pkg-message.server.in (-1 / +15 lines)
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

Lines 1-19 Link Here

(-)sysutils/bacula-server/pkg-plist (-6 / +5 lines)
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

Lines 1-16 Link Here

(-)sysutils/bacula-server/pkg-plist.client (-13 / +12 lines)
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