Accepting request 231513 from server:database

- Update to new git snapshot 0.9.0+git40

OBS-URL: https://build.opensuse.org/request/show/231513
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdbi-drivers?expand=0&rev=15

badcode.diff

@@ -1,32 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2013-09-07 22:51:05.518210575 +0200
-
-build: resolve rpmlint aborting due to bad code
-
-gcc:
-src/constraint.c:167:32: warning: initialization makes pointer from integer without a cast [enabled by default]
-src/constraint.c:168:5: warning: passing argument 1 of 'matches' makes pointer from integer without a cast [enabled by default]
-src/constraint.c:168:5: note: expected 'const void *' but argument is of type 'intptr_t'
-
-rpmlint:
-E: libdbi-drivers 64bit-portability-issue src/constraint.c:167, 168
-
----
- tests/cgreen/src/constraint.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: libdbi-drivers-0.9.0/tests/cgreen/src/constraint.c
-===================================================================
---- libdbi-drivers-0.9.0.orig/tests/cgreen/src/constraint.c
-+++ libdbi-drivers-0.9.0/tests/cgreen/src/constraint.c
-@@ -164,8 +164,8 @@ static void test_want_double(Constraint
- }
- 
- static int compare_using_matcher(Constraint *constraint, intptr_t actual) {
--	int (*matches)(const void*) = constraint->expected;
--    return matches(actual);
-+	int (*matches)(const void*) = (void *)(intptr_t)constraint->expected;
-+    return matches((void *)actual);
- }
- 
- static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) {

libdbi-drivers-0.9.0.g40.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7be9cea29cf5dc41a0bdbe1fc809bad264f051f293ddd2da291f3bf861ef1608
+size 252392

libdbi-drivers-0.9.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43d2eacd573a4faff296fa925dd97fbf2aedbf1ae35c6263478210c61004c854
-size 1829864

libdbi-drivers.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr 17 14:57:46 UTC 2014 - jengelh@inai.de
+
+- Update to new git snapshot 0.9.0+git40
+* Support the new datetimex API from libdbi-0.9.0+git21
+* dbd_sqlite3: resolve a stack buffer overflow
+- Remove sqlite3.diff, badcode.diff, libdl.diff: merged upstream
+
 -------------------------------------------------------------------
 Thu Feb  6 11:50:13 UTC 2014 - fcrozat@suse.com
 

libdbi-drivers.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libdbi-drivers
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,29 +16,38 @@
 #
 
 
-%define libdbi_sover 1
 Name:           libdbi-drivers
-Version:        0.9.0
+Version:        0.9.0.g40
+#Snapshot:	libdbi-drivers-0.9.0-40-gb48dd7e
 Release:        0
 Summary:        Database drivers for libdbi
 License:        LGPL-2.1+
-Group:          System/Libraries
+Group:          Productivity/Databases/Servers
-Url:            http://libdbi-drivers.sf.net/
+URL:            http://libdbi-drivers.sf.net/
 
-Source:         http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz
+#Source:         http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz
-Patch1:         sqlite3.diff
+Source:		%name-%version.tar.xz
-Patch2:         badcode.diff
-Patch3:         libdl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gettext
-BuildRequires:  libdbi-devel
+BuildRequires:  libdbi-devel >= 0.9.0.g21
 BuildRequires:  libtool
 BuildRequires:  mysql-devel
 BuildRequires:  openjade
 BuildRequires:  postgresql-devel
+BuildRequires:  sqlite2-devel
 BuildRequires:  sqlite3-devel
+BuildRequires:  xz
+%define build_doc 0
+%if %build_doc
+# Only needed when doc is not already prebuilt
+BuildRequires:  docbook-dsssl-stylesheets
+BuildRequires:  openjade
+BuildRequires:  texlive-collection-fontsrecommended
+BuildRequires:  texlive-jadetex
+BuildRequires:  texlive-pdftex-bin
+%endif
 
 %description
 libdbi implements a database-independent abstraction layer in C,
@@ -48,7 +57,6 @@ separately from the library itself.
 %package dbd-mysql
 Summary:        MySQL driver for libdbi
 Group:          System/Libraries
-Requires:       libdbi%{libdbi_sover} = %version
 
 %description dbd-mysql
 This driver provides connectivity to MySQL database servers through
@@ -59,8 +67,6 @@ code.
 %package dbd-pgsql
 Summary:        PostgreSQL driver for libdbi
 Group:          System/Libraries
-Requires:       libdbi%{libdbi_sover} = %version
-Requires:       postgresql >= 7.0.3
 
 %description dbd-pgsql
 This driver provides connectivity to PostgreSQL database servers
@@ -68,26 +74,32 @@ through the libdbi database independent abstraction layer. Switching
 a program's driver does not require recompilation or rewriting source
 code.
 
-%package dbd-sqlite3
+%package dbd-sqlite
-Summary:        SQLite3 driver for libdbi
+Summary:        SQLite (old) driver for libdbi
 Group:          System/Libraries
-Requires:       libdbi%{libdbi_sover} = %version
-Requires:       sqlite
 
-%description dbd-sqlite3
+%description dbd-sqlite
 This driver provides connectivity to SQLite database servers through the
 libdbi database independent abstraction layer. Switching a program's driver
 does not require recompilation or rewriting source code.
 
+%package dbd-sqlite3
+Summary:        SQLite3 driver for libdbi
+Group:          System/Libraries
+
+%description dbd-sqlite3
+This driver provides connectivity to SQLite 3.x database servers through the
+libdbi database independent abstraction layer. Switching a program's driver
+does not require recompilation or rewriting source code.
+
 %prep
-%setup -q
+%setup -qn %name
-%patch -P 1 -P 2 -P 3 -p1
 
 #ensure license doesn't have a executable permission
 chmod 644 COPYING
 
 # Fake the __DATE__ so we do not needelessly rebuild
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %_sourcedir/%name.changes '+%%b %%e %%Y')
 sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" drivers/*/*.c
 
 %build
@@ -95,15 +107,15 @@ autoreconf -fi
 %configure		\
 	--with-mysql 				\
 	--with-pgsql 				\
-	--with-sqlite3 				\
+	--with-sqlite3 --with-sqlite		\
-	--with-dbi-incdir=%_includedir/dbi	\
+	--with-dbi-incdir="%_includedir/dbi"	\
-	--with-dbi-libdir=%{_libdir}		\
+	--with-dbi-libdir="%_libdir"		\
 	--disable-static			\
-	--disable-docs
+	--docdir="%_docdir/%name" --disable-docs
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR="%buildroot"
 find "%buildroot" -type f -name "*.la" -delete
 
 %check
@@ -112,19 +124,24 @@ make check || :
 %files dbd-mysql
 %defattr(-,root,root)
 %doc COPYING
-%dir %{_libdir}/dbd
+%dir %_libdir/dbd
-%{_libdir}/dbd/libdbdmysql.so
+%_libdir/dbd/libdbdmysql.so
 
 %files dbd-pgsql
 %defattr(-,root,root)
 %doc COPYING
-%dir %{_libdir}/dbd
+%dir %_libdir/dbd
-%{_libdir}/dbd/libdbdpgsql.so
+%_libdir/dbd/libdbdpgsql.so
+
+%files dbd-sqlite
+%defattr(-,root,root)
+%dir %_libdir/dbd
+%_libdir/dbd/libdbdsqlite.so
 
 %files dbd-sqlite3
 %defattr(-,root,root)
 %doc COPYING
-%dir %{_libdir}/dbd
+%dir %_libdir/dbd
-%{_libdir}/dbd/libdbdsqlite3.so
+%_libdir/dbd/libdbdsqlite3.so
 
 %changelog

libdl.diff

@@ -1,26 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2013-09-11 14:33:49.545836772 +0200
-
-build: add missing libraries to link line
-
-test_dbi_dlopen.o: In function `main':
-test_dbi_dlopen.c:41: undefined reference to `dlopen'
-test_dbi_dlopen.c:45: undefined reference to `dlopen'
-test_dbi_dlopen.c:61: undefined reference to `dlsym'
-test_dbi_dlopen.c:63: undefined reference to `dlerror'
----
- tests/Makefile.am |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: libdbi-drivers-0.9.0/tests/Makefile.am
-===================================================================
---- libdbi-drivers-0.9.0.orig/tests/Makefile.am
-+++ libdbi-drivers-0.9.0/tests/Makefile.am
-@@ -11,6 +11,7 @@ test_dbi_SOURCES = test_dbi.c
- test_dbi_LDADD = $(top_srcdir)/tests/cgreen/libcgreen.a -L@libdir@ -lm -ldbi @LIBADD_LIBDBI@
- test_dbi_dlopen_SOURCES = test_dbi_dlopen.c
- test_dbi_dlopen_LDFLAGS = @LIBADD_LIBDBI@
-+test_dbi_dlopen_LDADD = -ldl
- libtest_dbi_plugin_la_SOURCES = test_dbi_plugin.c
- libtest_dbi_plugin_la_LIBADD = @LIBADD_LIBDBI@
- libtest_dbi_plugin_la_LDFLAGS = -module -rpath /nowhere

sqlite3.diff

@@ -1,25 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2013-09-04 12:52:32.851115468 +0200
-
-build: resolve link failure in sqlite3 module
-
-The sqlite3 backend fails to link because the wrong library name is
-used. (Ideally, libdbi-drivers should use PKG_CHECK_MODULES instead.)
-
----
- acinclude.m4 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libdbi-drivers-0.9.0/acinclude.m4
-===================================================================
---- libdbi-drivers-0.9.0.orig/acinclude.m4
-+++ libdbi-drivers-0.9.0/acinclude.m4
-@@ -310,7 +310,7 @@ if test "$ac_sqlite3" = "yes"; then
- 		AC_SEARCH_LIBS_VAR([sqlite3_exec], sqlite3, , , , SQLITE3_LIBS)
- 		SQLITE3_LDFLAGS=""
- 	else
--		SQLITE3_LIBS=-lsqlite
-+		SQLITE3_LIBS=-lsqlite3
- 		SQLITE3_LDFLAGS=-L$ac_sqlite3_libdir
- 	fi
-