#
#
# patch "Makefile.am"
#  from [217871be55814e6257f04ba0047f3bb5a3bbe411]
#    to [08fa45a89201866b0221b30122dea03a4e3ac54c]
# 
# patch "netsync.cc"
#  from [db9761bee4ccb6d94b175fd11ad7f48ea2e95c71]
#    to [cb89c5ef1f5eef0c7f786dbc502772dd6ab031d8]
# 
# patch "transforms.hh"
#  from [79df8cc6117ecb60117ffa7dc22511dc45a84216]
#    to [d29e873b0c5fb56542d94658ec70ee51bdcacc23]
#
============================================================
--- Makefile.am	217871be55814e6257f04ba0047f3bb5a3bbe411
+++ Makefile.am	08fa45a89201866b0221b30122dea03a4e3ac54c
@@ -348,7 +348,7 @@ unit_tester_LDADD = $(UNIT_TEST_OBJ_SUPP
 unit_tester_SOURCES = $(UNIT_TEST_SOURCES) $(UNIT_TEST_SRC_SUPPORT)
 unit_tester_LDADD = $(UNIT_TEST_OBJ_SUPPORT)
 
-tester_SOURCES = tester.cc transforms.cc
+tester_SOURCES = tester.cc transforms.cc gzip.cc
 nodist_tester_SOURCES = testlib.c
 tester_LDADD = $(addprefix mtn-, $(patsubst %.cc, %.$(OBJEXT), \
 		 $(filter %.cc, $(SANITY_CORE_SOURCES) $(LUAEXT_SOURCES) \
============================================================
--- netsync.cc	db9761bee4ccb6d94b175fd11ad7f48ea2e95c71
+++ netsync.cc	cb89c5ef1f5eef0c7f786dbc502772dd6ab031d8
@@ -1504,7 +1504,7 @@ session::process_auth_cmd(protocol_role 
 
   globish_matcher their_matcher(their_include_pattern, their_exclude_pattern);
 
-  if (!project.db.public_key_exists(their_key_hash))
+  if (!project.db.public_key_exists(client))
     {
       // If it's not in the db, it still could be in the keystore if we
       // have the private key that goes with it.
@@ -1529,7 +1529,7 @@ session::process_auth_cmd(protocol_role 
   // Get their public key.
   rsa_keypair_id their_id;
   base64<rsa_pub_key> their_key;
-  project.db.get_pubkey(their_key_hash, their_id, their_key);
+  project.db.get_pubkey(client, their_id, their_key);
 
   lua.hook_note_netsync_start(session_id, "server", their_role,
                               peer_id, their_id,
@@ -1805,18 +1805,18 @@ session::data_exists(netcmd_item_type ty
     {
     case key_item:
       return key_refiner.local_item_exists(item)
-        || db.public_key_exists(item);
+        || project.db.public_key_exists(item);
     case file_item:
-      return db.file_version_exists(file_id(item));
+      return project.db.file_version_exists(file_id(item));
     case revision_item:
       return rev_refiner.local_item_exists(item)
-        || db.revision_exists(revision_id(item));
+        || project.db.revision_exists(revision_id(item));
     case cert_item:
       return cert_refiner.local_item_exists(item)
-        || db.revision_cert_exists(revision_id(item));
+        || project.db.revision_cert_exists(revision_id(item));
     case epoch_item:
       return epoch_refiner.local_item_exists(item)
-        || db.epoch_exists(epoch_id(item));
+        || project.db.epoch_exists(epoch_id(item));
     }
   return false;
 }
============================================================
--- transforms.hh	79df8cc6117ecb60117ffa7dc22511dc45a84216
+++ transforms.hh	d29e873b0c5fb56542d94658ec70ee51bdcacc23
@@ -11,6 +11,7 @@
 // PURPOSE.
 
 #include "vocab.hh"
+#include "gzip.hh"
 
 // this file contans various sorts of string transformations. each
 // transformation should be self-explanatory from its type signature. see