Apply upstream patch for 0.99 to fix crash. Add better version for fast stabilization for security bug #342705.

Package-Manager: portage-2.1.9.22/cvs/Linux x86_64

6 files changed, 202 insertions, 4 deletions

diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog
index 3784420cade8..0386ffde5154 100644
--- a/dev-vcs/monotone/ChangeLog
+++ b/dev-vcs/monotone/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-vcs/monotone
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.8 2010/10/29 07:58:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.9 2010/10/29 15:24:17 pva Exp $
+
+*monotone-0.99-r1 (29 Oct 2010)
+*monotone-0.48.1 (29 Oct 2010)
+
+  29 Oct 2010; Peter Volkov <pva@gentoo.org> +monotone-0.48.1.ebuild,
+  +files/monotone-0.48.1-sqlite-3.7.3.patch, -monotone-0.99.ebuild,
+  +monotone-0.99-r1.ebuild, +files/monotone-0.99-crash.patch:
+  Apply upstream patch for 0.99 to fix crash. Add better version for fast
+  stabilization for security bug #342705.
 
 *monotone-0.99 (29 Oct 2010)
 
diff --git a/dev-vcs/monotone/Manifest b/dev-vcs/monotone/Manifest
index adb3f7c635a3..0e7195f669b9 100644
--- a/dev-vcs/monotone/Manifest
+++ b/dev-vcs/monotone/Manifest
@@ -2,16 +2,20 @@ AUX 50monotone-gentoo.el 1217 RMD160 82532c08ab1409fe2a9a643baf0f769841f39db2 SH
 AUX hooks.lua 154 RMD160 0297c570bafe350a4160a46351c00f46ea4fc1ef SHA1 f31bdd8d567639b2aa427e98b2df47351a8e1237 SHA256 55e17360a14ccf70d2da5b3e3ad038b1021c30f4be5c69029f50bd1ec8cbf326
 AUX monotone-0.36.initd 2431 RMD160 bfa9672644eb07cbdfc2a03f7e20c557f2b5cc97 SHA1 448eea7bf3bdf14c85ce01d7197d04cfacedd89d SHA256 361cd19633a64f6b037b98ac50a2622d8856ff2dffb89c0b11b45660ba43bdb6
 AUX monotone-0.45-gcc45.patch 242 RMD160 1928c622e4493deac474d73e6a7cd675a24ce1a0 SHA1 4c498e24eb47d7a28c2e04bef9dcc7e08d909500 SHA256 bbde8fe9c5ae2d259d09a9bc1dbd7fb2b38aca9ba9b021d03f4b5481d145b734
+AUX monotone-0.48.1-sqlite-3.7.3.patch 1248 RMD160 d89d6659a86c758727830a08e9c8a36fbe616795 SHA1 b5db46f3dddaaba047cfd9943f7513a0b21533c9 SHA256 ad10f9d4b0c170d1bbfcaf5125000cf038f92b662444b6607432d344153eb620
+AUX monotone-0.99-crash.patch 1017 RMD160 870ddad5494292c969ebbbe52d1e0dade4849268 SHA1 fb3982db22aeec4939391a66ca16bc185c736278 SHA256 cd030914b0fdfb87fa142a455182b382bd6b20d2cca043744841f94133bd6c70
 AUX monotone.confd 803 RMD160 507ee4058e6f8197bd0b7a25f1115ec42ae226ec SHA1 1887e76fd00585344e614c3392527866bb94614c SHA256 4e266a08108441438fb4b3ac40216e731378d378593807b0826f58446c346e5b
 AUX read-permissions 192 RMD160 de9f340da2e143f306b7cf37584d7b43b100c06b SHA1 b83336348987f9c6f9a46f0191adf9fa87d1b83c SHA256 4f93a644b2f16d6ea5c4d28e3039dfddd7f8e38ca1b8d54389094be751fbfa7c
 AUX write-permissions 32 RMD160 164bc129fb3cdb2314d7ec96d23a9fc6f0e856a3 SHA1 0b48801914336a5a3baebf79725be81b52d279f4 SHA256 ddd40fac5d6fe98d9f58c4731a500eb1350a42ae7ca0ddaa40eaa3bbeb99026c
 DIST monotone-0.45.tar.gz 4645511 RMD160 d225595ba908d2d9366ffc3490caba83aa9ad9bb SHA1 84bd7ab5f7b1bfe98028f5105e3dbcd82c809e51 SHA256 64c734274715f392eb4a879172a11c0606d37c02b4a6f23045772af5f8e2a9ec
 DIST monotone-0.47.tar.gz 4698647 RMD160 8473366009542ea334ccfabba813f43d0bc89404 SHA1 a901c9e1a7dd1138c30483934bbf5f02945c2d2f SHA256 7a99f1a5e4eb2bb7bf82794ab7fc61435fbc55826b710243243c52f7b10be51b
+DIST monotone-0.48.1.tar.gz 4868557 RMD160 c3fe7132b45fd51ec08152edf097324f0c3f6e01 SHA1 0536efda6de6bd77b23ed4891161879645deb4f7 SHA256 e5ab4917866d2c597f99577554549b7c4cda9895be7a5dd0469f1c7798fe3c10
 DIST monotone-0.48.tar.gz 4792019 RMD160 233571b3075cf7d21b9db3c74b77d8fb6757c082 SHA1 275ed47cb0bc78bc8b40b3ee234ff52d50d0fb64 SHA256 3149abf0e4433a0e14c5da805a04dbbc45b16086bc267d473b17e933407d839d
 DIST monotone-0.99.tar.gz 4940625 RMD160 cf9c62ebd48a061c481f15d8e74d476e59bc259a SHA1 badcf38bf532193124a88463c82a55a1e1f217a9 SHA256 fa677f09169afb71452598ce92ea376fe06037d17bfe650fb6aed17cead11453
 EBUILD monotone-0.45.ebuild 3360 RMD160 15b99a25803569c7b852e2cfedc95e13b2e9d2a4 SHA1 ee6082ea1c9a6e3bb753e9e39a284929a01e9b62 SHA256 e68330fd743d7c34e202907a5574cc9d98dc963d47e4335cb72d7f45d936318e
 EBUILD monotone-0.47.ebuild 3435 RMD160 2346ce9ea311f71df638780e9999f4c235a2fb46 SHA1 8189adeea810426a154a1b27166133122534ec5c SHA256 8efbc1148eff6d4f139c8565dfdf5f97afa5a30a1f71cbb0c2c5c629709bf3d7
+EBUILD monotone-0.48.1.ebuild 3358 RMD160 4f3d8b6e231e20ffe3ebc34ff4188e781c5b4314 SHA1 9f9b8e11fdebb04ce5d295d0a17816c6a1704c8c SHA256 9924810eff5e6185198711da6c0c24bd790ad074b110cac1d8fed5b75c8916f3
 EBUILD monotone-0.48.ebuild 3298 RMD160 110abb18444584e21c6baf32ffa1c9c63817d8db SHA1 ea3cf5da23aafb71f5e792bc6313e65b3b0ec2dc SHA256 41a60a406918444d98d88bd9a5dbdcba216755befe47d87daf17b1d9ee64d2b0
-EBUILD monotone-0.99.ebuild 3298 RMD160 ad425b4fa9cfc0c1111abd55dfa4a1762efdd30c SHA1 81a8030bdc15a4a791d5112f9b16f80d0689e34c SHA256 4238c00b502c8e32484733ec01dc535e140ad7a227c8ff20ce76fe8fc16b5c91
-MISC ChangeLog 11962 RMD160 f2dad59df1c4eafe0f48fd631917ef2a7b125011 SHA1 187b0a836d595f578cae3c37670ba687bad923dd SHA256 2eeecc95d2b7e9968e845f457c5167164d3c00392a2af590c069fc0c054a24e7
+EBUILD monotone-0.99-r1.ebuild 3340 RMD160 7fd334a24cdb4a65f033d67bbb34b7db9aa8d77d SHA1 c03a3a02e94f45c8df08bc5a7dd0a4b13cd542ca SHA256 07bdb46771f43012d329d0e0ccba83a3fe26e2cd200e785171570fc97959ac8a
+MISC ChangeLog 12343 RMD160 e18a52d32d251ea4afd5182cd162c63f5b182435 SHA1 40492a8cdeb5067da3856f26e19bf821e4d377ac SHA256 5349fecb875c6e74da03ae065ba2a9809718255a1a1d2751646fc155cee43cbb
 MISC metadata.xml 1115 RMD160 05759456628f2c600bddfdfe28e45e570019fd41 SHA1 922579ba97cccbe0c4bc25340d0457b45712a6a1 SHA256 a22b12bb8cad7a1f220dbd74511e11790444b639a67bb7c05be389a161232c94
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
new file mode 100644
index 000000000000..fc0092229c0a
--- /dev/null
+++ b/dev-vcs/monotone/files/monotone-0.48.1-sqlite-3.7.3.patch
@@ -0,0 +1,27 @@
+============================================================
+--- 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
new file mode 100644
index 000000000000..0a6220dc4f69
--- /dev/null
+++ b/dev-vcs/monotone/files/monotone-0.99-crash.patch
@@ -0,0 +1,30 @@
+============================================================
+--- 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);
+ 
diff --git a/dev-vcs/monotone/monotone-0.48.1.ebuild b/dev-vcs/monotone/monotone-0.48.1.ebuild
new file mode 100644
index 000000000000..6f11462873f6
--- /dev/null
+++ b/dev-vcs/monotone/monotone-0.48.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.48.1.ebuild,v 1.1 2010/10/29 15:24:17 pva Exp $
+
+EAPI=2
+inherit bash-completion elisp-common eutils toolchain-funcs
+
+DESCRIPTION="Monotone Distributed Version Control System"
+HOMEPAGE="http://monotone.ca"
+SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="doc emacs ipv6 nls"
+
+RDEPEND="sys-libs/zlib
+	emacs? ( virtual/emacs )
+	>=dev-libs/libpcre-7.6
+	>=dev-libs/botan-1.8.0
+	>=dev-db/sqlite-3.3.8
+	>=dev-lang/lua-5.1
+	net-dns/libidn"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.33.1
+	nls? ( >=sys-devel/gettext-0.11.5 )
+	doc? ( sys-apps/texinfo )"
+
+pkg_setup() {
+	enewgroup monotone
+	enewuser monotone -1 -1 /var/lib/monotone monotone
+}
+
+src_prepare() {
+	if [[ $(gcc-major-version) -lt "3"  ||
+		( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then
+		die 'requires >=gcc-3.4'
+	fi
+
+	epatch "${FILESDIR}/monotone-0.48.1-sqlite-3.7.3.patch"
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		$(use_enable ipv6)
+}
+
+src_compile() {
+	emake || die
+
+	if use doc; then
+		emake html || die
+	fi
+
+	if use emacs; then
+		cd contrib
+		elisp-compile *.el || die
+	fi
+}
+
+src_test() {
+	if [ ${UID} != 0 ]; then
+		emake check || die "emake check failed"
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+
+	dobashcompletion contrib/monotone.bash_completion
+
+	if use doc; then
+		dohtml -r html/*
+		dohtml -r figures
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/*.{el,elc} || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el \
+			|| die
+	fi
+
+	dodoc AUTHORS NEWS README* UPGRADE || die
+	docinto contrib
+	dodoc contrib/*
+	newconfd "${FILESDIR}"/monotone.confd monotone || die
+	newinitd "${FILESDIR}"/${PN}-0.36.initd monotone || die
+
+	insinto /etc/monotone
+	newins "${FILESDIR}"/hooks.lua hooks.lua || die
+	newins "${FILESDIR}"/read-permissions read-permissions || die
+	newins "${FILESDIR}"/write-permissions write-permissions || die
+
+	keepdir /var/lib/monotone/keys/ /var/{log,run}/monotone
+	fowners monotone:monotone /var/lib/monotone{,/keys} /var/{log,run}/monotone
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	bash-completion_pkg_postinst
+
+	elog
+	elog "For details and instructions to upgrade from previous versions,"
+	elog "please read /usr/share/doc/${PF}/UPGRADE.bz2"
+	elog
+	elog "  1. edit /etc/conf.d/monotone"
+	elog "  2. import the first keys to enable access with"
+	elog "     env HOME=\${homedir} mtn pubkey me@example.net | /etc/init.d/monotone import"
+	elog "     Thereafter, those with write permission can add other keys via"
+	elog "     netsync with 'monotone push --key-to-push=IDENT' and then IDENT"
+	elog "     can be used in the read-permission and write-permission files."
+	elog "  3. adjust permisions in /etc/monotone/read-permissions"
+	elog "                      and /etc/monotone/write-permissions"
+	elog "  4. start the daemon: /etc/init.d/monotone start"
+	elog "  5. make persistent: rc-update add monotone default"
+	elog
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/monotone/monotone-0.99.ebuild b/dev-vcs/monotone/monotone-0.99-r1.ebuild
index db7be441c1f1..271a397d87bb 100644
--- a/dev-vcs/monotone/monotone-0.99.ebuild
+++ b/dev-vcs/monotone/monotone-0.99-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.99.ebuild,v 1.1 2010/10/29 07:58:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.99-r1.ebuild,v 1.1 2010/10/29 15:24:17 pva Exp $
 
 EAPI=2
 inherit bash-completion elisp-common eutils toolchain-funcs
@@ -36,6 +36,7 @@ src_prepare() {
 		( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then
 		die 'requires >=gcc-3.4'
 	fi
+	epatch "${FILESDIR}/${P}-crash.patch"
 }
 
 src_configure() {