public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mdbtools] f44: Update to 1.0.1, fix FTBFS (rhbz#2434814)
@ 2026-07-13 10:47 Michal Schorm
  0 siblings, 0 replies; only message in thread
From: Michal Schorm @ 2026-07-13 10:47 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/mdbtools
            Branch : f44
            Commit : a39484fe3e838d57046323674188ad08b5c2320b
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-13T02:02:00+02:00
            Stats  : +9/-73 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/mdbtools/c/a39484fe3e838d57046323674188ad08b5c2320b?branch=f44

            Log:
            Update to 1.0.1, fix FTBFS (rhbz#2434814)

Upstream 1.0.1 dropped '-Werror' from 'configure.ac', fixing the
build failure caused by GCC 15 flagging an unused 'yynerrs'
variable in the bison-generated 'parser.c'.

Both Fedora patches are included upstream in the upstream commit '7625bfaebfc9':
- 'mdb-sql.c' fgets buffer size fix (gcc 13 / i686)
- 'odbc.c' uninitialized 'quote_char' fix (s390x)

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/.gitignore b/.gitignore
index b5a46c8..5fe18c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 mdbtools-0.*.tar.gz
+mdbtools-1.*.tar.gz
 0.*.tar.gz
-/mdbtools-1.0.0.tar.gz

diff --git a/mdbtools-0.9.3-mdb-sql-compile-fix.patch b/mdbtools-0.9.3-mdb-sql-compile-fix.patch
deleted file mode 100644
index b47fa2f..0000000
--- a/mdbtools-0.9.3-mdb-sql-compile-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-gcc 13 does not like this loop (on i686):
-
-			while (strlen(mybuf) + strlen(s) > bufsz) {
-				bufsz *= 2;
-				mybuf = (char *) g_realloc(mybuf, bufsz);
-			}
-
-and ends up deciding that bufsz may become -1 leading to this compile error:
-
-In file included from /usr/include/stdio.h:959,
-                 from mdb-sql.c:19:
-In function 'fgets',
-    inlined from 'main' at mdb-sql.c:423:9:
-/usr/include/bits/stdio2.h:213:12: error: argument 2 value -1 is negative [-Werror=stringop-overflow=]
-  213 |     return __fgets_alias (__s, __n, __stream);
-      |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In file included from /usr/include/features.h:503,
-                 from /usr/include/bits/libc-header-start.h:33,
-                 from /usr/include/stdio.h:27:
-/usr/include/bits/stdio2.h: In function 'main':
-/usr/include/bits/stdio2.h:198:14: note: in a call to function '*fgets' declared with attribute 'access (write_only, 1, 2)'
-  198 | extern char *__REDIRECT (__fgets_alias,
-      |              ^~~~~~~~~~
-cc1: all warnings being treated as errors
-make[3]: *** [Makefile:709: mdb-sql.o] Error 1
-
-Only the size of the buffer which stores all statements until the "go"
-command needs to grow dynamically. Limit reading of input to always read
-4096 bytes lines or chunks. Which matches the size which the old code
-would always use for the first line read.
-
-This makes mdb-sql.c build again on i686 with gcc 13.
-
-diff -up mdbtools-0.9.3/src/util/mdb-sql.c~ mdbtools-0.9.3/src/util/mdb-sql.c
---- mdbtools-0.9.3/src/util/mdb-sql.c~	2023-03-23 15:05:26.000000000 +0100
-+++ mdbtools-0.9.3/src/util/mdb-sql.c	2023-03-23 15:14:09.719333781 +0100
-@@ -321,6 +321,7 @@ int
- main(int argc, char **argv)
- {
- 	char *s = NULL;
-+	const int s_bufsz = 4096;
- 	char prompt[20];
- 	int line = 0;
- 	char *mybuf;
-@@ -420,8 +420,8 @@ main(int argc, char **argv)
- 		}
- 
- 		if (in) {
--			s=calloc(bufsz, 1);
--			if (!fgets(s, bufsz, in)) {
-+			s=calloc(s_bufsz, 1);
-+			if (!fgets(s, s_bufsz, in)) {
- 				// Backwards compatibility with older MDBTools
- 				// Files read from the command line had an
- 				// implicit "go" at the end

diff --git a/mdbtools-1.0.0-s390x-build-fix.patch b/mdbtools-1.0.0-s390x-build-fix.patch
deleted file mode 100644
index dc00310..0000000
--- a/mdbtools-1.0.0-s390x-build-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mdbtools-1.0.0/src/odbc/odbc.c~ mdbtools-1.0.0/src/odbc/odbc.c
---- mdbtools-1.0.0/src/odbc/odbc.c~	2021-09-29 15:12:55.000000000 +0200
-+++ mdbtools-1.0.0/src/odbc/odbc.c	2024-06-21 20:34:12.048447730 +0200
-@@ -1987,7 +1987,7 @@ static int _odbc_fix_literals(struct _hs
- 	char tmp[4096];
- 	char *s, *d, *p;
- 	int i, quoted = 0, find_end = 0;
--	char quote_char;
-+	char quote_char = 0; /* Initialize to fix -Werror=maybe-uninitialized on s390x */
- 
- 	s=stmt->query;
- 	d=tmp;

diff --git a/mdbtools.spec b/mdbtools.spec
index 17575da..42d17e1 100644
--- a/mdbtools.spec
+++ b/mdbtools.spec
@@ -1,12 +1,10 @@
 Name:           mdbtools
-Version:        1.0.0
-Release:        10%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        Access data stored in Microsoft Access databases
 License:        GPL-2.0-or-later
 URL:            https://github.com/mdbtools/mdbtools/
 Source0:        https://github.com/mdbtools/mdbtools/releases/download/v%{version}/mdbtools-%{version}.tar.gz
-Patch1:         mdbtools-0.9.3-mdb-sql-compile-fix.patch
-Patch2:         mdbtools-1.0.0-s390x-build-fix.patch
 BuildRequires:  make gcc
 BuildRequires:  libxml2-devel glib2-devel unixODBC-devel readline-devel gettext-devel
 BuildRequires:  bison flex txt2man rarian-compat bash-completion
@@ -90,6 +88,11 @@ find %{buildroot} -type f -name "*.la" -delete
 
 
 %changelog
+* Mon Jul 13 2026 Michal Schorm <mschorm@redhat.com> - 1.0.1-1
+- Update to 1.0.1
+- Fix FTBFS (rhbz#2434814)
+- Drop patches included upstream
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index c83a7d7..af2addb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mdbtools-1.0.0.tar.gz) = 146606d1c26c939cef5d4e153f312c24858e0a2eeaad9260c3bdd5eea9f5b58f5fd06ccad72323aa18db5fe197b4c50167b3ca9e112f1a8200ea5b69e1b16ccd
+SHA512 (mdbtools-1.0.1.tar.gz) = 3f033db4c036f53f800982b5499a64756d3a859d9284ef5202a7062dc7a2d1ef1a657d43b8ea3f76aa999f5adcc4b3799eaaa8b8084adf6f60d55ba9ccc78b72

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-13 10:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-13 10:47 [rpms/mdbtools] f44: Update to 1.0.1, fix FTBFS (rhbz#2434814) Michal Schorm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox