← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/softoken/softkver.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/softoken/softkver.h
57
57
 * The format of the version string should be
58
58
 *     "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]"
59
59
 */
60
 
#define SOFTOKEN_VERSION  "3.12.3.1" SOFTOKEN_ECC_STRING
 
60
#define SOFTOKEN_VERSION  "3.12.4.6" SOFTOKEN_ECC_STRING
61
61
#define SOFTOKEN_VMAJOR   3
62
62
#define SOFTOKEN_VMINOR   12
63
 
#define SOFTOKEN_VPATCH   3
 
63
#define SOFTOKEN_VPATCH   4
64
64
#define SOFTOKEN_BETA     PR_FALSE
65
65
 
66
66
#endif /* _SOFTKVER_H_ */