>Number:         31570
>Category:       pkg
>Synopsis:       sysutils/bacula update to 1.36.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Oct 12 19:30:00 +0000 2005
>Originator:     Geert Hendrickx
>Release:        NetBSD 2.1_RC5
>Organization:
	
>Environment:
	
	
System: NetBSD mantis 2.1_RC5 NetBSD 2.1_RC5 (MANTIS) #0: Tue Sep 20 13:08:45 CEST 2005 geert@mantis:/cvs/obj/sys/arch/i386/compile/MANTIS i386
Architecture: i386
Machine: i386
>Description:
	
This is an update for sysutils/bacula version to version 1.36.3, the
latest version on its stable branch.  

One patch was added (patch-ag), because this version uses statvfs(2),
which NetBSD 2.0.x doesn't have.  Simply replacing it with statfs(2)
works nicely.  

I also moved the .include "../../mk/bsd.pkg.mk" line from
Makefile.common to Makefile, as is more common (and necessary once this
package will be split in -server and -client parts).  

Please note that this version still is vulnerable to
http://secunia.com/advisories/16866/
This issue has been fixed in CVS, but no new release on the 1.36.x
branch has been made yet.  I'll try to pullup the changes into patches/.  
>How-To-Repeat:
	
>Fix:
	
Here's the diff: 

? patches/patch-ag
Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/sysutils/bacula/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	16 Jan 2005 19:34:45 -0000	1.3
+++ Makefile	12 Oct 2005 19:22:57 -0000
@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.3 2005/01/16 19:34:45 kristerw Exp $
 
-PKGREVISION=	1
-
 .include "Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
Index: Makefile.common
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/sysutils/bacula/Makefile.common,v
retrieving revision 1.10
diff -u -r1.10 Makefile.common
--- Makefile.common	10 Oct 2005 17:04:15 -0000	1.10
+++ Makefile.common	12 Oct 2005 19:22:57 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.10 2005/10/10 17:04:15 hira Exp $
 #
 
-DISTNAME=		bacula-1.36.0
+DISTNAME=		bacula-1.36.3
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 
@@ -80,4 +80,3 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/sysutils/bacula/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	24 Feb 2005 13:40:50 -0000	1.2
+++ distinfo	12 Oct 2005 19:22:57 -0000
@@ -1,9 +1,10 @@
 $NetBSD: distinfo,v 1.2 2005/02/24 13:40:50 agc Exp $
 
-SHA1 (bacula-1.36.0.tar.gz) = 022606a36bb5c094a8e212c57c0f41d83b458172
-RMD160 (bacula-1.36.0.tar.gz) = a005ad833f006bd5f074f973d6e2f6ef69964d62
-Size (bacula-1.36.0.tar.gz) = 6806740 bytes
+SHA1 (bacula-1.36.3.tar.gz) = 4b3366e43fd4a8b6cbdc23e86ea20da6933d0f75
+RMD160 (bacula-1.36.3.tar.gz) = e8fb6eee221e261ac5b927019f9e69256cfb1732
+Size (bacula-1.36.3.tar.gz) = 11153154 bytes
 SHA1 (patch-aa) = 3369d0c37108f05828ea7c33b7aabc287e0213fd
 SHA1 (patch-ac) = 295dbf7fc6d1f5104b13d37a8ff32ea8580d4019
 SHA1 (patch-ae) = ad4b7d5cb83f021235c11504a034def897fffcac
 SHA1 (patch-af) = 926e74b83a09f4620672ffb8419d9ea22983d231
+SHA1 (patch-ag) = 62a982073fea267bc87c4dbb5691cf4d8c26c204


and here's the new patches/patch-ag file:

$NetBSD$

--- src/findlib/fstype.c.orig	2005-04-05 19:23:56.000000000 +0200
+++ src/findlib/fstype.c
@@ -82,8 +82,8 @@ bool fstype(const char *fname, char *fs,
 
 bool fstype(const char *fname, char *fs, int fslen)
 {
-   struct statvfs st;
-   if (statvfs(fname, &st) == 0) {
+   struct statfs st;
+   if (statfs(fname, &st) == 0) {
       bstrncpy(fs, st.f_fstypename, fslen);
       return true;
    }

>Unformatted: