[Monotone-commits-diffs] org.debian.monotone: 9b69e64c9ac3b4697cd7bfdfc3372380ccb2a2e3

[code]

revision:            9b69e64c9ac3b4697cd7bfdfc3372380ccb2a2e3
date:                2010-11-11T07:30:13
author:              Richard Levitte <address@hidden>
branch:              org.debian.monotone
changelog:
New upstream release

manifest:
format_version "1"

new_manifest [18684758b9748a3e25d3b1227f0dcfbe97b7b665]

old_revision [fbfd33230edd751a48e33774dbfb4af434eb0910]

delete "patches/00-fail_cleanly_on_unreadable_db.diff"

delete "patches/10-sqlite_3.7.3_empty_blob.diff"

delete "patches/20-empty-command.diff"

patch "changelog"
 from [31468979b9efb1f5b8941a6a116cd03fb46b4c03]
   to [32d5a8f37758795e5e8ec67ce3a76f89566eb4fa]

patch "patches/series"
 from [faa1e22ee9c7d7b87ac41adf27f45caed6701634]
   to [a9cedff979e581682473c4fbc9cc727893cfaa9a]
============================================================
--- changelog	31468979b9efb1f5b8941a6a116cd03fb46b4c03
+++ changelog	32d5a8f37758795e5e8ec67ce3a76f89566eb4fa
@@ -1,3 +1,15 @@
+monotone (0.99.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/patches/00-fail_cleanly_on_unreadable_db.diff: removed, since
+    it's been fixed upstream.
+  * debian/patches/10-sqlite_3.7.3_empty_blob.diff: removed, since it's
+    been fixed upstream.
+  * debian/patches/20-empty-command.diff: removed, , since it's been fixed
+    upstream.
+
+ -- Richard Levitte <address@hidden>  Thu, 11 Nov 2010 07:41:12 +0100
+
 monotone (0.48-3) unstable; urgency=high
 
   * Add debian/source/format file as it may become mandatory.
============================================================
--- patches/00-fail_cleanly_on_unreadable_db.diff	ef03fafa904ae94e146ff33b0692bdd1bccf449e
+++ /dev/null	
@@ -1,17 +0,0 @@
-From upstream changelog for revision 78f4db157a353de19b33df875959efc2492812b4:
-  SQLite 3.7 is less eager about creting journal files; in particular a
-  do-nothing 'db migrate' doesn't create one. So don't require that
-  'db migrate' fail if the database directory isn't writeable.
-
-Index: monotone-0.48/tests/fail_cleanly_on_unreadable_db/__driver__.lua
-===================================================================
---- monotone-0.48.orig/tests/fail_cleanly_on_unreadable_db/__driver__.lua	2010-08-01 02:38:13.994830204 +0100
-+++ monotone-0.48/tests/fail_cleanly_on_unreadable_db/__driver__.lua	2010-08-01 02:38:52.708854534 +0100
-@@ -48,7 +48,6 @@
- check(mtn("--db=subdir/foo.db", "ls", "branches"), 0, false, false)
- check(mtn("--db=subdir/foo.db", "db", "info"), 0, false, false)
- check(mtn("--db=subdir/foo.db", "db", "version"), 0, false, false)
--check(mtn("--db=subdir/foo.db", "db", "migrate"), 1, false, false)
- check(mtn("--db=subdir/bar.db", "db", "load"), 1, false, false)
- check(mtn("--db=subdir/baz.db", "db", "init"), 1, false, false)
- check({"chmod", "a+w", "subdir"})
============================================================
--- patches/10-sqlite_3.7.3_empty_blob.diff	69ffd220f2ed68b00fe2b06bd93402b76cf01903
+++ /dev/null	
@@ -1,34 +0,0 @@
-From upstream changelog for revision 97939c9677047b36beef031cce4c1896849a987c:
-  sqlite3_column_blob() returns null for both empty blobs and real nulls.
-  Check the actual datatype first, and don't rely on a non-null return.
-  This only matters for recent SQLite, noted in bug 96.
-
-See also http://code.monotone.ca/p/monotone/issues/96/.
-Index: monotone-0.48.1/database.cc
-===================================================================
---- monotone-0.48.1.orig/database.cc	2010-10-26 17:09:59.401570755 +0100
-+++ monotone-0.48.1/database.cc	2010-10-26 17:10:14.563939979 +0100
-@@ -1489,12 +1489,19 @@
-       vector<string> row;
-       for (int col = 0; col < ncol; col++)
-         {
-+          // We never store NULLs, so we should never see one.
-+          int const datatype = sqlite3_column_type(i->second.stmt(), col);
-+          E(datatype != SQLITE_NULL, origin::database,
-+            F("null result in query: %s") % query.sql_cmd);
-           const char * value = (const char*)sqlite3_column_blob(i->second.stmt(), col);
-           int bytes = sqlite3_column_bytes(i->second.stmt(), col);
--          E(value, origin::database,
--            F("null result in query: %s") % query.sql_cmd);
--          row.push_back(string(value, value + bytes));
--          //L(FL("row %d col %d value='%s'") % nrow % col % value);
-+          if (value) {
-+            row.push_back(string(value, value + bytes));
-+          } else {
-+            // sqlite3_column_blob() returns null for zero-length
-+            I(bytes == 0);
-+            row.push_back(string());
-+          }
-         }
-       res.push_back(row);
-     }
============================================================
--- patches/20-empty-command.diff	57f26a70ddcacfd5ce05c7a5dc5954ce5d75838e
+++ /dev/null	
@@ -1,45 +0,0 @@
-Description: Prevent remote crashing of certain montone server configurations
-  Monotone versions 0.46, 0.47 and 0.48 are affected by a bug whereby a client
-  sending an empty command string to the server can cause it to terminate if
-  remote command execution is enabled. This was fixed in 0.48.1.
-Bug-Debian: http://bugs.debian.org/601850
-Origin: upstream, commit: 2cc01e1baf1032ccf40053bd9910b12d7b87cce6, 
-  commit: c6d7e5ab7f497d2cbef5f91e6880028a67d1f8e2
-Index: monotone-0.48/commands.cc
-===================================================================
---- monotone-0.48.orig/commands.cc	2010-10-30 12:00:32.906613057 +0100
-+++ monotone-0.48/commands.cc	2010-10-30 12:00:33.168601416 +0100
-@@ -302,8 +302,6 @@
-   {
-     map< command_id, command * > matches;
- 
--    I(!prefix().empty());
--
-     for (children_set::const_iterator iter = children().begin();
-          iter != children().end(); iter++)
-       {
-@@ -426,8 +424,10 @@
-   complete_command(args_vector const & args)
-   {
-     // Handle categories early; no completion allowed.
--    if (CMD_REF(__root__)->find_command(make_command_id(args[0]())) != NULL)
--      return make_command_id(args[0]());
-+    command_id first_cmd_part = make_command_id(args[0]());
-+    if (!first_cmd_part.empty() &&
-+         CMD_REF(__root__)->find_command(first_cmd_part) != NULL)
-+      return first_cmd_part;
- 
-     command_id id;
-     for (args_vector::const_iterator iter = args.begin();
-Index: monotone-0.48/tests/empty_command_name/__driver__.lua
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ monotone-0.48/tests/empty_command_name/__driver__.lua	2010-10-30 12:00:33.169601371 +0100
-@@ -0,0 +1,7 @@
-+mtn_setup()
-+
-+check(mtn(''), 1, false, true)
-+check(qgrep("is ambiguous", "stderr"))
-+
-+check(mtn('ls', ''), 1, false, true)
-+check(qgrep("is ambiguous", "stderr"))
============================================================
--- patches/series	faa1e22ee9c7d7b87ac41adf27f45caed6701634
+++ patches/series	a9cedff979e581682473c4fbc9cc727893cfaa9a
@@ -1,4 +1 @@
-00-fail_cleanly_on_unreadable_db.diff
-10-sqlite_3.7.3_empty_blob.diff
-20-empty-command.diff
 90-stacktrace-on-crash.diff