[Midnightbsd-cvs] mports [23634] fix some issues with hal and modernize a bit
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 22 13:04:48 EDT 2018
Revision: 23634
http://svnweb.midnightbsd.org/mports/?rev=23634
Author: laffer1
Date: 2018-07-22 13:04:48 -0400 (Sun, 22 Jul 2018)
Log Message:
-----------
fix some issues with hal and modernize a bit
Modified Paths:
--------------
trunk/sysutils/hal/Makefile
trunk/sysutils/hal/files/README.fuse
trunk/sysutils/hal/files/hald.in
trunk/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c
trunk/sysutils/hal/files/patch-hald_hf-storage.c
trunk/sysutils/hal/files/patch-tools_hal-storage-mount.c
trunk/sysutils/hal/pkg-plist
Property Changed:
----------------
trunk/sysutils/hal/files/10-mouse-sysmouse.fdi
trunk/sysutils/hal/files/README.fuse
trunk/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
trunk/sysutils/hal/files/hald.in
trunk/sysutils/hal/files/mount-fuse
trunk/sysutils/hal/files/patch-Makefile.in
trunk/sysutils/hal/files/patch-doc_Makefile.in
trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi
trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
trunk/sysutils/hal/files/patch-hald-runner_runner.c
trunk/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
trunk/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
trunk/sysutils/hal/files/patch-hald_freebsd_hf-drm.c
trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
trunk/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
trunk/sysutils/hal/files/patch-hald_freebsd_probe-usb2-device.c
trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c
trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c
trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c
trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
trunk/sysutils/hal/files/patch-hald_hf-storage.c
trunk/sysutils/hal/files/patch-tools_hal-storage-eject.c
trunk/sysutils/hal/files/patch-tools_hal-storage-mount.c
trunk/sysutils/hal/files/patch-tools_hal-storage-shared.c
trunk/sysutils/hal/files/pkg-deinstall.in
trunk/sysutils/hal/files/pkg-install.in
Modified: trunk/sysutils/hal/Makefile
===================================================================
--- trunk/sysutils/hal/Makefile 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/Makefile 2018-07-22 17:04:48 UTC (rev 23634)
@@ -2,7 +2,7 @@
PORTNAME= hal
DISTVERSION= 0.5.14
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
@@ -11,19 +11,18 @@
LICENSE= gpl2
-BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
# keep shared lib ver to avoid polkit confusion
-LIB_DEPENDS= libpolkit.so.2:${PORTSDIR}/sysutils/policykit \
- libvolume_id.so:${PORTSDIR}/devel/libvolume_id \
- libck-connector.so:${PORTSDIR}/sysutils/consolekit
-RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
- bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS= libpolkit.so.2:sysutils/policykit \
+ libvolume_id.so:devel/libvolume_id \
+ libck-connector.so:sysutils/consolekit2
+RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids \
+ bash:shells/bash
-USES= gettext gmake libtool:keepla pathfix pkgconfig shebangfix
+USES= gettext gmake libtool:keepla pathfix pkgconfig python shebangfix
USE_GNOME= intlhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PYTHON= yes
CONFIGURE_ARGS= --disable-gtk-doc \
--with-backend=freebsd \
--disable-docbook-docs \
@@ -72,15 +71,12 @@
.include <bsd.port.pre.mk>
-RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode
-
-.if ${OSVERSION} >= 5000
-PLIST_SUB+= USB2=""
-.else
-PLIST_SUB+= USB2="@comment "
+.if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
+RUN_DEPENDS+= dmidecode:sysutils/dmidecode
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's/==/=/g' ${WRKSRC}/tools/hal-luks*
@${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
${WRKSRC}/tools/Makefile.in \
${WRKSRC}/tools/freebsd/Makefile.in
Index: trunk/sysutils/hal/files/10-mouse-sysmouse.fdi
===================================================================
--- trunk/sysutils/hal/files/10-mouse-sysmouse.fdi 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/10-mouse-sysmouse.fdi 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/10-mouse-sysmouse.fdi
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/hal/files/README.fuse
===================================================================
--- trunk/sysutils/hal/files/README.fuse 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/README.fuse 2018-07-22 17:04:48 UTC (rev 23634)
@@ -1,7 +1,7 @@
Mounting Fuse File Systems with HAL
-----------------------------------
-$FreeBSD$
+$MidnightBSD: head/sysutils/hal/files/README.fuse 340872 2014-01-24 00:14:07Z mat $
Hal supports mounting Fuse device-backed file systems (e.g. NTFS). To enable
this feature, copy the included %%LOCALBASE%%/share/hal/mount-fuse script
Property changes on: trunk/sysutils/hal/files/README.fuse
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
===================================================================
--- trunk/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/sysutils/hal/files/hald.in
===================================================================
--- trunk/sysutils/hal/files/hald.in 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/hald.in 2018-07-22 17:04:48 UTC (rev 23634)
@@ -1,10 +1,9 @@
#!/bin/sh
#
-# $FreeBSD$
-# $MCom: ports/sysutils/hal/files/hald.in,v 1.22 2010/04/17 19:05:10 marcus Exp $
+# $MidnightBSD: head/sysutils/hal/files/hald.in 420769 2016-08-24 07:49:40Z kevlo $
#
# PROVIDE: hald
-# REQUIRE: DAEMON usbd devd dbus moused webcamd
+# REQUIRE: DAEMON devd dbus moused webcamd
#
# Add the following line to /etc/rc.conf to enable the HAL daemon:
#
Property changes on: trunk/sysutils/hal/files/hald.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Index: trunk/sysutils/hal/files/mount-fuse
===================================================================
--- trunk/sysutils/hal/files/mount-fuse 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/mount-fuse 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/mount-fuse
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-Makefile.in
===================================================================
--- trunk/sysutils/hal/files/patch-Makefile.in 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-Makefile.in 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-doc_Makefile.in
===================================================================
--- trunk/sysutils/hal/files/patch-doc_Makefile.in 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-doc_Makefile.in 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-doc_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi
===================================================================
--- trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
===================================================================
--- trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald-runner_runner.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald-runner_runner.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald-runner_runner.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald-runner_runner.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_hf-devd.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_hf-devd.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_hf-drm.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_hf-drm.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_hf-drm.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_hf-drm.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c 2018-07-22 17:04:48 UTC (rev 23634)
@@ -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"))
{
Index: trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c 2018-07-22 17:04:48 UTC (rev 23634)
@@ -1,5 +1,5 @@
--- hald/freebsd/hf-usb2.c.orig 2009-08-24 14:42:29.000000000 +0200
-+++ hald/freebsd/hf-usb2.c 2011-06-28 16:18:02.000000000 +0200
++++ hald/freebsd/hf-usb2.c 2014-02-06 08:22:11.000000000 +0100
@@ -22,7 +22,7 @@
**************************************************************************/
@@ -9,7 +9,7 @@
#endif
#include <string.h>
-@@ -42,246 +42,200 @@
+@@ -42,246 +42,213 @@
static struct libusb20_backend *hf_usb2_be = NULL;
static void
@@ -61,7 +61,7 @@
+ if (driver) {
+ if (!strcmp(driver, "ukbd"))
+ hf_device_set_input(device, "keyboard", "keys", NULL);
-+ else if (!strcmp(driver, "ums") || !strcmp(driver, "atp")) {
++ else if (!strcmp(driver, "ums") || !strcmp(driver, "atp") || !strcmp(driver, "wsp")) {
+ hf_device_set_input(device, "mouse", NULL, devname);
+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
+ } else if (!strcmp(driver, "uhid")) {
@@ -94,6 +94,19 @@
+
+ hf_usb_device_compute_udi(device);
+ hf_device_add(device);
++
++ /*
++ * The SCSI bus could already exist; make it a child of
++ * this USB interface.
++ */
++ if (driver && !strcmp(driver, "umass")) {
++ HalDevice *scsi_bus;
++ scsi_bus = hf_device_store_match(hald_get_gdl(),
++ "scsi_host.freebsd.driver", HAL_PROPERTY_TYPE_STRING, driver,
++ "scsi_host.freebsd.unit", HAL_PROPERTY_TYPE_INT32, hal_device_property_get_int(device, "freebsd.unit"), NULL);
++ if (scsi_bus)
++ hal_device_property_set_string(scsi_bus, "info.parent", hal_device_get_udi(device));
++ }
+ }
+ }
}
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_hf-volume.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_hf-volume.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_probe-usb2-device.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_probe-usb2-device.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_probe-usb2-device.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_probe-usb2-device.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c 2018-07-22 17:04:48 UTC (rev 23634)
@@ -1,8 +1,8 @@
---- hald/freebsd/probing/probe-video4linux.c.orig 2010-02-21 14:51:01.000000000 -0500
-+++ hald/freebsd/probing/probe-video4linux.c 2010-02-21 14:54:51.000000000 -0500
-@@ -0,0 +1,225 @@
+--- hald/freebsd/probing/probe-video4linux.c.orig 2014-10-03 22:48:53.887627582 -0300
++++ hald/freebsd/probing/probe-video4linux.c 2014-10-12 23:37:47.263963719 -0300
+@@ -0,0 +1,218 @@
+/***************************************************************************
-+ * CVSID: $Id: patch-hald_freebsd_probing_probe-video4linux.c,v 1.1 2011-10-01 01:09:23 laffer1 Exp $
++ * CVSID: $Id$
+ *
+ * probe-video4linux.c : Probe video4linux devices
+ * Adapted for FreeBSD by : Joe Marcus Clarke <marcus at FreeBSD.org>
@@ -87,17 +87,6 @@
+ return -1;
+ }
+ g_free (contents);
-+
-+ len = 4;
-+ sysctlnametomib ("kern.proc.pid", mib, &len);
-+
-+ len = sizeof(struct kinfo_proc);
-+ mib[3] = pid;
-+
-+ /* This is just a rough test. */
-+ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1)
-+ return -1;
-+
+ return i;
+}
+
@@ -110,6 +99,7 @@
+ int bus = -1;
+ int addr = -1;
+ int intf = -1;
++ //int i;
+ char *device_file = NULL;
+ char *busstr;
+ char *addrstr;
@@ -118,6 +108,7 @@
+ struct v4l2_capability v2cap;
+ LibHalChangeSet *cset;
+
++
+ if (! hfp_init (argc, argv))
+ goto out;
+
@@ -134,6 +125,8 @@
+ bus = atoi (busstr);
+ addr = atoi (addrstr);
+ intf = atoi (intfstr);
++
++ //g_message("bus:%d, addr=%d, intf=%d",bus,addr,intf);
+ if (intf != 0)
+ goto out;
+
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/sysutils/hal/files/patch-hald_hf-storage.c
===================================================================
--- trunk/sysutils/hal/files/patch-hald_hf-storage.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-hald_hf-storage.c 2018-07-22 17:04:48 UTC (rev 23634)
@@ -1,5 +1,5 @@
---- hald/freebsd/hf-storage.c.orig 2009-08-24 08:42:29.000000000 -0400
-+++ hald/freebsd/hf-storage.c 2011-07-20 20:52:51.000000000 -0400
+--- hald/freebsd/hf-storage.c.orig 2009-08-24 12:42:29.000000000 +0000
++++ hald/freebsd/hf-storage.c 2014-04-16 19:04:08.004114131 +0000
@@ -30,6 +30,7 @@
#include <limits.h>
#include <inttypes.h>
@@ -8,7 +8,18 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/disklabel.h>
-@@ -418,10 +419,41 @@ hf_storage_parse_conftxt (const char *co
+@@ -174,6 +175,10 @@
+ if (! geom_obj)
+ return;
+
++ /* Exclude /dev/diskid/ labels as they are duplicates. */
++ if (strncmp(geom_obj->dev, "diskid/", 7) == 0)
++ return;
++
+ node = g_node_find(hf_storage_geom_tree, G_PRE_ORDER, G_TRAVERSE_ALL,
+ GUINT_TO_POINTER(geom_obj->hash));
+
+@@ -418,10 +423,42 @@
continue;
}
@@ -21,7 +32,8 @@
+ ! strcmp(fields[1], "BSD") ||
+ ! strcmp(fields[1], "PART")) &&
+ (! strncmp(fields[2], "ufsid/", strlen("ufsid/")) ||
-+ ! strncmp(fields[2], "ufs/", strlen("ufs/"))))
++ ! strncmp(fields[2], "ufs/", strlen("ufs/")) ||
++ ! strncmp(fields[2], "diskid/", strlen("diskid/"))))
+ {
+ g_strfreev(fields);
+ continue;
@@ -50,7 +62,7 @@
geom_obj->type = -1; /* We use -1 here to denote a missing type. */
geom_obj->hash = hash;
-@@ -458,6 +490,13 @@ hf_storage_parse_conftxt (const char *co
+@@ -458,6 +495,13 @@
{
g_free(geom_obj->class);
geom_obj->class = g_strdup(fields[12]);
@@ -64,7 +76,7 @@
}
}
}
-@@ -589,11 +628,18 @@ hf_storage_devd_notify (const char *syst
+@@ -589,11 +633,18 @@
char *conftxt;
GSList *new_disks;
@@ -84,7 +96,7 @@
new_disks = hf_storage_parse_conftxt(conftxt);
g_free(conftxt);
-@@ -669,7 +715,7 @@ hf_storage_conftxt_timeout_cb (gpointer
+@@ -669,7 +720,7 @@
if (hf_is_waiting)
return TRUE;
Property changes on: trunk/sysutils/hal/files/patch-hald_hf-storage.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-tools_hal-storage-eject.c
===================================================================
--- trunk/sysutils/hal/files/patch-tools_hal-storage-eject.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-tools_hal-storage-eject.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-tools_hal-storage-eject.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/hal/files/patch-tools_hal-storage-mount.c
===================================================================
--- trunk/sysutils/hal/files/patch-tools_hal-storage-mount.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-tools_hal-storage-mount.c 2018-07-22 17:04:48 UTC (rev 23634)
@@ -2,7 +2,7 @@
+++ tools/hal-storage-mount.c 2008-10-09 00:54:34.000000000 -0400
@@ -56,8 +56,9 @@
- #ifdef __FreeBSD__
+ #ifdef __MidnightBSD__
#define MOUNT "/sbin/mount"
-#define MOUNT_OPTIONS "noexec,nosuid"
+#define MOUNT_OPTIONS "nosuid"
Property changes on: trunk/sysutils/hal/files/patch-tools_hal-storage-mount.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/sysutils/hal/files/patch-tools_hal-storage-shared.c
===================================================================
--- trunk/sysutils/hal/files/patch-tools_hal-storage-shared.c 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/patch-tools_hal-storage-shared.c 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/patch-tools_hal-storage-shared.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/hal/files/pkg-deinstall.in
===================================================================
--- trunk/sysutils/hal/files/pkg-deinstall.in 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/pkg-deinstall.in 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/pkg-deinstall.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/hal/files/pkg-install.in
===================================================================
--- trunk/sysutils/hal/files/pkg-install.in 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/files/pkg-install.in 2018-07-22 17:04:48 UTC (rev 23634)
Property changes on: trunk/sysutils/hal/files/pkg-install.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Modified: trunk/sysutils/hal/pkg-plist
===================================================================
--- trunk/sysutils/hal/pkg-plist 2018-07-22 16:57:10 UTC (rev 23633)
+++ trunk/sysutils/hal/pkg-plist 2018-07-22 17:04:48 UTC (rev 23634)
@@ -9,9 +9,6 @@
bin/hal-lock
bin/hal-set-property
bin/lshal
- at exec mkdir -p %D/etc/hal/fdi/preprobe
- at exec mkdir -p %D/etc/hal/fdi/policy
- at exec mkdir -p %D/etc/hal/fdi/information
include/hal/libhal-storage.h
include/hal/libhal.h
lib/libhal-storage.a
@@ -66,9 +63,9 @@
libexec/hald-probe-scsi
libexec/hald-probe-smbios
libexec/hald-probe-storage
-%%USB2%%libexec/hald-probe-usb2-device
-%%USB2%%libexec/hald-probe-usb2-interface
-%%USB2%%libexec/hald-probe-video4linux
+libexec/hald-probe-usb2-device
+libexec/hald-probe-usb2-interface
+libexec/hald-probe-video4linux
libexec/hald-probe-volume
libexec/hald-runner
man/man1/hal-disable-polling.1.gz
@@ -94,7 +91,6 @@
%%DATADIR%%/dist/hal.conf
%%DATADIR%%/fdi/fdi.dtd
%%DATADIR%%/fdi/information/10freedesktop/01-deprecated-keys.fdi
- at exec mkdir -p %D/%%DATADIR%%/fdi/information/20thirdparty
%%DATADIR%%/fdi/policy/10osvendor/10-dockstation.fdi
%%DATADIR%%/fdi/policy/10osvendor/10-input-policy.fdi
%%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -108,35 +104,18 @@
%%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi
%%DATADIR%%/fdi/policy/10osvendor/30-wol.fdi
%%DATADIR%%/mount-fuse
- at exec mkdir -p %D/%%DATADIR%%/fdi/policy/20thirdparty
- at exec mkdir -p %D/%%DATADIR%%/fdi/preprobe/10osvendor
- at exec mkdir -p %D/%%DATADIR%%/fdi/preprobe/20thirdparty
- at dir %%DATADIR%%/fdi/preprobe/20thirdparty
- at dir %%DATADIR%%/fdi/preprobe/10osvendor
- at dir %%DATADIR%%/fdi/preprobe
- at dir %%DATADIR%%/fdi/policy/20thirdparty
- at dir %%DATADIR%%/fdi/policy/10osvendor
- at dir %%DATADIR%%/fdi/policy
- at dir %%DATADIR%%/fdi/information/20thirdparty
- at dir %%DATADIR%%/fdi/information/10freedesktop
- at dir %%DATADIR%%/fdi/information
- at dir %%DATADIR%%/fdi
- at dir %%DATADIR%%/dist
- at dir %%DATADIR%%
-%%PORTDOCS%%@dir %%DOCSDIR%%
- at dir libexec/hal/scripts/freebsd
- at dir libexec/hal/scripts
- at dir libexec/hal
- at dir include/hal
- at dir etc/hal/fdi/preprobe
- at dir etc/hal/fdi/policy
- at dir etc/hal/fdi/information
- at dir etc/hal/fdi
- at dir etc/hal
@unexec rm -f /var/lib/PolicyKit/user-haldaemon.auths 2>/dev/null || true
@unexec rm -f /var/run/hald/hald.pid 2>/dev/null || true
- at unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
- at unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true
- at unexec rmdir /var/run/hald 2>/dev/null || true
- at unexec rmdir /var/cache/hald 2>/dev/null || true
- at unexec rmdir /var/lib/hal 2>/dev/null || true
+ at dir etc/hal/fdi/information
+ at dir etc/hal/fdi/policy
+ at dir etc/hal/fdi/preprobe
+ at dir %%DATADIR%%/fdi/information/20thirdparty
+ at dir %%DATADIR%%/fdi/policy/20thirdparty
+ at dir %%DATADIR%%/fdi/preprobe/10osvendor
+ at dir %%DATADIR%%/fdi/preprobe/20thirdparty
+ at dir /var/cache/hald
+ at dir /var/lib/hal
+ at dir /var/lib
+ at dir /var/run/hald/hald-local
+ at dir /var/run/hald/hald-runner
+ at dir /var/run/hald
More information about the Midnightbsd-cvs
mailing list