From 555b47b93fe7c73c4ff15355825eb5586fbc6201 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 12 Jan 2009 21:17:07 +0000 Subject: [PATCH] "important bug fix" update to 2.4.4 ok merdely@ (maintainer). --- sysutils/bacula/Makefile | 10 ++++------ sysutils/bacula/distinfo | 15 +++++---------- sysutils/bacula/patches/patch-configure | 12 ++++++------ sysutils/bacula/pkg/PLIST-bat | 7 ++++--- sysutils/bacula/pkg/PLIST-server | 7 ++++--- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index d2a83ef89e4..b4377831a89 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,20 +1,18 @@ -# $OpenBSD: Makefile,v 1.12 2008/11/04 21:32:44 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2009/01/12 21:17:07 sthen Exp $ COMMENT-main= network backup solution (client) COMMENT-server= network backup solution (server) COMMENT-bat= network backup solution (gui-client) -V= 2.4.3 +V= 2.4.4 DISTNAME= bacula-$V FULLPKGNAME-main= bacula-client-$V FULLPKGPATH-main= ${PKGPATH},-main -PKGNAME-server= bacula-server-$Vp0 +PKGNAME-server= bacula-server-$V FULLPKGNAME-bat= bacula-bat-$V FULLPKGPATH-bat= ${PKGPATH},-bat CATEGORIES= sysutils -PATCHFILES= 2.4.3-orphaned-jobs.patch - MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} HOMEPAGE= http://www.bacula.org/ @@ -161,7 +159,7 @@ LIB_DEPENDS-main= CONFIGURE_ARGS+= --disable-bat .else CONFIGURE_ARGS+= --enable-bat -WANTLIB-bat= ${WANTLIB} ICE SM X11 Xcursor Xext Xfixes +WANTLIB-bat= ${WANTLIB} ICE SM X11 Xext WANTLIB-bat+= Xi Xinerama Xrandr Xrender fontconfig freetype WANTLIB-bat+= glib-2.0 gthread-2.0 iconv intl png MULTI_PACKAGES+= -bat diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index ecab5de2a36..d8e89b24971 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,10 +1,5 @@ -MD5 (2.4.3-orphaned-jobs.patch) = sPGg9T41gYuLraY46k1EOg== -MD5 (bacula-2.4.3.tar.gz) = bGH3MOiW5hYdIdZ+/tVaWw== -RMD160 (2.4.3-orphaned-jobs.patch) = 0JmVj3TmbebdCmMdn9EtzNIVk2s= -RMD160 (bacula-2.4.3.tar.gz) = P8IWcYdG+M3B5Mo4Xj1vnHLFNMU= -SHA1 (2.4.3-orphaned-jobs.patch) = BLRL5GXwBDk2WAZWGeVNuYKJKvo= -SHA1 (bacula-2.4.3.tar.gz) = wk58K9hwZGfXHGCzLMzexBaQLMM= -SHA256 (2.4.3-orphaned-jobs.patch) = /NOy1/DfduFXeWhnvRffJ5HlJwX2wS51+8wG13RnKx4= -SHA256 (bacula-2.4.3.tar.gz) = 8NK802omeocROP+XOU7GRnHxwJ3G6aib8iHOCVfN+sI= -SIZE (2.4.3-orphaned-jobs.patch) = 565 -SIZE (bacula-2.4.3.tar.gz) = 3125702 +MD5 (bacula-2.4.4.tar.gz) = TrYVW0VhEBivAwAtN6L/3g== +RMD160 (bacula-2.4.4.tar.gz) = phOy1zHz03r/OLOuBQu9UcGzVnA= +SHA1 (bacula-2.4.4.tar.gz) = zNz4K/l11dfHtdkQH20KEqH5TAk= +SHA256 (bacula-2.4.4.tar.gz) = OmmL3w/T9VczpqSqvow9wrHtGtXKf6sAD24PgEqdPTg= +SIZE (bacula-2.4.4.tar.gz) = 3145564 diff --git a/sysutils/bacula/patches/patch-configure b/sysutils/bacula/patches/patch-configure index b111b651dd5..565c2fbd1b0 100644 --- a/sysutils/bacula/patches/patch-configure +++ b/sysutils/bacula/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.3 2008/10/19 03:44:42 merdely Exp $ ---- configure.orig Thu Jun 19 15:44:34 2008 -+++ configure Tue Jul 1 19:28:12 2008 -@@ -4014,7 +4014,7 @@ echo "${ECHO_T}no" >&6; } +$OpenBSD: patch-configure,v 1.4 2009/01/12 21:17:07 sthen Exp $ +--- configure.orig Sun Dec 28 10:41:33 2008 ++++ configure Tue Jan 6 12:45:22 2009 +@@ -4008,7 +4008,7 @@ echo "${ECHO_T}no" >&6; } fi @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.3 2008/10/19 03:44:42 merdely Exp $ { { echo "$as_me:$LINENO: error: Unable to find C++ compiler" >&5 echo "$as_me: error: Unable to find C++ compiler" >&2;} { (exit 1); exit 1; }; } -@@ -29982,6 +29982,7 @@ openbsd) +@@ -29981,6 +29981,7 @@ openbsd) platforms/openbsd/bacula-fd \ platforms/openbsd/bacula-sd \ platforms/openbsd/bacula-dir" @@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.3 2008/10/19 03:44:42 merdely Exp $ ;; redhat) if test -f /etc/whitebox-release ; then -@@ -31766,7 +31767,7 @@ if test "${support_bat}" = "yes" ; then +@@ -31765,7 +31766,7 @@ if test "${support_bat}" = "yes" ; then QMAKEBIN="qmake" if test "x$QMAKEQT4" != "xnone"; then diff --git a/sysutils/bacula/pkg/PLIST-bat b/sysutils/bacula/pkg/PLIST-bat index fd13a65a5e0..f5de8de5f32 100644 --- a/sysutils/bacula/pkg/PLIST-bat +++ b/sysutils/bacula/pkg/PLIST-bat @@ -1,17 +1,18 @@ -@comment $OpenBSD: PLIST-bat,v 1.3 2008/10/19 03:44:42 merdely Exp $ +@comment $OpenBSD: PLIST-bat,v 1.4 2009/01/12 21:17:07 sthen Exp $ @newgroup _bacula:591 @newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin @newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin @man man/man1/bat.1 @bin sbin/bat -share/examples/bacula/ @mode 750 @owner _bacula @group _bacula @sample ${BACULACONF}/ -@mode 644 +@mode @owner @group +share/examples/bacula/ +@mode 644 share/examples/bacula/bat.conf @mode 640 @owner _bacula diff --git a/sysutils/bacula/pkg/PLIST-server b/sysutils/bacula/pkg/PLIST-server index 4dcbf3b61c3..6ed5d4c31a4 100644 --- a/sysutils/bacula/pkg/PLIST-server +++ b/sysutils/bacula/pkg/PLIST-server @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-server,v 1.4 2008/10/19 03:44:42 merdely Exp $ +@comment $OpenBSD: PLIST-server,v 1.5 2009/01/12 21:17:07 sthen Exp $ @conflict bacula-<2.2.7 @newgroup _bacula:591 @newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin @@ -61,16 +61,17 @@ sbin/btraceback @bin sbin/dbcheck share/doc/bacula/ share/doc/bacula/README-server.OpenBSD -share/examples/bacula/ @mode 750 @owner _bacula @group _bacula @sample ${BACULACONF}/ @mode 770 @sample ${BACULASTATE}/ -@mode 644 +@mode @owner @group +share/examples/bacula/ +@mode 644 share/examples/bacula/bacula-dir.conf @mode 640 @owner _bacula