From owner-svn-ports-head@freebsd.org Fri Sep 23 00:21:05 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 EB10BBE5BD2;
Fri, 23 Sep 2016 00:21:05 +0000 (UTC)
(envelope-from swills@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 B86B819E7;
Fri, 23 Sep 2016 00:21:05 +0000 (UTC)
(envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8N0L4AE068047;
Fri, 23 Sep 2016 00:21:04 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8N0L4Uu068045;
Fri, 23 Sep 2016 00:21:04 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201609230021.u8N0L4Uu068045@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Fri, 23 Sep 2016 00:21:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r422642 - in head/sysutils/hal: . 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.23
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: Fri, 23 Sep 2016 00:21:06 -0000
Author: swills
Date: Fri Sep 23 00:21:04 2016
New Revision: 422642
URL: https://svnweb.freebsd.org/changeset/ports/422642
Log:
sysutils/hal: fix cd support
PR: 210354
Submitted by: Ivan Klymenko <fidaj@ukr.net>
Approved by: gnome@ (kwm)
Modified:
head/sysutils/hal/Makefile
head/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
Modified: head/sysutils/hal/Makefile
==============================================================================
--- head/sysutils/hal/Makefile Thu Sep 22 21:51:48 2016 (r422641)
+++ head/sysutils/hal/Makefile Fri Sep 23 00:21:04 2016 (r422642)
@@ -4,7 +4,7 @@
PORTNAME= hal
DISTVERSION= 0.5.14
-PORTREVISION= 30
+PORTREVISION= 31
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
Modified: head/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
==============================================================================
--- head/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c Thu Sep 22 21:51:48 2016 (r422641)
+++ head/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c Fri Sep 23 00:21:04 2016 (r422642)
@@ -9,6 +9,15 @@
{
hal_device_property_set_string(device, "storage.bus", "usb");
hal_device_property_set_string(device, "storage.originating_device", hal_device_get_udi(parent));
+@@ -301,7 +301,7 @@
+
+ driver = hal_device_property_get_string(child, "freebsd.driver");
+ /* ATAPI devices: CD-ROM (acd), tape (ast) or floppy (afd) */
+- if (! driver || (strcmp(driver, "acd") && strcmp(driver, "ast") && strcmp(driver, "afd")))
++ if (! driver || (strcmp(driver, "acd") && strcmp(driver, "ast") && strcmp(driver, "afd") && strcmp(driver, "cd")))
+ continue;
+
+ phys_device = hal_device_property_get_string(child, "storage.originating_device");
@@ -508,6 +508,16 @@
if (! parent || ! hal_device_property_get_bool(parent, "info.ignore"))
{