fix ODBC type mismatch (r1908586)

use autosetup

apr-util-1.6.3-r1908586.patch

@@ -0,0 +1,16 @@
+
+https://svn.apache.org/viewvc?view=revision&revision=1908586
+
+--- apr-util/dbd/apr_dbd_odbc.c
++++ apr-util/dbd/apr_dbd_odbc.c
+@@ -582,8 +582,8 @@
+                     (textmode ? atoi(args[*argp]) : *(short *)args[*argp]);
+                 break;
+             case SQL_INTEGER:
+-                ptr = apr_palloc(pool, sizeof(int));
+-                len = sizeof(int);
++                ptr = apr_palloc(pool, sizeof(long));
++                len = sizeof(long);
+                 *(long *)ptr =
+                     (textmode ? atol(args[*argp]) : *(long *)args[*argp]);
+                 break;

apr-util.spec

@@ -37,7 +37,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.6.3
-Release: 15%{?dist}
+Release: 16%{?dist}
 # Apache-2.0:  everything
 # RSA-MD:      https://gitlab.com/fedora/legal/fedora-legal-docs/-/merge_requests/187
 #              include\apr_md5.h, passwd\apr_md5.c, crypto\apr_md4.c, include\apr_md4.h
@@ -53,6 +53,7 @@ Patch2: apr-util-1.4.1-private.patch
 Patch3: apr-util-1.6.3-allow-ipv6.patch
 Patch4: apr-util-configure-c99.patch
 Patch5: apr-util-1.6.3-lmdb-support.patch
+Patch6: apr-util-1.6.3-r1908586.patch
 BuildRequires: gcc
 BuildRequires: autoconf, apr-devel >= 1.3.0
 BuildRequires: %{dbdep}, expat-devel, libuuid-devel
@@ -171,14 +172,10 @@ This package provides the NSS crypto support for the apr-util.
 %endif
 
 %prep
-%setup -q
+%autosetup -p1
-%patch -P1 -p1 -b .pkgconf
-%patch -P2 -p1 -b .private
-%patch -P3 -p1 -b .r1907541
-%patch -P4 -p1
-%patch -P5 -p1 -b .lmdb-support
 
 : Configured for LDAP library: %{ldaplib}
+: Configured for DBM library: %{dbdep}
 
 %build
 autoheader && autoconf
@@ -283,6 +280,10 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Feb  8 2024 Joe Orton <jorton@redhat.com> - 1.6.3-16
+- fix ODBC type mismatch (r1908586)
+- use autosetup
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild