updating botan and monotone patches

["Jeremy C. Reed" <reed%reedmedia.net@localhost>]

I am updating botan 1.10.3.  By default it has a versioned include path 
that I changed to just include/botan. It does have some 
incompatibilities.

security/softhsm appears to build and its tests complete using the 
updated botan.

But devel/monotone does not. The upstream code has been patched but not 
in a release yet. But here are the patches for pkgsrc:

http://reedmedia.net/~reed/tmp/pkgsrc-monotone-patches.tar.gz

diff -u -r1.48 distinfo
--- distinfo    1 Apr 2011 13:51:54 -0000       1.48
+++ distinfo    8 Jan 2013 23:22:44 -0000
@@ -3,3 +3,14 @@
 SHA1 (monotone-1.0.tar.bz2) = aac556bb26d92910b74b65450a0be6c5045e2052
 RMD160 (monotone-1.0.tar.bz2) = 4c0813ae0c11f271dc88f42dd8814e474a67e988
 Size (monotone-1.0.tar.bz2) = 3588074 bytes
+SHA1 (patch-src_database.cc) = 18a4cff3d9d21e171e54b527d212883539ab4a1c
+SHA1 (patch-src_gzip.cc) = 14c4e35f0db1e6e77175549d54747dcf79fba445
+SHA1 (patch-src_gzip.hh) = e23d71991f493bd0fbf8423e0478f89dddc71bae
+SHA1 (patch-src_key__packet.cc) = 420548a26b5bf8985fae542c66ba7614df34b640
+SHA1 (patch-src_key__store.cc) = baefe48a14dc4d1134c6f6d25051f7b0a49ffa5a
+SHA1 (patch-src_monotone.cc) = 757b4b4492cc19fb5911536ff0c4f6e028d7ce6e
+SHA1 (patch-src_packet.cc) = 5a144265f3e55b1b247bcb10b31326a4c2d34b35
+SHA1 (patch-src_packet.hh) = 637de560d74777d51801d88fde738857977b326f
+SHA1 (patch-src_sha1.cc) = bbc5251fc98cb4ed105c5ea0fbc4257f675508c4
+SHA1 (patch-src_ssh__agent.cc) = a86a04189dcb4f0fdb1b0ce8acaa99f7a7bfb18d
+SHA1 (patch-src_transforms.cc) = 411d51359159da26b645ba9583f525ccd600f726

Anyone available to test using this monotone?

It builds and installs fine for me using old and new botan.

As for botan, does anyone care if the includes are versioned? Do you 
want two botans in pkgsrc? If not, do you want bin/botan-config-1.10 or 
bin/botan-config?

Anyone using botan from pkgsrc for projects not in pkgsrc?  (I use it 
for bind10.)

The botan has several customizations for machine architectures and 
operating system platforms and several platform PLISTs and I can't 
easily test and confirm them all.  Here is a work in progress:

http://reedmedia.net/~reed/tmp/pkgsrc-botan.tar.gz

Your feedback is appreciated.

  Jeremy C. Reed