From owner-svn-ports-head@freebsd.org  Wed Jan 27 23:07:09 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D752DA706CA;
 Wed, 27 Jan 2016 23:07:09 +0000 (UTC) (envelope-from acm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A9A0F109F;
 Wed, 27 Jan 2016 23:07:09 +0000 (UTC) (envelope-from acm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0RN78ra031241;
 Wed, 27 Jan 2016 23:07:08 GMT (envelope-from acm@FreeBSD.org)
Received: (from acm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RN78hr031239;
 Wed, 27 Jan 2016 23:07:08 GMT (envelope-from acm@FreeBSD.org)
Message-Id: <201601272307.u0RN78hr031239@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org
 using -f
From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
Date: Wed, 27 Jan 2016 23:07:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r407390 - in head/sysutils/bareos-server: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 23:07:09 -0000

Author: acm
Date: Wed Jan 27 23:07:08 2016
New Revision: 407390
URL: https://svnweb.freebsd.org/changeset/ports/407390

Log:
  - Fix a problem with NDMP jobs
  - Bump PORTREVISION
  
  Obtained from:	https://bugs.bareos.org/view.php?id=604

Added:
  head/sysutils/bareos-server/files/patch-src-stored-ndmp_tape.c   (contents, props changed)
Modified:
  head/sysutils/bareos-server/Makefile

Modified: head/sysutils/bareos-server/Makefile
==============================================================================
--- head/sysutils/bareos-server/Makefile	Wed Jan 27 21:02:30 2016	(r407389)
+++ head/sysutils/bareos-server/Makefile	Wed Jan 27 23:07:08 2016	(r407390)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bareos
 DISTVERSION=	15.2.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server

Added: head/sysutils/bareos-server/files/patch-src-stored-ndmp_tape.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/bareos-server/files/patch-src-stored-ndmp_tape.c	Wed Jan 27 23:07:08 2016	(r407390)
@@ -0,0 +1,19 @@
+--- src/stored/ndmp_tape.c	2016-01-27 17:57:48.370956000 -0500
++++ src/stored/ndmp_tape.c	2016-01-27 17:59:50.890336000 -0500
+@@ -347,6 +347,16 @@
+    DCR *dcr = jcr->dcr;
+    POOLMEM *rec_data;
+ 
++   if (!dcr) {
++      Dmsg0(100, "No dcr defined, bailing out\n");
++      return retval;
++   }
++
++   if (!dcr->rec) {
++      Dmsg0(100, "No dcr->rec defined, bailing out\n");
++      return retval;
++   }
++
+    /*
+     * Keep track of the original data buffer and restore it on exit from this function.
+     */