From 96957e805aa4c2d48c804090d0217c038eb86610 Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Mon, 4 Feb 2013 15:12:54 -0800 Subject: [PATCH] Allow building nss softoken against older sqlite - Adding a patch already applied upstream by Kai Engert --- allow-building-nss-against-older-sqlite.patch | 20 +++++++++++++++++++ nss.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 allow-building-nss-against-older-sqlite.patch diff --git a/allow-building-nss-against-older-sqlite.patch b/allow-building-nss-against-older-sqlite.patch new file mode 100644 index 0000000..627edfb --- /dev/null +++ b/allow-building-nss-against-older-sqlite.patch @@ -0,0 +1,20 @@ +Index: ./mozilla/security/nss/lib/softoken/sdb.c +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sdb.c,v +retrieving revision 1.30 +retrieving revision 1.31 +diff -u -p -r1.30 -r1.31 +--- ./mozilla/security/nss/lib/softoken/sdb.c 16 Jan 2013 18:13:25 -0000 1.30 ++++ ./mozilla/security/nss/lib/softoken/sdb.c 4 Feb 2013 19:58:20 -0000 1.31 +@@ -254,6 +254,11 @@ sdb_getFallbackTempDir(void) + #error "sdb_getFallbackTempDir not implemented" + #endif + ++#ifndef SQLITE_FCNTL_TEMPFILENAME ++/* SQLITE_FCNTL_TEMPFILENAME was added in SQLite 3.7.15 */ ++#define SQLITE_FCNTL_TEMPFILENAME 16 ++#endif ++ + static char * + sdb_getTempDir(sqlite3 *sqlDB) + { diff --git a/nss.spec b/nss.spec index ee0fc28..0f08d3f 100644 --- a/nss.spec +++ b/nss.spec @@ -11,7 +11,7 @@ Summary: Network Security Services Name: nss Version: 3.14.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv2.0 URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -78,6 +78,7 @@ Patch39: nss-ssl-enforce-no-pkcs11-bypass.path Patch40: nss-3.14.0.0-disble-ocsp-test.patch # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=835919 Patch43: no-softoken-freebl-tests.patch +Patch44: allow-building-nss-against-older-sqlite.patch %description Network Security Services (NSS) is a set of libraries designed to @@ -162,6 +163,8 @@ low level services. %patch39 -p1 -b .nobypass %patch40 -p1 -b .noocsptest %patch43 -p0 -b .nosoftokentests +# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=837799 +%patch44 -p0 -b .oldersqlite %build @@ -607,6 +610,9 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h %changelog +* Mon Feb 04 2013 Elio Maldonado - 3.14.2-2 +- Allow building nss against older system sqlite + * Fri Feb 01 2013 Elio Maldonado - 3.14.2-1 - Update to NSS_3_14_2_RTM