Re: [Monotone-devel] recent Botan changes?

2013-03-28 Thread Markus Wanner
On 03/26/2013 11:48 PM, Stephen Leake wrote:
 Thomas Moschny thomas.mosc...@gmx.de writes:
 Am Tue, 26 Mar 2013 03:59:42 -0400
 schrieb Stephen Leake stephen_le...@stephe-leake.org:
 I tried upgrading to Botan 1.10.5 (current as of today), but that
 fails at configure time with a Python syntax error. Red Hat 5.0 has
 Python 2.4.3, Botan 10.x apparently requires a later Python version.

Correct. Python 2.4 and older are not supported by botan-1.10. And even
for 2.5 you need to tweak configure.py a bit. See the comment at the
very top of that file.

 Then Botan 1.10.5 compiled easily as well, except that configure.py only
 works with 2.7.3.

Python 3.3 seems be a bit bleeding-edgy. Again, see that comment.

 I had to add -I/usr/local/include/botan/botan-1.10 and -lbotan-1.10 to
 the mtn configure line, then it compiled fine. and it works, so I'm happy.

Glad to hear that.

 monotone configure says we support Botan  1.6.3, which is apparently
 no longer true.

I still intend to support Botan as far back as 1.6.3. And I certainly
tested with some one version from each stable Botan branch, including
1.6. On Debian exclusively, though. And in non-standard locations (as
you did for botan-1.10 on RedHat). Then again, I'd be surprised if the
OS matters much in this case.

 We should fix this then.

Stephen now thinks it was a configuration issue on his RedHat box. So
there's nothing to fix in monotone, I think.

 Yes. But what range of Botan versions do we want to support? I'm ok with
 1.10, but Debian stable is also an important consideration.

I don't see much reason to raise the bar. Certainly not to 1.10. We
might think about dropping support for the botan-1.6 (and -1.7) series,
but let's please do a monotone-1.1 release before that.

BTW: current Debian stable (squeeze) still has botan1.8, while wheezy
(soon-to-be-stable) brings 1.10.

Regards

Markus Wanner



signature.asc
Description: OpenPGP digital signature
___
Monotone-devel mailing list
Monotone-devel@nongnu.org
https://lists.nongnu.org/mailman/listinfo/monotone-devel


Re: [Monotone-devel] recent Botan changes?

2013-03-27 Thread Richard Hopkins
 How recent a head?

I've done a fresh checkout of 083dfa48871b21905f81ab22822709e0db97635b: 
autoreconf, configure, make cycle with no problems using botan 1.6.4.

5934509c86e975ce771c66a1511671620eceb6d0 is fine as well which I was at 
previously and is a child of 9ff6e4 (introduced the new botan defines).

I haven't tested those yet on OpenSUSE/Windows with the later botan versions.


___
Monotone-devel mailing list
Monotone-devel@nongnu.org
https://lists.nongnu.org/mailman/listinfo/monotone-devel


Re: [Monotone-devel] recent Botan changes?

2013-03-27 Thread Stephen Leake
Richard Hopkins richhguard-monot...@yahoo.co.uk writes:

 How recent a head?

 I've done a fresh checkout of
 083dfa48871b21905f81ab22822709e0db97635b: autoreconf, configure, make
 cycle with no problems using botan 1.6.4.

 5934509c86e975ce771c66a1511671620eceb6d0 is fine as well which I was
 at previously and is a child of 9ff6e4 (introduced the new botan
 defines).

 I haven't tested those yet on OpenSUSE/Windows with the later botan versions.

Ok. I'll put it down to a misconfigure on Red Hat.

-- 
-- Stephe

___
Monotone-devel mailing list
Monotone-devel@nongnu.org
https://lists.nongnu.org/mailman/listinfo/monotone-devel


Re: [Monotone-devel] recent Botan changes?

2013-03-26 Thread Stephen Leake
Richard Hopkins richhguard-monot...@yahoo.co.uk writes:

 monotone configure says we support Botan  1.6.3, which is apparently
 no longer true.

 We should fix this then.

 I successfully compile and run monotone (head) with botan 1.6.4 on
 SUSE Enterprise, and from memory 1.8.x and 1.10.x on OpenSUSE/Windows.

How recent a head?

This is the revision that failed for me:

   7282e7ba458b5e92f9c3850486c7b1c0df13c951
   2013-03-20T11:53:14  stephen_leak...@stephe-leake.org
 * src/merge_content.cc (get_dropped_details): replace rev_id with 
uncommon_ancestors, lca; much more efficient search

I'm guessing the problem is introduced in:

   9ff6e41adc6f40ae054fb4487f356bf69324dbdb
   2013-03-17T10:14:12  mar...@bluegap.ch
 Add conditional code using Botan 1.10 specific API. This prevents

Maybe my actual problem is that the condition #defines are not set
properly on my Red Hat system when using Botan 1.8.3; I did not
investigate.

-- 
-- Stephe

___
Monotone-devel mailing list
Monotone-devel@nongnu.org
https://lists.nongnu.org/mailman/listinfo/monotone-devel


Re: [Monotone-devel] recent Botan changes?

2013-03-26 Thread Stephen Leake
Thomas Moschny thomas.mosc...@gmx.de writes:

 Am Tue, 26 Mar 2013 03:59:42 -0400
 schrieb Stephen Leake stephen_le...@stephe-leake.org:

 I'm compiling monotone head on Red Hat 5.0 (for work); I need a recent
 fix I put in for drop/modified conflicts.

 The Red Hat repository does not have Botan (any version).

 Botan is available for RHEL 5 and 6 via the EPEL[1] repository.

I'm using the official supported Red Hat at work; we have a
maintenance contract.

I'm not clear how to go about telling the system to add another
repository to search, and I'm not sure what that would do to the
maintenance contract; for now, it's easier to install stuff from source.
It goes in /usr/local, so it's easy to distinguish from the official
stuff.

 I tried upgrading to Botan 1.10.5 (current as of today), but that
 fails at configure time with a Python syntax error. Red Hat 5.0 has
 Python 2.4.3, Botan 10.x apparently requires a later Python version.

 Python 2.6.X is also available via EPEL, should be easier to try that
 instead of compiling from sources.

I did some more work today; Python 3.3.0 and 2.7.3 both compiled easily
from source.

Then Botan 1.10.5 compiled easily as well, except that configure.py only
works with 2.7.3.

I had to add -I/usr/local/include/botan/botan-1.10 and -lbotan-1.10 to
the mtn configure line, then it compiled fine. and it works, so I'm happy.

 monotone configure says we support Botan  1.6.3, which is apparently
 no longer true.

 We should fix this then.

Yes. But what range of Botan versions do we want to support? I'm ok with
1.10, but Debian stable is also an important consideration.


 BTW, do you think it makes sense to backport the fix you mentioned to
 0.42, the Monotone version provided via EPEL for RHEL5?

no, 0.42 doesn't support mtn conflicts at all.

Who's maintaining mtn in that repository?

--
-- Stephe

___
Monotone-devel mailing list
Monotone-devel@nongnu.org
https://lists.nongnu.org/mailman/listinfo/monotone-devel