I have made the following changes intended for : CE:MW:Shared / obexd Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/7769 Thank You, martinjones [This message was auto-generated] --- Request # 7769: Messages from BOSS: State: review at 2013-01-30T08:46:51 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:martinjones / obexd -> CE:MW:Shared / obexd changes files: -------------- ++++++ new changes file: --- obexd.changes +++ obexd.changes @@ -0,0 +1,89 @@ +* Fri Jul 29 2011 Zheng wu <[email protected]> - 0.42 +- Fix obexd-server hangs when obex-client does SYNC profile yet for BMC #16689 +- The patch has been accepted by upstream and will be removed after next upgrading. + +* Tue Jul 19 2011 Zheng wu <[email protected]> - 0.42 +- Upgrade to 0.42 for BMC #21358 +- ver 0.42: + Fix issue with freeing buffer before transfer is complete. + Fix issue with invalid memory read when pulling phonebook. + Fix issue with test cases for empty phonebooks. + Add support for multiple phonebooks when using EDS. + Add support for handling OBEX Action command. + +* Tue Apr 26 2011 Zheng wu <[email protected]> - 0.40 +- Fix obex-client crashes when getting phonebook from phone via SYNC profile for BMC #16691 + +* Thu Feb 24 2011 Zheng wu <[email protected]> - 0.40 +- Fix issue with linking obexd-server to tracker backend for BMC #12548 + +* Fri Jan 21 2011 Zheng wu <[email protected]> - 0.40 +- Upgrade to 0.40 for BMC #12746 +- ver 0.40: + Fix issue with plugin close & disconnect functions call order. + Fix issue with history queries for contacts outside phonebook. + Fix issue with crash after fetching single owner vCard. + Add support for multiple URLs in phonebooks. + +* Mon Jan 10 2011 Zhang Qiang <[email protected]> - 0.39 +- Upgrade to 0.39 + +* Mon Oct 18 2010 Zhu Yanhai <[email protected]> - 0.35 +- Upgrade to 0.35 + +* Fri Aug 27 2010 Zhu Yanhai <[email protected]> - 0.32 +- Upgrade to 0.32 + +* Fri Jul 30 2010 Zhu Yanhai <[email protected]> - 0.29 +- Upgrade to 0.29. + +* Mon Jun 28 2010 Ross Burton <[email protected]> - 0.26 +- Split the server to obexd-server (part of MBC#198) + +* Tue May 4 2010 Zhu Yanhai <[email protected]> - 0.26 +- Upgrade to 0.26, which also fixed BMC#1830. + +* Wed Apr 21 2010 Ross Burton <[email protected]> - 0.21 +- Expose $HOME over OBEX, not /tmp (MBC#920) + +* Sat Apr 10 2010 Anas Nashif <[email protected]> - 0.21 +- Fixed rpmlint errors + +* Fri Feb 26 2010 Zhu Yanhai <[email protected]> - 0.21 +- Upgrade to 0.21 +- Changed enable-syncevolution.patch a bit to fix MB#9933 + +* Mon Feb 22 2010 Anas Nashif <[email protected]> - 0.20 +- Use Spectacle + +* Wed Dec 16 2009 Zhu Yanhai <[email protected]> - 0.20 +- Upgrade to 0.20 +- Switch from --enable-ebook to --with-phonebook=ebook + +* Tue Oct 26 2009 Martin Xu <[email protected]> - 0.18 +- add add_obexd_servicer_desktop.patch to fix bug #6788 + +* Tue Oct 13 2009 Martin Xu <[email protected]> - 0.18 +- Upgrade to 0.18 + +* Mon Sep 14 2009 Martin Xu <[email protected]> - 0.17 +- Upgrade to 0.17 +- add --enable-ebook + +* Fri May 8 2009 Martin Xu <[email protected]> - 0.10 +- Upgrade to 0.12 + +* Thu Apr 30 2009 Martin Xu <[email protected]> - 0.10 +- Upgrade to 0.10 + +* Fri Mar 13 2009 Yin Kangkai <[email protected]> - 0.9 +- Upgrade to 0.9 + +* Thu Dec 18 2008 Arjan van de Ven <[email protected]> - 0.8 +- Use standard specfile + +* Fri Dec 12 2008 - Martin Xu <[email protected]> - 0.8 +- upgrade to obex-0.8 package + +* Fri Nov 11 2008 - Martin Xu <[email protected]> - 0.7 +- initialized obex-0.7 package new: ---- add_obexd_service_desktop.patch fix_sync_profile_crash.patch obexd-0.42.tar.gz obexd.changes obexd.spec obexd.yaml spec files: ----------- ++++++ new spec file: --- obexd.spec +++ obexd.spec @@ -0,0 +1,103 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.25 +# + +Name: obexd + +# >> macros +# << macros + +Summary: D-Bus service for Obex Client access +Version: 0.42 +Release: 1 +Group: System/Daemons +License: GPLv2+ +URL: http://www.bluez.org/ +Source0: http://www.kernel.org/pub/linux/bluetooth/obexd-%{version}.tar.gz +Source100: obexd.yaml +Patch0: add_obexd_service_desktop.patch +Patch1: fix_sync_profile_crash.patch +BuildRequires: pkgconfig(openobex) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(bluez) >= 4.0 +BuildRequires: pkgconfig(libical) + +%description +obexd contains obex-client, a D-Bus service to allow sending files +using the Obex Push protocol, common on mobile phones and +other Bluetooth-equipped devices. + + +%package server +Summary: a server for incoming OBEX connections +Group: System/Daemons +Requires: %{name} = %{version}-%{release} + +%description server +obexd-server contains a server for receiving OBEX operations. + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for %{name}. + + +%prep +%setup -q -n %{name}-%{version} + +# add_obexd_service_desktop.patch +%patch0 -p1 +# fix_sync_profile_crash.patch +%patch1 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%reconfigure --disable-static +make %{?jobs:-j%jobs} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +chmod -x test/send-files +# << install post + + +%files +%defattr(-,root,root,-) +# >> files +%doc README test/send-files doc/client-api.txt COPYING AUTHORS +%{_libexecdir}/obex-client +%{_datadir}/dbus-1/services/obex-client.service +# << files + +%files server +%defattr(-,root,root,-) +# >> files server +%{_libexecdir}/obexd +%{_datadir}/dbus-1/services/obexd.service +#%{_libdir}/obex/plugins/*.so +%{_sysconfdir}/xdg/autostart/obexd-server.desktop +# << files server + +%files devel +%defattr(-,root,root,-) +# >> files devel +%doc test/send-files doc/client-api.txt +# << files devel other changes: -------------- ++++++ add_obexd_service_desktop.patch (new) --- add_obexd_service_desktop.patch +++ add_obexd_service_desktop.patch @@ -0,0 +1,62 @@ +--- b/Makefile.am 2011-07-11 17:02:44.443727390 +0800 ++++ a/Makefile.am 2011-07-11 17:05:16.482698970 +0800 +@@ -5,6 +5,8 @@ + + service_in_files = + ++autostartdir = $(sysconfdir)/xdg/autostart ++ + doc_files = doc/obexd-api.txt doc/agent-api.txt doc/client-api.txt + + test_files = test/simple-agent test/send-files \ +@@ -26,6 +28,8 @@ + if SERVER + confdir = $(sysconfdir)/obex + ++autostart_in_files = src/obexd-server.desktop.in ++ + service_in_files += src/obexd.service.in + + builtin_modules = +@@ -125,6 +129,8 @@ + client_obex_client_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @OPENOBEX_LIBS@ @BLUEZ_LIBS@ + endif + ++autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) ++ + service_DATA = $(service_in_files:.service.in=.service) + + AM_CFLAGS = @OPENOBEX_CFLAGS@ @BLUEZ_CFLAGS@ @EBOOK_CFLAGS@ \ +@@ -137,7 +143,7 @@ + -I$(srcdir)/gdbus -I$(srcdir)/gwobex \ + -I$(srcdir)/btio + +-CLEANFILES = $(service_DATA) $(builtin_files) ++CLEANFILES = $(service_DATA) $(builtin_files) $(autostart_DATA) + + EXTRA_DIST = src/genbuiltin $(doc_files) $(test_files) \ + src/obexd.service.in client/obex-client.service.in \ +@@ -154,6 +160,9 @@ + %.service: %.service.in config.log + $(AM_V_GEN)$(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + ++%.desktop: %.desktop.in config.log ++ $(AM_V_GEN)$(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ ++ + plugins/phonebook.c: plugins/@PHONEBOOK_DRIVER@ + $(AM_V_GEN)$(LN_S) @abs_top_srcdir@/$< $@ + +diff -Nur obexd-0.20/src/obexd-server.desktop.in obexd-0.20.new/src/obexd-server.desktop.in +--- obexd-0.20/src/obexd-server.desktop.in 1970-01-01 08:00:00.000000000 +0800 ++++ obexd-0.20.new/src/obexd-server.desktop.in 2009-12-16 14:05:59.000000000 +0800 +@@ -0,0 +1,9 @@ ++[Desktop Entry] ++Name=Obexd Server ++Comment=Obexd Server Daemon ++Exec=@libexecdir@/obexd --nodaemon --opp --ftp -a --syncevolution --root . ++Terminal=false ++Type=Application ++Categories= ++X-GNOME-Autostart-enable=true ++X-Moblin-Priority=Low + ++++++ fix_sync_profile_crash.patch (new) --- fix_sync_profile_crash.patch +++ fix_sync_profile_crash.patch @@ -0,0 +1,42 @@ +--- obexd-0.40/client/sync.c 2011-04-25 13:28:37.436981087 +0800 ++++ new/obexd-0.40/client/sync.c 2011-04-25 13:28:19.339950617 +0800 +@@ -78,6 +78,9 @@ + DBusMessage *reply; + char *buf = NULL; + ++ if (session->msg == NULL) ++ goto done; ++ + reply = dbus_message_new_method_return(session->msg); + + if (transfer->filled > 0) +@@ -91,6 +94,8 @@ + g_dbus_send_message(session->conn, reply); + dbus_message_unref(session->msg); + session->msg = NULL; ++done: ++ transfer_unregister(transfer); + } + + static DBusMessage *sync_getphonebook(DBusConnection *connection, + +--- old/plugins/irmc.c 2011-07-15 15:32:17.448664952 +0800 ++++ new/plugins/irmc.c 2011-07-15 15:37:20.548581935 +0800 +@@ -167,6 +167,8 @@ + else + irmc->buffer = g_string_append(irmc->buffer, owner_vcard); + ++ if (buffer == NULL) ++ goto finish; + /* loop around buffer and add X-IRMC-LUID attribs */ + s = buffer; + while ((t = strstr(s, "UID:")) != NULL) { +@@ -189,7 +191,7 @@ + } + /* add remaining bit of buffer */ + irmc->buffer = g_string_append(irmc->buffer, s); +- ++finish: + obex_object_set_io_flags(irmc, G_IO_IN, 0); + } + ++++++ obexd-0.42.tar.gz (new) ++++++ obexd.yaml (new) --- obexd.yaml +++ obexd.yaml @@ -0,0 +1,35 @@ +Name: obexd +Summary: D-Bus service for Obex Client access +Version: 0.42 +Release: 1 +Group: System/Daemons +License: GPLv2+ +URL: http://www.bluez.org/ +Description: | + obexd contains obex-client, a D-Bus service to allow sending files + using the Obex Push protocol, common on mobile phones and + other Bluetooth-equipped devices. + +Sources: + - http://www.kernel.org/pub/linux/bluetooth/obexd-%{version}.tar.gz +Patches: + - add_obexd_service_desktop.patch + - fix_sync_profile_crash.patch + +PkgConfigBR: + - openobex + - glib-2.0 + - dbus-1 + - bluez >= 4.0 + - libical + +Configure: reconfigure +AutoSubPackages: + - devel + +SubPackages: + - Name: server + Summary: a server for incoming OBEX connections + Group: System/Daemons + Description: | + obexd-server contains a server for receiving OBEX operations.
