public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/apr-util] rawhide: new version 1.6.5
@ 2026-08-10 12:39
0 siblings, 0 replies; only message in thread
From: @ 2026-08-10 12:39 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/apr-util
Branch : rawhide
Commit : 1738ab84727023d794fb6e69b1b0c47bdc5807d9
Author : Luboš Uhliarik <luhliari@redhat.com>
Date : 2026-08-10T14:39:15+02:00
Stats : +10/-676 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/apr-util/c/1738ab84727023d794fb6e69b1b0c47bdc5807d9?branch=rawhide
Log:
new version 1.6.5
---
diff --git a/.gitignore b/.gitignore
index d83cdac..dbb1344 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ apr-util-1.3.9.tar.bz2
/apr-util-1.6.0.tar.bz2
/apr-util-1.6.1.tar.bz2
/apr-util-1.6.3.tar.bz2
+/apr-util-1.6.5.tar.bz2
diff --git a/apr-util-1.6.3-allow-ipv6.patch b/apr-util-1.6.3-allow-ipv6.patch
deleted file mode 100644
index b964a63..0000000
--- a/apr-util-1.6.3-allow-ipv6.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 828d644c8eba8765843985d9293f033898ed0592 Mon Sep 17 00:00:00 2001
-From: Joe Orton <jorton@apache.org>
-Date: Fri, 3 Feb 2023 15:12:10 +0000
-Subject: [PATCH] * memcache/apr_memcache.c (conn_connect): Allow use of IPv6
- rather than forcing name resolution to IPv4 only.
-
-Submitted by: Lubos Uhliarik <luhliari redhat.com>
-Github: closes #39
-
-
-git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1907242 13f79535-47bb-0310-9956-ffa450edef68
----
- memcache/apr_memcache.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/memcache/apr_memcache.c b/memcache/apr_memcache.c
-index 5f8135c52c..18806281a4 100644
---- a/memcache/apr_memcache.c
-+++ b/memcache/apr_memcache.c
-@@ -290,9 +290,9 @@ static apr_status_t conn_connect(apr_memcache_conn_t *conn)
- apr_status_t rv = APR_SUCCESS;
- apr_sockaddr_t *sa;
- #if APR_HAVE_SOCKADDR_UN
-- apr_int32_t family = conn->ms->host[0] != '/' ? APR_INET : APR_UNIX;
-+ apr_int32_t family = conn->ms->host[0] != '/' ? APR_UNSPEC : APR_UNIX;
- #else
-- apr_int32_t family = APR_INET;
-+ apr_int32_t family = APR_UNSPEC;
- #endif
-
- rv = apr_sockaddr_info_get(&sa, conn->ms->host, family, conn->ms->port, 0, conn->p);
-@@ -328,9 +328,9 @@ mc_conn_construct(void **conn_, void *params, apr_pool_t *pool)
- apr_pool_t *tp;
- apr_memcache_server_t *ms = params;
- #if APR_HAVE_SOCKADDR_UN
-- apr_int32_t family = ms->host[0] != '/' ? APR_INET : APR_UNIX;
-+ apr_int32_t family = ms->host[0] != '/' ? APR_UNSPEC : APR_UNIX;
- #else
-- apr_int32_t family = APR_INET;
-+ apr_int32_t family = APR_UNSPEC;
- #endif
-
- rv = apr_pool_create(&np, pool);
-
-From 59341af138dd2c6fe9444ee9c865b769c0053bdd Mon Sep 17 00:00:00 2001
-From: Joe Orton <jorton@apache.org>
-Date: Tue, 27 Jun 2023 14:06:09 +0000
-Subject: [PATCH] * memcache/apr_memcache.c (conn_connect, mc_conn_construct):
- Fix regression in IPv4 handling in r1907242. Cycle through the address
- list handling v4/v6 addresses correctly.
-
-Submitted by: Lubos Uhliarik <luhliari redhat.com>
-Github: closes #44
-
-
-git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1910629 13f79535-47bb-0310-9956-ffa450edef68
----
- memcache/apr_memcache.c | 36 ++++++++++++++++++------------------
- 1 file changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/memcache/apr_memcache.c b/memcache/apr_memcache.c
-index 41b93a0a33..09779d91b5 100644
---- a/memcache/apr_memcache.c
-+++ b/memcache/apr_memcache.c
-@@ -300,14 +300,26 @@ static apr_status_t conn_connect(apr_memcache_conn_t *conn)
- return rv;
- }
-
-- rv = apr_socket_timeout_set(conn->sock, 1 * APR_USEC_PER_SEC);
-- if (rv != APR_SUCCESS) {
-- return rv;
-+ /* Cycle through address until a connect() succeeds. */
-+ for (; sa; sa = sa->next) {
-+ rv = apr_socket_create(&conn->sock, sa->family, SOCK_STREAM, 0, conn->p);
-+ if (rv == APR_SUCCESS) {
-+ rv = apr_socket_timeout_set(conn->sock, 1 * APR_USEC_PER_SEC);
-+ if (rv != APR_SUCCESS) {
-+ return rv;
-+ }
-+
-+ rv = apr_socket_connect(conn->sock, sa);
-+ if (rv == APR_SUCCESS) {
-+ break;
-+ }
-+
-+ apr_socket_close(conn->sock);
-+ }
- }
-
-- rv = apr_socket_connect(conn->sock, sa);
-- if (rv != APR_SUCCESS) {
-- return rv;
-+ if (!sa) {
-+ return APR_ECONNREFUSED;
- }
-
- rv = apr_socket_timeout_set(conn->sock, -1);
-@@ -327,11 +339,6 @@ mc_conn_construct(void **conn_, void *params, apr_pool_t *pool)
- apr_pool_t *np;
- apr_pool_t *tp;
- apr_memcache_server_t *ms = params;
--#if APR_HAVE_SOCKADDR_UN
-- apr_int32_t family = ms->host[0] != '/' ? APR_UNSPEC : APR_UNIX;
--#else
-- apr_int32_t family = APR_UNSPEC;
--#endif
-
- rv = apr_pool_create(&np, pool);
- if (rv != APR_SUCCESS) {
-@@ -349,13 +356,6 @@ mc_conn_construct(void **conn_, void *params, apr_pool_t *pool)
- conn->p = np;
- conn->tp = tp;
-
-- rv = apr_socket_create(&conn->sock, family, SOCK_STREAM, 0, np);
--
-- if (rv != APR_SUCCESS) {
-- apr_pool_destroy(np);
-- return rv;
-- }
--
- conn->buffer = apr_palloc(conn->p, BUFFER_SIZE + 1);
- conn->blen = 0;
- conn->ms = ms;
diff --git a/apr-util-1.6.3-r1908584.patch b/apr-util-1.6.3-r1908584.patch
deleted file mode 100644
index 102ed7c..0000000
--- a/apr-util-1.6.3-r1908584.patch
+++ /dev/null
@@ -1,486 +0,0 @@
-# ./pullrev.sh 1908584
-
-http://svn.apache.org/viewvc?view=revision&revision=1908584
-
-+ Forcibly disable ENGINE support.
-
---- apr-1.6.3/build/crypto.m4
-+++ apr-1.6.3/build/crypto.m4
-@@ -53,11 +53,11 @@
- crypto_library_enabled=1
- fi
- done
-- if test "$crypto_library_enabled" = "1"; then
-+ if test "$crypto_library_enabled" = "1"; then
- AC_MSG_NOTICE([Crypto was requested but no crypto library was found; autodetecting possible libraries])
- else
- AC_ERROR([Crypto was requested but all possible crypto libraries were disabled.])
-- fi
-+ fi
- fi
-
- APU_CHECK_CRYPTO_OPENSSL
-@@ -91,15 +91,14 @@
- if test "$withval" = "yes"; then
- AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
- AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
-- if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
-+ if test "$openssl_have_headers" = "1" && test "$openssl_have_libs" = "1"; then
- apu_have_openssl=1
- fi
- elif test "$withval" = "no"; then
- apu_have_openssl=0
- else
--
- openssl_CPPFLAGS="-I$withval/include"
-- openssl_LDFLAGS="-L$withval/lib "
-+ openssl_LDFLAGS="-L$withval/lib -L$withval/lib64"
-
- APR_ADDTO(CPPFLAGS, [$openssl_CPPFLAGS])
- APR_ADDTO(LDFLAGS, [$openssl_LDFLAGS])
-@@ -107,16 +106,16 @@
- AC_MSG_NOTICE(checking for openssl in $withval)
- AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
- AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
-- if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
-+ if test "$openssl_have_headers" = "1" && test "$openssl_have_libs" = "1"; then
- apu_have_openssl=1
-- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-+ APR_ADDTO(APRUTIL_INCLUDES, [$openssl_CPPFLAGS])
-+ APR_ADDTO(APRUTIL_LDFLAGS, [$openssl_LDFLAGS])
- fi
--
-- AC_CHECK_DECLS([EVP_PKEY_CTX_new], [], [],
-- [#include <openssl/evp.h>])
--
- fi
-+ if test "$apu_have_openssl" = "1"; then
-+ AC_CHECK_LIB(crypto, OPENSSL_init_crypto)
-+ AC_CHECK_FUNCS([OPENSSL_init_crypto])
-+ fi
- ], [
- apu_have_openssl=0
- ])
-@@ -130,18 +129,12 @@
- apu_have_crypto=1
-
- AC_MSG_CHECKING([for const input buffers in OpenSSL])
-- AC_TRY_COMPILE([#include <openssl/rsa.h>],
-- [ const unsigned char * buf;
-- unsigned char * outbuf;
-- RSA rsa;
--
-- RSA_private_decrypt(1,
-- buf,
-- outbuf,
-- &rsa,
-- RSA_PKCS1_PADDING);
--
-- ],
-+ AC_TRY_COMPILE(
-+ [#include <openssl/evp.h>],
-+ [ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
-+ const unsigned char key[128] = {0}, iv[128] = {0};
-+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
-+ EVP_CIPHER_CTX_free(ctx); ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE([CRYPTO_OPENSSL_CONST_BUFFERS], 1, [Define that OpenSSL uses const buffers])],
- [AC_MSG_RESULT([no])])
---- apr-1.6.3/crypto/apr_crypto_openssl.c
-+++ apr-1.6.3/crypto/apr_crypto_openssl.c
-@@ -17,6 +17,7 @@
- #include "apr_lib.h"
- #include "apu.h"
- #include "apu_errno.h"
-+#include "apu_config.h"
-
- #include <ctype.h>
- #include <assert.h>
-@@ -30,24 +31,69 @@
-
- #if APU_HAVE_CRYPTO
-
-+#ifndef OPENSSL_API_COMPAT
-+#define OPENSSL_API_COMPAT 0x10101000L /* for ENGINE API */
-+#endif
-+
- #include <openssl/evp.h>
- #include <openssl/rand.h>
- #include <openssl/engine.h>
-+#include <openssl/opensslv.h>
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000
-+#include <openssl/macros.h>
-+#include <openssl/core_names.h>
-+#endif
-
--#define LOG_PREFIX "apr_crypto_openssl: "
-+#if defined(LIBRESSL_VERSION_NUMBER)
-
--#ifndef APR_USE_OPENSSL_PRE_1_1_API
--#if defined(LIBRESSL_VERSION_NUMBER)
- /* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
- * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...), so
- * we have to work around this...
- */
--#define APR_USE_OPENSSL_PRE_1_1_API (1)
-+#define APR_USE_OPENSSL_PRE_1_0_API 0
-+#if LIBRESSL_VERSION_NUMBER < 0x2070000f
-+#define APR_USE_OPENSSL_PRE_1_1_API 1
- #else
--#define APR_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#define APR_USE_OPENSSL_PRE_1_1_API 0
- #endif
-+/* TODO: keep up with LibreSSL latest versions */
-+#define APR_USE_OPENSSL_PRE_1_1_1_API 1
-+#define APR_USE_OPENSSL_PRE_3_0_API 1
-+
-+#else /* defined(LIBRESSL_VERSION_NUMBER) */
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
-+#define APR_USE_OPENSSL_PRE_1_0_API 1
-+#else
-+#define APR_USE_OPENSSL_PRE_1_0_API 0
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define APR_USE_OPENSSL_PRE_1_1_API 1
-+#else
-+#define APR_USE_OPENSSL_PRE_1_1_API 0
-+#endif
-+#if OPENSSL_VERSION_NUMBER < 0x10101000L
-+#define APR_USE_OPENSSL_PRE_1_1_1_API 1
-+#else
-+#define APR_USE_OPENSSL_PRE_1_1_1_API 0
-+#endif
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-+#define APR_USE_OPENSSL_PRE_3_0_API 1
-+#else
-+#define APR_USE_OPENSSL_PRE_3_0_API 0
-+#endif
-
-+#endif /* defined(LIBRESSL_VERSION_NUMBER) */
-+
-+#if APR_USE_OPENSSL_PRE_3_0_API \
-+ || (defined(OPENSSL_API_LEVEL) && OPENSSL_API_LEVEL < 30000)
-+#define APR_USE_OPENSSL_ENGINE_API 0
-+#else
-+#define APR_USE_OPENSSL_ENGINE_API 0
-+#endif
-+
-+#define LOG_PREFIX "apr_crypto_openssl: "
-+
- struct apr_crypto_t {
- apr_pool_t *pool;
- const apr_crypto_driver_t *provider;
-@@ -58,7 +104,11 @@
- };
-
- struct apr_crypto_config_t {
-+#if APR_USE_OPENSSL_ENGINE_API
- ENGINE *engine;
-+#else
-+ void *engine;
-+#endif
- };
-
- struct apr_crypto_key_t {
-@@ -113,9 +163,21 @@
- */
- static apr_status_t crypto_shutdown(void)
- {
-+#if HAVE_OPENSSL_INIT_CRYPTO
-+ /* Openssl v1.1+ handles all termination automatically. Do
-+ * nothing in this case.
-+ */
-+
-+#else
-+ /* Termination below is for legacy Openssl versions v1.0.x and
-+ * older.
-+ */
-+
- ERR_free_strings();
- EVP_cleanup();
- ENGINE_cleanup();
-+#endif
-+
- return APR_SUCCESS;
- }
-
-@@ -130,6 +192,19 @@
- static apr_status_t crypto_init(apr_pool_t *pool, const char *params,
- const apu_err_t **result)
- {
-+#if HAVE_OPENSSL_INIT_CRYPTO
-+ /* Openssl v1.1+ handles all initialisation automatically, apart
-+ * from hints as to how we want to use the library.
-+ *
-+ * We tell openssl we want to include engine support.
-+ */
-+ OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
-+
-+#else
-+ /* Configuration below is for legacy versions Openssl v1.0 and
-+ * older.
-+ */
-+
- #if APR_USE_OPENSSL_PRE_1_1_API
- (void)CRYPTO_malloc_init();
- #else
-@@ -140,6 +215,7 @@
- OpenSSL_add_all_algorithms();
- ENGINE_load_builtin_engines();
- ENGINE_register_all_complete();
-+#endif
-
- apr_pool_cleanup_register(pool, pool, crypto_shutdown_helper,
- apr_pool_cleanup_null);
-@@ -203,12 +279,13 @@
- */
- static apr_status_t crypto_cleanup(apr_crypto_t *f)
- {
--
-+#if APR_USE_OPENSSL_ENGINE_API
- if (f->config->engine) {
- ENGINE_finish(f->config->engine);
- ENGINE_free(f->config->engine);
- f->config->engine = NULL;
- }
-+#endif
- return APR_SUCCESS;
-
- }
-@@ -235,11 +312,10 @@
- const apr_crypto_driver_t *provider, const char *params,
- apr_pool_t *pool)
- {
-- apr_crypto_config_t *config = NULL;
-- apr_crypto_t *f = apr_pcalloc(pool, sizeof(apr_crypto_t));
--
-+ apr_crypto_t *f;
-+ apr_crypto_config_t *config;
- const char *engine = NULL;
--
-+ apr_status_t status = APR_SUCCESS;
- struct {
- const char *field;
- const char *value;
-@@ -253,8 +329,9 @@
- char **elts = NULL;
- char *elt;
- int i = 0, j;
-- apr_status_t status;
-
-+ *ff = NULL;
-+
- if (params) {
- if (APR_SUCCESS != (status = apr_tokenize_to_argv(params, &elts, pool))) {
- return status;
-@@ -287,25 +364,45 @@
- engine = fields[0].value;
- }
-
-+ f = apr_pcalloc(pool, sizeof(apr_crypto_t));
- if (!f) {
- return APR_ENOMEM;
- }
-- *ff = f;
-- f->pool = pool;
-- f->provider = provider;
-- config = f->config = apr_pcalloc(pool, sizeof(apr_crypto_config_t));
-+ f->config = config = apr_pcalloc(pool, sizeof(apr_crypto_config_t));
- if (!config) {
- return APR_ENOMEM;
- }
-+ f->pool = pool;
-+ f->provider = provider;
-
-+ /* The default/builtin "openssl" engine is the same as NULL though with
-+ * openssl-3+ it's called something else, keep NULL for that name.
-+ */
-+ if (engine && strcasecmp(engine, "openssl") != 0) {
-+#if APR_USE_OPENSSL_ENGINE_API
-+ config->engine = ENGINE_by_id(engine);
-+ if (!config->engine) {
-+ return APR_ENOENGINE;
-+ }
-+ if (!ENGINE_init(config->engine)) {
-+ status = APR_EINITENGINE;
-+ goto cleanup;
-+ }
-+#else
-+ return APR_ENOTIMPL;
-+#endif
-+ }
-+
- f->result = apr_pcalloc(pool, sizeof(apu_err_t));
- if (!f->result) {
-- return APR_ENOMEM;
-+ status = APR_ENOMEM;
-+ goto cleanup;
- }
-
- f->types = apr_hash_make(pool);
- if (!f->types) {
-- return APR_ENOMEM;
-+ status = APR_ENOMEM;
-+ goto cleanup;
- }
- apr_hash_set(f->types, "3des192", APR_HASH_KEY_STRING, &(key_types[0]));
- apr_hash_set(f->types, "aes128", APR_HASH_KEY_STRING, &(key_types[1]));
-@@ -314,28 +411,20 @@
-
- f->modes = apr_hash_make(pool);
- if (!f->modes) {
-- return APR_ENOMEM;
-+ status = APR_ENOMEM;
-+ goto cleanup;
- }
- apr_hash_set(f->modes, "ecb", APR_HASH_KEY_STRING, &(key_modes[0]));
- apr_hash_set(f->modes, "cbc", APR_HASH_KEY_STRING, &(key_modes[1]));
-
-+ *ff = f;
- apr_pool_cleanup_register(pool, f, crypto_cleanup_helper,
-- apr_pool_cleanup_null);
--
-- if (engine) {
-- config->engine = ENGINE_by_id(engine);
-- if (!config->engine) {
-- return APR_ENOENGINE;
-- }
-- if (!ENGINE_init(config->engine)) {
-- ENGINE_free(config->engine);
-- config->engine = NULL;
-- return APR_EINITENGINE;
-- }
-- }
--
-+ apr_pool_cleanup_null);
- return APR_SUCCESS;
-
-+cleanup:
-+ crypto_cleanup(f);
-+ return status;
- }
-
- /**
-@@ -435,7 +524,7 @@
- return APR_ENOMEM;
- }
- apr_crypto_clear(p, key->key, key->keyLen);
--
-+
- return APR_SUCCESS;
- }
-
---- apr-1.6.3/test/testcrypto.c
-+++ apr-1.6.3/test/testcrypto.c
-@@ -483,6 +483,10 @@
-
- f1 = make(tc, pool, driver1);
- f2 = make(tc, pool, driver2);
-+ if (!f1 || !f2) {
-+ return;
-+ }
-+
- key1 = passphrase(tc, pool, driver1, f1, type, mode, doPad, description);
- key2 = passphrase(tc, pool, driver2, f2, type, mode, doPad, description);
-
-@@ -577,6 +581,10 @@
- driver = get_openssl_driver(tc, pool);
-
- f = make(tc, pool, driver);
-+ if (!f) {
-+ return;
-+ }
-+
- keysecret(tc, pool, driver, f, APR_KEY_AES_256, APR_MODE_CBC, 1, 32,
- "KEY_AES_256/MODE_CBC");
- apr_pool_destroy(pool);
-@@ -596,6 +604,10 @@
- driver = get_nss_driver(tc, pool);
-
- f = make(tc, pool, driver);
-+ if (!f) {
-+ return;
-+ }
-+
- keysecret(tc, pool, driver, f, APR_KEY_AES_256, APR_MODE_CBC, 1, 32,
- "KEY_AES_256/MODE_CBC");
- apr_pool_destroy(pool);
-@@ -615,6 +627,10 @@
- driver = get_commoncrypto_driver(tc, pool);
-
- f = make(tc, pool, driver);
-+ if (!f) {
-+ return;
-+ }
-+
- keysecret(tc, pool, driver, f, APR_KEY_AES_256, APR_MODE_CBC, 1, 32,
- "KEY_AES_256/MODE_CBC");
- apr_pool_destroy(pool);
-@@ -1166,6 +1182,10 @@
- if (driver) {
-
- f = make(tc, pool, driver);
-+ if (!f) {
-+ return;
-+ }
-+
- apr_crypto_get_block_key_types(&types, f);
-
- key_3des_192 = apr_hash_get(types, "3des192", APR_HASH_KEY_STRING);
-@@ -1209,6 +1229,10 @@
- if (driver) {
-
- f = make(tc, pool, driver);
-+ if (!f) {
-+ return;
-+ }
-+
- apr_crypto_get_block_key_types(&types, f);
-
- key_3des_192 = apr_hash_get(types, "3des192", APR_HASH_KEY_STRING);
-@@ -1252,6 +1276,10 @@
- if (driver) {
-
- f = make(tc, pool, driver);
-+ if (!f) {
-+ return;
-+ }
-+
- apr_crypto_get_block_key_types(&types, f);
-
- key_3des_192 = apr_hash_get(types, "3des192", APR_HASH_KEY_STRING);
-@@ -1293,6 +1321,10 @@
- if (driver) {
-
- f = make(tc, pool, driver);
-+ if (!f) {
-+ return;
-+ }
-+
- apr_crypto_get_block_key_modes(&modes, f);
-
- mode_ecb = apr_hash_get(modes, "ecb", APR_HASH_KEY_STRING);
-@@ -1326,6 +1358,10 @@
- if (driver) {
-
- f = make(tc, pool, driver);
-+ if (!f) {
-+ return;
-+ }
-+
- apr_crypto_get_block_key_modes(&modes, f);
-
- mode_ecb = apr_hash_get(modes, "ecb", APR_HASH_KEY_STRING);
-@@ -1359,6 +1395,10 @@
- if (driver) {
-
- f = make(tc, pool, driver);
-+ if (!f) {
-+ return;
-+ }
-+
- apr_crypto_get_block_key_modes(&modes, f);
-
- mode_ecb = apr_hash_get(modes, "ecb", APR_HASH_KEY_STRING);
diff --git a/apr-util-1.6.3-r1908585.patch b/apr-util-1.6.3-r1908585.patch
deleted file mode 100644
index e2abbbc..0000000
--- a/apr-util-1.6.3-r1908585.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# ./pullrev.sh 1908585
-http://svn.apache.org/viewvc?view=revision&revision=1908585
-
---- apr-util-1.6.3/test/testbuckets.c
-+++ apr-util-1.6.3/test/testbuckets.c
-@@ -100,12 +100,12 @@
- apr_size_t len = elen;
- char msg[200];
-
-- sprintf(msg, "%s: flatten brigade", ctx);
-+ apr_snprintf(msg, sizeof msg, "%s: flatten brigade", ctx);
- apr_assert_success(tc, msg, apr_brigade_flatten(bb, buf, &len));
-- sprintf(msg, "%s: length match (%ld not %ld)", ctx,
-- (long)len, (long)elen);
-+ apr_snprintf(msg, sizeof msg, "%s: length match (%ld not %ld)", ctx,
-+ (long)len, (long)elen);
- ABTS_ASSERT(tc, msg, len == elen);
-- sprintf(msg, "%s: result match", msg);
-+ apr_snprintf(msg, sizeof msg, "%s: result match", ctx);
- ABTS_STR_NEQUAL(tc, expect, buf, len);
- free(buf);
- }
diff --git a/apr-util-1.6.3-r1908586.patch b/apr-util-1.6.3-r1908586.patch
deleted file mode 100644
index d7dcfbf..0000000
--- a/apr-util-1.6.3-r1908586.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-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;
diff --git a/apr-util-configure-c99.patch b/apr-util-configure-c99.patch
deleted file mode 100644
index 4e387be..0000000
--- a/apr-util-configure-c99.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Add a missing implied int in the Berkeley DB configure probe. This
-avoids build failures with future Fedora toolchain defaults.
-
-Submitted upstream: <https://bz.apache.org/bugzilla/show_bug.cgi?id=66396>
-
-diff --git a/build/dbm.m4 b/build/dbm.m4
-index 57bd131fc3b74099..ffdbdbc0f43e04da 100644
---- a/build/dbm.m4
-+++ b/build/dbm.m4
-@@ -235,7 +235,7 @@ AC_DEFUN([APU_TRY_BERKELEY_DB],
- #include <stdlib.h>
- #include <stdio.h>
- #include <$apu_try_berkeley_db_header>
--main ()
-+int main ()
- {
- int major, minor, patch;
-
diff --git a/apr-util.spec b/apr-util.spec
index 5ba8db6..a78c3ca 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -36,8 +36,8 @@
Summary: Apache Portable Runtime Utility library
Name: apr-util
-Version: 1.6.3
-Release: 29%{?dist}
+Version: 1.6.5
+Release: 1%{?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
@@ -50,14 +50,9 @@ URL: https://apr.apache.org/
Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
Patch1: apr-util-1.2.7-pkgconf.patch
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
-Patch7: apr-util-1.6.3-r1908584.patch
-Patch8: apr-util-1.6.3-r1908585.patch
-Patch9: apr-util-1.6.3-drop-engine-headers.patch
-Patch10: apr-util-1.6.3-r1928729.patch
+Patch3: apr-util-1.6.3-lmdb-support.patch
+Patch4: apr-util-1.6.3-drop-engine-headers.patch
+Patch5: apr-util-1.6.3-r1928729.patch
BuildRequires: gcc
BuildRequires: autoconf, apr-devel >= 1.3.0
BuildRequires: %{dbdep}, expat-devel, libuuid-devel
@@ -285,6 +280,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}/apr-util-%{apuver}
%{_datadir}/aclocal/*.m4
%changelog
+* Mon Aug 10 2026 Luboš Uhliarik <luhliari@redhat.com> - 1.6.5-1
+- new version 1.6.5
+
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index 8244037..832afa6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apr-util-1.6.3.tar.bz2) = 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe
+SHA512 (apr-util-1.6.5.tar.bz2) = 98ac53dd0c7d9d43a9afcc04443a237dee56b166e154435f231c461c40a23f1b67e63efd3eeb8737b7e5ebc4b620a5a9d9255b9a7bba644007506901bb4231b8
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-10 12:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-10 12:39 [rpms/apr-util] rawhide: new version 1.6.5
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox