← Back to branch summary

~ubuntu-branches/ubuntu/lucid/nss/lucid

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/pki/pkistore.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Fabien Tassin, Alexander Sack
  • Date: 2009-01-11 15:06:17 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090111150617-iz4lw05qgy2odorl
Tags: 3.12.2~rc1-0ubuntu1
* New upstream snapshot: 3.12.2 RC1

[ Fabien Tassin <fta@ubuntu.com> ]
* Remove patch applied upstream:
  - drop debian/patches/80_security_tools.patch
  - update debian/patches/series
* Update diverged patches:
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
* Add new symbols to symbols file
  - update debian/libnss3-1d.symbols

[ Alexander Sack <asac@ubuntu.com> ]
* disable soname patch to become binary compatible with upstream
  - update debian/patches/series
* flip links: libnss3.so <- libnss3.so.1d (before: libnss3.so ->
  libnss3.so.1d); same link flipping was done for all other previously
  soname patched libs: libnssutil3.so, libsmime3.so.1d, libssl3.so.1d
  - update debian/libnss3-1d.links
  - update debian/libnss3-1d.symbols
* properly transition links in preinst and postrm; also cover abort-
  cases in the other maintainer scripts
  - add debian/libnss3-1d.postinst
  - add debian/libnss3-1d.postrm
  - add debian/libnss3-1d.preinst
  - add debian/libnss3-1d.prerm
* remove hack from debian/rules that debian uses to recreate
  libsoftokn3.so with a versioned SONAME
  - update debian/rules
* install the unversioned .so binaries
  - update debian/rules
* only install the 4 main libraries into /usr/lib; all the others
  go to pkglibdir
  - update debian/rules
* higher bar for libnspr4 Build-Depend to >= 4.7.3~, which is
  the version where the soname droppage is going to happen
  - update debian/control
* explitily pass libraries to be used for dpkg-gensymbols run of
  dh_makeshlibs
  - update debian/rules
* fix lintian complain about no-shlibs-control-file
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/pki/pkistore.c
35
35
 * ***** END LICENSE BLOCK ***** */
36
36
 
37
37
#ifdef DEBUG
38
 
static const char CVS_ID[] = "@(#) $RCSfile: pkistore.c,v $ $Revision: 1.32 $ $Date: 2008/02/03 01:59:49 $";
 
38
static const char CVS_ID[] = "@(#) $RCSfile: pkistore.c,v $ $Revision: 1.33 $ $Date: 2008/06/06 01:19:30 $";
39
39
#endif /* DEBUG */
40
40
 
41
41
#ifndef PKIM_H
354
354
 
355
355
NSS_IMPLEMENT void
356
356
nssCertificateStore_Unlock (
357
 
  nssCertificateStore *store, nssCertificateStoreTrace* in,
 
357
  nssCertificateStore *store, const nssCertificateStoreTrace* in,
358
358
  nssCertificateStoreTrace* out
359
359
)
360
360
{
363
363
    PORT_Assert(out);
364
364
    out->store = store;
365
365
    out->lock = store->lock;
 
366
    PORT_Assert(!out->locked);
366
367
    out->unlocked = PR_TRUE;
367
368
 
368
369
    PORT_Assert(in->store == out->store);
369
370
    PORT_Assert(in->lock == out->lock);
370
371
    PORT_Assert(in->locked);
 
372
    PORT_Assert(!in->unlocked);
371
373
 
372
374
    PZ_Unlock(out->lock);
373
375
#else