[tor-commits] [torbrowser/master] Add missing header to intermediate cert store patch

erinn at torproject.org erinn at torproject.org
Sun Oct 23 23:18:26 UTC 2011


commit 7e288fdc4bdac4e4533f2cdc09bd0a7ec47ffdac
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sun Jul 10 00:06:12 2011 +0200

    Add missing header to intermediate cert store patch
    
    The patch omitted the changes necessary in nsNSSComponent.h and only
    contained the changes for nsNSSComponent.cpp. This would mean that the
    patch could be applied, but the build failed. Add the missing part of
    the patch.
---
 ...-Make-Intermediate-Cert-Store-memory-only.patch |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/src/current-patches/0002-Firefox5-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/0002-Firefox5-Make-Intermediate-Cert-Store-memory-only.patch
index 17ad3a2..2bd11e8 100644
--- a/src/current-patches/0002-Firefox5-Make-Intermediate-Cert-Store-memory-only.patch
+++ b/src/current-patches/0002-Firefox5-Make-Intermediate-Cert-Store-memory-only.patch
@@ -278,6 +278,23 @@ index d3ae772..fa37ace 100644
  }
  
  void
+--- a/security/manager/ssl/src/nsNSSComponent.h
++++ b/security/manager/ssl/src/nsNSSComponent.h
+@@ -321,10 +321,10 @@
+ 
+   // Methods that we use to handle the profile change notifications (and to
+   // synthesize a full profile change when we're just doing a profile startup):
+-  void DoProfileApproveChange(nsISupports* aSubject);
++  PRBool DoProfileApproveChange(nsISupports* aSubject);
+   void DoProfileChangeNetTeardown();
+-  void DoProfileChangeTeardown(nsISupports* aSubject);
+-  void DoProfileBeforeChange(nsISupports* aSubject);
++  PRBool DoProfileChangeTeardown(nsISupports* aSubject);
++  PRBool DoProfileBeforeChange(nsISupports* aSubject);
+   void DoProfileChangeNetRestore();
+   
+   Mutex mutex;
+
 -- 
 1.7.3.4
 





More information about the tor-commits mailing list