From 54b6ca64860c39c746179bd63b1b3040720338d7 Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 26 May 2022 13:25:55 -0400 Subject: [PATCH] Auto sync2gitlab import of postgresql-odbc-10.03.0000-2.el8.src.rpm --- .gitignore | 1 + EMPTY | 1 - ...9.05.0400-revert-money-testsuite-fix.patch | 30 ++ ...sql-odbc-09.06.0200-revert-money-fix.patch | 95 +++++ postgresql-odbc.spec | 378 ++++++++++++++++++ sources | 1 + 6 files changed, 505 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 EMPTY create mode 100644 postgresql-odbc-09.05.0400-revert-money-testsuite-fix.patch create mode 100644 postgresql-odbc-09.06.0200-revert-money-fix.patch create mode 100644 postgresql-odbc.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..79b529c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/psqlodbc-10.03.0000.tar.gz diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/postgresql-odbc-09.05.0400-revert-money-testsuite-fix.patch b/postgresql-odbc-09.05.0400-revert-money-testsuite-fix.patch new file mode 100644 index 0000000..4e2fa93 --- /dev/null +++ b/postgresql-odbc-09.05.0400-revert-money-testsuite-fix.patch @@ -0,0 +1,30 @@ +Revert "Fix regression test failures in param-convesrions-test." + +As we have applied a downstream patch for reverting the money type patch, +we need to also revert upstream test cases that are not supposed to be passing +in the first place. +This reverts commit eb480e19ee71b19de7f61013bdb4d5abd1cd98e4. + +Related discussion: +http://www.postgresql.org/message-id/3259874.lgiBp3an9Y@nb.usersys.redhat.com +--- + +diff --git a/test/expected/param-conversions.out b/test/expected/param-conversions.out +index 777cc94..449a398 100644 +--- a/test/expected/param-conversions.out ++++ b/test/expected/param-conversions.out +@@ -72,12 +72,12 @@ Error while executing the query + + Testing "SELECT 1.3 > ?" with SQL_C_CHAR -> SQL_FLOAT param "3', 'injected, BAD!', '1"... + SQLExecDirect failed +-22P02=ERROR: invalid input syntax for type numeric: "3', 'injected, BAD!', '1"; ++22P02=ERROR: invalid input syntax for type double precision: "3', 'injected, BAD!', '1"; + Error while executing the query + + Testing "SELECT 1.4 > ?" with SQL_C_CHAR -> SQL_FLOAT param "4 \'bad', '1"... + SQLExecDirect failed +-22P02=ERROR: invalid input syntax for type numeric: "4 \'bad', '1"; ++22P02=ERROR: invalid input syntax for type double precision: "4 \'bad', '1"; + Error while executing the query + + Testing "SELECT 1-?" with SQL_C_CHAR -> SQL_INTEGER param "-1"... diff --git a/postgresql-odbc-09.06.0200-revert-money-fix.patch b/postgresql-odbc-09.06.0200-revert-money-fix.patch new file mode 100644 index 0000000..0fc8263 --- /dev/null +++ b/postgresql-odbc-09.06.0200-revert-money-fix.patch @@ -0,0 +1,95 @@ +From 56ca20671a9fb87d7c6ca011207e9628349c9301 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup +Date: Mon, 13 Mar 2017 10:38:54 +0100 +Subject: [PATCH] Revert "Fix the bug about MONEY type." + +This reverts commit d5374bcc4d58556eb5cc70241c44dcad4d9b441e. + +Proposed upstream: +http://www.postgresql.org/message-id/3259874.lgiBp3an9Y@nb.usersys.redhat.com +--- + convert.c | 45 ++++++++------------------------------------- + pgtypes.c | 4 ++++ + 2 files changed, 12 insertions(+), 37 deletions(-) + +diff --git a/convert.c b/convert.c +index f118e30..00904d8 100644 +--- a/convert.c ++++ b/convert.c +@@ -5363,50 +5363,21 @@ cleanup: + static BOOL + convert_money(const char *s, char *sout, size_t soutmax) + { +- char in, decp = 0; + size_t i = 0, + out = 0; +- int num_in = -1, period_in = -1, comma_in = -1; + + for (i = 0; s[i]; i++) + { +- switch (in = s[i]) ++ if (s[i] == '$' || s[i] == ',' || s[i] == ')') ++ ; /* skip these characters */ ++ else + { +- case '.': +- if (period_in < 0) +- period_in = i; +- break; +- case ',': +- if (comma_in < 0) +- comma_in = i; +- break; +- default: +- if ('0' <= in && '9' >= in) +- num_in = i; +- break; +- } +- } +- if (period_in > comma_in) +- { +- if ( period_in >= num_in - 2) +- decp = '.'; +- } +- else if (comma_in >= 0 && +- comma_in >= num_in - 2) +- decp = ','; +- for (i = 0; s[i] && out + 1 < soutmax; i++) +- { +- switch (in = s[i]) +- { +- case '(': +- case '-': ++ if (out + 1 >= soutmax) ++ return FALSE; /* sout is too short */ ++ if (s[i] == '(') + sout[out++] = '-'; +- break; +- default: +- if (in >= '0' && in <= '9') +- sout[out++] = in; +- else if (in == decp) +- sout[out++] = '.'; ++ else ++ sout[out++] = s[i]; + } + } + sout[out] = '\0'; +diff --git a/pgtypes.c b/pgtypes.c +index a58925c..d42179c 100644 +--- a/pgtypes.c ++++ b/pgtypes.c +@@ -1273,6 +1273,10 @@ sqltype_to_pgcast(const ConnectionClass *conn, SQLSMALLINT fSqlType) + case SQL_DATE: + pgCast = "::date"; + break; ++ case SQL_DOUBLE: ++ case SQL_FLOAT: ++ pgCast = "::float8"; ++ break; + case SQL_DECIMAL: + case SQL_NUMERIC: + pgCast = "::numeric"; +-- +2.9.3 + diff --git a/postgresql-odbc.spec b/postgresql-odbc.spec new file mode 100644 index 0000000..7496f01 --- /dev/null +++ b/postgresql-odbc.spec @@ -0,0 +1,378 @@ +%global upstream_name psqlodbc + +Name: postgresql-odbc +Summary: PostgreSQL ODBC driver +Version: 10.03.0000 +Release: 2%{?dist} +License: LGPLv2+ +Group: Applications/Databases +URL: https://odbc.postgresql.org/ + +Source0: http://ftp.postgresql.org/pub/odbc/versions/src/%{upstream_name}-%{version}.tar.gz + +Patch0: postgresql-odbc-09.06.0200-revert-money-fix.patch +Patch1: postgresql-odbc-09.05.0400-revert-money-testsuite-fix.patch + +BuildRequires: unixODBC-devel postgresql-devel +BuildRequires: libpq-devel + +# Testsuite deps. +BuildRequires: postgresql-test-rpm-macros + +Provides: %upstream_name = %version-%release + +# This spec file and ancillary files are licensed in accordance with +# the psqlodbc license. + +%description +This package includes the driver needed for applications to access a +PostgreSQL system via ODBC (Open Database Connectivity). + + +%prep +%autosetup -p1 -n %{upstream_name}-%{version} + +cat <README.rpmdist +The upstream psqlodbc testsuite is distributed in '%{name}-tests' +(sub)package. +EOF + +%build +%configure --with-unixodbc --disable-dependency-tracking +make %{?_smp_mflags} + + +%install +make DESTDIR=$RPM_BUILD_ROOT install + +%global testsuitedir %{_libdir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT/%{testsuitedir} +cp -R test $RPM_BUILD_ROOT/%{testsuitedir} +sed -i 's~^drvr=.*~drvr=%{_libdir}/psqlodbc~' $RPM_BUILD_ROOT/%{testsuitedir}/test/odbcini-gen.sh + +# Provide the old library name "psqlodbc.so" as a symlink, +# and remove the rather useless .la file +pushd ${RPM_BUILD_ROOT}%{_libdir} + ln -s psqlodbcw.so psqlodbc.so + rm psqlodbcw.la psqlodbca.la +popd + + +%check +%pgtests_init +%pgtests_start + +cd test && make installcheck %{_smp_mflags} || { + echo "=== trying to find all regression.diffs files in build directory ===" + find -name regression.diffs | while read line; do + cat "$line" + done + false +} + + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + + +%package tests +Summary: Testsuite files for psqlodbc +Requires: postgresql-test +Requires: %{name} = %{version}-%{release} +# Those are requires to successful testsuite run +Requires: gcc make unixODBC-devel + + +%description tests +The postgresql-odbc-tests package contains files needed for various tests for +the PostgreSQL unixODBC driver. + + +%files +%{_libdir}/psqlodbc.so +%{_libdir}/psqlodbca.so +%{_libdir}/psqlodbcw.so +%doc license.txt readme.txt docs/* README.rpmdist + + +%files tests +%doc license.txt +%dir %{testsuitedir} +%defattr(-,postgres,postgres) +%{testsuitedir}/test + + +%changelog +* Wed May 30 2018 Pavel Raiskup - 10.03.0000-2 +- rebuild for metadata fix (upstream URL) + +* Mon May 21 2018 Pavel Raiskup - 10.03.0000-1 +- update: new upstream release, per announcement: + https://www.postgresql.org/message-id/20180519131632.8E59CB40E51%40winpg.jp + +* Fri Apr 13 2018 Pavel Raiskup - 10.02.0000-1 +- build against libpq-devel and postgresql-test-rpm-macros +- update to new upstream release, per announcement: + https://www.postgresql.org/message-id/20180330143925.88CEDB40E51%40winpg.jp + +* Fri Feb 09 2018 Fedora Release Engineering - 10.01.0000-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Dec 27 2017 Pavel Raiskup - 10.01.0000-1 +- update to new upstream release, per announcement: + https://www.postgresql.org/message-id/20171227144219.0ABC4B4C417%40winpg.jp + +* Mon Oct 23 2017 Pavel Raiskup - 10.00.0000-1 +- update to new upstream release, per announcement: + https://www.postgresql.org/message-id/20171013143455.9D0E5B4C412%40winpg.jp + +* Tue Sep 05 2017 Pavel Raiskup - 09.06.0500-1 +- update to new upstream release, per: + https://www.postgresql.org/message-id/20170905143318.95448B4C411@winpg.jp + +* Thu Jul 27 2017 Pavel Raiskup - 09.06.0410-1 + https://odbc.postgresql.org/docs/release.html + +* Thu Jul 27 2017 Fedora Release Engineering - 09.06.0310-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri May 12 2017 Pavel Raiskup - 09.06.0310-1 +- rebase to latest upstream version, per release notes: + https://odbc.postgresql.org/docs/release.html + +* Tue May 09 2017 Pavel Raiskup - 09.06.0300-1 +- rebase to latest upstream version, per release notes: + https://odbc.postgresql.org/docs/release.html + +* Mon Mar 13 2017 Pavel Raiskup - 09.06.0200-1 +- rebase to latest upstream version, per release notes: + https://odbc.postgresql.org/docs/release.html + +* Mon Feb 06 2017 Pavel Raiskup - 09.06.0100-1 +- rebase to latest upstream version, per release notes: + https://odbc.postgresql.org/docs/release.html + +* Thu Oct 20 2016 Pavel Raiskup - 09.05.0400-4 +- provide 'psqlodbc', we possibly should rename the package in future + +* Wed Oct 05 2016 Pavel Raiskup - 09.05.0400-3 +- depend on postgresql-setup 5.0 (in postgresql-devel package) + +* Mon Aug 29 2016 Petr Kubat - 09.05.0400-2 +- once again revert upstream commit d5374bcc4d +- also revert its accompanying testsuite commit eb480e19ee + +* Thu Aug 11 2016 Petr Kubat - 09.05.0400-1 +- rebase to latest upstream version, per release notes: + https://odbc.postgresql.org/docs/release.html + +* Tue Jul 26 2016 Pavel Raiskup - 09.05.0300-2 +- backport upstream fixes for testsuite failures (rhbz#1350486) + +* Sat Jun 18 2016 Pavel Raiskup - 09.05.0300-1 +- rebase to latest upstream version, per release notes: + https://odbc.postgresql.org/docs/release.html + +* Mon May 02 2016 Pavel Raiskup - 09.05.0210-1 +- rebase to latest upstream version, per release notes: + https://odbc.postgresql.org/docs/release.html +- revert one upstream commit to fix testsuite issues +- disable one armv7hl related issue during self-testing (rhbz#1330031) + +* Thu Apr 14 2016 Pavel Raiskup - 09.05.0200-2 +- enable testsuite during build + +* Tue Apr 12 2016 Pavel Raiskup - 09.05.0200-1 +- rebase to latest upstream version, per release notes: + https://odbc.postgresql.org/docs/release.html + +* Thu Feb 04 2016 Fedora Release Engineering - 09.05.0100-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 11 2016 Pavel Raiskup - 09.05.0100-1 +- rebase to latest upstream version, per release notes: + http://psqlodbc.projects.pgfoundry.org/docs/release.html + +* Thu Jun 18 2015 Fedora Release Engineering - 09.03.0400-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Nov 19 2014 Pavel Raiskup - 09.03.0400-3 +- fix testsuite requirements + +* Wed Nov 19 2014 Pavel Raiskup - 09.03.0400-2 +- install the testsuite + +* Wed Oct 29 2014 Pavel Raiskup - 09.03.0400-1 +- rebase to latest upstream version, per release notes: + http://psqlodbc.projects.pgfoundry.org/docs/release.html + +* Sun Aug 17 2014 Fedora Release Engineering - 09.03.0300-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 09.03.0300-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 19 2014 Pavel Raiskup - 09.03.0300-2 +- run upstream testsuite when '%%runselftest' defined + +* Mon May 19 2014 Pavel Raiskup - 09.03.0300-1 +- rebase to latest upstream version, per release notes: + http://psqlodbc.projects.pgfoundry.org/docs/release.html + +* Wed Apr 23 2014 Pavel Raiskup - 09.03.0210-1 +- rebase to latest upstream version (#1090345), per release notes: + http://psqlodbc.projects.pgfoundry.org/docs/release.html + +* Thu Dec 19 2013 Pavel Raiskup - 09.03.0100-1 +- rebase to latest upstream version + +* Mon Nov 18 2013 Pavel Raiskup - 09.02.0100-1 +- rebase to latest upstream version + +* Sun Aug 04 2013 Fedora Release Engineering - 09.01.0200-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 09.01.0200-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Nov 16 2012 Tom Lane 09.01.0200-2 +- Update tarball URL in specfile (no actual package change) + +* Mon Aug 20 2012 Tom Lane 09.01.0200-1 +- Update to version 09.01.0200 +- Minor specfile cleanup per suggestions from Tom Callaway +Related: #845110 + +* Sat Jul 21 2012 Fedora Release Engineering - 09.01.0100-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jan 10 2012 Tom Lane 09.01.0100-1 +- Update to version 09.01.0100 + +* Wed Feb 09 2011 Fedora Release Engineering - 09.00.0200-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 29 2010 Tom Lane 09.00.0200-1 +- Update to version 09.00.0200 + +* Wed Jan 20 2010 Tom Lane 08.04.0200-2 +- Correct Source0: tag and comment to reflect how to get the tarball + +* Wed Dec 30 2009 Tom Lane 08.04.0200-1 +- Update to version 08.04.0200 + +* Fri Aug 28 2009 Tom Lane 08.04.0100-2 +- Rebuild with new openssl + +* Tue Aug 18 2009 Tom Lane 08.04.0100-1 +- Update to version 08.04.0100 + +* Sun Jul 26 2009 Fedora Release Engineering - 08.03.0200-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 08.03.0200-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 20 2009 Tom Lane 08.03.0200-2 +- Rebuild for unixODBC 2.2.14. + +* Tue Aug 5 2008 Tom Lane 08.03.0200-1 +- Update to version 08.03.0200 + +* Tue Feb 12 2008 Tom Lane 08.03.0100-1 +- Update to version 08.03.0100 +- Since it looks like upstream has decided to stick with psqlodbcw.so + permanently, allow the library to have that name. But continue to + provide psqlodbc.so as a symlink. + +* Fri Nov 2 2007 Tom Lane 08.02.0500-1 +- Update to version 08.02.0500 + +* Thu Aug 2 2007 Tom Lane 08.02.0200-2 +- Update License tag to match code. + +* Wed Apr 25 2007 Tom Lane 08.02.0200-1 +- Update to version 08.02.0200 + +* Mon Dec 11 2006 Tom Lane 08.01.0200-4 +- Rebuild for new Postgres libraries + +* Wed Jul 12 2006 Jesse Keating - 08.01.0200-3.1 +- rebuild + +* Sat Jun 10 2006 Tom Lane 08.01.0200-3 +- Fix BuildRequires: for mock build environment + +* Wed Mar 22 2006 Tom Lane 08.01.0200-2 +- Change library name back to psqlodbc.so, because it appears that upstream + will revert to that name in next release; no point in thrashing the name. +- Include documentation files unaccountably omitted before (bug #184158) + +* Fri Feb 10 2006 Jesse Keating - 08.01.0200-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 08.01.0200-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Feb 3 2006 Tom Lane 08.01.0200-1 +- Update to version 08.01.0200. +- Upstream now calls the library psqlodbcw.so ... add a symlink to avoid + breaking existing odbc configuration files. + +* Wed Dec 14 2005 Tom Lane 08.01.0102-1 +- Update to version 08.01.0102. +- Add buildrequires postgresql-devel (bz #174505) + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Nov 7 2005 Tom Lane 08.01.0100-1 +- Update to version 08.01.0100. + +* Wed Mar 2 2005 Tom Lane 08.00.0100-1 +- Update to version 08.00.0100. + +* Fri Nov 12 2004 Tom Lane 7.3-9 +- back-port 64-bit fixes from current upstream (bug #139004) + +* Tue Sep 21 2004 Tom Lane 7.3-8 +- rebuilt + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Mar 10 2004 Tom Lane +- Correct License: annotation. + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Nov 21 2003 David Jee 7.3-5 +- rebuild + +* Wed Nov 05 2003 David Jee 7.3-4 +- import new community version 07.03.0200 + +* Mon Sep 15 2003 Andrew Overholt 7.3-3 +- autotools fixes (courtesy Alex Oliva and + Owen Taylor ) + +* Tue Jul 08 2003 Andrew Overholt 7.3-3 +- allow use with unixODBC (courtesy Troels Arvin) [Bug #97998] + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Jun 02 2003 Andrew Overholt 7.3-1 +- sync to new community version (07.03.0100 => v7.3, r1) + +* Thu Jan 23 2003 Tim Powers 1-2 +- rebuild + +* Tue Jan 14 2003 Andrew Overholt +- 1-1 +- initial build (just took old package sections) diff --git a/sources b/sources new file mode 100644 index 0000000..f9df460 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (psqlodbc-10.03.0000.tar.gz) = c8d2322a4e97d0312eb822cd8533931a87b808fa9686754ebaea09b433f53b5cfec7572bd19ec0a8797ffb5d83aa0a83aa802af7a97a8e1b0ae4453042bb7867