From owner-svn-ports-all@freebsd.org Tue Aug 21 07:18:30 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98C53108BD15; Tue, 21 Aug 2018 07:18:30 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 453F176D24; Tue, 21 Aug 2018 07:18:30 +0000 (UTC) (envelope-from koobs@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 200F320CB6; Tue, 21 Aug 2018 07:18:30 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7L7ITFZ043327; Tue, 21 Aug 2018 07:18:29 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7L7ISt2043322; Tue, 21 Aug 2018 07:18:28 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201808210718.w7L7ISt2043322@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Tue, 21 Aug 2018 07:18:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r477708 - in branches/2018Q3/sysutils/dvd+rw-tools: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in branches/2018Q3/sysutils/dvd+rw-tools: . files X-SVN-Commit-Revision: 477708 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Aug 2018 07:18:30 -0000 Author: koobs Date: Tue Aug 21 07:18:28 2018 New Revision: 477708 URL: https://svnweb.freebsd.org/changeset/ports/477708 Log: MFH: r476826 sysutils/dvd+rw-tools: Fix issue appending more than 25gb on BD-R DL discs While burning ISO Multisession BD-R 50G growisofs reports no space left while 24G+ are available. Backport a fix from Debian [1] to address the issue. While I'm here, document description and origins of both patches [1][2] that apply to same source file, for our future selves, and to avoid confusion as both chunks reference the same variable. [1] https://bugs.debian.org/615978 [2] https://bugs.debian.org/713016 PR: 230493 Submitted by: Masachika ISHIZUKA Approved by: portmgr (implicit, unmaintained port) Obtained from: Debian [1] Approved by: miwi (ports-secteam) Modified: branches/2018Q3/sysutils/dvd+rw-tools/Makefile branches/2018Q3/sysutils/dvd+rw-tools/files/patch-Makefile.m4 branches/2018Q3/sysutils/dvd+rw-tools/files/patch-growisofs__mmc.cpp branches/2018Q3/sysutils/dvd+rw-tools/files/patch-mp.h branches/2018Q3/sysutils/dvd+rw-tools/files/patch-transport.hxx Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/sysutils/dvd+rw-tools/Makefile ============================================================================== --- branches/2018Q3/sysutils/dvd+rw-tools/Makefile Tue Aug 21 07:16:14 2018 (r477707) +++ branches/2018Q3/sysutils/dvd+rw-tools/Makefile Tue Aug 21 07:18:28 2018 (r477708) @@ -3,7 +3,7 @@ PORTNAME= dvd+rw-tools PORTVERSION= 7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.pkix.net/mirror/fy.chalmers.se/ \ http://fy.chalmers.se/~appro/linux/DVD+RW/tools/ Modified: branches/2018Q3/sysutils/dvd+rw-tools/files/patch-Makefile.m4 ============================================================================== --- branches/2018Q3/sysutils/dvd+rw-tools/files/patch-Makefile.m4 Tue Aug 21 07:16:14 2018 (r477707) +++ branches/2018Q3/sysutils/dvd+rw-tools/files/patch-Makefile.m4 Tue Aug 21 07:18:28 2018 (r477708) @@ -1,6 +1,6 @@ --- Makefile.m4.orig 2008-03-02 17:17:09 UTC +++ Makefile.m4 -@@ -13,6 +13,7 @@ ifelse(substr(OS,0,7),[CYGWIN_],[define( +@@ -13,6 +13,7 @@ ifelse(substr(OS,0,7),[CYGWIN_],[define([OS],[MINGW32] ifelse(substr(OS,0,7),[MINGW32],[define([OS],[MINGW32])]) ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix]) ifelse(OS,OpenBSD,[define([OS],[BSD])]) Modified: branches/2018Q3/sysutils/dvd+rw-tools/files/patch-growisofs__mmc.cpp ============================================================================== --- branches/2018Q3/sysutils/dvd+rw-tools/files/patch-growisofs__mmc.cpp Tue Aug 21 07:16:14 2018 (r477707) +++ branches/2018Q3/sysutils/dvd+rw-tools/files/patch-growisofs__mmc.cpp Tue Aug 21 07:18:28 2018 (r477708) @@ -1,11 +1,26 @@ +# Cannot append data to BD-R DL used more than 25gb +# https://bugs.freebsd.org/230493 via http://bugs.debian.org/615978 +# +# growisofs error: close session failed when burning 25gb blu-ray disc +# https://bugs.freebsd.org/198991 via http://bugs.debian.org/713016 + --- growisofs_mmc.cpp.orig 2008-03-04 17:47:49 UTC +++ growisofs_mmc.cpp -@@ -756,6 +756,8 @@ static void bd_r_format (Scsi_Command &c +@@ -410,7 +410,7 @@ static unsigned int get_2k_capacity (Scsi_Command &cmd + } - wait_for_unit (cmd); + nwa = 0; +- if (buf[7]&1 && !bdr_plus_pow) // NWA_V ++ if (buf[7]&1) // NWA_V + { nwa = buf[12]<<24; + nwa |= buf[13]<<16; + nwa |= buf[14]<<8; +@@ -755,6 +755,8 @@ static void bd_r_format (Scsi_Command &cmd) + exit (FATAL_START(errno)); -+ bdr_plus_pow = 1; + wait_for_unit (cmd); + ++ bdr_plus_pow = 1; + cmd[0] = 0x35; // FLUSH CACHE cmd[9] = 0; - cmd.transport(); Modified: branches/2018Q3/sysutils/dvd+rw-tools/files/patch-mp.h ============================================================================== --- branches/2018Q3/sysutils/dvd+rw-tools/files/patch-mp.h Tue Aug 21 07:16:14 2018 (r477707) +++ branches/2018Q3/sysutils/dvd+rw-tools/files/patch-mp.h Tue Aug 21 07:18:28 2018 (r477708) @@ -1,6 +1,6 @@ --- mp.h.orig 2008-02-24 17:56:07 UTC +++ mp.h -@@ -46,7 +46,9 @@ static void *__thread_create(int (*func) +@@ -46,7 +46,9 @@ static void *__thread_create(int (*func)(void *),void if (pthread_attr_init(&attr)==0 && pthread_attr_setstacksize(&attr,stack_sz)==0 && Modified: branches/2018Q3/sysutils/dvd+rw-tools/files/patch-transport.hxx ============================================================================== --- branches/2018Q3/sysutils/dvd+rw-tools/files/patch-transport.hxx Tue Aug 21 07:16:14 2018 (r477707) +++ branches/2018Q3/sysutils/dvd+rw-tools/files/patch-transport.hxx Tue Aug 21 07:18:28 2018 (r477708) @@ -1,6 +1,6 @@ --- transport.hxx.orig 2008-03-01 10:34:43 UTC +++ transport.hxx -@@ -483,7 +483,7 @@ public: +@@ -483,7 +483,7 @@ class Scsi_Command { (public) { return 1; } };