Attachment 248537 Details for Bug 277115 – 0001-sysutils-cdrdao-Zero-or-odd-length-DMA-fix.patch

[patch] 0001-sysutils-cdrdao-Zero-or-odd-length-DMA-fix.patch

0001-sysutils-cdrdao-Zero-or-odd-length-DMA-fix.patch (text/plain), 2.61 KB, created by Benjamin Jacobs on 2024-02-17 17:31:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Jacobs

Created: 2024-02-17 17:31:21 UTC

Size: 2.61 KB

patch

obsolete

>From 869acdddac6ffe34111c433d40a0550af62668fd Mon Sep 17 00:00:00 2001
>From: Benjamin Jacobs <freebsd@dev.thsi.be>
>Date: Sat, 17 Feb 2024 15:45:27 +0000
>Subject: [PATCH] sysutils/cdrdao: Zero or odd-length DMA fix
>
>* patch to fix bad CAM CCB.
>
>* switch to new mandir.
>
>PR:             277115
>---
> sysutils/cdrdao/Makefile                        |  2 ++
> .../files/patch-dao_ScsiIf-freebsd-cam.cc       | 17 +++++++++++++++++
> sysutils/cdrdao/pkg-plist                       |  8 ++++----
> 3 files changed, 23 insertions(+), 4 deletions(-)
> create mode 100644 sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc
>
>diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
>index 0256027261d3..684e99938325 100644
>--- a/sysutils/cdrdao/Makefile
>+++ b/sysutils/cdrdao/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	cdrdao
> DISTVERSION=	1_2_5
>+PORTREVISION=	1
> CATEGORIES=	sysutils audio
> MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/rel_${DISTVERSION}/ \
> 		SF/${PORTNAME}/rel_${DISTVERSION}
>@@ -21,6 +22,7 @@ CONFIGURE_ARGS=	--with-gcdmaster=no \
> 		--without-pcctsinc \
> 		--with-posix-threads=no \
> 		--with-scglib
>+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
> 
> OPTIONS_DEFINE=		DOCS TOC2MP3 MP3OGG
> OPTIONS_DEFAULT=	MP3OGG
>diff --git a/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc b/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc
>new file mode 100644
>index 000000000000..c1b73187481c
>--- /dev/null
>+++ b/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc
>@@ -0,0 +1,17 @@
>+--- dao/ScsiIf-freebsd-cam.cc.orig	2023-01-25 14:30:35 UTC
>++++ dao/ScsiIf-freebsd-cam.cc
>+@@ -125,8 +125,13 @@ int ScsiIf::sendCmd(const unsigned char *cmd, int cmdL
>+ 	}
>+ 	else if (dataIn && dataInLen > 0) {
>+ 		data_ptr = dataIn;
>+-		data_len = dataInLen;
>++		data_len = dataInLen + (dataInLen % 2);
>+ 		flags = CAM_DIR_IN;
>++	}
>++	else {
>++		data_len = 0;
>++		data_ptr = (u_int8_t *)0;
>++		flags = CAM_DIR_NONE;
>+ 	}
>+ 
>+ 	cam_fill_csio(&impl_->ccb->csio,
>diff --git a/sysutils/cdrdao/pkg-plist b/sysutils/cdrdao/pkg-plist
>index be2ca724326c..6c53eb53a731 100644
>--- a/sysutils/cdrdao/pkg-plist
>+++ b/sysutils/cdrdao/pkg-plist
>@@ -4,10 +4,10 @@ bin/toc2cddb
> bin/toc2cue
> %%TOC2MP3%%bin/toc2mp3
> @postunexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi
>-man/man1/cdrdao.1.gz
>-man/man1/cue2toc.1.gz
>-man/man1/toc2cddb.1.gz
>-man/man1/toc2cue.1.gz
>+share/man/man1/cdrdao.1.gz
>+share/man/man1/cue2toc.1.gz
>+share/man/man1/toc2cddb.1.gz
>+share/man/man1/toc2cue.1.gz
> %%DATADIR%%/drivers
> %%PORTDOCS%%%%DOCSDIR%%/CREDITS
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 277115: 248537 | 248539 | 248560