Re: Patch to compile against Botan 2.x

This is a multi-part message in MIME format.
--------------2033EDF34D2F6FB960D602E8
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

Hi Jack, Markus,
     I'm trying to compile recent trunk on Win10 WSL1 Ubuntu Focal, and 
it seems like Botan is using a "E" template and that conflicts with a 
macro that Monotone is using (sanity.hh).

I was first trying to work around this by changing include orders, 
generally taking netsync.hh up being loaded first or second, but then I 
found a more general solution by including <botan/exceptn.h> at the very 
end of base.hh, so that it is always included before sanity.hh goes.

Also, default buffer size seems to have changed name.

I know the project is being still for a long time, but I think an 1.2 
release that officially supports Botan2 would be in order, maybe that 
would even get into Ubuntu repositories again (I don't know about that, 
I wouldn't do it myself), but certainly the FreeBSD Port would be happy 
to drop the old Botan 1.10 dependency.
(else, I'd be tempted to update it from a snapshot anyways, but a clean 
release would be nicer)

-- 
Lapo Luchini
[email protected]

--------------2033EDF34D2F6FB960D602E8
Content-Type: text/plain; charset=UTF-8;
 name="build-with-botan2.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="build-with-botan2.patch"

IwojIG9sZF9yZXZpc2lvbiBbODgwZGY3YjUwNmZhYTFhYzg0ODcxYjg0NjI5NjE2YTY2YmMw
MmI4NF0KIwojIHBhdGNoICJzcmMvYmFzZS5oaCIKIyAgZnJvbSBbMmM2ZjIyODAxYWVmOTli
YjQ0YjE3M2ZiYTdlNDU2NGFlNGQ5Yjk1Zl0KIyAgICB0byBbZDcyYWZkMGNlM2M4YzM0ZDI3
NWQwYjUwOGUyODRiMzYxOGE1NzJlNl0KIyAKIyBwYXRjaCAic3JjL2d6aXAuY2MiCiMgIGZy
b20gWzlkN2Y2OGIzNmJmOTAzOWE4MTM4MzE3NjAzYWJlMzdkYjU0NTFkNjZdCiMgICAgdG8g
Wzc4NzJhNGRkZDVkODA1NzMxY2ZhYmEwYTdmZjc0MzIyNDc2M2YzZmNdCiMKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBzcmMvYmFzZS5oaAkyYzZmMjI4MDFhZWY5OWJiNDRiMTczZmJhN2U0NTY0YWU0ZDliOTVm
CisrKyBzcmMvYmFzZS5oaAlkNzJhZmQwY2UzYzhjMzRkMjc1ZDBiNTA4ZTI4NGIzNjE4YTU3
MmU2CkBAIC05Nyw2ICs5NywxMCBAQCB0ZW1wbGF0ZSA8PiB2b2lkIGR1bXAodW5zaWduZWQg
bG9uZyBsb25nCiAjZGVmaW5lIF8oc3RyKSBnZXR0ZXh0KHN0cikKICNkZWZpbmUgTl8oc3Ry
KSBnZXR0ZXh0X25vb3Aoc3RyKQogCisvLyBpbmNsdWRlIGl0IGhlcmUgc28gdGhhdCBpdCBn
ZXRzIGxvYWRlZCBiZWZvcmUgInNhbml0eS5oaCIKKy8vIGFzIGl0IGRlZmluZXMgYW4gIkUi
IG1hY3JvIHdoaWNoIGNvbmZsaWN0cyB3aXRoIGl0CisjaW5jbHVkZSAiYm90YW4vZXhjZXB0
bi5oIgorCiAjZW5kaWYgLy8gX19CQVNFX0hIX18KIAogLy8gTG9jYWwgVmFyaWFibGVzOgo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIHNyYy9nemlwLmNjCTlkN2Y2OGIzNmJmOTAzOWE4MTM4MzE3NjAzYWJlMzdk
YjU0NTFkNjYKKysrIHNyYy9nemlwLmNjCTc4NzJhNGRkZDVkODA1NzMxY2ZhYmEwYTdmZjc0
MzIyNDc2M2YzZmMKQEAgLTg4LDcgKzg4LDcgQEAgR3ppcF9Db21wcmVzc2lvbjo6R3ppcF9D
b21wcmVzc2lvbih1MzJiaQogKiBHemlwX0NvbXByZXNzaW9uIENvbnN0cnVjdG9yICAgICAg
ICAgICAgICAgICAgICoKICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovCiBHemlwX0NvbXByZXNzaW9uOjpHemlwX0NvbXByZXNzaW9uKHUzMmJp
dCBsKSA6Ci0gICBsZXZlbCgobCA+PSA5KSA/IDkgOiBsKSwgYnVmZmVyKERFRkFVTFRfQlVG
RkVSU0laRSksCisgICBsZXZlbCgobCA+PSA5KSA/IDkgOiBsKSwgYnVmZmVyKEJPVEFOX0RF
RkFVTFRfQlVGRkVSX1NJWkUpLAogICAgcGlwZShuZXcgSGFzaF9GaWx0ZXIoIkNSQzMyIikp
LCBjb3VudCggMCApCiAgICB7CiAKQEAgLTIyMCwxMSArMjIwLDExIEBAIHZvaWQgR3ppcF9D
b21wcmVzc2lvbjo6cHV0X2Zvb3RlcigpCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKgogKiBHemlwX0RlY29tcHJlc3Npb24gQ29uc3RydWN0
b3IgICAgICAgICAgICAgICAgICoKICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKiovCi1HemlwX0RlY29tcHJlc3Npb246Okd6aXBfRGVjb21wcmVz
c2lvbigpIDogYnVmZmVyKERFRkFVTFRfQlVGRkVSU0laRSksCitHemlwX0RlY29tcHJlc3Np
b246Okd6aXBfRGVjb21wcmVzc2lvbigpIDogYnVmZmVyKEJPVEFOX0RFRkFVTFRfQlVGRkVS
X1NJWkUpLAogICAgbm9fd3JpdGVzKHRydWUpLCBwaXBlKG5ldyBIYXNoX0ZpbHRlcigiQ1JD
MzIiKSksIGZvb3RlcigwKQogICAgewotICAgaWYgKERFRkFVTFRfQlVGRkVSU0laRSA8IHNp
emVvZihHWklQOjpHWklQX0hFQURFUikpCi0gICAgICB0aHJvdyBEZWNvZGluZ19FcnJvcigi
REVGQVVMVF9CVUZGRVJTSVpFIGlzIHRvbyBzbWFsbCIpOworICAgaWYgKEJPVEFOX0RFRkFV
TFRfQlVGRkVSX1NJWkUgPCBzaXplb2YoR1pJUDo6R1pJUF9IRUFERVIpKQorICAgICAgdGhy
b3cgRGVjb2RpbmdfRXJyb3IoIkJPVEFOX0RFRkFVTFRfQlVGRkVSX1NJWkUgaXMgdG9vIHNt
YWxsIik7CiAKICAgIHpsaWIgPSBuZXcgWmxpYl9TdHJlYW07CiAK
--------------2033EDF34D2F6FB960D602E8--