From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3004515A7DA for ; Mon, 20 Mar 2023 05:36:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A9CCE085B; Mon, 20 Mar 2023 05:36:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 295E9E085B for ; Mon, 20 Mar 2023 05:36:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53660335CC1 for ; Mon, 20 Mar 2023 05:36:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AC358F0 for ; Mon, 20 Mar 2023 05:36:09 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1679290332.fcf8c8b1a3b361a0e5ddfa887c6fc02d2558a753.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch X-VCS-Directories: dev-libs/apr-util/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fcf8c8b1a3b361a0e5ddfa887c6fc02d2558a753 X-VCS-Branch: master Date: Mon, 20 Mar 2023 05:36:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 89070222-dab3-4483-88d6-88b95289f960 X-Archives-Hash: bd060a062061a560b66782cd1f0bb696 commit: fcf8c8b1a3b361a0e5ddfa887c6fc02d2558a753 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Mar 19 10:43:35 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 20 05:32:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf8c8b1 dev-libs/apr-util: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30230 Signed-off-by: Sam James gentoo.org> .../apr-util-1.6.1-fix-gdbm-error-handling.patch | 79 -------------- .../files/apr-util-1.6.1-mariadb-support.patch | 116 --------------------- 2 files changed, 195 deletions(-) diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch b/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch deleted file mode 100644 index 92a4738e66a5..000000000000 --- a/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch +++ /dev/null @@ -1,79 +0,0 @@ -# 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) diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch b/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch deleted file mode 100644 index 137e99f97637..000000000000 --- a/dev-libs/apr-util/files/apr-util-1.6.1-mariadb-support.patch +++ /dev/null @@ -1,116 +0,0 @@ -Backport of http://svn.apache.org/viewvc?rev=1872060&view=rev - ---- a/build/dbd.m4 -+++ b/build/dbd.m4 -@@ -163,10 +163,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - old_cppflags="$CPPFLAGS" - old_ldflags="$LDFLAGS" - -+ my_library="mysqlclient" -+ - AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]), - [ - if test "$withval" = "yes"; then - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config]) -+ if test "x$MYSQL_CONFIG" = "x"; then -+ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config]) -+ fi - if test "x$MYSQL_CONFIG" != 'x'; then - mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" - mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" -@@ -174,29 +179,37 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - - APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) - APR_ADDTO(LIBS, [$mysql_LIBS]) -+ -+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then -+ my_library="mariadb" -+ fi - fi - -- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include ]) -- if test "$apu_have_mysql" = "0"; then -- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include ]) -+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ if test "$apr_have_mysql" = "0"; then -+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) - fi -- if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then -+ if test "$apr_have_mysql" = "1"; then -+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) -+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) -+ fi -+ if test "$apu_have_mysql" = "1" && test "x$MYSQL_CONFIG" != 'x'; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) - fi - elif test "$withval" = "no"; then - : - else - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin]) -+ if test "x$MYSQL_CONFIG" = "x"; then -+ AC_PATH_TOOL([MYSQL_CONFIG],[mariadb_config],,[$withval/bin]) -+ fi - if test "x$MYSQL_CONFIG" != 'x'; then - mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" - mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" - mysql_LIBS="`$MYSQL_CONFIG --libs_r`" -+ if $MYSQL_CONFIG --libs_r | grep -q mariadb; then -+ my_library="mariadb" -+ fi - else - mysql_CPPFLAGS="-I$withval/include" - mysql_LDFLAGS="-L$withval/lib " -@@ -207,18 +220,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - APR_ADDTO(LIBS, [$mysql_LIBS]) - - AC_MSG_NOTICE(checking for mysql in $withval) -- AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include ]) -- -- if test "$apu_have_mysql" != "1"; then -- AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], -- AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]), -- [apu_have_mysql=0; break], -- [#include ]) -+ AC_CHECK_HEADERS([mysql.h errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ if test "$apr_have_mysql" = "0"; then -+ AC_CHECK_HEADERS([mysql/mysql.h mysql/errmsg.h], [apu_have_mysql=1], [apu_have_mysql=0; break]) -+ fi -+ if test "$apr_have_mysql" = "1"; then -+ AC_CHECK_HEADERS([my_global.h my_sys.h mysql/my_global.h mysql/my_sys.h]) -+ AC_CHECK_LIB($my_library, mysql_init,, [apu_have_mysql=0]) - fi -- if test "$apu_have_mysql" != "0"; then -+ if test "$apu_have_mysql" = "1"; then - APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) - fi - fi -@@ -229,7 +239,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ - dnl Since we have already done the AC_CHECK_LIB tests, if we have it, - dnl we know the library is there. - if test "$apu_have_mysql" = "1"; then -- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS]) -+ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -l$my_library $mysql_LIBS]) - fi - AC_SUBST(LDADD_dbd_mysql) - ---- a/dbd/apr_dbd_mysql.c -+++ b/dbd/apr_dbd_mysql.c -@@ -1262,7 +1262,9 @@ static apr_status_t thread_end(void *data) - - static void dbd_mysql_init(apr_pool_t *pool) - { -+#if MYSQL_VERSION_ID < 100000 - my_init(); -+#endif - mysql_thread_init(); - - /* FIXME: this is a guess; find out what it really does */