From 9167b9227ad06f6f5554cf5c00c80c0b5dc5d84aad053384b394a04734c266ef Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Jan 2017 09:07:58 +0000 Subject: [PATCH 1/4] - Update to new git snapshot 0.9.0.g53 OBS-URL: https://build.opensuse.org/package/show/server:database/libdbi-drivers?expand=0&rev=18 --- _service | 14 ++++++++++++++ libdbi-drivers-0.9.0.g51.tar.xz | 3 --- libdbi-drivers-0.9.0.g53.tar.xz | 3 +++ libdbi-drivers.changes | 6 ++++++ libdbi-drivers.spec | 4 +--- 5 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 _service delete mode 100644 libdbi-drivers-0.9.0.g51.tar.xz create mode 100644 libdbi-drivers-0.9.0.g53.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..0950445 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + git://git.code.sf.net/p/libdbi-drivers/libdbi-drivers + master + libdbi-drivers-0.9.0 + 0.9.0.g@TAG_OFFSET@ + + + *.tar + xz + + + diff --git a/libdbi-drivers-0.9.0.g51.tar.xz b/libdbi-drivers-0.9.0.g51.tar.xz deleted file mode 100644 index 378288a..0000000 --- a/libdbi-drivers-0.9.0.g51.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf8520e56229f7bf95663ec3f219b88c27cf344d9909acf0af0a92893943a148 -size 252560 diff --git a/libdbi-drivers-0.9.0.g53.tar.xz b/libdbi-drivers-0.9.0.g53.tar.xz new file mode 100644 index 0000000..696bfae --- /dev/null +++ b/libdbi-drivers-0.9.0.g53.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e076bf203880fa2039ab246f7e8cf5c9266b918f1b60838b1fff176a05c64f8 +size 247784 diff --git a/libdbi-drivers.changes b/libdbi-drivers.changes index b7f6c42..42eb240 100644 --- a/libdbi-drivers.changes +++ b/libdbi-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 27 09:07:26 UTC 2017 - jengelh@inai.de + +- Update to new git snapshot 0.9.0.g53 +* Fix compile error with freetds 1.0 + ------------------------------------------------------------------- Thu Feb 4 10:19:16 UTC 2016 - christof.hanke@rzg.mpg.de diff --git a/libdbi-drivers.spec b/libdbi-drivers.spec index 633ba91..eb7781c 100644 --- a/libdbi-drivers.spec +++ b/libdbi-drivers.spec @@ -22,15 +22,13 @@ %endif Name: libdbi-drivers -Version: 0.9.0.g51 -#Snapshot: libdbi-drivers-0.9.0-51-gfe23caa +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/ -#Git-Clone: git://git.code.sf.net/p/libdbi-drivers/libdbi-drivers #Source: http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz Source: %name-%version.tar.xz Patch1: configure.ac.patch From 43878641e74a148bbe3e305f0c7406abf94f5c0bc75808a537c98aec66e3b13f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Jan 2017 09:13:41 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/server:database/libdbi-drivers?expand=0&rev=19 --- libdbi-drivers.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbi-drivers.spec b/libdbi-drivers.spec index eb7781c..679bfc6 100644 --- a/libdbi-drivers.spec +++ b/libdbi-drivers.spec @@ -113,9 +113,9 @@ libdbi database independent abstraction layer. Switching a program's driver does not require recompilation or rewriting source code. %prep -%setup -qn %name +%setup -q %if 0%{?suse_version} == 1110 -%patch1 -p1 +%patch -P 1 -p1 %endif chmod a-x COPYING From facb1786d0e97078666313b763caedf993725fccdf65fd48db608998210f1488 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Jan 2017 14:40:01 +0000 Subject: [PATCH 3/4] Add 0001-freetds-resolve-compile-error-with-1.0.patch OBS-URL: https://build.opensuse.org/package/show/server:database/libdbi-drivers?expand=0&rev=20 --- ...eetds-resolve-compile-error-with-1.0.patch | 57 +++++++++++++++++++ libdbi-drivers-0.9.0.g52.tar.xz | 3 + libdbi-drivers-0.9.0.g53.tar.xz | 3 - libdbi-drivers.changes | 4 +- libdbi-drivers.spec | 4 +- 5 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 0001-freetds-resolve-compile-error-with-1.0.patch create mode 100644 libdbi-drivers-0.9.0.g52.tar.xz delete mode 100644 libdbi-drivers-0.9.0.g53.tar.xz diff --git a/0001-freetds-resolve-compile-error-with-1.0.patch b/0001-freetds-resolve-compile-error-with-1.0.patch new file mode 100644 index 0000000..bbeeeea --- /dev/null +++ b/0001-freetds-resolve-compile-error-with-1.0.patch @@ -0,0 +1,57 @@ +From 3bf3e4a856604703c4070bdebbe42fe0068f540a Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Fri, 27 Jan 2017 09:55:41 +0100 +Subject: [PATCH] freetds: resolve compile error with 1.0 + +dbd_freetds.c: In function "dbd_connect": +dbd_freetds.c:232:12: error: "CS_TDS_80" undeclared (first use in this function) + num = CS_TDS_80; + +freetds 1.0 has dropped the CS_TDS_80 identifier. In 0.95, it defined +CS_TDS_80=CS_TDS_71, while 0.91 has no CS_TDS_71, which is why a full +autoconf check is needed. +--- + acinclude.m4 | 13 +++++++++++++ + drivers/freetds/dbd_freetds.c | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 45db616..85eec28 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -562,6 +562,19 @@ if test "$ac_freetds" = "yes"; then + AC_SUBST(FREETDS_LIBS) + AC_SUBST(FREETDS_INCLUDE) + AC_SUBST(FREETDS_LDFLAGS) ++ ++ AH_TEMPLATE([DBI_CS_TDS_80], []) ++ AC_MSG_CHECKING([CS_TDS_80]) ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++ #include ++ int x = CS_TDS_80; ++ ])], [ ++ AC_DEFINE([DBI_CS_TDS_80], [CS_TDS_80]) ++ AC_MSG_RESULT([CS_TDS_80]) ++ ], [ ++ AC_DEFINE([DBI_CS_TDS_80], [CS_TDS_71]) ++ AC_MSG_RESULT([CS_TDS_71]) ++ ]) + else + AC_MSG_RESULT(no) + fi +diff --git a/drivers/freetds/dbd_freetds.c b/drivers/freetds/dbd_freetds.c +index 22fddfd..d01f13b 100644 +--- a/drivers/freetds/dbd_freetds.c ++++ b/drivers/freetds/dbd_freetds.c +@@ -229,7 +229,7 @@ int dbd_connect(dbi_conn_t * conn) + switch (str[0]) { + // We can use it if "CS_TDS_80" will be add to ct_con_props() by CS_SET action + case '8': +- num = CS_TDS_80; ++ num = DBI_CS_TDS_80; + break; + case '7': + num = CS_TDS_70; +-- +2.11.0 + diff --git a/libdbi-drivers-0.9.0.g52.tar.xz b/libdbi-drivers-0.9.0.g52.tar.xz new file mode 100644 index 0000000..4077c81 --- /dev/null +++ b/libdbi-drivers-0.9.0.g52.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b2de10e1963110b1ca47445bc7861689aa91805f4af9e00db7fba131c3cf616 +size 247764 diff --git a/libdbi-drivers-0.9.0.g53.tar.xz b/libdbi-drivers-0.9.0.g53.tar.xz deleted file mode 100644 index 696bfae..0000000 --- a/libdbi-drivers-0.9.0.g53.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e076bf203880fa2039ab246f7e8cf5c9266b918f1b60838b1fff176a05c64f8 -size 247784 diff --git a/libdbi-drivers.changes b/libdbi-drivers.changes index 42eb240..764f36c 100644 --- a/libdbi-drivers.changes +++ b/libdbi-drivers.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Fri Jan 27 09:07:26 UTC 2017 - jengelh@inai.de -- Update to new git snapshot 0.9.0.g53 -* Fix compile error with freetds 1.0 +- Update to new git snapshot 0.9.0.g52 +- Add 0001-freetds-resolve-compile-error-with-1.0.patch ------------------------------------------------------------------- Thu Feb 4 10:19:16 UTC 2016 - christof.hanke@rzg.mpg.de diff --git a/libdbi-drivers.spec b/libdbi-drivers.spec index 679bfc6..3f722aa 100644 --- a/libdbi-drivers.spec +++ b/libdbi-drivers.spec @@ -22,7 +22,7 @@ %endif Name: libdbi-drivers -Version: 0.9.0.g53 +Version: 0.9.0.g52 Release: 0 Summary: Database drivers for libdbi License: LGPL-2.1+ @@ -32,6 +32,7 @@ URL: http://libdbi-drivers.sf.net/ #Source: http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz Source: %name-%version.tar.xz Patch1: configure.ac.patch +Patch2: 0001-freetds-resolve-compile-error-with-1.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -117,6 +118,7 @@ does not require recompilation or rewriting source code. %if 0%{?suse_version} == 1110 %patch -P 1 -p1 %endif +%patch -P 2 -p1 chmod a-x COPYING # Fake the __DATE__ so we do not needelessly rebuild From fed1e984a0730df0b9f1615ce40ab2e932056d986a1f0b3e7dffef008ff6434d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Jan 2017 15:58:39 +0000 Subject: [PATCH 4/4] Drop 0001-freetds-resolve-compile-error-with-1.0.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/server:database/libdbi-drivers?expand=0&rev=21 --- ...eetds-resolve-compile-error-with-1.0.patch | 57 ------------------- libdbi-drivers-0.9.0.g52.tar.xz | 3 - libdbi-drivers-0.9.0.g53.tar.xz | 3 + libdbi-drivers.changes | 4 +- libdbi-drivers.spec | 4 +- 5 files changed, 6 insertions(+), 65 deletions(-) delete mode 100644 0001-freetds-resolve-compile-error-with-1.0.patch delete mode 100644 libdbi-drivers-0.9.0.g52.tar.xz create mode 100644 libdbi-drivers-0.9.0.g53.tar.xz diff --git a/0001-freetds-resolve-compile-error-with-1.0.patch b/0001-freetds-resolve-compile-error-with-1.0.patch deleted file mode 100644 index bbeeeea..0000000 --- a/0001-freetds-resolve-compile-error-with-1.0.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 3bf3e4a856604703c4070bdebbe42fe0068f540a Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Fri, 27 Jan 2017 09:55:41 +0100 -Subject: [PATCH] freetds: resolve compile error with 1.0 - -dbd_freetds.c: In function "dbd_connect": -dbd_freetds.c:232:12: error: "CS_TDS_80" undeclared (first use in this function) - num = CS_TDS_80; - -freetds 1.0 has dropped the CS_TDS_80 identifier. In 0.95, it defined -CS_TDS_80=CS_TDS_71, while 0.91 has no CS_TDS_71, which is why a full -autoconf check is needed. ---- - acinclude.m4 | 13 +++++++++++++ - drivers/freetds/dbd_freetds.c | 2 +- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 45db616..85eec28 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -562,6 +562,19 @@ if test "$ac_freetds" = "yes"; then - AC_SUBST(FREETDS_LIBS) - AC_SUBST(FREETDS_INCLUDE) - AC_SUBST(FREETDS_LDFLAGS) -+ -+ AH_TEMPLATE([DBI_CS_TDS_80], []) -+ AC_MSG_CHECKING([CS_TDS_80]) -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ #include -+ int x = CS_TDS_80; -+ ])], [ -+ AC_DEFINE([DBI_CS_TDS_80], [CS_TDS_80]) -+ AC_MSG_RESULT([CS_TDS_80]) -+ ], [ -+ AC_DEFINE([DBI_CS_TDS_80], [CS_TDS_71]) -+ AC_MSG_RESULT([CS_TDS_71]) -+ ]) - else - AC_MSG_RESULT(no) - fi -diff --git a/drivers/freetds/dbd_freetds.c b/drivers/freetds/dbd_freetds.c -index 22fddfd..d01f13b 100644 ---- a/drivers/freetds/dbd_freetds.c -+++ b/drivers/freetds/dbd_freetds.c -@@ -229,7 +229,7 @@ int dbd_connect(dbi_conn_t * conn) - switch (str[0]) { - // We can use it if "CS_TDS_80" will be add to ct_con_props() by CS_SET action - case '8': -- num = CS_TDS_80; -+ num = DBI_CS_TDS_80; - break; - case '7': - num = CS_TDS_70; --- -2.11.0 - diff --git a/libdbi-drivers-0.9.0.g52.tar.xz b/libdbi-drivers-0.9.0.g52.tar.xz deleted file mode 100644 index 4077c81..0000000 --- a/libdbi-drivers-0.9.0.g52.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b2de10e1963110b1ca47445bc7861689aa91805f4af9e00db7fba131c3cf616 -size 247764 diff --git a/libdbi-drivers-0.9.0.g53.tar.xz b/libdbi-drivers-0.9.0.g53.tar.xz new file mode 100644 index 0000000..5ca895b --- /dev/null +++ b/libdbi-drivers-0.9.0.g53.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87c487b530b8bfb6658500055f0c002a769aef76e1b6ac5fc8b19d1c4ddf9247 +size 247904 diff --git a/libdbi-drivers.changes b/libdbi-drivers.changes index 764f36c..879d228 100644 --- a/libdbi-drivers.changes +++ b/libdbi-drivers.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Fri Jan 27 09:07:26 UTC 2017 - jengelh@inai.de -- Update to new git snapshot 0.9.0.g52 -- Add 0001-freetds-resolve-compile-error-with-1.0.patch +- 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 diff --git a/libdbi-drivers.spec b/libdbi-drivers.spec index 3f722aa..679bfc6 100644 --- a/libdbi-drivers.spec +++ b/libdbi-drivers.spec @@ -22,7 +22,7 @@ %endif Name: libdbi-drivers -Version: 0.9.0.g52 +Version: 0.9.0.g53 Release: 0 Summary: Database drivers for libdbi License: LGPL-2.1+ @@ -32,7 +32,6 @@ URL: http://libdbi-drivers.sf.net/ #Source: http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz Source: %name-%version.tar.xz Patch1: configure.ac.patch -Patch2: 0001-freetds-resolve-compile-error-with-1.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -118,7 +117,6 @@ does not require recompilation or rewriting source code. %if 0%{?suse_version} == 1110 %patch -P 1 -p1 %endif -%patch -P 2 -p1 chmod a-x COPYING # Fake the __DATE__ so we do not needelessly rebuild