[mingw-sqlite: 24/31] update to sqlite 3.7.9
Kalev Lember
kalev at fedoraproject.org
Tue Mar 6 21:34:00 UTC 2012
commit 25a724e997c3bbbfdb80d6c0a8c84c48491da177
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Mon Jan 16 22:16:41 2012 +0100
update to sqlite 3.7.9
.gitignore | 1 +
...atch => mingw32-sqlite-3.7.7-no-undefined.patch | 6 +-
mingw32-sqlite.spec | 24 ++++----
sources | 2 +-
sqlite-3.6.12-libdl.patch | 11 ----
sqlite-3.7.3-lemon-snprintf.patch | 60 --------------------
sqlite-3.7.4-wal2-nodirsync.patch | 16 -----
sqlite-3.7.7.1-stupid-openfiles-test.patch | 36 ++++++++++++
8 files changed, 53 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6fe3f93..737cb69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ sqlite-3.6.20.tar.gz
sqlite-3.6.22.tar.gz
/sqlite-3.7.3.tar.gz
/sqlite-src-3070500.zip
+/sqlite-src-3070900.zip
diff --git a/mingw32-sqlite-3.6.12-no-undefined.patch b/mingw32-sqlite-3.7.7-no-undefined.patch
similarity index 77%
rename from mingw32-sqlite-3.6.12-no-undefined.patch
rename to mingw32-sqlite-3.7.7-no-undefined.patch
index 211dcd3..3f14024 100644
--- a/mingw32-sqlite-3.6.12-no-undefined.patch
+++ b/mingw32-sqlite-3.7.7-no-undefined.patch
@@ -1,6 +1,6 @@
---- sqlite-3.6.12/Makefile.in.orig 2009-03-30 18:37:16.000000000 +0200
-+++ sqlite-3.6.12/Makefile.in 2009-04-23 11:16:17.000000000 +0200
-@@ -463,14 +463,15 @@
+--- sqlite-3.7.9/Makefile.in.orig 2009-03-30 18:37:16.000000000 +0200
++++ sqlite-3.7.9/Makefile.in 2009-04-23 11:16:17.000000000 +0200
+@@ -486,14 +486,15 @@
libsqlite3.la: $(LIBOBJ)
$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
diff --git a/mingw32-sqlite.spec b/mingw32-sqlite.spec
index 1310bac..e3ab505 100644
--- a/mingw32-sqlite.spec
+++ b/mingw32-sqlite.spec
@@ -7,7 +7,7 @@
%global name1 sqlite
-%global realver 3070500
+%global realver 3070900
%global rpmver %(echo %{realver}|sed -e "s/00//g" -e "s/0/./g")
# bcond default logic is nicely backwards...
@@ -16,7 +16,7 @@
Name: mingw32-%{name1}
Version: %{rpmver}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: MinGW Windows port of sqlite embeddable SQL database engine
License: Public Domain
@@ -28,14 +28,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Patches from Fedora native package.
-Patch1: sqlite-3.6.12-libdl.patch
-Patch2: sqlite-3.6.23-lemon-system-template.patch
-Patch3: sqlite-3.7.4-wal2-nodirsync.patch
-# Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
-Patch4: sqlite-3.7.3-lemon-snprintf.patch
+# Support a system-wide lemon template
+Patch1: sqlite-3.6.23-lemon-system-template.patch
+# Shut up stupid tests depending on system settings of allowed open fd's
+Patch2: sqlite-3.7.7.1-stupid-openfiles-test.patch
# Patches for MinGW port.
-Patch1000: mingw32-sqlite-3.6.12-no-undefined.patch
+Patch1000: mingw32-sqlite-3.7.9-no-undefined.patch
BuildRequires: mingw32-filesystem >= 52
BuildRequires: mingw32-gcc
@@ -92,10 +91,8 @@ This package contains static cross-compiled library
%prep
%setup -q -n %{name1}-src-%{realver}
-%patch1 -p1 -b .libdl
-%patch2 -p1 -b .lemon
-%patch3 -p1 -b .wal2
-%patch4 -p1 -b .lemon-sprintf
+%patch1 -p1 -b .lemon-system-template
+%patch2 -p1 -b .stupid-openfiles-test
%patch1000 -p1
# Ships with an old/broken version of libtool which cannot create
@@ -167,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/libsqlite3.a
%changelog
+* Mon Jan 16 2012 Thomas Sailer <sailer at holmes.localdomain> - %(echo %{realver}|sed -e "s/00//g" -e "s/0/./g")-1
+- update to 3.7.9
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index e2fe071..01871ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d61d784997d42cd0d92bac7994094c56 sqlite-src-3070500.zip
+b2646c5a0c0b5bc6b8f0b67fc318bab3 sqlite-src-3070900.zip
diff --git a/sqlite-3.7.7.1-stupid-openfiles-test.patch b/sqlite-3.7.7.1-stupid-openfiles-test.patch
new file mode 100644
index 0000000..ec6d3f7
--- /dev/null
+++ b/sqlite-3.7.7.1-stupid-openfiles-test.patch
@@ -0,0 +1,36 @@
+diff -up sqlite-src-3070701/test/oserror.test.openfiles sqlite-src-3070701/test/oserror.test
+--- sqlite-src-3070701/test/oserror.test.openfiles 2011-07-13 09:56:46.025857411 +0300
++++ sqlite-src-3070701/test/oserror.test 2011-07-13 09:57:11.634759798 +0300
+@@ -51,19 +51,19 @@ proc do_re_test {tn script expression} {
+ # a call to getcwd() may fail if there are no free file descriptors. So
+ # an error may be reported for either open() or getcwd() here.
+ #
+-puts "Possible valgrind error about invalid file descriptor follows:"
+-do_test 1.1.1 {
+- set ::log [list]
+- list [catch {
+- for {set i 0} {$i < 2000} {incr i} { sqlite3 dbh_$i test.db -readonly 1 }
+- } msg] $msg
+-} {1 {unable to open database file}}
+-do_test 1.1.2 {
+- catch { for {set i 0} {$i < 2000} {incr i} { dbh_$i close } }
+-} {1}
+-do_re_test 1.1.3 {
+- lindex $::log 0
+-} {^os_unix.c:\d+: \(\d+\) (open|getcwd)\(.*test.db\) - }
++#puts "Possible valgrind error about invalid file descriptor follows:"
++#do_test 1.1.1 {
++# set ::log [list]
++# list [catch {
++# for {set i 0} {$i < 2000} {incr i} { sqlite3 dbh_$i test.db -readonly 1 }
++# } msg] $msg
++#} {1 {unable to open database file}}
++#do_test 1.1.2 {
++# catch { for {set i 0} {$i < 2000} {incr i} { dbh_$i close } }
++#} {1}
++#do_re_test 1.1.3 {
++# lindex $::log 0
++#} {^os_unix.c:\d+: \(\d+\) (open|getcwd)\(.*test.db\) - }
+
+
+ # Test a failure in open() due to the path being a directory.
More information about the scm-commits
mailing list