# # # patch "configure.ac" # from [fa15e2a1f818de964fe09c857563a17b223ec921] # to [edf504010331db10ae70b876e8bce304366d68f5] # # patch "netsync.cc" # from [0d3df08a84150efc364f663fff73490a3cbf8e0c] # to [7784c41be6d94265c32cf1505457e5cbd73c95a2] # ============================================================ --- configure.ac fa15e2a1f818de964fe09c857563a17b223ec921 +++ configure.ac edf504010331db10ae70b876e8bce304366d68f5 @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.58) -AC_INIT(monotone, 0.25.2, address@hidden) +AC_INIT(monotone, 0.25.2+oe-hack, address@hidden) AM_INIT_AUTOMAKE(1.7.1) AC_CONFIG_SRCDIR([app_state.cc]) AC_CONFIG_TESTDIR([tests]) ============================================================ --- netsync.cc 0d3df08a84150efc364f663fff73490a3cbf8e0c +++ netsync.cc 7784c41be6d94265c32cf1505457e5cbd73c95a2 @@ -1060,7 +1060,7 @@ && (k->ident == hexenc("6e205d2fe108f337e62ed13f8db67e9a2e70c954") || k->ident == hexenc("78a4544b0da0db7bef0ee08f054a51321fc0d271"))) // this cert is evil! we shall discard it, with comment! - P(F("received a cert we don't want, from %s") % remote_peer_key_name); + P(F("received a cert we don't want, from %s; discarding") % remote_peer_key_name); else this->dbw.consume_revision_cert(revision(*k)); }