Author: arekm Date: Sat Aug 8 11:52:58 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; oui/utf8 patches from fc, init fixes
---- Files affected: packages/bluez: bluez.spec (1.31 -> 1.32) , bluez-oui.patch (NONE -> 1.1) (NEW), bluez-try-utf8-harder.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/bluez/bluez.spec diff -u packages/bluez/bluez.spec:1.31 packages/bluez/bluez.spec:1.32 --- packages/bluez/bluez.spec:1.31 Tue Aug 4 21:13:20 2009 +++ packages/bluez/bluez.spec Sat Aug 8 13:52:52 2009 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Narzędzia Bluetooth Name: bluez Version: 4.47 -Release: 2 +Release: 3 License: GPL v2+ Group: Applications/System #Source0Download: http://www.bluez.org/download.html @@ -15,7 +15,9 @@ Source4: pand.init Source5: rfcomm.init Patch0: %{name}-etc_dir.patch +Patch1: %{name}-oui.patch Patch2: %{name}-wacom-mode-2.patch +Patch3: %{name}-try-utf8-harder.patch URL: http://www.bluez.org/ BuildRequires: alsa-lib-devel >= 1.0.10-1 BuildRequires: autoconf >= 2.50 @@ -34,6 +36,7 @@ BuildRequires: rpmbuild(macros) >= 1.268 Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: rc-scripts +Requires: hwdata >= 0.225 Obsoletes: bluez-hciemu Obsoletes: bluez-pan Obsoletes: bluez-sdp @@ -170,7 +173,9 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} @@ -312,6 +317,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.32 2009/08/08 11:52:52 arekm +- rel 3; oui/utf8 patches from fc, init fixes + Revision 1.31 2009/08/04 19:13:20 arekm - rel 2; init scripts into separate files ================================================================ Index: packages/bluez/bluez-oui.patch diff -u /dev/null packages/bluez/bluez-oui.patch:1.1 --- /dev/null Sat Aug 8 13:52:58 2009 +++ packages/bluez/bluez-oui.patch Sat Aug 8 13:52:52 2009 @@ -0,0 +1,25 @@ +--- bluez-4.47/common/oui.c~ 2009-01-08 17:00:12.000000000 +0100 ++++ bluez-4.47/common/oui.c 2009-08-08 13:51:09.519278151 +0200 +@@ -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) + { +@@ -48,12 +48,7 @@ + + fd = open("oui.txt", 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: packages/bluez/bluez-try-utf8-harder.patch diff -u /dev/null packages/bluez/bluez-try-utf8-harder.patch:1.1 --- /dev/null Sat Aug 8 13:52:58 2009 +++ packages/bluez/bluez-try-utf8-harder.patch Sat Aug 8 13:52:52 2009 @@ -0,0 +1,23 @@ +diff --git a/src/security.c b/src/security.c +index 905cf61..67fd266 100644 +--- a/src/security.c ++++ b/src/security.c +@@ -705,8 +705,16 @@ static inline void remote_name_information(int dev, bdaddr_t *sba, void *ptr) + memcpy(name, evt->name, MAX_NAME_LENGTH); + /* It's ok to cast end between const and non-const since + * we know it points to inside of name which is non-const */ +- if (!g_utf8_validate(name, -1, (const char **) &end)) +- *end = '\0'; ++ if (!g_utf8_validate(name, -1, (const char **) &end)) { ++ char *utf8_name; ++ ++ utf8_name = g_convert(name, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL); ++ if (utf8_name) { ++ memcpy(name, utf8_name, 248); ++ g_free(utf8_name); ++ } else ++ *end = '\0'; ++ } + write_device_name(sba, &dba, name); + } + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/bluez.spec?r1=1.31&r2=1.32&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
