* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/, dev-libs/apr-util/
@ 2018-09-13 16:36 Thomas Deutschmann
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Deutschmann @ 2018-09-13 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 1d491df62fb432335e681eeff99acfc7ff10927e
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 16:35:36 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 16:36:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d491df6
dev-libs/apr-util: fix gdbm error handling
Package-Manager: Portage-2.3.49, Repoman-2.3.10
...il-1.6.1-r2.ebuild => apr-util-1.6.1-r3.ebuild} | 6 ++
.../apr-util-1.6.1-fix-gdbm-error-handling.patch | 79 ++++++++++++++++++++++
2 files changed, 85 insertions(+)
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r2.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
similarity index 96%
rename from dev-libs/apr-util/apr-util-1.6.1-r2.ebuild
rename to dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index 251a895865a..6fa6e9f9d95 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r2.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -48,6 +48,7 @@ DOCS=(CHANGES NOTICE README)
PATCHES=(
"${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
+ "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch
)
src_prepare() {
@@ -116,6 +117,11 @@ src_compile() {
use doc && emake dox
}
+src_test() {
+ # Building tests in parallel is broken
+ emake -j1 check
+}
+
src_install() {
default
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
new file mode 100644
index 00000000000..92a4738e66a
--- /dev/null
+++ b/dev-libs/apr-util/files/apr-util-1.6.1-fix-gdbm-error-handling.patch
@@ -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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/, dev-libs/apr-util/
@ 2022-07-01 7:49 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-07-01 7:49 UTC (permalink / raw
To: gentoo-commits
commit: fda5d0d0e2f3a13c77a03b3e3622594017980d99
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Jun 19 03:29:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 1 07:46:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda5d0d0
dev-libs/apr-util: Fix the build with rlibtool
Bug: https://bugs.gentoo.org/779487
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/25968
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/apr-util/apr-util-1.6.1-r9.ebuild | 148 +++++++++++++++++++++
.../apr-util/files/apr-util-1.6.1-libtool.patch | 20 +++
2 files changed, 168 insertions(+)
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
new file mode 100644
index 000000000000..445641cf3612
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
+# APR_PV="${PV}"
+APR_PV="1.6.2"
+
+inherit autotools db-use libtool multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Utility Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
+#RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/apr-${APR_PV}:1=
+ dev-libs/expat
+ virtual/libcrypt:=
+ berkdb? ( >=sys-libs/db-4:= )
+ gdbm? ( sys-libs/gdbm:= )
+ ldap? ( net-nds/openldap:= )
+ mysql? ( || (
+ dev-db/mariadb-connector-c
+ >=dev-db/mysql-connector-c-8
+ ) )
+ nss? ( dev-libs/nss )
+ odbc? ( dev-db/unixODBC )
+ openssl? (
+ dev-libs/openssl:0=
+ )
+ postgres? ( dev-db/postgresql:= )
+ sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="
+ ${RDEPEND}
+ >=sys-devel/libtool-2.4.2
+ doc? ( app-doc/doxygen )
+"
+
+DOCS=(CHANGES NOTICE README)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
+ "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch
+ "${FILESDIR}"/${PN}-1.6.1-libtool.patch # 779487
+ "${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch
+ "${FILESDIR}"/${PN}-1.6.1-my_bool.patch
+ "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
+)
+
+src_prepare() {
+ default
+
+ # Fix usage of libmysqlclient (bug #620230)
+ grep -lrF "libmysqlclient_r" "${S}" \
+ | xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
+ || die
+
+ mv configure.{in,ac} || die
+ eautoreconf
+ elibtoolize
+}
+
+src_configure() {
+ local myconf=(
+ --datadir="${EPREFIX}"/usr/share/apr-util-1
+ --with-apr="${ESYSROOT}"/usr
+ --with-expat="${EPREFIX}"/usr
+ --without-sqlite2
+ $(use_with gdbm)
+ $(use_with ldap)
+ $(use_with mysql)
+ $(use_with nss)
+ $(use_with odbc)
+ $(use_with openssl)
+ $(use_with postgres pgsql)
+ $(use_with sqlite sqlite3)
+ )
+
+ tc-is-static-only && myconf+=( --disable-util-dso )
+
+ if use berkdb; then
+ local db_version
+ db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
+ db_version="$(db_ver_to_slot "${db_version}")"
+ db_version="${db_version/\./}"
+ myconf+=(
+ --with-dbm=db${db_version}
+ # We use $T for the libdir because otherwise it'd simply be the normal
+ # system libdir. That's pointless as the compiler will search it for
+ # us already. This makes cross-compiling and such easier.
+ --with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+ )
+ else
+ myconf+=( --without-berkeley-db )
+ fi
+
+ if use nss || use openssl ; then
+ myconf+=( --with-crypto ) # 518708
+ fi
+
+ econf "${myconf[@]}"
+ # Use the current env build settings rather than whatever apr was built with.
+ sed -i -r \
+ -e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
+ -e "/^CC=/s:=.*:=$(tc-getCC):" \
+ -e '/^(C|CPP|CXX|LD)FLAGS=/d' \
+ -e '/^LTFLAGS/s:--silent::' \
+ build/rules.mk || die
+}
+
+src_compile() {
+ emake
+ use doc && emake dox
+}
+
+src_test() {
+ # Building tests in parallel is broken
+ emake -j1 check
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name "*.la" -delete || die
+ if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
+ find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
+ fi
+ if ! use static-libs ; then
+ find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
+ fi
+
+ if use doc ; then
+ docinto html
+ dodoc -r docs/dox/html/*
+ fi
+
+ # This file is only used on AIX systems, which Gentoo is not,
+ # and causes collisions between the SLOTs, so remove it.
+ rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die
+}
diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-libtool.patch b/dev-libs/apr-util/files/apr-util-1.6.1-libtool.patch
new file mode 100644
index 000000000000..5c2015b64fd7
--- /dev/null
+++ b/dev-libs/apr-util/files/apr-util-1.6.1-libtool.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/779487
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 20:20:09 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+This fixes the build with rlibtool which requires the generated libtool
+to determine if building shared or static libraries.
+
+--- a/configure.in
++++ b/configure.in
+@@ -8,6 +8,8 @@ AC_INIT(export_vars.sh.in)
+ AC_CONFIG_HEADER(include/private/apu_config.h)
+ AC_CONFIG_AUX_DIR(build)
+
++LT_INIT
++
+ sinclude(build/apu-conf.m4)
+ sinclude(build/apu-iconv.m4)
+ sinclude(build/apu-hints.m4)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-01 7:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-13 16:36 [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/files/, dev-libs/apr-util/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2022-07-01 7:49 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox