SOURCES: mpdscribble-default_verbose_level.patch (NEW), mpdscribble-libsoup...

[arvenil]

Author: arvenil                      Date: Wed Sep  3 22:06:38 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- initial

---- Files affected:
SOURCES:
   mpdscribble-default_verbose_level.patch (NONE -> 1.1)  (NEW), mpdscribble-libsoup.patch (NONE -> 1.1)  (NEW), mpdscribble-memory_corruption.patch (NONE -> 1.1)  (NEW), mpdscribble-path.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/mpdscribble-default_verbose_level.patch
diff -u /dev/null SOURCES/mpdscribble-default_verbose_level.patch:1.1
--- /dev/null	Thu Sep  4 00:06:39 2008
+++ SOURCES/mpdscribble-default_verbose_level.patch	Thu Sep  4 00:06:31 2008
@@ -0,0 +1,12 @@
+http://code.google.com/p/mpdscribble/issues/detail?id=25
+--- mpdscribble-0.2.12/file.c
++++ mpdscribble-0.2.12/file.c
+@@ -85,7 +85,7 @@ help (void)
+           "  --sleep          <interval> \tupdate interval (default 1 second)\n"
+           "  --cache-interval <interval> \twrite cache file every i seconds\n"
+           "                              \t(default 600 seconds)\n"
+-          "  --verbose <0-2>             \tverbosity (default 1)\n"
++          "  --verbose <0-2>             \tverbosity (default 2)\n"
+           "\n"
+           "Report bugs to <kuno at frob.nl>.\n");
+ 

================================================================
Index: SOURCES/mpdscribble-libsoup.patch
diff -u /dev/null SOURCES/mpdscribble-libsoup.patch:1.1
--- /dev/null	Thu Sep  4 00:06:39 2008
+++ SOURCES/mpdscribble-libsoup.patch	Thu Sep  4 00:06:32 2008
@@ -0,0 +1,65 @@
+Patch for conn.c from http://aur.archlinux.org/packages/mpdscribble/mpdscribble/0001-Ported-to-libsoup-2.4.patch
+--- mpdscribble-0.2.12/configure.in	2006-12-03 15:03:18.000000000 +0000
++++ mpdscribble-0.2.12/configure.in	2008-09-03 18:09:23.000000000 +0000
+@@ -12,7 +12,7 @@
+ AC_SUBST(libgthread_CFLAGS)
+ AC_SUBST(libgthread_LIBS)
+ 
+-PKG_CHECK_MODULES([libsoup],[libsoup-2.2],,[AC_MSG_ERROR([libsoup-2.2 not found])])
++PKG_CHECK_MODULES([libsoup],[libsoup-2.4],,[AC_MSG_ERROR([libsoup-2.4 not found])])
+ AC_SUBST(libsoup_CFLAGS)
+ AC_SUBST(libsoup_LIBS)
+ 
+--- mpdscribble-0.2.12/conn.c
++++ mpdscribble-0.2.12/conn.c
+@@ -31,7 +31,7 @@
+ 
+ struct global {
+   SoupSession *session;
+-  SoupUri *base_uri;
++  SoupURI *base_uri;
+   char *base;
+   int pending;
+   char *receive;
+@@ -51,19 +51,21 @@ conn_grow_buffer (size_t new)
+ }
+ 
+ static void
+-conn_callback (SoupMessage * msg, gpointer uri)
++conn_callback (SoupSession * session, SoupMessage * msg, gpointer uri)
+ {
+   size_t l;
+ 
+   if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
+     {
+-      l = msg->response.length;
++      l = msg->response_body->length;
+       conn_grow_buffer (g.count + l);
+-      memcpy (g.receive + g.count, msg->response.body, l);
++      memcpy (g.receive + g.count, msg->response_body->data, l);
+       g.count += l;
+     }
+ 
+-  soup_uri_free (uri);
++  if (uri)
++    soup_uri_free (uri);
++  
+   if (!--g.pending)
+     {
+       g.callback (g.count, g.receive);
+@@ -114,11 +116,11 @@ conn_initiate (char *url, callback_t *callback, char *post_data,
+       msg = soup_message_new (SOUP_METHOD_POST, g.base);
+       soup_message_set_request
+         (msg, "application/x-www-form-urlencoded",
+-         SOUP_BUFFER_USER_OWNED, post_data, strlen (post_data));
+-      soup_message_add_header (msg->request_headers, "User-Agent", 
++         SOUP_MEMORY_COPY, post_data, strlen (post_data));
++      soup_message_headers_append (msg->request_headers, "User-Agent", 
+                                AS_CLIENT_ID "/" AS_CLIENT_VERSION);
+-      soup_message_add_header (msg->request_headers, "Pragma", "no-cache");
+-      soup_message_add_header (msg->request_headers, "Accept", "*/*");
++      soup_message_headers_append (msg->request_headers, "Pragma", "no-cache");
++      soup_message_headers_append (msg->request_headers, "Accept", "*/*");
+     }
+   else
+     {

================================================================
Index: SOURCES/mpdscribble-memory_corruption.patch
diff -u /dev/null SOURCES/mpdscribble-memory_corruption.patch:1.1
--- /dev/null	Thu Sep  4 00:06:40 2008
+++ SOURCES/mpdscribble-memory_corruption.patch	Thu Sep  4 00:06:32 2008
@@ -0,0 +1,13 @@
+Patch from http://code.google.com/p/mpdscribble/issues/detail?id=23
+--- mpdscribble-0.2.12/file.c	2008-07-28 00:16:28 +0700
++++ mpdscribble-0.2.12/file.c	2008-07-28 20:17:22 +0700
+@@ -170,6 +170,9 @@ get_pair (char *str)
+   do
+     {
+       ptr += m[0].rm_eo + 1;
++      if(*ptr == '\0') {
++         break;
++      }
+       error = regexec (&compiled, ptr, 4, m, 0);
+       if (!error && m[3].rm_eo != -1)
+         add_pair (&p, ptr,

================================================================
Index: SOURCES/mpdscribble-path.patch
diff -u /dev/null SOURCES/mpdscribble-path.patch:1.1
--- /dev/null	Thu Sep  4 00:06:40 2008
+++ SOURCES/mpdscribble-path.patch	Thu Sep  4 00:06:33 2008
@@ -0,0 +1,14 @@
+--- mpdscribble-0.2.12/file.h	2008-09-03 19:52:41.000000000 +0000
++++ mpdscribble-0.2.12/file.h.	2008-09-03 19:53:00.000000000 +0000
+@@ -29,9 +29,9 @@
+   FILE_USR_* will be used instead if FILE_USR_CONF exists.
+ */
+ 
+-#define FILE_CONF       "/etc/mpdscribble.conf"
++#define FILE_CONF       "/etc/mpdscribble/mpdscribble.conf"
+ #define FILE_CACHE      "/var/cache/mpdscribble/mpdscribble.cache"
+-#define FILE_LOG        "/var/log/mpdscribble/mpdscribble.log"
++#define FILE_LOG        "/var/log/mpdscribble.log"
+ #define FILE_HOME_CONF  "~/.mpdscribble/mpdscribble.conf"
+ #define FILE_HOME_CACHE "~/.mpdscribble/mpdscribble.cache"
+ #define FILE_HOME_LOG   "~/.mpdscribble/mpdscribble.log"
================================================================