Date: 3 Aug 2007 20:48:32 -0000 From: Lapo Luchini <lapo@lapo.it> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Lapo Luchini <lapo@lapo.it> Subject: ports/115180: port upgrade: devel/monotone 0.36 Message-ID: <20070803204832.95237.qmail@mail.lapo.it> Resent-Message-ID: <200708032050.l73Ko1dB072124@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115180 >Category: ports >Synopsis: port upgrade: devel/monotone 0.36 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Aug 03 20:50:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Lapo Luchini >Release: FreeBSD 6.2-STABLE amd64 >Organization: >Environment: System: FreeBSD motoko.lapo.it 6.2-STABLE FreeBSD 6.2-STABLE #7: Fri Jun 15 15:41:02 CEST 2007 root@motoko.lapo.it:/usr/obj/usr/src/sys/MOTOKO amd64 >Description: New upstream release. Two patches no more needed. >How-To-Repeat: >Fix: --- pr-monotone-0.36 begins here --- diff -ruN monotone/Makefile monotone-0.36/Makefile --- monotone/Makefile 2007-07-23 11:35:44.000000000 +0200 +++ monotone-0.36/Makefile 2007-08-03 14:51:08.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= monotone -PORTVERSION= 0.35 -PORTREVISION= 1 +PORTVERSION= 0.36 CATEGORIES= devel MASTER_SITES= http://monotone.ca/downloads/${PORTVERSION}/ diff -ruN monotone/distinfo monotone-0.36/distinfo --- monotone/distinfo 2007-05-27 12:40:50.000000000 +0200 +++ monotone-0.36/distinfo 2007-08-03 14:51:50.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (monotone-0.35.tar.gz) = 9b53046dda8ba7549fa5ce765e14fa65 -SHA256 (monotone-0.35.tar.gz) = bbe0c5ff34f58a8af81563560e5f21408a568dfe277baa452a56f19b5b7a07de -SIZE (monotone-0.35.tar.gz) = 4857094 +MD5 (monotone-0.36.tar.gz) = ba6733ebd9992c8c7b48b9e2226f9fb7 +SHA256 (monotone-0.36.tar.gz) = 99042322392ff6b7024a75935324287109fb7260d0e6b3e6aafdac9a67d0b2a4 +SIZE (monotone-0.36.tar.gz) = 4836460 diff -ruN monotone/files/patch-numeric_vocab.hh monotone-0.36/files/patch-numeric_vocab.hh --- monotone/files/patch-numeric_vocab.hh 2007-07-04 17:11:34.000000000 +0200 +++ monotone-0.36/files/patch-numeric_vocab.hh 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- numeric_vocab.hh.orig Mon May 7 16:13:44 2007 -+++ numeric_vocab.hh Sat Jun 30 22:53:12 2007 -@@ -11,6 +11,7 @@ - // PURPOSE. - - #include <cstddef> -+#include <climits> - #include <limits> - - #include "mt-stdint.h" diff -ruN monotone/files/patch-paths.cc monotone-0.36/files/patch-paths.cc --- monotone/files/patch-paths.cc 2007-07-16 00:21:51.000000000 +0200 +++ monotone-0.36/files/patch-paths.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ ---- paths.cc.orig 2007-05-07 14:13:44.000000000 +0000 -+++ paths.cc 2007-07-15 22:17:32.000000000 +0000 -@@ -10,6 +10,7 @@ - #include <string> - #include <sstream> - -+#include <boost/version.hpp> - #include <boost/filesystem/operations.hpp> - #include <boost/filesystem/convenience.hpp> - -@@ -249,6 +250,41 @@ - I(fully_normalized_path_split(path, true, sp)); - } - -+// path::normalize() is deprecated in Boost 1.34, and also -+// doesn't remove leading or trailing dots any more. -+static fs::path -+normalize_path(fs::path const & in) -+{ -+#if BOOST_VERSION < 103400 -+ return in.normalize(); -+#else -+ fs::path out; -+ vector<string> stack; -+ for (fs::path::iterator i = in.begin(); i != in.end(); ++i) -+ { -+ // remove . elements -+ if (*i == ".") -+ continue; -+ // remove foo/.. element pairs -+ if (*i == "..") -+ { -+ if (!stack.empty()) -+ { -+ stack.pop_back(); -+ continue; -+ } -+ } -+ stack.push_back(*i); -+ } -+ for (vector<string>::const_iterator i = stack.begin(); -+ i != stack.end(); ++i) -+ { -+ out /= *i; -+ } -+ return out; -+#endif -+} -+ - static void - normalize_external_path(string const & path, string & normalized) - { -@@ -272,7 +308,7 @@ - base = initial_rel_path.get(); - // the fs::native is needed to get it to accept paths like ".foo". - relative = fs::path(path, fs::native); -- out = (base / relative).normalize(); -+ out = normalize_path(base / relative); - } - catch (exception &) - { -@@ -539,9 +575,9 @@ - normalize_out_dots(string const & path) - { - #ifdef WIN32 -- return fs::path(path, fs::native).normalize().string(); -+ return normalize_path(fs::path(path, fs::native)).string(); - #else -- return fs::path(path, fs::native).normalize().native_file_string(); -+ return normalize_path(fs::path(path, fs::native)).native_file_string(); - #endif - } - -@@ -679,9 +715,17 @@ - } - - // check for _MTN/. and _MTN/.. to see if mt dir is readable -- if (!fs::exists(check / ".") || !fs::exists(check / "..")) -+ try -+ { -+ if (!fs::exists(check / ".") || !fs::exists(check / "..")) -+ { -+ L(FL("problems with '%s' (missing '.' or '..')") % check.string()); -+ return false; -+ } -+ } -+ catch(exception &) - { -- L(FL("problems with '%s' (missing '.' or '..')") % check.string()); -+ L(FL("problems with '%s' (cannot check for '.' or '..')") % check.string()); - return false; - } - return true; --- pr-monotone-0.36 ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070803204832.95237.qmail>