git.maemo.org Git - oespirit1/blob - obexd/maemo-changes.patch

   1 --- obexd-0.10/debian/obexd-test.dirs
   2 +++ obexd-0.10/debian/obexd-test.dirs
   3 @@ -0,0 +1 @@
   4 +usr/bin
   5 --- obexd-0.10/debian/compat
   6 +++ obexd-0.10/debian/compat
   7 @@ -0,0 +1 @@
   8 +4
   9 --- obexd-0.10/debian/obexd.install
  10 +++ obexd-0.10/debian/obexd.install
  11 @@ -0,0 +1,3 @@
  12 +debian/tmp/usr/lib/obex/obexd
  13 +debian/tmp/usr/share/doc/*
  14 +debian/tmp/usr/share/dbus-1/services/obexd.service
  15 --- obexd-0.10/debian/obexd-test.install
  16 +++ obexd-0.10/debian/obexd-test.install
  17 @@ -0,0 +1 @@
  18 +debian/tmp/usr/bin/obexd-*
  19 --- obexd-0.10/debian/changelog
  20 +++ obexd-0.10/debian/changelog
  21 @@ -0,0 +1,137 @@
  22 +obexd (0.10-0maemo2+0m5) unstable; urgency=low
  23 +
  24 +  * This entry has been added by BIFH queue processor
  25 +    Suffix +0m5 added to package revision
  26 +
  27 + -- Mika Linnanoja <mika.linnanoja@nokia.com>  Thu, 16 Apr 2009 12:18:30 +0300
  28 +
  29 +obexd (0.10-0maemo2) unstable; urgency=low
  30 +
  31 +  * Backport fix for pending call cancelation. Might fix: NB#105927
  32 +
  33 + -- Johan Hedberg <johan.hedberg@nokia.com>  Sat, 11 Apr 2009 13:18:58 +0300
  34 +
  35 +obexd (0.10-0maemo1) unstable; urgency=low
  36 +
  37 +  * New upstream release
  38 +  * Changes in upstream ChangeLog since 0.8:
  39 +     - Fix showing symlinks as files.
  40 +     - Fix error codes on OBEX get operations.
  41 +     - Fix "not found" error for delete operations.
  42 +     - Fix NULL pointer usage of 'nonnull' parameter.
  43 +     - Fix TTY handling with PC Suite mode.
  44 +     - Fix D-Bus NameOwnerChanged watch handling.
  45 +     - Fix O_NOCTTY issue when opening TTY device.
  46 +     - Add support for verbose compiler warnings.
  47 +     - Add support for application parameters.
  48 +     - Add support for generic GetCapabilities command.
  49 +     - Add initial support for Synchronization profile.
  50 +     - Add basic implementation of Phonebook Access profile.
  51 +     - Add basic Phonebook Access client support.
  52 +  * Might fix: NB#105611, NB#104711, NB#110496, NB#110549, NB#110178
  53 +  * Note: this requires a kernel with the fix for NB#109936
  54 +
  55 + -- Johan Hedberg <johan.hedberg@nokia.com>  Thu,  9 Apr 2009 21:16:20 +0300
  56 +
  57 +obexd (0.8-0maemo3) unstable; urgency=low
  58 +
  59 +  * Don't open tty upon startup. Fixes: NB#100759, NB#100939
  60 +
  61 + -- Johan Hedberg <johan.hedberg@nokia.com>  Fri,  3 Apr 2009 12:41:29 +0300
  62 +
  63 +obexd (0.8-0maemo2) unstable; urgency=low
  64 +
  65 +  * Backport O_NOCTTY patch. Fixes: NB#97887
  66 +
  67 + -- Johan Hedberg <johan.hedberg@nokia.com>  Wed, 28 Jan 2009 15:00:41 +0000
  68 +
  69 +obexd (0.8-0maemo1) unstable; urgency=low
  70 +
  71 +  * New upstream release
  72 +  * Changes from ChangeLog since 0.7:
  73 +     - Fix memory leaks with asynchronous operations.
  74 +     - Fix issues with handling larger MTU sizes.
  75 +     - Fix session and client disconnect handling.
  76 +     - Add basic Nokia PC Suite support.
  77 +     - Add support for reinitializing TTY server.
  78 +  * Use special masync script for capability object. Fixes: NB#91609
  79 +
  80 + -- Johan Hedberg <johan.hedberg@nokia.com>  Thu, 20 Nov 2008 12:04:21 +0000
  81 +
  82 +obexd (0.7-0maemo1) unstable; urgency=low
  83 +
  84 +  * New upstream release
  85 +  * Changes from ChangeLog since 0.6:
  86 +     - Fix issue with transfers larger than session buffer size.
  87 +     - Fix various memory leaks within session handling.
  88 +     - Add support for OBEX client session interface.
  89 +     - Add support for File Transfer client interface.
  90 +     - Add support for using the any adapter object path.
  91 +  * Monitor bluetoothd and use the new "any" adapter. Fixes: NB#90474
  92 +
  93 + -- Johan Hedberg <johan.hedberg@nokia.com>  Sun,  9 Nov 2008 20:02:35 +0000
  94 +
  95 +obexd (0.6-0maemo1) unstable; urgency=low
  96 +
  97 +  * New upstream version. Changes from ChangeLog since 0.4:
  98 +     - Use BlueZ service for FTP authorization.
  99 +     - Use BlueZ service for service records.
 100 +     - Never send an OBEX abort for a server.
 101 +     - Set buffer to NULL after freeing it.
 102 +     - Include the correct COPYING file.
 103 +     - Add initial obex-client support.
 104 +     - Add missing API documenation.
 105 +     - Rename D-Bus service files.
 106 +  * Enable USB support through --tty /dev/ttyGS0
 107 +
 108 + -- Johan Hedberg <johan.hedberg@nokia.com>  Fri, 17 Oct 2008 22:31:46 +0000
 109 +
 110 +obexd (0.4-0maemo1) unstable; urgency=low
 111 +
 112 +  * New upstream release. Changes from ChangeLog since 0.3:
 113 +     - Add plugin infrastructure.
 114 +     - Add support for TTY transport.
 115 +     - Fix case when the client doesn't send length header.
 116 +     - Use LM_AUTH and LM_ENCRYPT instead of LM_SECURE.
 117 +  * Fix PUT/Delete detection without length header. Fixes: NB#88563
 118 +
 119 + -- Johan Hedberg <johan.hedberg@nokia.com>  Fri, 19 Sep 2008 03:06:40 +0000
 120 +
 121 +obexd (0.3-0maemo3) unstable; urgency=low
 122 +
 123 +  * Only enable socket security if specified. Fixes: NB#88520
 124 +
 125 + -- Johan Hedberg <johan.hedberg@nokia.com>  Tue, 16 Sep 2008 19:31:09 +0000
 126 +
 127 +obexd (0.3-0maemo2) unstable; urgency=low
 128 +
 129 +  * Recompile against libbluetooth3
 130 +
 131 + -- Johan Hedberg <johan.hedberg@nokia.com>  Thu,  7 Aug 2008 09:28:48 +0000
 132 +
 133 +obexd (0.3-0maemo1) unstable; urgency=low
 134 +
 135 +  * New upstream release. Changes from ChangeLog:
 136 +     - Add support for dynamic capability file.
 137 +     - Removing incomplete files on error.
 138 +     - Multiple bug fixes.
 139 +
 140 + -- Johan Hedberg <johan.hedberg@nokia.com>  Fri, 25 Jul 2008 09:22:59 +0000
 141 +
 142 +obexd (0.2-0maemo1) unstable; urgency=low
 143 +
 144 +  * New upstream release. Changes from ChangeLog:
 145 +     - Add folder listing support.
 146 +     - Add D-Bus session interface.
 147 +     - Check for dbus_watch_get_unix_fd function.
 148 +  * Implemented: NR#192005
 149 +
 150 + -- Johan Hedberg <johan.hedberg@nokia.com>  Fri,  4 Jul 2008 10:44:24 +0000
 151 +
 152 +obexd (0.1-0maemo1) unstable; urgency=low
 153 +
 154 +  * Initial release
 155 +  * Implemented: NR#192004
 156 +  * Partial: NR#192005
 157 +
 158 + -- Johan Hedberg <johan.hedberg@nokia.com>  Fri, 27 Jun 2008 12:09:09 +0000
 159 --- obexd-0.10/debian/rules
 160 +++ obexd-0.10/debian/rules
 161 @@ -0,0 +1,11 @@
 162 +#!/usr/bin/make -f
 163 +include /usr/share/cdbs/1/rules/buildcore.mk
 164 +include /usr/share/cdbs/1/rules/debhelper.mk
 165 +include /usr/share/cdbs/1/rules/simple-patchsys.mk
 166 +include /usr/share/cdbs/1/class/autotools.mk
 167 +
 168 +DEB_DH_STRIP_ARGS := --dbg-package=obexd
 169 +DEB_CONFIGURE_EXTRA_FLAGS := --enable-debug --libexec=/usr/lib/obex
 170 +
 171 +install/obexd-test::
 172 +       install -D -m 0755 test/simple-agent $(DEB_DESTDIR)/usr/bin/obexd-simple-agent
 173 --- obexd-0.10/debian/obexd.dirs
 174 +++ obexd-0.10/debian/obexd.dirs
 175 @@ -0,0 +1,3 @@
 176 +usr/lib/obex
 177 +usr/share/dbus-1/services
 178 +etc/obex
 179 --- obexd-0.10/debian/copyright
 180 +++ obexd-0.10/debian/copyright
 181 @@ -0,0 +1,6 @@
 182 +obexd - OBEX Server
 183 +
 184 +Copyright (C) 2007-2008  Nokia Corporation
 185 +Copyright (C) 2007-2008  Instituto Nokia de Tecnologia (INdT)
 186 +Copyright (C) 2007-2008  Marcel Holtmann <marcel@holtmann.org>
 187 +
 188 --- obexd-0.10/debian/patches/001_daemon_params.patch
 189 +++ obexd-0.10/debian/patches/001_daemon_params.patch
 190 @@ -0,0 +1,7 @@
 191 +--- src/obexd.service.in       2008-10-04 13:05:03.000000000 +0000
 192 ++++ src/obexd.service.in       2008-11-20 12:08:31.000000000 +0000
 193 +@@ -1,3 +1,3 @@
 194 + [D-BUS Service]
 195 + Name=org.openobex
 196 +-Exec=@libexecdir@/obexd --nodaemon --opp --ftp
 197 ++Exec=@libexecdir@/obexd --nodaemon --opp --ftp --pcsuite --symlinks --tty /dev/ttyGS0 --root /home/user/MyDocs --capability '!/usr/bin/gen-obex-capability.sh'
 198 --- obexd-0.10/debian/patches/002_nonblocking_tty.patch
 199 +++ obexd-0.10/debian/patches/002_nonblocking_tty.patch
 200 @@ -0,0 +1,58 @@
 201 +diff --git a/src/main.c b/src/main.c
 202 +index f23356c..3d6292c 100644
 203 +--- a/src/main.c
 204 ++++ b/src/main.c
 205 +@@ -72,7 +72,7 @@ int tty_init(int services, const gchar *root_path,
 206 + {
 207 +       struct server *server;
 208 +       struct termios options;
 209 +-      int fd, ret;
 210 ++      int fd, err, arg;
 211 +       glong flags;
 212 +
 213 +       tty_needs_reinit = TRUE;
 214 +@@ -88,6 +88,18 @@ int tty_init(int services, const gchar *root_path,
 215 +       cfmakeraw(&options);
 216 +       tcsetattr(fd, TCSANOW, &options);
 217 +
 218 ++      arg = fcntl(fd, F_GETFL);
 219 ++      if (arg < 0) {
 220 ++              err = -errno;
 221 ++              goto failed;
 222 ++      }
 223 ++
 224 ++      arg |= O_NONBLOCK;
 225 ++      if (fcntl(fd, F_SETFL, arg) < 0) {
 226 ++              err = -errno;
 227 ++              goto failed;
 228 ++      }
 229 ++
 230 +       server = g_new0(struct server, 1);
 231 +       server->services = services;
 232 +       server->folder = g_strdup(root_path);
 233 +@@ -97,14 +109,21 @@ int tty_init(int services, const gchar *root_path,
 234 +       server->rx_mtu = TTY_RX_MTU;
 235 +       server->tx_mtu = TTY_TX_MTU;
 236 +
 237 +-      ret = obex_session_start(fd, server);
 238 +-      if (ret < 0) {
 239 ++      err = obex_session_start(fd, server);
 240 ++      if (err < 0) {
 241 +               server_free(server);
 242 +-              close(fd);
 243 ++              goto failed;
 244 +       } else
 245 +               tty_needs_reinit = FALSE;
 246 +
 247 +-      return ret;
 248 ++      debug("Successfully opened %s", devnode);
 249 ++
 250 ++      return 0;
 251 ++
 252 ++failed:
 253 ++      error("tty_init(): %s (%d)", strerror(-err), -err);
 254 ++      close(fd);
 255 ++      return err;
 256 + }
 257 +
 258 + void tty_closed(void)
 259 --- obexd-0.10/debian/patches/003_auth_cancel.patch
 260 +++ obexd-0.10/debian/patches/003_auth_cancel.patch
 261 @@ -0,0 +1,74 @@
 262 +diff --git a/src/manager.c b/src/manager.c
 263 +index 0abab9c..2c2768d 100644
 264 +--- a/src/manager.c
 265 ++++ b/src/manager.c
 266 +@@ -833,6 +833,9 @@ static void agent_reply(DBusPendingCall *call, gpointer user_data)
 267 +       DBusMessage *reply = dbus_pending_call_steal_reply(call);
 268 +       const gchar *name;
 269 +       DBusError derr;
 270 ++      gboolean *got_reply = user_data;
 271 ++
 272 ++      *got_reply = TRUE;
 273 +
 274 +       /* Received a reply after the agent exited */
 275 +       if (!agent)
 276 +@@ -870,17 +873,8 @@ static void agent_reply(DBusPendingCall *call, gpointer user_data)
 277 + static gboolean auth_error(GIOChannel *io, GIOCondition cond,
 278 +                       gpointer user_data)
 279 + {
 280 +-      DBusMessage *msg;
 281 +-
 282 +       agent->auth_pending = FALSE;
 283 +
 284 +-      msg = dbus_message_new_method_call(agent->bus_name, agent->path,
 285 +-                                      "org.openobex.Agent", "Cancel");
 286 +-
 287 +-      dbus_connection_send_with_reply(connection, msg, NULL, -1);
 288 +-
 289 +-      dbus_message_unref(msg);
 290 +-
 291 +       return FALSE;
 292 + }
 293 +
 294 +@@ -897,6 +891,7 @@ int request_authorization(gint32 cid, int fd, const gchar *filename,
 295 +       const gchar *bda = address;
 296 +       gchar *path;
 297 +       guint watch;
 298 ++      gboolean got_reply;
 299 +
 300 +       if (!agent)
 301 +               return -1;
 302 +@@ -940,6 +935,7 @@ int request_authorization(gint32 cid, int fd, const gchar *filename,
 303 +       dbus_message_unref(msg);
 304 +
 305 +       agent->auth_pending = TRUE;
 306 ++      got_reply = FALSE;
 307 +
 308 +       /* Catches errors before authorization response comes */
 309 +       io = g_io_channel_unix_new(fd);
 310 +@@ -948,7 +944,7 @@ int request_authorization(gint32 cid, int fd, const gchar *filename,
 311 +                       auth_error, NULL, NULL);
 312 +       g_io_channel_unref(io);
 313 +
 314 +-      dbus_pending_call_set_notify(call, agent_reply, NULL, NULL);
 315 ++      dbus_pending_call_set_notify(call, agent_reply, &got_reply, NULL);
 316 +
 317 +       /* Workaround: process events while agent doesn't reply */
 318 +       while (agent && agent->auth_pending)
 319 +@@ -956,7 +952,15 @@ int request_authorization(gint32 cid, int fd, const gchar *filename,
 320 +
 321 +       g_source_remove(watch);
 322 +
 323 +-      dbus_pending_call_cancel(call);
 324 ++      if (!got_reply) {
 325 ++              dbus_pending_call_cancel(call);
 326 ++              msg = dbus_message_new_method_call(agent->bus_name,
 327 ++                                                      agent->path,
 328 ++                                                      "org.openobex.Agent",
 329 ++                                                      "Cancel");
 330 ++              g_dbus_send_message(connection, msg);
 331 ++      }
 332 ++
 333 +       dbus_pending_call_unref(call);
 334 +
 335 +       if (!agent || !agent->new_name)
 336 --- obexd-0.10/debian/control
 337 +++ obexd-0.10/debian/control
 338 @@ -0,0 +1,29 @@
 339 +Source: obexd
 340 +Priority: optional
 341 +Section: net
 342 +Maintainer: Johan Hedberg <johan.hedberg@nokia.com>
 343 +Build-Depends: debhelper (>> 4.0.0), libopenobex1-dev, libbluetooth3-dev (>= 4.0), cdbs, libdbus-1-dev, libdbus-glib-1-dev, libglib2.0-dev
 344 +Standards-Version: 3.7.2
 345 +
 346 +Package: obexd
 347 +Section: net
 348 +Depends: ${shlibs:Depends}, bluez (>= 4.18)
 349 +Conflicts: obex-data-server
 350 +Architecture: any
 351 +Description: OBEX Server
 352 + A basic OBEX server implementation.
 353 +
 354 +Package: obexd-test
 355 +Architecture: any
 356 +Priority: extra
 357 +Depends: obexd (= ${binary:Version}), python, python2.5-gobject, python2.5-dbus
 358 +Description: testing tools for obexd
 359 + This package contains test tools for testing obexd
 360 +
 361 +Package: obexd-dbg
 362 +Section: libdevel
 363 +Architecture: any
 364 +Depends: obexd (= ${binary:Version})
 365 +Description: Debug symbols for obexd
 366 + This package contains debug symbols for the obexd package.
 367 +