diff options
| author | drochner <drochner> | 2010-10-30 15:10:54 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2010-10-30 15:10:54 +0000 |
| commit | 8236521b1c037a2f00869b7a2f9e9f3ee2ff36c0 (patch) | |
| tree | 05e7450dcb32ba21e1e259dec9eb77d8fb964e5b /devel | |
| parent | 0dd77afdcb1fcbf6424a41b87e810c1dd6d45099 (diff) | |
| download | pkgsrc-8236521b1c037a2f00869b7a2f9e9f3ee2ff36c0.tar.gz | |
update to 0.48.1
changes:
-fix crash on empty cmd line arguments which is considered a security
problem because it can crash mtn server processes (SA41960)
-minor fixes
also add a patch from upstream to adapt to a behavior change
in sqlite3-3.7.3
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/monotone/Makefile | 6 | ||||
| -rw-r--r-- | devel/monotone/distinfo | 9 | ||||
| -rw-r--r-- | devel/monotone/patches/patch-aa | 28 |
3 files changed, 36 insertions, 7 deletions
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index 0da76864ad6..1616cde8d84 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.63 2010/06/16 14:47:26 jmmv Exp $ +# $NetBSD: Makefile,v 1.64 2010/10/30 15:10:54 drochner Exp $ # -DISTNAME= monotone-0.48 +DISTNAME= monotone-0.48.1 CATEGORIES= devel scm -MASTER_SITES= http://monotone.ca/downloads/0.48/ +MASTER_SITES= http://monotone.ca/downloads/0.48.1/ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://monotone.ca/ diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo index 79653824380..dab0dc8b8b9 100644 --- a/devel/monotone/distinfo +++ b/devel/monotone/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.44 2010/06/16 14:47:27 jmmv Exp $ +$NetBSD: distinfo,v 1.45 2010/10/30 15:10:54 drochner Exp $ -SHA1 (monotone-0.48.tar.gz) = 275ed47cb0bc78bc8b40b3ee234ff52d50d0fb64 -RMD160 (monotone-0.48.tar.gz) = 233571b3075cf7d21b9db3c74b77d8fb6757c082 -Size (monotone-0.48.tar.gz) = 4792019 bytes +SHA1 (monotone-0.48.1.tar.gz) = 0536efda6de6bd77b23ed4891161879645deb4f7 +RMD160 (monotone-0.48.1.tar.gz) = c3fe7132b45fd51ec08152edf097324f0c3f6e01 +Size (monotone-0.48.1.tar.gz) = 4868557 bytes +SHA1 (patch-aa) = e94c896ef549d481207009727d67d6aad22759a1 diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa new file mode 100644 index 00000000000..301ae97f556 --- /dev/null +++ b/devel/monotone/patches/patch-aa @@ -0,0 +1,28 @@ +$NetBSD: patch-aa,v 1.22 2010/10/30 15:10:54 drochner Exp $ + +--- database.cc.orig 2010-10-22 00:04:05.000000000 +0000 ++++ database.cc +@@ -1489,12 +1489,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); + } |