From chuck@pkix.net  Fri Mar 30 18:38:00 2007
Return-Path: <chuck@pkix.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 179B116A407
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Mar 2007 18:38:00 +0000 (UTC)
	(envelope-from chuck@pkix.net)
Received: from pkix-gw.codefab.com (pkix-gw.codefab.com [199.103.21.226])
	by mx1.freebsd.org (Postfix) with ESMTP id B78C413C4C7
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Mar 2007 18:37:59 +0000 (UTC)
	(envelope-from chuck@pkix.net)
Received: from localhost (localhost [127.0.0.1])
	by ns1.pkix.net (Postfix) with ESMTP id 8A63C54E0
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Mar 2007 14:19:56 -0400 (EDT)
Received: from pkix-gw.codefab.com ([127.0.0.1])
	by localhost (ns1.pkix.net [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id sP0ClMiAAFX4 for <FreeBSD-gnats-submit@freebsd.org>;
	Fri, 30 Mar 2007 14:19:49 -0400 (EDT)
Received: by pkix-gw.codefab.com (Postfix, from userid 1003)
	id A6F2954DF; Fri, 30 Mar 2007 14:19:49 -0400 (EDT)
Message-Id: <20070330181949.A6F2954DF@pkix-gw.codefab.com>
Date: Fri, 30 Mar 2007 14:19:49 -0400 (EDT)
From: Charles Swiger <chuck@pkix.net>
Reply-To: Charles Swiger <chuck@pkix.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update port: sysutils/dvd+rw-tools to v7.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         111042
>Category:       ports
>Synopsis:       update port: sysutils/dvd+rw-tools to v7.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 30 18:40:04 GMT 2007
>Closed-Date:    Fri Mar 30 20:51:54 GMT 2007
>Last-Modified:  Fri Mar 30 21:00:09 GMT 2007
>Originator:     Charles Swiger
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
PKIx
>Environment:
System: FreeBSD ns1.pkix.net 4.11-STABLE FreeBSD 4.11-STABLE #0: Sat Jun 18 18:51:43 EDT 2005 root@ns1.pkix.net:/usr/obj/usr/src/sys/NORMAL i386

	
>Description:

Update dvd+rw-tools port to v7.0 & including Bacula support patch updated
thanks to <h.eichmann@gmx.de>.

>How-To-Repeat:

N/A.

>Fix:

diff -dur dvd+rw-tools_orig/Makefile dvd+rw-tools/Makefile
--- dvd+rw-tools_orig/Makefile	Fri Mar 30 14:04:54 2007
+++ dvd+rw-tools/Makefile	Fri Mar 30 14:06:04 2007
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/sysutils/dvd+rw-tools/Makefile,v 1.24 2007/01/31 14:07:58 pav Exp $
 
 PORTNAME=	dvd+rw-tools
-PORTVERSION=	6.1
+PORTVERSION=	7.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.pkix.net/mirror/fy.chalmers.se/ \
 		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/
diff -dur dvd+rw-tools_orig/distinfo dvd+rw-tools/distinfo
--- dvd+rw-tools_orig/distinfo	Fri Mar 30 14:04:54 2007
+++ dvd+rw-tools/distinfo	Fri Mar 30 14:06:14 2007
@@ -1,3 +1,3 @@
-MD5 (dvd+rw-tools-6.1.tar.gz) = d6bad594e55a2e0d7cf76ce452fce399
-SHA256 (dvd+rw-tools-6.1.tar.gz) = 43ddf89a5aaafcf4725337c107d0dfa659132541696c8ba1ed74bea19c4e33f1
-SIZE (dvd+rw-tools-6.1.tar.gz) = 121425
+MD5 (dvd+rw-tools-7.0.tar.gz) = 2eb9c2a6b1e6bc7c4d72d3b5ece34ceb
+SHA256 (dvd+rw-tools-7.0.tar.gz) = c9ffc46ac4e97153f1752f0232a135ebae5688a8e35e975d23e958b785951422
+SIZE (dvd+rw-tools-7.0.tar.gz) = 131259
diff -dur dvd+rw-tools_orig/files/patch-growisofs.c dvd+rw-tools/files/patch-growisofs.c
--- dvd+rw-tools_orig/files/patch-growisofs.c	Fri Mar 30 14:04:54 2007
+++ dvd+rw-tools/files/patch-growisofs.c	Fri Mar 30 14:11:02 2007
@@ -1,12 +1,12 @@
---- growisofs.c_old	2006-01-26 22:16:54.000000000 +0100
-+++ growisofs.c	2006-02-15 00:00:44.000000000 +0100
-@@ -355,12 +355,17 @@
-  * - Treat only x73xx OPC errors as fatal;
-  * - Fix typo in -speed scaling code;
-  * - permit tracksize to be not divisible by 32KB in DAO mode;
-+ * 6.1.1: (by Nicolas Boichat, Bacula project)
+--- growisofs.c.orig	Sun Sep 24 17:28:53 2006
++++ growisofs.c	Fri Feb  2 12:08:20 2007
+@@ -370,12 +370,17 @@
+  *   upon Layer Break command, therefore longer timeout is required;
+  * - Linux: deploy BLKFLSBUF to avoid media reloads when possible;
+  * - add unit buffer utilization indicator [by request from K3b];
++ * 7.0.1: (by Nicolas Boichat, Bacula project)
 + * - Allow session to cross 4GB boundary regardless of medium type
-+ *   (don't need to have a DL media)
++ *   (dont need to have a DL media)
 + * - Add a -F option (used instead of -M or -Z), which displays next_session
 + *   offset and capacity (free space = next_session - capacity).
   */
@@ -14,12 +14,12 @@
      char *s=strrchr((cmd),'/');				\
      s ? s++ : (s=(cmd));				\
      printf ("* %.*sgrowisofs by <appro@fy.chalmers.se>,"\
--	    " version 6.1,\n",(int)(s-(cmd)),(cmd));	\
-+	    " version 6.1.1,\n",(int)(s-(cmd)),(cmd));	\
+-	    " version 7.0,\n",(int)(s-(cmd)),(cmd));	\
++	    " version 7.0.1,\n",(int)(s-(cmd)),(cmd));	\
  } while (0)
  
  #define _LARGEFILE_SOURCE 
-@@ -2329,6 +2334,18 @@
+@@ -2773,6 +2778,18 @@
  		else          in_device = argv[++i];
  		dev_found = 'Z';
  	    }
@@ -38,27 +38,44 @@
  	    else if (!strcmp(opt,"-poor-man"))
  	    {	if (poor_man<0) poor_man = 1;
  		continue;
-@@ -2542,7 +2559,9 @@
+@@ -2908,6 +2925,9 @@
+ 		fflush (stdout);
+ #if defined(__unix) || defined(__unix__)
+ 		setuid(getuid());
++# ifdef __FreeBSD__
++		munlockall();
++#endif
+ 		execlp (mkisofs_argv[0],mkisofs_argv[0],"-version",NULL);
+ #elif defined(_WIN32)
+ 		if (_spawnl (_P_WAIT,mkisofs_argv[0],
+@@ -2989,11 +3009,14 @@
+ 		if (n==0) set_errno(EIO);	/* end-of-file reached? */
+ 	    }
+ 	    if (n!=2048 && dev_found=='M')
++	    {
+ 		perror (":-( unable to pread64(2) primary volume descriptor"),
  		fprintf (stderr,"    you most likely want to use -Z option.\n"), 
  		exit (FATAL_START(errno));
- 
+-
 -	    if (dev_found == 'M')
++	    }
 +		if ((dev_found == 'M') || 
 +			((dev_found == 'F') && !(mmc_profile&0x10000)) && (saved_descriptors[0].type[0] || saved_descriptors[0].type[1] || saved_descriptors[0].type[2]))
 +				/* -F : The medium is not blank, there is a fs on it (the_buffer[0,1 or 2] != 0), so compute next_session. */
  	    {	if (memcmp (saved_descriptors[0].type,"\1CD001",6))
  	            fprintf (stderr,":-( %s doesn't look like isofs...\n",
  		    		in_device), exit(FATAL_START(EMEDIUMTYPE));
-@@ -2565,7 +2584,7 @@
+@@ -3016,8 +3039,7 @@
  			exit(FATAL_START(EINVAL));
  		}
  		else if (next_session > (0x200000-0x5000)) /* 4GB/2K-40MB/2K */
--		    if ((mmc_profile&0xFFFF)!=0x2B || !no_4gb_check)
+-		    if ((mmc_profile&0xFFFF)<0x20 ||
+-			((mmc_profile&0xFFFF)<0x40 && !no_4gb_check))
 +		    if (!no_4gb_check)
  			fprintf (stderr,":-( next session would cross 4GB "
  					"boundary, aborting...\n"),
  			exit (FATAL_START(ENOSPC));
-@@ -2608,7 +2627,7 @@
+@@ -3060,7 +3082,7 @@
  	exit (FATAL_START(EINVAL));
  
      if (imgfd<0)
@@ -67,10 +84,11 @@
  	    fprintf (stderr,"%s: no mkisofs options specified, "
  			    "aborting...\n",argv[0]),
  	    exit (FATAL_START(EINVAL));
-@@ -2880,6 +2899,15 @@
+@@ -3243,6 +3265,15 @@
+ 		break;
  	}
      }
- 
++
 +	if (dev_found == 'F') {
 +		off64_t capacity = 0;
 +		printf("next_session=%lld\n", next_session*CD_BLOCK);
@@ -79,7 +97,6 @@
 +		printf("capacity=%lld\n", capacity);
 +		exit(0);
 +	}
-+
+ 
      if (imgfd>=0)
      {	quiet--;
- 	if (builtin_dd (imgfd,out_fd,next_session*CD_BLOCK) < 0)
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Mar 30 20:46:51 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111042 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/111042: commit references a PR
Date: Fri, 30 Mar 2007 20:51:50 +0000 (UTC)

 pav         2007-03-30 20:51:44 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/dvd+rw-tools Makefile distinfo 
     sysutils/dvd+rw-tools/files patch-growisofs.c 
   Log:
   - Update to 7.0
   
   PR:             ports/111042
   Submitted by:   Charles Swiger <chuck@pkix.net> (maintainer)
   
   Revision  Changes    Path
   1.25      +1 -1      ports/sysutils/dvd+rw-tools/Makefile
   1.17      +3 -3      ports/sysutils/dvd+rw-tools/distinfo
   1.5       +37 -20    ports/sysutils/dvd+rw-tools/files/patch-growisofs.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
