Attachment 106211 Details for Bug 146766 – update-to-5.0.2.diff

[patch] update-to-5.0.2.diff

update-to-5.0.2.diff (text/plain), 22.70 KB, created by tacid on 2010-05-20 20:12:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tacid

Created: 2010-05-20 20:12:46 UTC

Size: 22.70 KB

patch

obsolete

>diff -ruN sysutils/bacula-server.orig/Makefile sysutils/bacula-server/Makefile
>--- sysutils/bacula-server.orig/Makefile	2010-05-19 11:57:42.000000000 +0300
>+++ sysutils/bacula-server/Makefile	2010-05-20 21:43:38.000000000 +0300
>@@ -6,22 +6,28 @@
> #
> 
> PORTNAME=	bacula
>-DISTVERSION=	5.0.0
>+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}
>+UNIQUENAME?=	${PORTNAME}${PKGNAMESUFFIX}
> 
>-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
>+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 \
>@@ -29,9 +35,7 @@
> 		ReleaseNotes \
> 		LICENSE \
> 		INSTALL
>-.endif
> 
>-.if !defined(WITH_BAT)
> .if !defined(WITH_CLIENT_ONLY)
> USE_RC_SUBR?=	bacula-dir bacula-sd
> .endif
>@@ -41,7 +45,6 @@
> .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
>@@ -49,7 +52,6 @@
> BACULA_DIR?=/var/db/bacula
> #
> MANCOMPRESSED=	yes
>-GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=	--with-tcp-wrappers=/usr/lib \
> 		--enable-smartalloc \
> 		--with-working-dir=${BACULA_DIR} \
>@@ -63,6 +65,7 @@
> 		--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
> 
>@@ -76,39 +79,19 @@
> 		--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>
> 
>@@ -133,9 +116,12 @@
> # 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)
>@@ -177,27 +163,24 @@
> 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)
>+.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."
>@@ -209,6 +192,8 @@
> 	@${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
> 
>@@ -307,3 +292,4 @@
> .endif
> 
> .include <bsd.port.post.mk>
>+.endif # if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY)
>diff -ruN sysutils/bacula-server.orig/distinfo sysutils/bacula-server/distinfo
>--- sysutils/bacula-server.orig/distinfo	2010-05-19 11:57:42.000000000 +0300
>+++ sysutils/bacula-server/distinfo	2010-05-20 15:57:08.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (bacula-5.0.0.tar.gz) = 68e008d2578a6d9a50af60439db17dcb
>-SHA256 (bacula-5.0.0.tar.gz) = 4c6344807769d1b6b61f9cbddc0a5dc1160c3eb51744b23c790fcb57947ac294
>-SIZE (bacula-5.0.0.tar.gz) = 4075825
>+MD5 (bacula-5.0.2.tar.gz) = e9204d2e772f12662de28da3327853de
>+SHA256 (bacula-5.0.2.tar.gz) = c465d00dd968832d129ba68eea59714357605a461d745cef7e802978c453c3fb
>+SIZE (bacula-5.0.2.tar.gz) = 4189272
>diff -ruN sysutils/bacula-server.orig/files/patch-bacula-src-cats-make_catalog_backup.pl.in sysutils/bacula-server/files/patch-bacula-src-cats-make_catalog_backup.pl.in
>--- sysutils/bacula-server.orig/files/patch-bacula-src-cats-make_catalog_backup.pl.in	2010-05-19 11:57:42.000000000 +0300
>+++ sysutils/bacula-server/files/patch-bacula-src-cats-make_catalog_backup.pl.in	1970-01-01 03:00:00.000000000 +0300
>@@ -1,14 +0,0 @@
>---- 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 -ruN sysutils/bacula-server.orig/files/patch-configure sysutils/bacula-server/files/patch-configure
>--- sysutils/bacula-server.orig/files/patch-configure	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/bacula-server/files/patch-configure	2010-05-20 20:26:43.000000000 +0300
>@@ -0,0 +1,11 @@
>+--- configure.orig	2010-05-20 20:25:58.000000000 +0300
>++++ configure	2010-05-20 20:26:30.000000000 +0300
>+@@ -47193,7 +47193,7 @@
>+    { (exit 1); exit 1; }; }
>+    fi
>+ 
>+-   QMAKEBIN="qmake"
>++   QMAKEBIN="$QMAKE"
>+    cd src/qt-console
>+    echo "Creating bat Makefile"
>+    touch bat
>diff -ruN sysutils/bacula-server.orig/files/patch-src-cats-Makefile.in sysutils/bacula-server/files/patch-src-cats-Makefile.in
>--- sysutils/bacula-server.orig/files/patch-src-cats-Makefile.in	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/bacula-server/files/patch-src-cats-Makefile.in	2010-05-20 15:57:08.000000000 +0300
>@@ -0,0 +1,11 @@
>+--- src/cats/Makefile.in.orig	2010-05-19 17:13:07.000000000 +0300
>++++ src/cats/Makefile.in	2010-05-19 17:15:47.000000000 +0300
>+@@ -69,7 +69,7 @@
>+ 
>+ libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
>+ 	@echo "Making $@ ..."	  
>+-	$(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)
>++	$(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)
>+ 
>+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
>+ 	cd $(topdir) \
>diff -ruN sysutils/bacula-server.orig/files/patch-src-cats-update_postgresql_tables.in sysutils/bacula-server/files/patch-src-cats-update_postgresql_tables.in
>--- sysutils/bacula-server.orig/files/patch-src-cats-update_postgresql_tables.in	2010-05-19 11:57:42.000000000 +0300
>+++ sysutils/bacula-server/files/patch-src-cats-update_postgresql_tables.in	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- 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 -ruN sysutils/bacula-server.orig/files/patch-src-dird-ua_prune.c sysutils/bacula-server/files/patch-src-dird-ua_prune.c
>--- sysutils/bacula-server.orig/files/patch-src-dird-ua_prune.c	2010-05-19 11:57:42.000000000 +0300
>+++ sysutils/bacula-server/files/patch-src-dird-ua_prune.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- 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 -ruN sysutils/bacula-server.orig/files/patch-src-findlib-Makefile.in sysutils/bacula-server/files/patch-src-findlib-Makefile.in
>--- sysutils/bacula-server.orig/files/patch-src-findlib-Makefile.in	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/bacula-server/files/patch-src-findlib-Makefile.in	2010-05-20 15:57:08.000000000 +0300
>@@ -0,0 +1,11 @@
>+--- src/findlib/Makefile.in.orig	2010-05-19 17:13:20.000000000 +0300
>++++ src/findlib/Makefile.in	2010-05-19 17:15:21.000000000 +0300
>+@@ -59,7 +59,7 @@
>+ 
>+ libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
>+ 	@echo "Making $@ ..."
>+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE)
>++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_CURRENT):$(LIBBACFIND_LT_REVISION):$(LIBBACFIND_LT_AGE)
>+ 
>+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
>+ 	cd $(topdir) \
>diff -ruN sysutils/bacula-server.orig/files/patch-src-lib-Makefile.in sysutils/bacula-server/files/patch-src-lib-Makefile.in
>--- sysutils/bacula-server.orig/files/patch-src-lib-Makefile.in	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/bacula-server/files/patch-src-lib-Makefile.in	2010-05-20 15:57:08.000000000 +0300
>@@ -0,0 +1,29 @@
>+--- 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) \
>diff -ruN sysutils/bacula-server.orig/files/patch-src-lib-crypto.c sysutils/bacula-server/files/patch-src-lib-crypto.c
>--- sysutils/bacula-server.orig/files/patch-src-lib-crypto.c	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/bacula-server/files/patch-src-lib-crypto.c	2010-05-20 20:17:11.000000000 +0300
>@@ -0,0 +1,25 @@
>+--- 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.
>diff -ruN sysutils/bacula-server.orig/files/patch-src-lib-tls.c sysutils/bacula-server/files/patch-src-lib-tls.c
>--- sysutils/bacula-server.orig/files/patch-src-lib-tls.c	1970-01-01 03:00:00.000000000 +0300
>+++ sysutils/bacula-server/files/patch-src-lib-tls.c	2010-05-20 20:44:14.000000000 +0300
>@@ -0,0 +1,11 @@
>+--- src/lib/tls.c.orig	2010-05-20 20:34:49.000000000 +0300
>++++ src/lib/tls.c	2010-05-20 20:35:19.000000000 +0300
>+@@ -315,7 +315,7 @@
>+          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
>+ 
>+          if (strcmp(extname, "subjectAltName") == 0) {
>+-#ifdef HAVE_OPENSSLv1
>++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
>+             const X509V3_EXT_METHOD *method;
>+ #else
>+             X509V3_EXT_METHOD *method;
>diff -ruN sysutils/bacula-server.orig/files/pkg-message.server.in sysutils/bacula-server/files/pkg-message.server.in
>--- sysutils/bacula-server.orig/files/pkg-message.server.in	2010-05-19 11:57:42.000000000 +0300
>+++ sysutils/bacula-server/files/pkg-message.server.in	2010-05-20 15:57:08.000000000 +0300
>@@ -60,12 +60,26 @@
> 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).
>+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
>diff -ruN sysutils/bacula-server.orig/pkg-plist sysutils/bacula-server/pkg-plist
>--- sysutils/bacula-server.orig/pkg-plist	2010-05-19 11:57:42.000000000 +0300
>+++ sysutils/bacula-server/pkg-plist	2010-05-20 15:57:08.000000000 +0300
>@@ -1,19 +1,18 @@
>-lib/bpipe-fd.so
> lib/libbac.la
> lib/libbac.so
>-lib/libbac.so.1
>+lib/libbac.so.%%MAJOR%%
> lib/libbaccfg.la
> lib/libbaccfg.so
>-lib/libbaccfg.so.1
>+lib/libbaccfg.so.%%MAJOR%%
> lib/libbacfind.la
> lib/libbacfind.so
>-lib/libbacfind.so.1
>+lib/libbacfind.so.%%MAJOR%%
> lib/libbacpy.la
> lib/libbacpy.so
>-lib/libbacpy.so.1
>+lib/libbacpy.so.%%MAJOR%%
> lib/libbacsql.la
> lib/libbacsql.so
>-lib/libbacsql.so.1
>+lib/libbacsql.so.%%MAJOR%%
> sbin/bacula
> sbin/bacula-dir
> sbin/bacula-sd
>diff -ruN sysutils/bacula-server.orig/pkg-plist.client sysutils/bacula-server/pkg-plist.client
>--- sysutils/bacula-server.orig/pkg-plist.client	2010-05-19 11:57:42.000000000 +0300
>+++ sysutils/bacula-server/pkg-plist.client	2010-05-20 15:57:08.000000000 +0300
>@@ -1,16 +1,15 @@
>-lib/bpipe-fd.so
>-lib/libbac.la
>-lib/libbac.so
>-lib/libbac.so.1
>-lib/libbaccfg.la
>-lib/libbaccfg.so
>-lib/libbaccfg.so.1
>-lib/libbacfind.la
>-lib/libbacfind.so
>-lib/libbacfind.so.1
>-lib/libbacpy.la
>-lib/libbacpy.so
>-lib/libbacpy.so.1
>+%%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%%
> %%SFDAEMON%%sbin/static-bacula-fd
> sbin/bacula-fd
> sbin/bconsole
>diff -ruN sysutils/bacula-bat.orig/Makefile sysutils/bacula-bat/Makefile
>--- sysutils/bacula-bat.orig/Makefile	2010-05-20 19:30:08.000000000 +0300
>+++ sysutils/bacula-bat/Makefile	2010-05-20 19:31:40.000000000 +0300
>@@ -10,8 +10,7 @@
> 
> COMMENT=	The network backup solution (GUI)
> 
>-LIB_DEPENDS+=	qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
>-		bac.1:${PORTSDIR}/sysutils/bacula-client
>+LIB_DEPENDS+=	qwt.5:${PORTSDIR}/x11-toolkits/qwt5 
> 
> USE_QT_VER=	4
> QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build
>@@ -32,21 +31,38 @@
> 		--disable-build-stored \
> 		--enable-client-only
> 
>-pre-install:
>-	# override master
>+.include "${MASTERDIR}/Makefile"
>+.include <bsd.port.pre.mk>
>+
>+.if exists(${LOCALBASE}/lib/libbac.so.${PORTVERSION:R:R}) && exists(${LOCALBASE}/lib/libbaccfg.so.${PORTVERSION:R:R})
>+LIB_DEPENDS+=	bac.${PORTVERSION:R:R}:${PORTSDIR}/sysutils/bacula-client
>+PLIST_SUB+=	INDEP="@comment "
>+
>+.elif exists(${LOCALBASE}/lib/libbac.so.1) || exists(${LOCALBASE}/lib/libbaccfg.so.1)
>+# To prevent build with old libraries
>+IGNORE=		Please update sysutils/bacula-client first
>+
>+.else
>+WITH_LIBS=	YES
>+PLIST_SUB+=	INDEP=""
>+.endif
> 
>-post-install:
>-	# override master
>+pre-everything::
>+	@${ECHO_MSG} "===> Building bat the GUI interface for Bacula."
> 
> do-install:
> 	# Install config files and preserve existing ones
>-	@if [ -f ${WRKSRC}/src/qt-console/bat ]; then \
>-		${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin; \
>-	else \
>-		${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin; \
>-	fi
> 	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bat.conf.sample
>-	${GZIP_CMD} ${WRKSRC}/manpages/bat.1
>-	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1.gz          ${PREFIX}/man/man1/
>+	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${PREFIX}/man/man1/
>+.if defined(WITH_LIBS)
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.${PORTVERSION:R:R} \
>+	    ${PREFIX}/lib
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbaccfg.so.${PORTVERSION:R:R} \
>+	    ${PREFIX}/lib
>+.else
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin
>+.endif
>+
>+.include <bsd.port.post.mk>
> 
>-.include "${MASTERDIR}/Makefile"
>diff -ruN sysutils/bacula-bat.orig/pkg-plist sysutils/bacula-bat/pkg-plist
>--- sysutils/bacula-bat.orig/pkg-plist	2010-05-20 19:30:08.000000000 +0300
>+++ sysutils/bacula-bat/pkg-plist	2010-05-20 18:00:27.000000000 +0300
>@@ -1,2 +1,4 @@
> etc/bat.conf.sample
> sbin/bat
>+%%INDEP%%lib/libbac.so.%%MAJOR%%
>+%%INDEP%%lib/libbaccfg.so.%%MAJOR%%
>diff -ruN net-mgmt/nagios-check_bacula.orig/Makefile net-mgmt/nagios-check_bacula/Makefile
>--- net-mgmt/nagios-check_bacula.orig/Makefile	2010-05-19 11:57:11.000000000 +0300
>+++ net-mgmt/nagios-check_bacula/Makefile	2010-05-20 21:24:22.000000000 +0300
>@@ -5,34 +5,50 @@
> # $FreeBSD: ports/net-mgmt/nagios-check_bacula/Makefile,v 1.8 2010/04/14 00:31:39 wen Exp $
> #
> 
>-PORTNAME=	check_bacula
>-PORTVERSION=	5.0.0
>+PORTNAME=	bacula
>+PKGNAMEPREFIX=  nagios-check_
> CATEGORIES=	net-mgmt
>-MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
>-PKGNAMEPREFIX=	nagios-
>-DISTNAME=	bacula-${PORTVERSION}
>+UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}
> 
> MAINTAINER=	freebsd@troback.com
> COMMENT=	Nagios plugin for Bacula
> 
>-WRKSRC=		${WRKDIR}/bacula-${PORTVERSION}
>+WITH_NAGIOS_CHECK_ONLY=	yes
>+MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
>+PLIST=		${.CURDIR}/pkg-plist
>+
> CONFIGURE_ARGS=	--enable-client-only \
> 		--disable-build-dird \
> 		--disable-build-stored \
>-		--disable-nls
>-GNU_CONFIGURE=	yes
>-USE_LDCONFIG=	yes
>+		--disable-nls \
>+		--disable-xatt
>+
>+.include "${MASTERDIR}/Makefile"
> 
> .include <bsd.port.pre.mk>
> 
>+.if exists(${LOCALBASE}/lib/libbac.so.${PORTVERSION:R:R})
>+LIB_DEPENDS+=	bac.${PORTVERSION:R:R}:${PORTSDIR}/sysutils/bacula-client
>+WITHOUT_LIBBAC=	YES
>+PLIST_SUB+=	INDEP="@comment "
>+.else
>+PLIST_SUB+=	INDEP=""
>+.endif
>+
>+pre-everything::
>+	@${ECHO_MSG} "===> Building nagios check only."
>+
> post-build:
> 	${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula
> 
> do-install:
> 	@${MKDIR} ${PREFIX}/libexec/nagios
> 	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/.libs/check_bacula \
>-		${PREFIX}/libexec/nagios/
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.1 \
>-		${PREFIX}/lib
>+	    ${PREFIX}/libexec/nagios
>+.if !defined(WITHOUT_LIBBAC)
>+	@${ECHO_MSG} "===> Installing libbac.so.${PORTVERSION:R:R} "
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.${PORTVERSION:R:R} \
>+	    ${PREFIX}/lib
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -ruN net-mgmt/nagios-check_bacula.orig/distinfo net-mgmt/nagios-check_bacula/distinfo
>--- net-mgmt/nagios-check_bacula.orig/distinfo	2010-05-19 11:57:11.000000000 +0300
>+++ net-mgmt/nagios-check_bacula/distinfo	1970-01-01 03:00:00.000000000 +0300
>@@ -1,3 +0,0 @@
>-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 -ruN net-mgmt/nagios-check_bacula.orig/pkg-plist net-mgmt/nagios-check_bacula/pkg-plist
>--- net-mgmt/nagios-check_bacula.orig/pkg-plist	2010-05-19 11:57:11.000000000 +0300
>+++ net-mgmt/nagios-check_bacula/pkg-plist	2010-05-20 12:02:26.000000000 +0300
>@@ -1,3 +1,3 @@
> libexec/nagios/check_bacula
>-lib/libbac.so.1
>+%%INDEP%%lib/libbac.so.%%MAJOR%%
> @dirrmtry libexec/nagios

Actions: View | Diff

Attachments on bug 146766: 106210 | 106211 | 106212 | 106213 | 106214 | 106215 | 106216