    static CK_FUNCTION_LIST functionList = {
      version,
 diff --git a/chaps/chaps_adaptor.cc b/chaps/chaps_adaptor.cc
-index 3e02d24fceb8..7f3eb2baedac 100644
+index 3e02d24..7f3eb2b 100644
 --- a/chaps/chaps_adaptor.cc
 +++ b/chaps/chaps_adaptor.cc
 @@ -25,7 +25,11 @@ namespace chaps {

From 315c5aa421c4cab3f0e8b0cf0bae89b57ead9bef Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Fri, 12 Sep 2014 10:32:19 +0100
Subject: [PATCH] Updates for standalone Linux Chaps build

 - Return CKR_BUFFER_TOO_SMALL if a buffer was provided by the user.
 - Ensure PAM module links with libpam.
 - Set SONAME in libchaps.0.so if CHAPS_VERSION_MAJOR specified.
 - Prevent interspersal of incremental and one-shot operations.
---
 chaps/Makefile                   | 24 ++++++++++++++++++++++-
 chaps/chaps.cc                   |  3 ++-
 chaps/chaps_adaptor.cc           |  4 ++++
 chaps/chaps_proxy.cc             |  2 +-
 chaps/isolate_linux.cc           |  2 +-
 chaps/object_store_test.cc       |  2 ++
 chaps/org.chromium.Chaps.service |  4 ++++
 chaps/session_impl.cc            | 42 ++++++++++++++++++++++++++++++++++++++--
 chaps/session_impl.h             |  9 +++++++++
 9 files changed, 86 insertions(+), 6 deletions(-)
 create mode 100644 chaps/org.chromium.Chaps.service

diff --git a/chaps/Makefile b/chaps/Makefile
index ad55a06..2083816 100644
--- a/chaps/Makefile
+++ b/chaps/Makefile
@@ -34,7 +34,7 @@ PC_DEPS = dbus-c++-1 protobuf-lite openssl \
