Date: Wed, 31 Mar 2010 23:40:48 +0200 (CEST) From: Anders Troback <freebsd@troback.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/145250: Maintainer update: net-mgmt/nagios-check_bacula Message-ID: <20100331214048.E805010E77C@mail.gelita.se> Resent-Message-ID: <201003312140.o2VLe59r060873@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145250 >Category: ports >Synopsis: Maintainer update: net-mgmt/nagios-check_bacula >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Mar 31 21:40:05 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Anders Troback >Release: >Organization: >Environment: >Description: Maintainer update of net-mgmt/nagios-check_bacula! >How-To-Repeat: >Fix: diff -ruN nagios-check_bacula_org/Makefile nagios-check_bacula/Makefile --- nagios-check_bacula_org/Makefile 2009-11-28 13:49:11.000000000 +0000 +++ nagios-check_bacula/Makefile 2010-03-31 14:04:33.000000000 +0000 @@ -6,7 +6,7 @@ # PORTNAME= check_bacula -PORTVERSION= 3.0.2 +PORTVERSION= 5.0.0 CATEGORIES= net-mgmt MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX= nagios- @@ -25,15 +25,12 @@ .include <bsd.port.pre.mk> -post-extract: - ${TAR} xzCf ${WRKSRC}/src ${WRKSRC}/examples/nagios/nagios_plugin_check_bacula.tgz - post-build: - ${MAKE} -C ${WRKSRC}/src/check_bacula + ${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula do-install: @${MKDIR} ${PREFIX}/libexec/nagios - ${INSTALL_PROGRAM} ${WRKSRC}/src/check_bacula/.libs/check_bacula \ + ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/.libs/check_bacula \ ${PREFIX}/libexec/nagios/ ${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.1 \ ${PREFIX}/lib diff -ruN nagios-check_bacula_org/distinfo nagios-check_bacula/distinfo --- nagios-check_bacula_org/distinfo 2009-11-28 13:49:11.000000000 +0000 +++ nagios-check_bacula/distinfo 2010-03-30 21:02:05.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (bacula-3.0.2.tar.gz) = 52f4bc25d8988dffcff429bb5e1ee81b -SHA256 (bacula-3.0.2.tar.gz) = 8f5e0bf4734c21949f83129209e0109acf054a362b4fce7cb87a87f1815904a5 -SIZE (bacula-3.0.2.tar.gz) = 3910414 +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 nagios-check_bacula_org/files/patch-configure nagios-check_bacula/files/patch-configure --- nagios-check_bacula_org/files/patch-configure 2010-02-15 05:14:36.000000000 +0000 +++ nagios-check_bacula/files/patch-configure 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ ---- configure.org 2009-07-10 16:12:39.000000000 +0200 -+++ configure 2009-09-28 15:10:56.000000000 +0200 -@@ -42884,7 +42884,7 @@ - exit 1 - fi - --ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makef ile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_d atabase src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 u pdatedb/update_sqlite_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" -+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makef ile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_d atabase src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 u pdatedb/update_sqlite_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES src/check_bacula/Makefile" - - ac_config_commands="$ac_config_commands default" - -@@ -43803,7 +43803,7 @@ - - cat >>$CONFIG_STATUS <<\_ACEOF - --# Handling of arguments. -+# Handling of arguments.n "src/check_bacula/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/check_bacula/Makefile" ;; - for ac_config_target in $ac_config_targets - do - case $ac_config_target in diff -ruN nagios-check_bacula_org/files/patch-src-check_bacula-authenticate.c nagios-check_bacula/files/patch-src-check_bacula-authenticate.c --- nagios-check_bacula_org/files/patch-src-check_bacula-authenticate.c 2010-02-15 05:14:36.000000000 +0000 +++ nagios-check_bacula/files/patch-src-check_bacula-authenticate.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ ---- src/check_bacula/authenticate.c.org 2009-09-28 16:16:01.000000000 +0200 -+++ src/check_bacula/authenticate.c 2009-09-28 16:16:34.000000000 +0200 -@@ -57,7 +57,7 @@ - /* Response from SD */ - static char SDOKhello[] = "3000 OK Hello\n"; - /* Response from FD */ --static char FDOKhello[] = "2000 OK Hello\n"; -+static char FDOKhello[] = "2000 OK Hello"; - - /* Forward referenced functions */ - -@@ -169,7 +169,7 @@ - } - Dmsg1(110, "<stored: %s", fd->msg); - stop_bsock_timer(tid); -- if (strncmp(fd->msg, FDOKhello, sizeof(FDOKhello)) != 0) { -+ if (strncmp(fd->msg, FDOKhello, sizeof(FDOKhello)-1) != 0) { - return 0; - } - return 1; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100331214048.E805010E77C>