cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

apr-util: sync with master

Browse Source 
This is a squash of the following cherry-picked commits:

27c4723936
03124bf4b4
141bd55316
40c7e95210
1d25dcde24
ea5b746e58
a62c0e599b
a16b294805
c24f5d258b
f6c218e74d

Short summary:

- adds external modules (crypto-openssl dbd-mysql dbd-odbc dbd-pgsql
  dbd-sqlite3 dbm-gdbm ldap)
- Makefile and patches are updated and cleaned
- adds myself as maintainer
- improves the cross-compile setup (via configure variables sed scripts)

For more details please check the individual commits provided above.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper
2020-02-08 21:50:33 +01:00
parent 391f5f087e
commit 4cba41ac1d
7 changed files with 423 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/apr-util/patches/002-fix-gdbm-error-handling.patch
+79
View File
@@ -0,0 +1,79 @@
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=889170
# needs to be submitted upstream
--- apr-util.orig/dbm/apr_dbm_gdbm.c
+++ apr-util/dbm/apr_dbm_gdbm.c
@@ -36,13 +36,22 @@
static apr_status_t g2s(int gerr)
{
if (gerr == -1) {
- /* ### need to fix this */
- return APR_EGENERAL;
+ return APR_OS_START_USEERR + gdbm_errno;
}
return APR_SUCCESS;
}
+static apr_status_t gdat2s(datum d)
+{
+ if (d.dptr == NULL) {
+ return APR_OS_START_USEERR + gdbm_errno;
+ }
+
+ return APR_SUCCESS;
+}
+
+
static apr_status_t datum_cleanup(void *dptr)
{
if (dptr)
@@ -55,19 +64,15 @@ static apr_status_t set_error(apr_dbm_t
{
apr_status_t rv = APR_SUCCESS;
- /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */
-
- if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) {
+ if (dbm_said == APR_SUCCESS) {
+ dbm->errcode = GDBM_NO_ERROR;
dbm->errmsg = NULL;
}
else {
+ dbm->errcode = dbm_said;
dbm->errmsg = gdbm_strerror(gdbm_errno);
- rv = APR_EGENERAL; /* ### need something better */
}
- /* captured it. clear it now. */
- gdbm_errno = GDBM_NO_ERROR;
-
return rv;
}
@@ -144,7 +149,7 @@ static apr_status_t vt_gdbm_fetch(apr_db
/* 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,
@@ -203,7 +208,7 @@ static apr_status_t vt_gdbm_firstkey(apr
apr_pool_cleanup_null);
/* 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)
@@ -223,7 +228,7 @@ static apr_status_t vt_gdbm_nextkey(apr_
apr_pool_cleanup_null);
/* 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)