pool/apr-util
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- drop dependency on Berkeley DB [SLE-12211], gdbm DBM connector

Browse Source 
is now built instead, but sdbm work as well

OBS-URL: https://build.opensuse.org/package/show/Apache/apr-util?expand=0&rev=26
This commit is contained in:
Petr Gajdos 2020-09-01 15:45:52 +00:00 committed by Git OBS Bridge
parent e8e3af772c
commit c0c69f30f4
3 changed files with 112 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
apr-util-apr_dbm_gdbm-fix-handling-of-error-codes.patch Normal file
View File

@ -0,0 +1,103 @@
--- 1.6.x/dbm/apr_dbm_gdbm.c 2018/02/25 16:36:31 1825311
+++ 1.6.x/dbm/apr_dbm_gdbm.c 2018/02/25 16:41:11 1825312
@@ -36,8 +36,20 @@
static apr_status_t g2s(int gerr)
{
if (gerr == -1) {
- /* ### need to fix this */
- return APR_EGENERAL;
+ if (gdbm_errno == GDBM_NO_ERROR)
+ return APR_SUCCESS;
+ return APR_OS_START_USEERR + gdbm_errno;
+ }
+
+ return APR_SUCCESS;
+}
+
+static apr_status_t gdat2s(datum d)
+{
+ if (d.dptr == NULL) {
+ if (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND)
+ return APR_SUCCESS;
+ return APR_OS_START_USEERR + gdbm_errno;
}
return APR_SUCCESS;
@@ -53,22 +65,14 @@
static apr_status_t set_error(apr_dbm_t *dbm, apr_status_t dbm_said)
{
- apr_status_t rv = APR_SUCCESS;
-
- /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */
+ dbm->errcode = dbm_said;
- if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) {
+ if (dbm_said == APR_SUCCESS)
dbm->errmsg = NULL;
- }
- else {
- dbm->errmsg = gdbm_strerror(gdbm_errno);
- rv = APR_EGENERAL; /* ### need something better */
- }
-
- /* captured it. clear it now. */
- gdbm_errno = GDBM_NO_ERROR;
+ else
+ dbm->errmsg = gdbm_strerror(dbm_said - APR_OS_START_USEERR);
- return rv;
+ return dbm_said;
}
/* --------------------------------------------------------------------------
@@ -107,7 +111,7 @@
NULL);
if (file == NULL)
- return APR_EGENERAL; /* ### need a better error */
+ return APR_OS_START_USEERR + gdbm_errno;
/* we have an open database... return it */
*pdb = apr_pcalloc(pool, sizeof(**pdb));
@@ -141,10 +145,12 @@
if (pvalue->dptr)
apr_pool_cleanup_register(dbm->pool, pvalue->dptr, datum_cleanup,
apr_pool_cleanup_null);
+ else
+ pvalue->dsize = 0;
/* store the error info into DBM, and return a status code. Also, note
that *pvalue should have been cleared on error. */
- return set_error(dbm, APR_SUCCESS);
+ return set_error(dbm, gdat2s(rd));
}
static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key,
@@ -201,9 +207,11 @@
if (pkey->dptr)
apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup,
apr_pool_cleanup_null);
+ else
+ pkey->dsize = 0;
/* store any error info into DBM, and return a status code. */
- return set_error(dbm, APR_SUCCESS);
+ return set_error(dbm, gdat2s(rd));
}
static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
@@ -221,9 +229,11 @@
if (pkey->dptr)
apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup,
apr_pool_cleanup_null);
+ else
+ pkey->dsize = 0;
/* store any error info into DBM, and return a status code. */
- return set_error(dbm, APR_SUCCESS);
+ return set_error(dbm, gdat2s(rd));
}
static void vt_gdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data)

4
apr-util.changes
View File

@ -1,8 +1,8 @@
-------------------------------------------------------------------
Tue Sep 1 11:33:52 UTC 2020 - pgajdos@suse.com
- drop dependency on Berkeley DB [SLE-12211], sqlite3 driver is
now required from the main package as the default instead
- drop dependency on Berkeley DB [SLE-12211], gdbm DBM connector
is now built instead, but sdbm work as well
-------------------------------------------------------------------
Wed Dec 18 10:46:26 UTC 2019 - pgajdos@suse.com

10
apr-util.spec
View File

@ -34,9 +34,12 @@ Patch2: apr-util-visibility.patch
Patch3: apr-util-mariadb-10.2.patch
# PATCH-FIX-OPENSUSE apr-util-postgresql.patch max@suse.com -- Fix build with PostgreSQL 11
Patch4: apr-util-postgresql.patch
# https://svn.apache.org/viewvc?view=revision&revision=1825312
Patch5: apr-util-apr_dbm_gdbm-fix-handling-of-error-codes.patch
BuildRequires: apr-devel
BuildRequires: autoconf
BuildRequires: doxygen
BuildRequires: gdbm-devel
BuildRequires: libexpat-devel
BuildRequires: libtool
BuildRequires: libuuid-devel
@ -47,8 +50,6 @@ BuildRequires: pkgconfig
BuildRequires: postgresql-devel >= 9.1.0
BuildRequires: sqlite-devel
BuildRequires: zlib-devel
# SLE-12211
Requires: %{libname}-dbd-sqlite3
%requires_ge libapr1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -74,6 +75,7 @@ Provides: %{libname}-devel = %{version}
Obsoletes: %{libname}-devel < %{version}-%{release}
Requires: %{libname} = %{version}
Requires: apr-devel
Requires: gdbm-devel
Requires: libexpat-devel
Requires: openldap2-devel
@ -114,6 +116,7 @@ DBD driver for SQLite 3 database.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
echo 'HTML_TIMESTAMP=NO' >> docs/doxygen.conf
@ -131,7 +134,7 @@ sed -i -e '/OBJECTS_all/s, dbd/apr_dbd_[^ ]*\.lo,,g' build-outputs.mk
--with-ldap \
--with-mysql \
--with-pgsql \
--without-gdbm
--with-gdbm
make %{?_smp_mflags} CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -fvisibility=hidden"
make %{?_smp_mflags} dox
@ -165,6 +168,7 @@ make -j1 check
%{_libdir}/libaprutil-%{apuver}.so.*
%dir %{dso_libdir}
%{dso_libdir}/apr_ldap*
%{dso_libdir}/apr_dbm_gdbm*
%{dso_libdir}/apr_crypto_openssl*
%files -n %{libname}-dbd-mysql