#
#
# rename "botan/certstore.cpp"
# to "botan/certstor.cpp"
#
# rename "botan/mp_muladd.cpp"
# to "botan/mp_mulop.cpp"
#
# add_file "botan/README.botan-monotone"
# content [4cad7258f90f77e42f88066b052d3dcdb6638843]
#
# patch "ChangeLog"
# from [a18d2332ad52a8496244db74cacfae9a535a6994]
# to [fc3383734ec1a50a679532f4b9610348e25a9f24]
#
# patch "Makefile.am"
# from [39ce000a75499d88f61ff8bfa889c57878345250]
# to [657175b256c34aec329326821fbcd9281adfa08f]
#
# patch "botan/base64.h"
# from [2b090ec65993ce3366d06dd30665032b2ce2ff02]
# to [3f09eb989fc4b2b391f9cefa31455c9fbd2794cb]
#
# patch "botan/config.cpp"
# from [d4dc8bd89b02461a03377681d9a106fbfbf4d70d]
# to [0c3d3bed551ae74cdb33be1843727648e87a80a2]
#
# patch "botan/config.h"
# from [538f35746c12898efa1cca7bd034027214f90611]
# to [67ea849588c76de31039a5b31d47983ae8ad7159]
#
# patch "botan/engine.h"
# from [83d79b578eeab1e96af10e64f9dd5c757611d0a9]
# to [b097b39a35e56fa7065db88304f00a54c79e88b3]
#
# patch "botan/enums.h"
# from [f4aae4647a70b0d879cd06bbe9951a2b1f8d33c8]
# to [baf21a6f233200a4cfd0e09f584285a4fd3caef4]
#
# patch "botan/filter.cpp"
# from [24a13d191c5b20b1445a0b581fc8b0ca92dcda43]
# to [eb64d7cb6d31e58b2bde650ed5f244626e1d69e3]
#
# patch "botan/hex.h"
# from [065a18cbf522daf1c6283587bec607f788be2e46]
# to [cd20faea5de483ad9e90bb8921e492bcbb7b743e]
#
# patch "botan/init_def.cpp"
# from [28f1a3f5c9ec0d18cc9d86a2ddc7009653d9accb]
# to [afd1c1e0132c65e36d289940fe251b2875ec3a25]
#
# patch "botan/libstate.cpp"
# from [9f1b052f1934e8bd5778d6952df3c2cfe4aab789]
# to [ab62d4062809876fb3f5e4f72bf6d44821bc218d]
#
# patch "botan/libstate.h"
# from [f5c5c2663864660f509a451ef9ff53fa6d7b8ecb]
# to [4070e82c699e67065b4337afd0475b0e9c9e6120]
#
# patch "botan/make_prm.cpp"
# from [e9f4a2387ea8bd55d93d4c93ba73fc8ebf028212]
# to [4ef12c2a523d27ad2c7602374ed7aac7d0de36ef]
#
# patch "botan/numthry.cpp"
# from [84009604c0629348da9cf653aa8d11f477c72ed9]
# to [126f52c53fff81483812e62e387a63db90aad512]
#
# patch "botan/policy.cpp"
# from [7edd21b6fc8e3770981ad0eba6b28402efdba46b]
# to [e166ff18acbb721c2e2631204f7214510606a596]
#
# patch "botan/symkey.h"
# from [2d69cca7990aa00f317cfce3c3fc4fe4aa82dbd7]
# to [bb111b6485d7142552cdaf683eb32c045d3bc837]
#
# patch "botan/ui.cpp"
# from [32d9c59fa34f0fd2f122a5cc3b2ff021b3a8898c]
# to [110c99f760077c645bd4066dee446930ad8736da]
#
# patch "botan/ui.h"
# from [b2113a0666a19f2ab5a86669b4aba1b7fb031b1a]
# to [798f616232c5e7d573b8804757aece798e38be28]
#
# patch "botan/x509_ext.cpp"
# from [ef06bb3ca34bbd16a7735dbc40fede0e06fad529]
# to [ea9c0179d437bd8041db6761a911dad82139cc36]
#
# patch "botan/x509cert.h"
# from [ec2ade1cc5bfc6ed02672025821794fc4589eac0]
# to [3e0aff7d3950cca7179fabe9758606bddc688d40]
#
============================================================
--- botan/README.botan-monotone 4cad7258f90f77e42f88066b052d3dcdb6638843
+++ botan/README.botan-monotone 4cad7258f90f77e42f88066b052d3dcdb6638843
@@ -0,0 +1,27 @@
+This botan/ subdirectory is maintained in a separate staging branch
+(currently au.asn.ucc.matt.botan.monotone-2). This avoids pulling the entire
+net.randombit.botan history into net.venge.monotone. It also evades the issue
+of being unable to resurrect files (a problem of die-die-die merge), as
+unwanted files are just moved into a.a.u.m.b.monotone-2's Attic/ directory.
+
+Steps to update net.venge.monotone.botan with net.randombit.net:
+
+1) "mtn pull randombit.net net.randombit.botan"
+
+2) "mtn propagate net.randombit.botan au.asn.ucc.matt.botan.monotone-2"
+
+3) "mtn up" in an a.a.u.m.b.monotone-2 workspace.
+ In a n.v.m.botan botan/ dir, do "rm *".
+ Then copy the entire / contents (no subdirs though) from the staging
+ branch's root dir to the botan/ dir.
+
+4) "mtn ls unknown botan/" and "mtn ls missing botan/" in n.v.m.botan. If
+ there are obviously renamed files, use "mtn rename" to fix them.
+ Otherwise add/drop files as appropriate. Also fix up Makefile.am.
+
+4) make check in n.v.m.botan. If it succeeds, commit. If there are problems,
+ copy the changes back to the staging branch and commit there as well. You
+ might need to move some files from Attic/src/ to / in the staging branch.
+
+Update this file if things don't work, and remember to push the staging branch
+to venge.net.
============================================================
--- ChangeLog a18d2332ad52a8496244db74cacfae9a535a6994
+++ ChangeLog fc3383734ec1a50a679532f4b9610348e25a9f24
@@ -1,4 +1,10 @@
+2006-12-18 Matt Johnston
+
+ * botan/: Update to Botan 1.6.0, add botan/README.botan-monotone
+ with maintainence details.
+
2006-12-16 Matt Johnston
+
* cmd_list.cc: ls_known, ls_changed: sort path output.
2006-12-15 Nathaniel Smith
============================================================
--- Makefile.am 39ce000a75499d88f61ff8bfa889c57878345250
+++ Makefile.am 657175b256c34aec329326821fbcd9281adfa08f
@@ -107,7 +107,7 @@ BOTAN_SOURCES = \
botan/ber_dec.cpp botan/big_base.cpp \
botan/big_code.cpp botan/big_io.cpp botan/big_ops2.cpp \
botan/big_ops3.cpp botan/blinding.cpp botan/buf_es.cpp \
- botan/buf_filt.cpp botan/cbc.cpp botan/certstore.cpp \
+ botan/buf_filt.cpp botan/cbc.cpp botan/certstor.cpp \
botan/cfb.cpp botan/charset.cpp botan/crc32.cpp \
botan/crl_ent.cpp botan/ctr.cpp botan/cts.cpp \
botan/data_snk.cpp botan/data_src.cpp \
@@ -127,7 +127,7 @@ BOTAN_SOURCES = \
botan/make_prm.cpp botan/mdx_hash.cpp \
botan/mem_pool.cpp botan/mgf1.cpp botan/mlock.cpp \
botan/mode_pad.cpp botan/modebase.cpp \
- botan/mp_comba.cpp botan/mp_muladd.cpp \
+ botan/mp_comba.cpp botan/mp_mulop.cpp \
botan/mp_misc.cpp botan/mp_mul.cpp botan/mp_shift.cpp \
botan/mutex.cpp botan/numthry.cpp \
botan/ofb.cpp botan/oids.cpp botan/parsing.cpp botan/pbes1.cpp \
============================================================
--- botan/base64.h 2b090ec65993ce3366d06dd30665032b2ce2ff02
+++ botan/base64.h 3f09eb989fc4b2b391f9cefa31455c9fbd2794cb
@@ -7,6 +7,7 @@
#define BOTAN_BASE64_H__
#include
+#include
namespace Botan {
============================================================
--- botan/config.cpp d4dc8bd89b02461a03377681d9a106fbfbf4d70d
+++ botan/config.cpp 0c3d3bed551ae74cdb33be1843727648e87a80a2
@@ -82,6 +82,14 @@ std::string Config::deref_alias(const st
}
/*************************************************
+* Set/Add an option *
+*************************************************/
+void Config::set_option(const std::string key, const std::string& value)
+ {
+ set("conf", key, value);
+ }
+
+/*************************************************
* Get an option value *
*************************************************/
std::string Config::option(const std::string& key) const
============================================================
--- botan/config.h 538f35746c12898efa1cca7bd034027214f90611
+++ botan/config.h 67ea849588c76de31039a5b31d47983ae8ad7159
@@ -27,22 +27,22 @@ class Config
void set(const std::string&, const std::string&,
const std::string&, bool = true);
+ std::string option(const std::string&) const;
u32bit option_as_u32bit(const std::string&) const;
u32bit option_as_time(const std::string&) const;
bool option_as_bool(const std::string&) const;
std::vector option_as_list(const std::string&) const;
+ void set_option(const std::string, const std::string&);
+
void add_alias(const std::string&, const std::string&);
std::string deref_alias(const std::string&) const;
- std::string option(const std::string&) const;
-
void load_inifile(const std::string&);
static void choose_sig_format(const std::string&, std::string&,
Signature_Format&);
private:
-
std::map settings;
};
============================================================
--- botan/engine.h 83d79b578eeab1e96af10e64f9dd5c757611d0a9
+++ botan/engine.h b097b39a35e56fa7065db88304f00a54c79e88b3
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include