rpms/bluez-utils/F-8 bluez-utils-oui-usage.patch, NONE, 1.1 bluez-utils.spec, 1.83, 1.84

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/bluez-utils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18999

Modified Files:
	bluez-utils.spec 
Added Files:
	bluez-utils-oui-usage.patch 
Log Message:
* Fri Jan 25 2008 - Bastien Nocera <bnocera at redhat.com> - 3.20-5
- Fix hcid trying to find the OUI file somewhere in /var (#428803)


bluez-utils-oui-usage.patch:

--- NEW FILE bluez-utils-oui-usage.patch ---
Index: common/oui.c
===================================================================
RCS file: /cvsroot/bluez/utils/common/oui.c,v
retrieving revision 1.2
diff -u -p -r1.2 oui.c
--- common/oui.c	13 Jan 2007 17:48:12 -0000	1.2
+++ common/oui.c	25 Jan 2008 12:16:58 -0000
@@ -38,7 +38,7 @@
 
 /* http://standards.ieee.org/regauth/oui/oui.txt */
 
-#define OUIFILE "/var/lib/misc/oui.txt"
+#define OUIFILE "/usr/share/hwdata/oui.txt"
 
 char *ouitocomp(const char *oui)
 {
@@ -46,14 +46,9 @@ char *ouitocomp(const char *oui)
 	char *str, *map, *off, *end;
 	int fd;
 
-	fd = open("oui.txt", O_RDONLY);
+	fd = open(OUIFILE, O_RDONLY);
 	if (fd < 0) {
-		fd = open(OUIFILE, O_RDONLY);
-		if (fd < 0) {
-			fd = open("/usr/share/misc/oui.txt", O_RDONLY);
-			if (fd < 0)
-				return NULL;
-		}
+		return NULL;
 	}
 
 	if (fstat(fd, &st) < 0) {


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/F-8/bluez-utils.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- bluez-utils.spec	28 Oct 2007 19:49:44 -0000	1.83
+++ bluez-utils.spec	25 Jan 2008 12:26:00 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 3.20
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -25,6 +25,7 @@
 Obsoletes: bluez-pan, bluez-sdp
 Requires: initscripts, bluez-libs >= %{version}
 Requires: dbus >= 0.60
+Requires: hwdata >= 0.215
 Requires: dbus-bluez-pin-helper
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig, /sbin/service
@@ -71,6 +72,7 @@
 
 %setup -q
 %patch0 -p1
+%patch1 -p0 -b .oui
 
 %build
 %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
@@ -154,6 +156,9 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Jan 25 2008 - Bastien Nocera <bnocera at redhat.com> - 3.20-5
+- Fix hcid trying to find the OUI file somewhere in /var (#428803)
+
 * Sun Oct 28 2007 Jeremy Katz <katzj at redhat.com> - 3.20-4
 - Follow guidelines for scriplets to quiet error (#354531)