[apr-util] 03/06: move to 1.6.0
Stefan Fritsch
sf at moszumanska.debian.org
Fri Aug 4 19:46:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
sf pushed a commit to branch master
in repository apr-util.
commit 8f64355a842c8d423024a9767974cec30e4e5b2a
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Fri Aug 4 20:49:29 2017 +0200
move to 1.6.0
* add changelog
* refresh patches
* remove obsolete patches:
disable_expat_buildconf.patch
openssl-1.1.patch
---
debian/changelog | 6 +
debian/patches/avoid_db_by-default.patch | 8 +-
debian/patches/avoid_ldap_by_defaut.patch | 12 +-
debian/patches/configure_in_remove_syspaths.patch | 8 +-
debian/patches/disable_expat_buildconf.patch | 27 ---
debian/patches/openssl-1.1.patch | 250 ----------------------
debian/patches/series | 2 -
debian/patches/support_mariadb.patch | 10 +-
8 files changed, 22 insertions(+), 301 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1002bb6..701330b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apr-util (1.6.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Stefan Fritsch <sf at debian.org> Fri, 04 Aug 2017 20:38:08 +0200
+
apr-util (1.5.4-3) unstable; urgency=medium
[ Helmut Grohne ]
diff --git a/debian/patches/avoid_db_by-default.patch b/debian/patches/avoid_db_by-default.patch
index e29d8fe..712935c 100644
--- a/debian/patches/avoid_db_by-default.patch
+++ b/debian/patches/avoid_db_by-default.patch
@@ -1,11 +1,9 @@
From: Stefan Fritsch <sf at debian.org>
Subject: Make apu-config not output dbm libs by default. See #622081
-Index: apr-util/apu-config.in
-===================================================================
--- apr-util.orig/apu-config.in
+++ apr-util/apu-config.in
-@@ -32,7 +32,8 @@
+@@ -32,7 +32,8 @@ INCLUDES="@APRUTIL_INCLUDES@"
LDFLAGS="@APRUTIL_LDFLAGS@"
ORIG_LDAP_LIBS="@LDADD_ldap@"
LDAP_LIBS=""
@@ -15,7 +13,7 @@ Index: apr-util/apu-config.in
APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
-@@ -58,8 +59,8 @@
+@@ -58,8 +59,8 @@ Known values for OPTION are:
--libs print library information
--avoid-ldap do not include ldap library information with --libs (default on Debian)
--ldap-libs print library information to link with ldap
@@ -26,7 +24,7 @@ Index: apr-util/apu-config.in
--srcdir print APR-util source directory
--link-ld print link switch(es) for linking to APR-util
--link-libtool print the libtool inputs for linking to APR-util
-@@ -129,7 +130,7 @@
+@@ -125,7 +126,7 @@ while test $# -gt 0; do
flags="$flags $ORIG_LDAP_LIBS"
;;
--dbm-libs)
diff --git a/debian/patches/avoid_ldap_by_defaut.patch b/debian/patches/avoid_ldap_by_defaut.patch
index 2d25e4d..d3377d9 100644
--- a/debian/patches/avoid_ldap_by_defaut.patch
+++ b/debian/patches/avoid_ldap_by_defaut.patch
@@ -2,11 +2,9 @@ From: Ryan Niebur <ryanryan52 at gmail.com>
Subject: by default --avoid-ldap since apache2 is the only user, and we don't
want to add extra dependencies to other apr-utils rdepends
-Index: trunk/apu-config.in
-===================================================================
---- trunk.orig/apu-config.in
-+++ trunk/apu-config.in
-@@ -30,7 +30,8 @@
+--- apr-util.orig/apu-config.in
++++ apr-util/apu-config.in
+@@ -30,7 +30,8 @@ includedir="@includedir@"
LIBS="@APRUTIL_EXPORT_LIBS@"
INCLUDES="@APRUTIL_INCLUDES@"
LDFLAGS="@APRUTIL_LDFLAGS@"
@@ -16,7 +14,7 @@ Index: trunk/apu-config.in
DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
-@@ -55,7 +56,7 @@
+@@ -55,7 +56,7 @@ Known values for OPTION are:
--includedir print location where headers are installed
--ldflags print linker flags
--libs print library information
@@ -25,7 +23,7 @@ Index: trunk/apu-config.in
--ldap-libs print library information to link with ldap
--avoid-dbm do not include DBM library information with --libs
--dbm-libs print additional library information to link with DBM
-@@ -125,7 +126,7 @@
+@@ -121,7 +122,7 @@ while test $# -gt 0; do
flags="$flags $LDAP_LIBS $DBM_LIBS $LIBS"
;;
--ldap-libs)
diff --git a/debian/patches/configure_in_remove_syspaths.patch b/debian/patches/configure_in_remove_syspaths.patch
index f67f4da..92293fd 100644
--- a/debian/patches/configure_in_remove_syspaths.patch
+++ b/debian/patches/configure_in_remove_syspaths.patch
@@ -6,11 +6,9 @@ Subject: Adjust LDFLAGS and INCLUDE
configure.in | 3 +++
1 file changed, 3 insertions(+)
-Index: trunk/configure.in
-===================================================================
---- trunk.orig/configure.in
-+++ trunk/configure.in
-@@ -213,6 +213,9 @@
+--- apr-util.orig/configure.in
++++ apr-util/configure.in
+@@ -270,6 +270,9 @@ dnl Prep all the flags and stuff for com
dnl
APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
diff --git a/debian/patches/disable_expat_buildconf.patch b/debian/patches/disable_expat_buildconf.patch
deleted file mode 100644
index 5b527cf..0000000
--- a/debian/patches/disable_expat_buildconf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Stefan Fritsch <sf at debian.org>
-Subject: We don't need the bundled expat. This allows us to avoid a build-dep
- on libtool.
-
----
- buildconf | 8 --------
- 1 file changed, 8 deletions(-)
-
-Index: trunk/buildconf
-===================================================================
---- trunk.orig/buildconf
-+++ trunk/buildconf
-@@ -89,14 +89,6 @@
- echo "Generating 'make' outputs ..."
- $apr_src_dir/build/gen-build.py $verbose make
-
--#
--# If Expat has been bundled, then go and configure the thing
--#
--if [ -f xml/expat/buildconf.sh ]; then
-- echo "Invoking xml/expat/buildconf.sh ..."
-- (cd xml/expat; ./buildconf.sh $verbose)
--fi
--
- # Remove autoconf cache again
- rm -rf autom4te*.cache
-
diff --git a/debian/patches/openssl-1.1.patch b/debian/patches/openssl-1.1.patch
deleted file mode 100644
index 090eb02..0000000
--- a/debian/patches/openssl-1.1.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-# commit f163d8b5af9185de80d24b4dd13951dd64872aa6
-# Author: Rainer Jung <rjung at apache.org>
-# Date: Sun Feb 7 14:40:46 2016 +0000
-#
-# Add support for OpenSSL 1.1.0:
-# - Switch configure test for OpenSSL libcrypto
-# from BN_init() to BN_new().
-# - BN_init() is gone in OpenSSL 1.1.0.
-# BN_new() exists at least since 0.9.8.
-# - use OPENSSL_malloc_init() instead of
-# CRYPTO_malloc_init
-# - make cipherCtx a pointer. Type EVP_CIPHER_CTX
-# is now opaque.
-# - use EVP_CIPHER_CTX_new() in init() functions
-# if initialised flag is not set (and set flag)
-# - use EVP_CIPHER_CTX_free() in cleanup function
-# - Improve reuse cleanup
-# - call EVP_CIPHER_CTX_reset() resp.
-# EVP_CIPHER_CTX_cleanup() in finish functions
-# - call EVP_CIPHER_CTX_reset() resp.
-# EVP_CIPHER_CTX_cleanup() when Update fails
-# Backport of r1728958 and r1728963 from trunk.
-#
-#
-# git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1728969 13f79535-47bb-0310-9956-ffa450edef68
-#
-diff --git a/build/crypto.m4 b/build/crypto.m4
-index 9f9be6f..57884e3 100644
---- a/build/crypto.m4
-+++ b/build/crypto.m4
-@@ -88,7 +88,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
- [
- if test "$withval" = "yes"; then
- AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
-- AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
-+ AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
- if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
- apu_have_openssl=1
- fi
-@@ -104,7 +104,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
-
- AC_MSG_NOTICE(checking for openssl in $withval)
- AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
-- AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
-+ AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
- if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
- apu_have_openssl=1
- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-@@ -113,7 +113,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
-
- if test "$apu_have_openssl" != "1"; then
- AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
-- AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
-+ AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
- if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
- apu_have_openssl=1
- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-diff --git a/crypto/apr_crypto_openssl.c b/crypto/apr_crypto_openssl.c
-index 0740f93..7d61fca 100644
---- a/crypto/apr_crypto_openssl.c
-+++ b/crypto/apr_crypto_openssl.c
-@@ -64,7 +64,7 @@ struct apr_crypto_block_t {
- apr_pool_t *pool;
- const apr_crypto_driver_t *provider;
- const apr_crypto_t *f;
-- EVP_CIPHER_CTX cipherCtx;
-+ EVP_CIPHER_CTX *cipherCtx;
- int initialised;
- int ivSize;
- int blockSize;
-@@ -111,7 +111,11 @@ static apr_status_t crypto_shutdown_helper(void *data)
- static apr_status_t crypto_init(apr_pool_t *pool, const char *params,
- const apu_err_t **result)
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- CRYPTO_malloc_init();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- /* SSL_load_error_strings(); */
- OpenSSL_add_all_algorithms();
-@@ -134,7 +138,7 @@ static apr_status_t crypto_block_cleanup(apr_crypto_block_t *ctx)
- {
-
- if (ctx->initialised) {
-- EVP_CIPHER_CTX_cleanup(&ctx->cipherCtx);
-+ EVP_CIPHER_CTX_free(ctx->cipherCtx);
- ctx->initialised = 0;
- }
-
-@@ -491,8 +495,10 @@ static apr_status_t crypto_block_encrypt_init(apr_crypto_block_t **ctx,
- apr_pool_cleanup_null);
-
- /* create a new context for encryption */
-- EVP_CIPHER_CTX_init(&block->cipherCtx);
-- block->initialised = 1;
-+ if (!block->initialised) {
-+ block->cipherCtx = EVP_CIPHER_CTX_new();
-+ block->initialised = 1;
-+ }
-
- /* generate an IV, if necessary */
- usedIv = NULL;
-@@ -519,16 +525,16 @@ static apr_status_t crypto_block_encrypt_init(apr_crypto_block_t **ctx,
-
- /* set up our encryption context */
- #if CRYPTO_OPENSSL_CONST_BUFFERS
-- if (!EVP_EncryptInit_ex(&block->cipherCtx, key->cipher, config->engine,
-+ if (!EVP_EncryptInit_ex(block->cipherCtx, key->cipher, config->engine,
- key->key, usedIv)) {
- #else
-- if (!EVP_EncryptInit_ex(&block->cipherCtx, key->cipher, config->engine, (unsigned char *) key->key, (unsigned char *) usedIv)) {
-+ if (!EVP_EncryptInit_ex(block->cipherCtx, key->cipher, config->engine, (unsigned char *) key->key, (unsigned char *) usedIv)) {
- #endif
- return APR_EINIT;
- }
-
- /* Clear up any read padding */
-- if (!EVP_CIPHER_CTX_set_padding(&block->cipherCtx, key->doPad)) {
-+ if (!EVP_CIPHER_CTX_set_padding(block->cipherCtx, key->doPad)) {
- return APR_EPADDING;
- }
-
-@@ -582,11 +588,16 @@ static apr_status_t crypto_block_encrypt(unsigned char **out,
- }
-
- #if CRYPT_OPENSSL_CONST_BUFFERS
-- if (!EVP_EncryptUpdate(&ctx->cipherCtx, (*out), &outl, in, inlen)) {
-+ if (!EVP_EncryptUpdate(ctx->cipherCtx, (*out), &outl, in, inlen)) {
- #else
-- if (!EVP_EncryptUpdate(&ctx->cipherCtx, (*out), &outl,
-+ if (!EVP_EncryptUpdate(ctx->cipherCtx, (*out), &outl,
- (unsigned char *) in, inlen)) {
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
-+#else
-+ EVP_CIPHER_CTX_reset(ctx->cipherCtx);
-+#endif
- return APR_ECRYPT;
- }
- *outlen = outl;
-@@ -616,14 +627,22 @@ static apr_status_t crypto_block_encrypt(unsigned char **out,
- static apr_status_t crypto_block_encrypt_finish(unsigned char *out,
- apr_size_t *outlen, apr_crypto_block_t *ctx)
- {
-+ apr_status_t rc = APR_SUCCESS;
- int len = *outlen;
-
-- if (EVP_EncryptFinal_ex(&ctx->cipherCtx, out, &len) == 0) {
-- return APR_EPADDING;
-+ if (EVP_EncryptFinal_ex(ctx->cipherCtx, out, &len) == 0) {
-+ rc = APR_EPADDING;
-+ }
-+ else {
-+ *outlen = len;
- }
-- *outlen = len;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
-+#else
-+ EVP_CIPHER_CTX_reset(ctx->cipherCtx);
-+#endif
-
-- return APR_SUCCESS;
-+ return rc;
-
- }
-
-@@ -662,8 +681,10 @@ static apr_status_t crypto_block_decrypt_init(apr_crypto_block_t **ctx,
- apr_pool_cleanup_null);
-
- /* create a new context for encryption */
-- EVP_CIPHER_CTX_init(&block->cipherCtx);
-- block->initialised = 1;
-+ if (!block->initialised) {
-+ block->cipherCtx = EVP_CIPHER_CTX_new();
-+ block->initialised = 1;
-+ }
-
- /* generate an IV, if necessary */
- if (key->ivSize) {
-@@ -674,16 +695,16 @@ static apr_status_t crypto_block_decrypt_init(apr_crypto_block_t **ctx,
-
- /* set up our encryption context */
- #if CRYPTO_OPENSSL_CONST_BUFFERS
-- if (!EVP_DecryptInit_ex(&block->cipherCtx, key->cipher, config->engine,
-+ if (!EVP_DecryptInit_ex(block->cipherCtx, key->cipher, config->engine,
- key->key, iv)) {
- #else
-- if (!EVP_DecryptInit_ex(&block->cipherCtx, key->cipher, config->engine, (unsigned char *) key->key, (unsigned char *) iv)) {
-+ if (!EVP_DecryptInit_ex(block->cipherCtx, key->cipher, config->engine, (unsigned char *) key->key, (unsigned char *) iv)) {
- #endif
- return APR_EINIT;
- }
-
- /* Clear up any read padding */
-- if (!EVP_CIPHER_CTX_set_padding(&block->cipherCtx, key->doPad)) {
-+ if (!EVP_CIPHER_CTX_set_padding(block->cipherCtx, key->doPad)) {
- return APR_EPADDING;
- }
-
-@@ -737,11 +758,16 @@ static apr_status_t crypto_block_decrypt(unsigned char **out,
- }
-
- #if CRYPT_OPENSSL_CONST_BUFFERS
-- if (!EVP_DecryptUpdate(&ctx->cipherCtx, *out, &outl, in, inlen)) {
-+ if (!EVP_DecryptUpdate(ctx->cipherCtx, *out, &outl, in, inlen)) {
- #else
-- if (!EVP_DecryptUpdate(&ctx->cipherCtx, *out, &outl, (unsigned char *) in,
-+ if (!EVP_DecryptUpdate(ctx->cipherCtx, *out, &outl, (unsigned char *) in,
- inlen)) {
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
-+#else
-+ EVP_CIPHER_CTX_reset(ctx->cipherCtx);
-+#endif
- return APR_ECRYPT;
- }
- *outlen = outl;
-@@ -771,15 +797,22 @@ static apr_status_t crypto_block_decrypt(unsigned char **out,
- static apr_status_t crypto_block_decrypt_finish(unsigned char *out,
- apr_size_t *outlen, apr_crypto_block_t *ctx)
- {
--
-+ apr_status_t rc = APR_SUCCESS;
- int len = *outlen;
-
-- if (EVP_DecryptFinal_ex(&ctx->cipherCtx, out, &len) == 0) {
-- return APR_EPADDING;
-+ if (EVP_DecryptFinal_ex(ctx->cipherCtx, out, &len) == 0) {
-+ rc = APR_EPADDING;
- }
-- *outlen = len;
-+ else {
-+ *outlen = len;
-+ }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
-+#else
-+ EVP_CIPHER_CTX_reset(ctx->cipherCtx);
-+#endif
-
-- return APR_SUCCESS;
-+ return rc;
-
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index ea88bc1..9d63290 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,9 +5,7 @@ debian_layout_fix.patch
dont_use_all_pg_build_deps.patch
avoid_ldap_by_defaut.patch
apu_config_dont_list_indep_libs.patch
-disable_expat_buildconf.patch
avoid_db_by-default.patch
test_verbose
fix_doxygen_inputdir
support_mariadb.patch
-openssl-1.1.patch
diff --git a/debian/patches/support_mariadb.patch b/debian/patches/support_mariadb.patch
index ab1bb61..6a084d9 100644
--- a/debian/patches/support_mariadb.patch
+++ b/debian/patches/support_mariadb.patch
@@ -9,13 +9,13 @@
+ [apu_have_mysql=1], [apu_have_mysql=0])
+ if test "$apu_have_mysql" = "0"; then
AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
- AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+ AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
[apu_have_mysql=0; break],
[#include <my_global.h>])
+ fi
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_r, mysql_init, [apu_have_mysql=1]),
+ AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
@@ -207,11 +212,16 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
APR_ADDTO(LIBS, [$mysql_LIBS])
@@ -25,19 +25,19 @@
+ [apu_have_mysql=1], [apu_have_mysql=0])
+ if test "$apu_have_mysql" != "1"; then
AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
- AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+ AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
[apu_have_mysql=0; break],
[#include <my_global.h>])
+ fi
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_r, mysql_init, [apu_have_mysql=1]),
+ AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
@@ -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_r $mysql_LIBS])
+- APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient $mysql_LIBS])
+ APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS $mysql_LIBS])
fi
AC_SUBST(LDADD_dbd_mysql)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr-util.git
More information about the Pkg-apache-commits
mailing list