rpms/hal/devel hal-0.5.8.1-dont-crash-on-cdrom-drives.patch, NONE, 1.1 hal-0.5.8.1-stat-devicefile-not-mountpoint.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 hal.spec, 1.106, 1.107 sources, 1.41, 1.42 hal-0.5.6-eject-audio-cd.patch, 1.1, NONE hal-0.5.7-dbus-deprecated.patch, 1.3, NONE hal-0.5.7-expand-sysfs-names.patch, 1.1, NONE hal-0.5.7-fix-fedora-power-save.patch, 1.1, NONE hal-0.5.7-fix-for-nfs-and-autofs.patch, 1.2, NONE hal-0.5.7-lid-open-fix.patch, 1.1, NONE hal-0.5.7-pcmcia-readers.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Sep 26 21:54:49 UTC 2006


Author: davidz

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11430

Modified Files:
	.cvsignore hal.spec sources 
Added Files:
	hal-0.5.8.1-dont-crash-on-cdrom-drives.patch 
	hal-0.5.8.1-stat-devicefile-not-mountpoint.patch 
Removed Files:
	hal-0.5.6-eject-audio-cd.patch hal-0.5.7-dbus-deprecated.patch 
	hal-0.5.7-expand-sysfs-names.patch 
	hal-0.5.7-fix-fedora-power-save.patch 
	hal-0.5.7-fix-for-nfs-and-autofs.patch 
	hal-0.5.7-lid-open-fix.patch hal-0.5.7-pcmcia-readers.patch 
Log Message:
* Tue Sep 26 2006 David Zeuthen <davidz at redhat.com> - 0.5.8.1-1%{?dist}
- upgrade to upstream release 0.5.8.1
- helpers have moved to %libdir/hal/scripts
- require gtk-doc instead of Doxygen
- drop upstreamed patches
- patch for correctly detecting FUSE mounts (e.g. ntfs-fuse)
- patch for not crashing on optical drives w/o write capabilities
- include devhelp gtk-doc's for libhal, libhal-storage in -devel package
- Require kernel >= 2.6.17, udev >= 089, libvolume_id >= 089
- Build require libvolume_id-devel >= 089
- Should fix #202316, #206669, #207715, #198573, #206732, #208027



hal-0.5.8.1-dont-crash-on-cdrom-drives.patch:
 probe-storage.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hal-0.5.8.1-dont-crash-on-cdrom-drives.patch ---
From: David Zeuthen <davidz at redhat.com>
Date: Tue, 26 Sep 2006 19:50:51 +0000 (-0400)
Subject: don't crash on cd drives without write capabilities
X-Git-Tag: HAL_0_2
X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c127f54ee1a91743989ccdbe93025740fe9cec73

don't crash on cd drives without write capabilities

This fix needs to be forward-ported to master. Probably we shouldn't
be looking for write speeds unless the drive can write. This fix
will do it for the 0.5.8 series though.
---

--- a/hald/linux/probing/probe-storage.c
+++ b/hald/linux/probing/probe-storage.c
@@ -254,8 +254,10 @@ main (int argc, char *argv[])
 						free (write_speeds);
 					}
 				} else {
+					gchar *wspeeds[1] = {NULL};
 					libhal_changeset_set_property_int (cs, "storage.cdrom.write_speed", 0);
-					libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds", NULL);
+					libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds", 
+									       (const char **) wspeeds);
 				}
 			}
 			

hal-0.5.8.1-stat-devicefile-not-mountpoint.patch:
 blockdev.c |   39 ++++++++-------------------------------
 1 files changed, 8 insertions(+), 31 deletions(-)

--- NEW FILE hal-0.5.8.1-stat-devicefile-not-mountpoint.patch ---
From: David Zeuthen <davidz at redhat.com>
Date: Mon, 25 Sep 2006 03:21:28 +0000 (-0400)
Subject: stat special device file, not the mount point
X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=2ea340399bf8cf3d2bb6bd1b5c4ecbc2042e93d4

stat special device file, not the mount point

This is required to make FUSE mounts work for e.g. the ntfs-fuse
driver.  Also remove the list used for autofs, no longer needed as we
don't use the .created-by-hal file anymore.
---

--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -168,7 +168,6 @@ blockdev_refresh_mount_state (HalDevice 
 	dev_t devt = makedev(0, 0);
 	GSList *volumes = NULL;
 	GSList *volume;
-        GSList *autofs_mounts = NULL;
 
 	/* open /proc/mounts */
 	g_snprintf (buf, sizeof (buf), "%s/mounts", get_hal_proc_path ());
@@ -189,6 +188,8 @@ blockdev_refresh_mount_state (HalDevice 
 	while ((mnte = getmntent_r (f, &mnt, buf, sizeof(buf))) != NULL) {
 		struct stat statbuf;
 
+		/*HAL_INFO ((" * /proc/mounts contain dev %s - type %s", mnt.mnt_fsname, mnt.mnt_type));*/
+
 		/* If this is a nfs mount (fstype == 'nfs') ignore the mount. Reason:
 		 *  1. we don't list nfs devices in HAL
 		 *  2. more problematic: stat on mountpoints with 'stale nfs handle' never come
@@ -197,35 +198,14 @@ blockdev_refresh_mount_state (HalDevice 
 		if (strcmp(mnt.mnt_type, "nfs") == 0)
 			continue;
 
-		/* If this is an autofs mount (fstype == 'autofs') 
-		 * store the mount in a list for later use. 
-		 * On mounts managed by autofs accessing files below the mount
-		 * point cause the mount point to be remounted after an 
-		 * unmount.  We keep the list so we do not check for
-		 * the .created-by-hal file on mounts under autofs mount points
-		 */
-		if (strcmp(mnt.mnt_type, "autofs") == 0) {
-			char *mnt_dir;
-
-			if (mnt.mnt_dir[strlen (mnt.mnt_dir) - 1] != '/')
-				mnt_dir = g_strdup_printf ("%s/", mnt.mnt_dir);
-			else
-				mnt_dir = g_strdup (mnt.mnt_dir);
-
-			autofs_mounts = g_slist_append (autofs_mounts,
-							mnt_dir);
-
-
+		/* get major:minor of special device file */
+		if (stat (mnt.mnt_fsname, &statbuf) != 0)
 			continue;
-		}
 
-		/* check the underlying device of the mount point */
-		if (stat (mnt.mnt_dir, &statbuf) != 0)
-			continue;
-		if (major(statbuf.st_dev) == 0)
+		if (major (statbuf.st_rdev) == 0)
 			continue;
 
-		/*HAL_INFO (("* found mounts dev %s (%i:%i)", mnt.mnt_fsname, major(statbuf.st_dev), minor(statbuf.st_dev)));*/
+		/*HAL_INFO (("* found mounts dev %s (%i:%i)", mnt.mnt_fsname, major (statbuf.st_rdev), minor (statbuf.st_rdev)));*/
 		/* match against all hal volumes */
 		for (volume = volumes; volume != NULL; volume = g_slist_next (volume)) {
 			HalDevice *dev;
@@ -235,10 +215,10 @@ blockdev_refresh_mount_state (HalDevice 
 			if (major == 0)
 				continue;
 			minor = hal_device_property_get_int (dev, "block.minor");
-			devt = makedev(major, minor);
+			devt = makedev (major, minor);
 			/*HAL_INFO (("  match %s (%i:%i)", hal_device_get_udi (dev), major, minor));*/
 
-			if (statbuf.st_dev == devt) {
+			if (statbuf.st_rdev == devt) {
 				/* found entry for this device in /proc/mounts */
 				device_property_atomic_update_begin ();
 				hal_device_property_set_bool (dev, "volume.is_mounted", TRUE);
@@ -255,9 +235,6 @@ blockdev_refresh_mount_state (HalDevice 
 		}
 	}
 
-	g_slist_foreach (autofs_mounts, (GFunc) g_free, NULL);
-	g_slist_free (autofs_mounts);
-
 	/* all remaining volumes are not mounted */
 	for (volume = volumes; volume != NULL; volume = g_slist_next (volume)) {
 		HalDevice *dev;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	26 Jul 2006 18:53:59 -0000	1.40
+++ .cvsignore	26 Sep 2006 21:54:46 -0000	1.41
@@ -28,3 +28,4 @@
 hal-0.5.7-0.cvs20060213.tar.gz
 hal-0.5.7.tar.gz
 hal-0.5.7.1.tar.gz
+hal-0.5.8.1.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- hal.spec	30 Aug 2006 16:43:13 -0000	1.106
+++ hal.spec	26 Sep 2006 21:54:47 -0000	1.107
@@ -5,33 +5,29 @@
 %define dbus_python_version	0.70
 %define pygtk2			2.0.0
 %define gnome_python2		2.0.0
-%define libselinux_version      1.17.14-1
-%define udev_version            057-3
+%define udev_version            089-1
 %define util_linux_version      2.12a-16
-%define doxygen_version         1.3.9.1-1
 %define initscripts_version     8.04-1
-%define kernel_version          2.6.15
+%define kernel_version          2.6.17
 %define gettext_version	        0.14.1-14
 %define libusb_version          0.1.10a-1
 %define dmidecode_version       2.7
 %define cryptsetup_luks_version 1.0.1-2
 %define pm_utils_version        0.10-1
+%define gtk_doc_version         1.4
 
 %define hal_user_uid           68
 
 Summary: Hardware Abstraction Layer
 Name: hal
-Version: 0.5.7.1
-Release: 3%{?dist}
+Version: 0.5.8.1
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Source2: hal-device-manager.desktop
-Patch0: hal-0.5.7-fix-fedora-power-save.patch
-Patch1: hal-0.5.7-lid-open-fix.patch
-Patch2: hal-0.5.7-fix-for-nfs-and-autofs.patch
-Patch3: hal-0.5.7-pcmcia-readers.patch
-Patch4: hal-0.5.7-dbus-deprecated.patch
+Patch0: hal-0.5.8.1-stat-devicefile-not-mountpoint.patch
+Patch1: hal-0.5.8.1-dont-crash-on-cdrom-drives.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -42,12 +38,12 @@
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: python-devel
 BuildRequires: hwdata
-BuildRequires: libselinux-devel >= %{libselinux_version}
-BuildRequires: doxygen >= %{doxygen_version}
 BuildRequires: gettext >= %{gettext_version}
 BuildRequires: dbus-glib >= %{dbus_glib_version}
 BuildRequires: perl-XML-Parser
 BuildRequires: desktop-file-utils >= 0.9
+BuildRequires: gtk-doc >= %{gtk_doc_version}
+BuildRequires: libvolume_id-devel >= %{udev_version} 
 
 %ifnarch s390 s390x
 BuildRequires: libusb-devel >= %{libusb_version}
@@ -56,8 +52,8 @@
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: glib2 >= %{glib2_version}
 Requires: udev >= %{udev_version} 
+Requires: libvolume_id >= %{udev_version} 
 Requires: util-linux >= %{util_linux_version} 
-Requires: libselinux >= %{libselinux_version}
 Requires: initscripts >= %{initscripts_version}
 Requires: cryptsetup-luks >= %{cryptsetup_luks_version}
 %ifnarch s390 s390x
@@ -101,14 +97,11 @@
 
 %prep
 %setup -q
-%patch -p0 -b .fix-fedora-powersave
-%patch1 -p1 -b .lid-open-fix
-%patch2 -p1 -b .fix-for-nfs-and-autofs
-%patch3 -p0 -b .pcmcia-readers
-%patch4 -p1 -b .dbus-deprecated
+%patch0 -p1 -b .stat-device-file-not-mountpoint
+%patch1 -p1 -b .dont-crash-on-cdrom-drives
 %build
 
-%configure --disable-docbook-docs --with-os-type=redhat
+%configure --disable-docbook-docs --with-os-type=redhat --disable-policy-kit
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -183,26 +176,30 @@
 
 %dir %{_datadir}/hal
 %dir %{_datadir}/hal/fdi
-%dir %{_datadir}/hal/scripts
 %dir %{_datadir}/doc/hal-%{version}
 %dir %{_datadir}/doc/hal-%{version}/conf
 
-%{_datadir}/hal/scripts/*
+%dir %{_libdir}/hal/scripts
+%dir %{_libdir}/hal/scripts/linux
+
 %{_datadir}/hal/fdi/*
 %{_datadir}/locale/*
 %{_datadir}/doc/hal-%{version}/conf/*
 
+%{_libdir}/hal/scripts/*
+%{_libdir}/hal/scripts/linux/*
+
 %{_sysconfdir}/udev/rules.d/90-hal.rules
 
 %files devel
 %defattr(-,root,root)
 
-%dir %{_datadir}/doc/hal-%{version}/api
+%dir %{_datadir}/gtk-doc/html/hal
+%{_datadir}/gtk-doc/html/hal/*
 
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-%{_datadir}/doc/hal-%{version}/api/*
 # TODO: include hal-spec
 
 
@@ -215,6 +212,18 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Sep 26 2006 David Zeuthen <davidz at redhat.com> - 0.5.8.1-1%{?dist}
+- upgrade to upstream release 0.5.8.1
+- helpers have moved to %libdir/hal/scripts
+- require gtk-doc instead of Doxygen
+- drop upstreamed patches
+- patch for correctly detecting FUSE mounts (e.g. ntfs-fuse)
+- patch for not crashing on optical drives w/o write capabilities
+- include devhelp gtk-doc's for libhal, libhal-storage in -devel package
+- Require kernel >= 2.6.17, udev >= 089, libvolume_id >= 089
+- Build require libvolume_id-devel >= 089
+- Should fix #202316, #206669, #207715, #198573, #206732, #208027
+
 * Wed Aug 30 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7.1-3%{?dist}
 - Add a .desktop file for hal-device-manager
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	26 Jul 2006 18:53:59 -0000	1.41
+++ sources	26 Sep 2006 21:54:47 -0000	1.42
@@ -1 +1 @@
-d7a7741808ba130f8aff3f5d3b5689e4  hal-0.5.7.1.tar.gz
+568d7ce9831c18a5e6e502abd6781257  hal-0.5.8.1.tar.gz


--- hal-0.5.6-eject-audio-cd.patch DELETED ---


--- hal-0.5.7-dbus-deprecated.patch DELETED ---


--- hal-0.5.7-expand-sysfs-names.patch DELETED ---


--- hal-0.5.7-fix-fedora-power-save.patch DELETED ---


--- hal-0.5.7-fix-for-nfs-and-autofs.patch DELETED ---


--- hal-0.5.7-lid-open-fix.patch DELETED ---


--- hal-0.5.7-pcmcia-readers.patch DELETED ---




More information about the fedora-cvs-commits mailing list