rpms/hal/devel hal-0.5.10-libhal-fix-psi-has-more.patch, NONE, 1.1 hal-0.5.10-use-correct-mode-for-open.patch, NONE, 1.1 hal.spec, 1.133, 1.134

David Zeuthen (davidz) fedora-extras-commits at redhat.com
Thu Aug 9 17:38:06 UTC 2007


Author: davidz

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7344

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.10-libhal-fix-psi-has-more.patch 
	hal-0.5.10-use-correct-mode-for-open.patch 
Log Message:
* Thu Aug 09 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070731%{?dist}.1
- Set the correct mode when using open(3p) (Joe Orton)
- Fix bug in implementation of libhal_psi_has_more()



hal-0.5.10-libhal-fix-psi-has-more.patch:

--- NEW FILE hal-0.5.10-libhal-fix-psi-has-more.patch ---
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 9 Aug 2007 17:28:45 +0000 (-0400)
Subject: fix libhal_psi_has_more() incorrect behavior
X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=bd213ae5a9ca9bc1f8889059647f25462936b855

fix libhal_psi_has_more() incorrect behavior

The last entry is not returned.
---

--- a/libhal/libhal.c
+++ b/libhal/libhal.c
@@ -760,7 +760,7 @@ libhal_psi_init (LibHalPropertySetIterat
 dbus_bool_t
 libhal_psi_has_more (LibHalPropertySetIterator * iter)
 {
-	return (iter->cur_prop->hh.next != NULL);
+	return (iter->cur_prop != NULL);
 }
 
 /**

hal-0.5.10-use-correct-mode-for-open.patch:

--- NEW FILE hal-0.5.10-use-correct-mode-for-open.patch ---
From: David Zeuthen <davidz at redhat.com>
Date: Thu, 9 Aug 2007 16:52:08 +0000 (-0400)
Subject: use correct mode for open(3p)
X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=e87f18c41a3f998a7c2b59f041fc9cd19026c048

use correct mode for open(3p)

From: Joe Orton <jorton at redhat.com>

This is caught by the new glibc open-as-macro feature (as a build
failure): is 0644 appropriate or this file?
---

--- a/tools/hal-acl-tool.c
+++ b/tools/hal-acl-tool.c
@@ -1149,7 +1149,7 @@ acl_lock (void)
 
 	printf ("%d: attempting to get lock on " PACKAGE_LOCALSTATEDIR "/lib/hal/acl-list\n", getpid ());
 
-	lock_acl_fd = open (PACKAGE_LOCALSTATEDIR "/lib/hal/acl-list", O_CREAT | O_RDWR);
+	lock_acl_fd = open (PACKAGE_LOCALSTATEDIR "/lib/hal/acl-list", O_CREAT | O_RDWR, 0644);
 	if (lock_acl_fd < 0) {
 		printf ("%d: error opening/creating " PACKAGE_LOCALSTATEDIR "/lib/hal/acl-list\n", getpid ());
 		return FALSE;


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- hal.spec	31 Jul 2007 16:51:12 -0000	1.133
+++ hal.spec	9 Aug 2007 17:37:33 -0000	1.134
@@ -26,9 +26,11 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.10
-Release: 0.git20070731%{?dist}
+Release: 0.git20070731%{?dist}.1
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}rc1.tar.gz
+Patch0: hal-0.5.10-use-correct-mode-for-open.patch
+Patch1: hal-0.5.10-libhal-fix-psi-has-more.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -119,6 +121,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -231,6 +235,10 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Thu Aug 09 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070731%{?dist}.1
+- Set the correct mode when using open(3p) (Joe Orton)
+- Fix bug in implementation of libhal_psi_has_more()
+
 * Tue Jul 31 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070731%{?dist}
 - Update to RC1 git snapshot; include PolicyKit support
 - Obsolete hal-gnome package as that is dropped upstream (eventually the




More information about the fedora-extras-commits mailing list