Allow building nss softoken against older sqlite
- Adding a patch already applied upstream by Kai Engert
This commit is contained in:
parent
7a7f48e712
commit
96957e805a
20
allow-building-nss-against-older-sqlite.patch
Normal file
20
allow-building-nss-against-older-sqlite.patch
Normal file
@ -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)
|
||||||
|
{
|
8
nss.spec
8
nss.spec
@ -11,7 +11,7 @@
|
|||||||
Summary: Network Security Services
|
Summary: Network Security Services
|
||||||
Name: nss
|
Name: nss
|
||||||
Version: 3.14.2
|
Version: 3.14.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: MPLv2.0
|
License: MPLv2.0
|
||||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||||
Group: System Environment/Libraries
|
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
|
Patch40: nss-3.14.0.0-disble-ocsp-test.patch
|
||||||
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=835919
|
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=835919
|
||||||
Patch43: no-softoken-freebl-tests.patch
|
Patch43: no-softoken-freebl-tests.patch
|
||||||
|
Patch44: allow-building-nss-against-older-sqlite.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Network Security Services (NSS) is a set of libraries designed to
|
Network Security Services (NSS) is a set of libraries designed to
|
||||||
@ -162,6 +163,8 @@ low level services.
|
|||||||
%patch39 -p1 -b .nobypass
|
%patch39 -p1 -b .nobypass
|
||||||
%patch40 -p1 -b .noocsptest
|
%patch40 -p1 -b .noocsptest
|
||||||
%patch43 -p0 -b .nosoftokentests
|
%patch43 -p0 -b .nosoftokentests
|
||||||
|
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=837799
|
||||||
|
%patch44 -p0 -b .oldersqlite
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -607,6 +610,9 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 04 2013 Elio Maldonado <emaldona@redhat.com> - 3.14.2-2
|
||||||
|
- Allow building nss against older system sqlite
|
||||||
|
|
||||||
* Fri Feb 01 2013 Elio Maldonado <emaldona@redhat.com> - 3.14.2-1
|
* Fri Feb 01 2013 Elio Maldonado <emaldona@redhat.com> - 3.14.2-1
|
||||||
- Update to NSS_3_14_2_RTM
|
- Update to NSS_3_14_2_RTM
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user