[Monotone-devel] Re: nvm.stripped & botan on FreeBSD [Was: propose to land .stripped on Tuesday]

2009-02-19 Thread Lapo Luchini
Zack Weinberg wrote: > Please try replacing line 198 of revision.cc with this > code: > > #if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7) It works, I committed it in revision 6d9507fb29ddf2eb. (I guess you might already have committed it, but can't hurt...) With this, stripped works on F

[Monotone-devel] Re: nvm.stripped & botan on FreeBSD [Was: propose to land .stripped on Tuesday]

2009-02-16 Thread Lapo Luchini
Zack Weinberg wrote: > This is the danger of moving huge blocks of code around, I guess ... > there *was* appropriate #ifdeffage in the previous incarnation of this > code on .stripped, in revision.cc, but I did the reorganization on > mainline. Please try replacing line 198 of revision.cc with th

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-02-09 Thread Stephen Leake
Stephen Leake writes: > Zack Weinberg writes: > >> On Tue, Jan 20, 2009 at 2:31 PM, Zack Weinberg wrote: >>> I noticed a severe slowdown in the time for nvm.stripped to run the >>> testsuite (from five to twelve minutes on my big beefy quad-core >>> machine) which *seems* to be all down to init

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-02-01 Thread Zack Weinberg
On Sun, Feb 1, 2009 at 9:05 AM, Markus Wanner wrote: > freebsd71-i386% /usr/local/bin/pkg-config --exists --print-errors 'botan >>= 1.6.3' > gnome-config: not found > Package botan was not found in the pkg-config search path. > Perhaps you should add the directory containing `botan.pc' > to the PK

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-02-01 Thread Markus Wanner
Hi, Zack Weinberg wrote: > Do you get the same output if you write it like this? > > $ /usr/local/bin/pkg-config --exists --print-errors 'botan >= 1.6.3' Hm.. not quite: freebsd71-i386% /usr/local/bin/pkg-config --exists --print-errors 'botan >= 1.6.3' gnome-config: not found Package botan was

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-02-01 Thread Zack Weinberg
On Sun, Feb 1, 2009 at 4:35 AM, Markus Wanner wrote: > Here's the output of a pkg-config request, as run by configure from that > same machine: > > freebsd71-i386% /usr/local/bin/pkg-config --exists --print-errors botan >= > 1.6.3 > gnome-config: not found > Package botan was not found in the pkg

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-02-01 Thread Markus Wanner
Hi, Zack Weinberg wrote: > On Sat, Jan 31, 2009 at 12:53 PM, Markus Wanner wrote: >> However, testing quickly on FreeBSD 7.1, I get: >> >> checking for botan... gnome-config: not found >> no >> usage: basename string [suffix] >> basename [-a] [-s suffix] string [...] >> checking for botan u

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-31 Thread Zack Weinberg
On Sat, Jan 31, 2009 at 12:53 PM, Markus Wanner wrote: > However, testing quickly on FreeBSD 7.1, I get: > > checking for botan... gnome-config: not found > no > usage: basename string [suffix] > basename [-a] [-s suffix] string [...] > checking for botan using --cflags: not found > no

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-31 Thread Markus Wanner
Hi, Zack Weinberg wrote: > There's two things that coulda gone wrong: first, I accidentally > checked in an incorrect change to Makefile.am last night; I've just > reverted that, so please update and try again. Okay, that did the trick on debian sid. Thank you. However, testing quickly on FreeBS

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-31 Thread Zack Weinberg
On Sat, Jan 31, 2009 at 11:32 AM, Markus Wanner wrote: > I just wanted to test nvm.stripped on some OSes again, but unfortunately > I can't even get automake to run through. automake-1.9 (from my debian > sid development machine) just aborts without any I can identify as an > error message. There

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-31 Thread Markus Wanner
Hi, Zack Weinberg wrote: >> As we now expect nvm.stripped to compile and run on most of the >> supported systems, I think we should land nvm.stripped in about a week, >> given further testing succeeds. > > I have no objection to this plan, provided no horrible breakage turns > up in the next few

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-26 Thread Zack Weinberg
On Sun, Jan 25, 2009 at 8:29 PM, Lapo Luchini wrote: > Zack Weinberg wrote: >> Ok, please try again with the change I just pushed >> (ef6b444ed286c55788bc258b1dda83d5da695ea2). > > % fgrep _PLATFORM config.status > S["WIN32_PLATFORM_FALSE"]="" > S["WIN32_PLATFORM_TRUE"]="#" > > Yep, it compiles.

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-26 Thread Markus Wanner
Hi, Zack Weinberg wrote: > Unfortunately it is not practical... Well, the code before did exactly that for these four libraries. However, the current approach is certainly cleaner. > The output of "mtn version --full" is dumped into the log files for > the test suite; might that be good enough?

[Monotone-devel] Re: nvm.stripped versus botan

2009-01-26 Thread Lapo Luchini
Zack Weinberg wrote: > On Sat, Jan 24, 2009 at 11:51 PM, Lapo Luchini wrote: >> nvm.stripped: >> % fgrep _PLATFORM config.status >> S["WIN32_PLATFORM_FALSE"]="#" >> S["WIN32_PLATFORM_TRUE"]="" >> >> Yes, it seems to be at reverse indeed... > > Ok, please try again with the change I just pushed >

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-25 Thread Zack Weinberg
On Sun, Jan 25, 2009 at 4:09 AM, Markus Wanner wrote: > Thank you very much for cleaning up the autoconf stuff, that indeed > looks pretty clean now. Thanks as well for tracking down and fixing the > loading speed issue. > > [ The only thing I'm missing now is the version information during > conf

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-25 Thread Zack Weinberg
On Sat, Jan 24, 2009 at 11:51 PM, Lapo Luchini wrote: > nvm: > % fgrep _PLATFORM config.status > S["AIX_PLATFORM_FALSE"]="" > S["AIX_PLATFORM_TRUE"]="#" > S["WIN32_PLATFORM_FALSE"]="" > S["WIN32_PLATFORM_TRUE"]="#" > > nvm.stripped: > % fgrep _PLATFORM config.status > S["WIN32_PLATFORM_FALSE"]="#"

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-25 Thread Markus Wanner
Hi, Zack Weinberg wrote: > I'm pretty happy with .stripped. I was able to muck out an incredible > amount of gunk from the configure script, and if we get rid of netxx > even more can go. The binary's smaller, the build is faster, and the > Debian security team will be happy with us. What remai

[Monotone-devel] Re: nvm.stripped versus botan

2009-01-24 Thread Lapo Luchini
Zack Weinberg wrote: > Can you compile mainline on Cygwin, and how are the Makefile > conditionals set after you run configure on mainline? (You can just > grep for "_PLATFORM" in config.status and post the gobbledygook that > it outputs. I know how to read it.) nvm: % fgrep _PLATFORM config.sta

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-24 Thread Jack Lloyd
On Sun, Jan 25, 2009 at 12:41:27AM -0500, Jack Lloyd wrote: > On Sat, Jan 24, 2009 at 09:34:52PM -0800, Zack Weinberg wrote: > > > At first glance that looks like heinous breakage in the system > > headers > > Win32 does indeed have min() and max() macros, by default in windows.h > > One can def

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-24 Thread Jack Lloyd
On Sat, Jan 24, 2009 at 09:34:52PM -0800, Zack Weinberg wrote: > At first glance that looks like heinous breakage in the system > headers Win32 does indeed have min() and max() macros, by default in windows.h One can define NOMINMAX before including th header to disable this 'feature', or just u

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-24 Thread Zack Weinberg
On Sat, Jan 24, 2009 at 2:27 AM, Lapo Luchini wrote: ... > In file included from ./sanity.hh:19, > from win32/read_password.cc:12: > ./numeric_vocab.hh:45:44: macro "max" requires 2 arguments, but only 1 given ... >45T mask = std::numeric_limits::max(); At first glance

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-24 Thread Derek Scherger
On Sat, Jan 24, 2009 at 6:35 AM, Stephen Leake < stephen_le...@stephe-leake.org> wrote: > I have not been able to work on this; the MS developer SDK is only > available as a DVD image, and I don't have the facilities to burn a > DVD. You should be able to mount it on linux over the loopback devi

[Monotone-devel] Re: nvm.stripped versus botan

2009-01-24 Thread Lapo Luchini
Stephen Leake wrote: > I have not been able to work on this; the MS developer SDK is only > available as a DVD image, and I don't have the facilities to burn a > DVD. You can "mount" it using the free MagicDisc or similar tools. http://www.magiciso.com/tutorials/miso-magicdisc-overview.htm -- L

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-24 Thread Stephen Leake
Zack Weinberg writes: > On Tue, Jan 20, 2009 at 2:31 PM, Zack Weinberg wrote: >> I noticed a severe slowdown in the time for nvm.stripped to run the >> testsuite (from five to twelve minutes on my big beefy quad-core >> machine) which *seems* to be all down to initializing botan's RNG. > > Most

[Monotone-devel] Re: nvm.stripped versus botan

2009-01-24 Thread Lapo Luchini
Zack Weinberg wrote: > Folks with exotic systems (non-Linux, non-*BSD) might wanna check what > I did to the configure script, btw. I might have been overoptimistic. > :-/ Well, configure worked on CygWin, compile less so ;-) % make [...] In file included from ./sanity.hh:19, fr

[Monotone-devel] Re: nvm.stripped versus botan

2009-01-23 Thread Zack Weinberg
On Tue, Jan 20, 2009 at 2:31 PM, Zack Weinberg wrote: > I noticed a severe slowdown in the time for nvm.stripped to run the > testsuite (from five to twelve minutes on my big beefy quad-core > machine) which *seems* to be all down to initializing botan's RNG. Most subcommands don't use cryptograp

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-21 Thread Thomas Moschny
Zack Weinberg wrote: > On Tue, Jan 20, 2009 at 4:16 PM, Jack Lloyd wrote: >> That said, it's no good to slow mtn startup down so much since that is >> clearly not the Right Thing either. > > Do you think we could get away with skipping es_unix if we have > something else, though? That's the real

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-21 Thread Zack Weinberg
On Tue, Jan 20, 2009 at 10:05 PM, Jack Lloyd wrote: ... > In particular I'd prefer not to simply disable particular sources, > unless there really is no other workable solution. > > Having spent all of 3 minutes thinking about it, I'm wondering if the > thing to do is drop the fast poll/slow poll

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-20 Thread Jack Lloyd
On Tue, Jan 20, 2009 at 09:11:06PM -0800, Zack Weinberg wrote: > Do you think we could get away with skipping es_unix if we have > something else, though? That's the really slow one. Probably, yes. However what I would like to do here is figure out a seeding discipline such that - The default i

Re: [Monotone-devel] Re: nvm.stripped versus botan

2009-01-20 Thread Zack Weinberg
On Tue, Jan 20, 2009 at 4:16 PM, Jack Lloyd wrote: > ... while > an entropy source can claim it works or not, in the sense that it will > produce some output, it really has no way of knowing if that output is > in any way random/unguessable by an attacker, which is really the > purpose of this cod

[Monotone-devel] Re: nvm.stripped versus botan

2009-01-20 Thread Jack Lloyd
On Tue, Jan 20, 2009 at 02:31:30PM -0800, Zack Weinberg wrote: > Jack - Can we get this fixed in botan? It seems to me that the Right > Thing is for each entropy source to report whether it works on a > particular system, and then for the RNG object to use only the first > one that works. Thus,

Re: [Monotone-devel] Re: nvm.stripped

2008-10-14 Thread Markus Wanner
Hi, Stephen Leake wrote: > Assuming we eventually integrate this branch into mainline, how many > versions of sqlite (and all the other libraries!) do we need the > buildbots to test? I think it's sufficient supporting the library versions shipped with the distributions. > And do we want to get

Re: [Monotone-devel] Re: nvm.stripped

2008-10-14 Thread Stephen Leake
Markus Wanner <[EMAIL PROTECTED]> writes: > With these fixes I've been able to compile and successfully test > monotone against all of these sqlite versions: > > 3.3.8 (as currently included in debian etch / stable) > 3.3.12 > 3.3.17 > 3.4.1 (what we shipped up to now) > 3.5.9 (as currentl

Re: [Monotone-devel] Re: nvm.stripped

2008-10-13 Thread Markus Wanner
Hi, Markus Wanner wrote: > 3.4.1 (what we shipped up to now) Oops, revoking that. 3.4.1 and 3.4.2 currently fail on test 'database_dump_load', which is fishy because 3.4.1 was integrated before, no? I'm investigating on the issue. Regards Markus Wanner _

Re: [Monotone-devel] Re: nvm.stripped

2008-10-13 Thread Markus Wanner
Hi, I've now corrected or worked around issues with various sqlite versions. These tests have failed before: Markus Wanner wrote: > 146 database_checkFAIL (line 23) > 216 i_selectorFAIL (line 32) Revision 40dba08582bcb2eecde9c97

Re: [Monotone-devel] Re: nvm.stripped

2008-10-12 Thread Patrick Georgi
Derek Scherger schrieb: > On Sun, Oct 12, 2008 at 2:49 PM, Zack Weinberg <[EMAIL PROTECTED] > > wrote: > > I put some patches on .library-build to deal with this. The 'best > effort' functionality is not available in 1.5 as far as I know, but I > don't know an

Re: [Monotone-devel] Re: nvm.stripped

2008-10-12 Thread Derek Scherger
On Sun, Oct 12, 2008 at 2:49 PM, Zack Weinberg <[EMAIL PROTECTED]> wrote: > I put some patches on .library-build to deal with this. The 'best > effort' functionality is not available in 1.5 as far as I know, but I > don't know any reason why the //TRANSLIT//IGNORE thing that we had > before the '

Re: [Monotone-devel] Re: nvm.stripped

2008-10-12 Thread Zack Weinberg
On Sat, Oct 11, 2008 at 9:28 PM, Derek Scherger <[EMAIL PROTECTED]> wrote: > I'm now looking at idna (libidn) which ought to be easy but isn't because of > some changes that were made at the 2007 summit iirc. Lapo, do you recall the > "best effort" stuff that got added to idna/toutf8.c? This is not

Re: [Monotone-devel] Re: nvm.stripped

2008-10-12 Thread Derek Scherger
On Sun, Oct 12, 2008 at 10:13 AM, Jack Lloyd <[EMAIL PROTECTED]> wrote: > Two things on nvm.stripped (rev b6c549d4c9c28227000b62a3fe26b8e9aa7d6ab1) > > I am warned: > > Makefile.am:339: whitespace following trailing backslash > > There is a trailing tab on that line. > > Also, here is the output c

Re: [Monotone-devel] Re: nvm.stripped

2008-10-12 Thread Jack Lloyd
On Sun, Oct 12, 2008 at 09:53:34AM -0600, Derek Scherger wrote: > Heh, just noticed that too. I've merged and pushed so things are good. I > removed -DTEMP_STORE from AM_CFLAGS in Makefile.am in the merged version. As > near as I can tell this was only relevant for SQLITE. Two things on nvm.strip

Re: [Monotone-devel] Re: nvm.stripped

2008-10-12 Thread Derek Scherger
On Sun, Oct 12, 2008 at 7:31 AM, Markus Wanner <[EMAIL PROTECTED]> wrote: > > > and also moved sqlite to the Attic > > ..oops, looks like we've done duplicate work. I've just committed and > pushed what I have. It's not quite complete, yet (rev > 4c625e162bf17c69406de23482187313dafd29cd). Have you

Re: [Monotone-devel] Re: nvm.stripped

2008-10-12 Thread Markus Wanner
Hi, Derek Scherger wrote: > I've made this change Cool, thanks. > and also moved sqlite to the Attic ..oops, looks like we've done duplicate work. I've just committed and pushed what I have. It's not quite complete, yet (rev 4c625e162bf17c69406de23482187313dafd29cd). Have you pushed your work,

Re: [Monotone-devel] Re: nvm.stripped

2008-10-11 Thread Derek Scherger
On Thu, Oct 9, 2008 at 7:43 PM, Jack Lloyd <[EMAIL PROTECTED]> wrote: > On Thu, Oct 09, 2008 at 07:39:51PM -0600, Derek Scherger wrote: > > Looking at the current checks for botan versions it seems that if I > happened > > to have 1.8.12 we would let it in because we check for major ==1 and > patc

Re: [Monotone-devel] Re: nvm.stripped

2008-10-09 Thread Jack Lloyd
On Thu, Oct 09, 2008 at 07:39:51PM -0600, Derek Scherger wrote: > Looking at the current checks for botan versions it seems that if I happened > to have 1.8.12 we would let it in because we check for major ==1 and patch > between 8 and 17. > Would using the version macros that botan defines be a be

Re: [Monotone-devel] Re: nvm.stripped

2008-10-09 Thread Derek Scherger
Looking at the current checks for botan versions it seems that if I happened to have 1.8.12 we would let it in because we check for major ==1 and patch between 8 and 17. Would using the version macros that botan defines be a better way to check things? Here's what I'm talking about: # # old_revis

Re: [Monotone-devel] Re: nvm.stripped

2008-10-09 Thread Jack Lloyd
On Thu, Oct 09, 2008 at 11:08:40AM +0200, Markus Wanner wrote: > Hi, > > Jack Lloyd wrote: > > OK, if I change in botan.m4 > > > > -CFLAGS="$CFLAGS $BOTAN_CPPFLAGS" > > +CPPFLAGS="$CPPFLAGS $BOTAN_CPPFLAGS" > > Ah! Thank you very much for pointing this out. > > Looks like configure on m

Re: [Monotone-devel] Re: nvm.stripped

2008-10-09 Thread Jack Lloyd
On Thu, Oct 09, 2008 at 11:08:40AM +0200, Markus Wanner wrote: > I've removed my system wide botan and can confirm that the issue is > solved now. (As of e5f6d85442972da43d641bd3d7bf5d6667bbd23a). Works here too. -Jack ___ Monotone-devel mailing list

Re: [Monotone-devel] Re: nvm.stripped

2008-10-09 Thread Markus Wanner
Hi, Jack Lloyd wrote: > OK, if I change in botan.m4 > > -CFLAGS="$CFLAGS $BOTAN_CPPFLAGS" > +CPPFLAGS="$CPPFLAGS $BOTAN_CPPFLAGS" Ah! Thank you very much for pointing this out. Looks like configure on my system simply picked the system installed botan during that stage, but then continu

Re: [Monotone-devel] Re: nvm.stripped

2008-10-08 Thread Jack Lloyd
On Wed, Oct 08, 2008 at 11:07:13AM -0400, Jack Lloyd wrote: > On Wed, Oct 08, 2008 at 10:30:21AM +0200, Markus Wanner wrote: > > > Are you sure this emits proper CFLAGS and LIBS > OK, if I change in botan.m4 -CFLAGS="$CFLAGS $BOTAN_CPPFLAGS" +CPPFLAGS="$CPPFLAGS $BOTAN_CPPFLAGS" Then B

[Monotone-devel] Re: nvm.stripped

2008-10-08 Thread Jack Lloyd
On Wed, Oct 08, 2008 at 10:30:21AM +0200, Markus Wanner wrote: > Are you sure this emits proper CFLAGS and LIBS Yes. Normally botan-config will not produce the right thing for pointing in-workspace Botan builds, but I made the modifications I wanted in src/build-data/botan-config.in so that the p

[Monotone-devel] Re: nvm.stripped

2008-10-08 Thread Markus Wanner
Hello Jack, Jack Lloyd wrote: > On Tue, Oct 07, 2008 at 01:10:55PM +0200, Markus Wanner wrote: >> Hm.. you manually added 'botan-config' from /home/lloyd/.. to your PATH, >> right? > > Yes (and edited it slightly so it would produce the right output for > an in-dir build) Are you sure this emits

[Monotone-devel] Re: nvm.stripped

2008-10-07 Thread Markus Wanner
Hello Jack, Jack Lloyd wrote: > Currently (rev 44c07854971c158f07da7f53d811d2e298c3f354) I am seeing > this: > > $ ./configure > [the usual configure output] > checking for Botan version 1.7.8 or newer... no > configure: error: Your botan library version not match (1.7.15). Hm.. thanks for this