summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-09-05 13:33:03 +0000
committerPeter Volkov <pva@gentoo.org>2011-09-05 13:33:03 +0000
commit5cf023b5c00832cca3b030b9ca956ad41cf0c6e5 (patch)
tree8c39e8a898f25302f83680a2ff6197b797aedb51 /dev-vcs/monotone/files
parentVersion bump pyro to 4.8. (diff)
downloadgentoo-2-5cf023b5c00832cca3b030b9ca956ad41cf0c6e5.tar.gz
gentoo-2-5cf023b5c00832cca3b030b9ca956ad41cf0c6e5.tar.bz2
gentoo-2-5cf023b5c00832cca3b030b9ca956ad41cf0c6e5.zip
Version bump, bug #381135; updated monotone-0.99.1 to depend on <dev-libs/botan-1.10, bug 380257, thank Dennis Schridde for both reports. Drop old.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs/monotone/files')
-rw-r--r--dev-vcs/monotone/files/monotone-0.45-gcc45.patch12
-rw-r--r--dev-vcs/monotone/files/monotone-0.48.1-sqlite-3.7.3.patch27
-rw-r--r--dev-vcs/monotone/files/monotone-0.99-crash.patch30
3 files changed, 0 insertions, 69 deletions
diff --git a/dev-vcs/monotone/files/monotone-0.45-gcc45.patch b/dev-vcs/monotone/files/monotone-0.45-gcc45.patch
deleted file mode 100644
index d343dcd4a626..000000000000
--- a/dev-vcs/monotone/files/monotone-0.45-gcc45.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=317509
-
---- selectors.cc
-+++ selectors.cc
-@@ -18,6 +18,7 @@
- #include "cmd.hh"
- #include "work.hh"
- #include "transforms.hh"
-+#include "roster.hh"
-
- #include <algorithm>
- #include <boost/tokenizer.hpp>
diff --git a/dev-vcs/monotone/files/monotone-0.48.1-sqlite-3.7.3.patch b/dev-vcs/monotone/files/monotone-0.48.1-sqlite-3.7.3.patch
deleted file mode 100644
index fc0092229c0a..000000000000
--- a/dev-vcs/monotone/files/monotone-0.48.1-sqlite-3.7.3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-============================================================
---- database.cc 0afa3ff4bd9c9ee3bc62b10bcf6295a9f5388d64
-+++ database.cc 8bfff559a0894259fe3668294bd3906ae837129b
-@@ -1531,12 +1531,19 @@ database_impl::fetch(results & res,
- 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);
- }
diff --git a/dev-vcs/monotone/files/monotone-0.99-crash.patch b/dev-vcs/monotone/files/monotone-0.99-crash.patch
deleted file mode 100644
index 0a6220dc4f69..000000000000
--- a/dev-vcs/monotone/files/monotone-0.99-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-============================================================
---- NEWS 28057863abe389acf343fd6781d215d7d99dd2eb
-+++ NEWS 287e77585d21957e85230c1fc3f06921a0621561
-@@ -1,3 +1,14 @@
-+??? ??? ?? ??:??:?? UTC 2010
-+
-+ 0.99.1 release.
-+
-+ Bugs fixed
-+
-+ - monotone crashed on x86_64 when a netsync action required
-+ the parsing of an URL. This has been fixed.
-+ (closes monotone issue 100)
-+
-+
- Thu Oct 28 21:07:18 UTC 2010
-
- 0.99 release.
-============================================================
---- pcrewrap.cc 08ac10d9a75557faba316d1b0a242b8ed3cd4243
-+++ pcrewrap.cc 42611610af4de2f7d1da39bf5c023038b7590be7
-@@ -144,7 +144,7 @@ namespace pcre
- // because pcre_exec might not signal trailing unmatched subpatterns
- // i.e. if "abc" matches "(abc)(de)?", the match count is two, not
- // the expected three
-- size_t cap_count;
-+ size_t cap_count = 0;
- int rc = pcre_fullinfo(basedat, extradat, PCRE_INFO_CAPTURECOUNT, &cap_count);
- I(rc == 0);
-