Sync from SUSE:SLFO:Main libdbi-drivers revision 268333a734058309f97a718b31265a78

This commit is contained in:
Adrian Schröter 2024-05-03 14:48:29 +02:00
commit 785896a0e7
6 changed files with 433 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

View File

@ -0,0 +1,120 @@
From 7a8e24ec1cf763226f4be31ba1018d888d4989f3 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 21 Mar 2019 14:21:27 +0100
Subject: [PATCH] build: adjust configure for postgresql 10/11
The openSUSE PostgreSQL 11 no longer ships the pg_config program.
Instead, there exists a .pc file (likewise in pg10), so make use of
that, by default.
The old --with-pgsql-inc and --with-pgsql-lib option are going away
and replaced by the standardized mechanisms pkg-config.m4 has in
store for when there is no .pc file or an unusual location:
./configure --with-pgsql pgsql_CFLAGS="-I/opt/pgsql/include" \
pgsql_LIBS="-L/opt/pgsql/lib -lpq"
---
acinclude.m4 | 66 ++++++---------------------------------
drivers/pgsql/Makefile.am | 4 +--
2 files changed, 12 insertions(+), 58 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 85eec28..e99318f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -154,64 +154,18 @@ AC_SUBST(MYSQL_TEST)
AC_DEFUN([AC_CHECK_PGSQL],
[
-AM_CONDITIONAL(HAVE_PGSQL, false)
-ac_pgsql="no"
-ac_pgsql_incdir="no"
-ac_pgsql_libdir="no"
-# exported variables
-PGSQL_LIBS=""
-PGSQL_LDFLAGS=""
-PGSQL_INCLUDE=""
-PGSQL_TEST=""
+AC_ARG_WITH([pgsql], [AS_HELP_STRING([--without-pgsql], [Build without pgsql output plugin [default=test]])],
+ [ac_pgsql="$withval"], [ac_pgsql=auto])
+enable_pgsql=no
+AS_IF([test "$ac_pgsql" = "auto"], [
+ PKG_CHECK_MODULES([pgsql], [libpq], [enable_pgsql=yes], [:])
+], [test "$ac_pgsql" != "no"], [
+ PKG_CHECK_MODULES([pgsql], [libpq], [enable_pgsql=yes])
+])
-AC_MSG_CHECKING(for PostgreSQL support)
-
-AC_ARG_WITH(pgsql,
- [ --with-pgsql Include PostgreSQL support.],
- [ ac_pgsql="$withval" ])
-AC_ARG_WITH(pgsql-incdir,
- [ --with-pgsql-incdir Specifies where the PostgreSQL include files are.],
- [ ac_pgsql_incdir="$withval" ])
-AC_ARG_WITH(pgsql-libdir,
- [ --with-pgsql-libdir Specifies where the PostgreSQL libraries are.],
- [ ac_pgsql_libdir="$withval" ])
-
-if test "$ac_pgsql" = "yes"; then
- AC_MSG_RESULT([yes])
- if test "$ac_pgsql_incdir" = "no" || test "$ac_pgsql_libdir" = "no"; then
- AC_CHECK_PROG([PG_CONFIG], [pg_config], [yes], [no])
- if test "$PG_CONFIG" = "no"; then
- AC_MSG_ERROR([cannot auto-configure PostgreSQL without pg_config])
- fi
- fi
- if test "$ac_pgsql_incdir" = "no"; then
- PGSQL_INCLUDE="-I"`pg_config --includedir`
- else
- PGSQL_INCLUDE=-I$ac_pgsql_incdir
- fi
- if test "$ac_pgsql_libdir" = "no"; then
- PGSQL_LDFLAGS=`pg_config --libdir`
- else
- PGSQL_LDFLAGS=-L$ac_pgsql_libdir
- fi
-
- PGSQL_LIBS=-lpq
- PGSQL_TEST="test_pgsql.sh"
-
-
- AM_CONDITIONAL(HAVE_PGSQL, true)
-
- AC_SUBST(PGSQL_LIBS)
- AC_SUBST(PGSQL_INCLUDE)
- AC_MSG_CHECKING(for PostgreSQL includes)
- AC_MSG_RESULT($PGSQL_INCLUDE)
- AC_SUBST(PGSQL_LDFLAGS)
- AC_MSG_CHECKING(for PostgreSQL libraries)
- AC_MSG_RESULT($PGSQL_LDFLAGS)
-else
- AC_MSG_RESULT(no)
-fi
+AM_CONDITIONAL([HAVE_PGSQL], [test "$enable_pgsql" = yes])
+AS_IF([test "$enable_pgsql" = yes], [PGSQL_TEST="test_pgsql.sh"])
AC_SUBST(PGSQL_TEST)
])
diff --git a/drivers/pgsql/Makefile.am b/drivers/pgsql/Makefile.am
index 058a9b5..f482eac 100644
--- a/drivers/pgsql/Makefile.am
+++ b/drivers/pgsql/Makefile.am
@@ -28,11 +28,11 @@ pgsql_sources =
endif
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include @DBI_INCLUDE@ @PGSQL_INCLUDE@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include @DBI_INCLUDE@ ${pgsql_CFLAGS}
driver_LTLIBRARIES = $(pgsql_ltlibs)
libdbdpgsql_la_LDFLAGS = $(pgsql_ldflags)
-libdbdpgsql_la_LIBADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@ @LIBADD_LIBDBI@
+libdbdpgsql_la_LIBADD = ${pgsql_LIBS} @LIBADD_LIBDBI@
libdbdpgsql_la_SOURCES = $(pgsql_sources)
libdbdpgsql_la_DEPENDENCIES = dbd_pgsql.h
--
2.21.0

14
_service Normal file
View File

@ -0,0 +1,14 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://git.code.sf.net/p/libdbi-drivers/libdbi-drivers</param>
<param name="revision">master</param>
<param name="parent-tag">libdbi-drivers-0.9.0</param>
<param name="versionformat">0.9.0.g@TAG_OFFSET@</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

BIN
libdbi-drivers-0.9.0.g53.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

115
libdbi-drivers.changes Normal file
View File

@ -0,0 +1,115 @@
-------------------------------------------------------------------
Thu Mar 21 13:22:03 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Remove configure.ac.patch (was only applied for 1110 anyway)
- Add 0001-build-adjust-configure-for-postgresql-10-11.patch
-------------------------------------------------------------------
Mon Mar 19 11:05:34 UTC 2018 - mpluskal@suse.com
- Drop support for sqlite2 (see boo#1085790)
-------------------------------------------------------------------
Fri Jan 27 09:07:26 UTC 2017 - jengelh@inai.de
- Update to new git snapshot 0.9.0.g53
* Resolve build error with freetds 1.0
-------------------------------------------------------------------
Thu Feb 4 10:19:16 UTC 2016 - christof.hanke@rzg.mpg.de
- allow building on SLES11-SP3 by removing freetds dependency
and unknown configure option "serial-tests" for SLES11;
add configure.ac.patch
-------------------------------------------------------------------
Tue Nov 11 13:53:28 UTC 2014 - jengelh@inai.de
- Update to new git snapshot 0.9.0+git51
* Fixed an out-of-bounds access in dbd_mysql due to bad type
punning. [boo#904873]
-------------------------------------------------------------------
Mon Jul 7 11:17:31 UTC 2014 - jengelh@inai.de
- Update to new git snapshot 0.9.0+git46
* Support automatic reconnect under MySQL
* Support character set retention across autoreconnect cycles
* Have drivers use the new DBI_TYPE_XDECIMAL type
- Enable building FreeTDS plugin
-------------------------------------------------------------------
Thu May 8 21:15:16 UTC 2014 - jengelh@inai.de
- Update to new git snapshot 0.9.0+git42
* dbd_mysql, dbd_msql: avoid NULL dereference
-------------------------------------------------------------------
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
- Add COPYING to generated package.
-------------------------------------------------------------------
Wed Sep 11 13:07:00 UTC 2013 - jengelh@inai.de
- Added libdl.diff (successfully link testsuite) and run testsuite
as far as possible
-------------------------------------------------------------------
Wed Sep 11 09:18:56 UTC 2013 - tchvatal@suse.com
- Remove tests code to have this not fail on rpm checks.
- Do not put __DATE__ into resulting binaries to avoid needless
rebuilds.
-------------------------------------------------------------------
Sun Sep 8 13:11:41 UTC 2013 - jengelh@inai.de
- Update to new upstream release 0.9.0
* the pgsql driver now supports features specific to PostgreSQL 9
and later
* drivers now support transactions and savepoints if the underlying
database engines do
- Added badcode.diff, sqlite3.diff to resolve build failures
-------------------------------------------------------------------
Thu Sep 27 09:38:04 UTC 2012 - idonmez@suse.com
- Fix libdbi dependencies
-------------------------------------------------------------------
Wed Feb 1 01:54:59 UTC 2012 - jengelh@medozas.de
- Remove redundant tags/sections per specfile guideline suggestions
- Parallel building using %_smp_mflags
-------------------------------------------------------------------
Thu Jan 12 11:30:42 UTC 2012 - coolo@suse.com
- change license to be in spdx.org format
-------------------------------------------------------------------
Tue Feb 22 08:57:42 UTC 2011 - coolo@novell.com
- remove explicit (and wrong) libmysql require
-------------------------------------------------------------------
Wed Dec 15 16:17:10 CET 2010 - meissner@suse.de
- spec file cleanup
- disabled static driver libs
- pass in RPM_OPT_FLAGS
-------------------------------------------------------------------
Wed Dec 15 16:05:55 CET 2010 - meissner@suse.de
- split off from libdbi

158
libdbi-drivers.spec Normal file
View File

@ -0,0 +1,158 @@
#
# spec file for package libdbi-drivers
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%if 0%{?suse_version} == 1110
%define build_freetds 0
%else
%define build_freetds 1
%endif
Name: libdbi-drivers
Version: 0.9.0.g53
Release: 0
Summary: Database drivers for libdbi
License: LGPL-2.1+
Group: Productivity/Databases/Servers
URL: http://libdbi-drivers.sf.net/
#Source: http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz
Source: %name-%version.tar.xz
Patch1: 0001-build-adjust-configure-for-postgresql-10-11.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext
%if %build_freetds
BuildRequires: freetds-devel
%endif
BuildRequires: libdbi-devel >= 0.9.0.g30
BuildRequires: libtool
BuildRequires: mysql-devel
BuildRequires: openjade
BuildRequires: postgresql-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,
similar to the DBI/DBD layer in Perl. Drivers are distributed
separately from the library itself.
%if %build_freetds
%package dbd-freetds
Summary: FreeTDS driver for libdbi
Group: System/Libraries
%description dbd-freetds
This driver provides connectivity to FreeTDS database servers
through the libdbi database independent abstraction layer. Switching
a program's driver does not require recompilation or rewriting source
code.
%endif
%package dbd-mysql
Summary: MySQL driver for libdbi
Group: System/Libraries
%description dbd-mysql
This driver provides connectivity to MySQL database servers through
the libdbi database independent abstraction layer. Switching a
program's driver does not require recompilation or rewriting source
code.
%package dbd-pgsql
Summary: PostgreSQL driver for libdbi
Group: System/Libraries
%description dbd-pgsql
This driver provides connectivity to PostgreSQL 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
%autosetup -p1
chmod a-x COPYING
# Fake the __DATE__ so we do not needelessly rebuild
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %_sourcedir/%name.changes '+%%b %%e %%Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" drivers/*/*.c
%build
if [ ! -e configure ]; then
autoreconf -fi
fi
%configure \
%if %build_freetds
--with-freetds \
%endif
--with-mysql \
--with-pgsql \
--with-sqlite3 \
--with-dbi-incdir="%_includedir/dbi" \
--with-dbi-libdir="%_libdir" \
--disable-static \
--docdir="%_docdir/%name" --disable-docs
make %{?_smp_mflags}
%install
%make_install
find "%buildroot" -type f -name "*.la" -delete
%check
make check || :
%if %build_freetds
%files dbd-freetds
%doc COPYING
%dir %_libdir/dbd
%_libdir/dbd/libdbdfreetds.so
%endif
%files dbd-mysql
%doc COPYING
%dir %_libdir/dbd
%_libdir/dbd/libdbdmysql.so
%files dbd-pgsql
%doc COPYING
%dir %_libdir/dbd
%_libdir/dbd/libdbdpgsql.so
%files dbd-sqlite3
%doc COPYING
%dir %_libdir/dbd
%_libdir/dbd/libdbdsqlite3.so
%changelog