sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- update apr to 1.5.2

Browse source 
Changes for APR 1.5.2
  *) apr_escape: Correctly calculate the size of the returned string in
     apr_escape_path and set the correct return value in case we actually
     escape the string. [<aduryagin gmail.com>] PR 57230.

  *) apr_poll(cb): fix error paths returned values and leaks.  [Yann Ylavic]

  *) apr_skiplist: Optimize the number of allocations by reusing pooled or
     malloc()ed nodes for the lifetime of the skiplist.  [Yann Ylavic]

  *) apr_skiplist: Fix possible multiple-free() on the same value in
     apr_skiplist_remove_all().  [Yann Ylavic]

  *) apr_global_mutex/apr_proc_mutex: Resolve failures with the
     POSIX sem implementation in environments which receive signals.
     [Jeff Trawick]

  *) apr_skiplist: Fix potential corruption of skiplists leading to
     results or crashes. [Takashi Sato <takashi tks st>, Eric Covener]
     PR 56654.
This commit is contained in:
Olli Hauer 2015-05-29 05:13:46 +00:00
parent 3726084121
commit ac6aa1ef53
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=387784
4 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
devel/apr1/Makefile
View file

@ -19,7 +19,7 @@ USES= iconv pathfix libtool cpe
USE_LDCONFIG= yes USE_LDCONFIG= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
APR_VERSION= 1.5.1 APR_VERSION= 1.5.2
APU_VERSION= 1.5.4 APU_VERSION= 1.5.4
CPE_VENDOR= apache CPE_VENDOR= apache
@ -213,4 +213,9 @@ test: build
#regression-test: test #regression-test: test
rpfl: configure
# maintainer only: strip PID from logs (better compair)
${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APR_WRKDIR}/config.log
${SED} -i '' -E 's|^configure:[0-9]+:|configure:_pid_:|g' ${APU_WRKDIR}/config.log
.include <bsd.port.mk> .include <bsd.port.mk>

4
devel/apr1/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (apr-1.5.1.tar.gz) = 94b1c9d9835cc9e902838b95d62ecc9a39b698f23e3e706812ec65a78ba41af7 SHA256 (apr-1.5.2.tar.gz) = 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
SIZE (apr-1.5.1.tar.gz) = 1020833 SIZE (apr-1.5.2.tar.gz) = 1031613
SHA256 (apr-util-1.5.4.tar.gz) = 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19 SHA256 (apr-util-1.5.4.tar.gz) = 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
SIZE (apr-util-1.5.4.tar.gz) = 874044 SIZE (apr-util-1.5.4.tar.gz) = 874044

36
devel/apr1/files/patch-apr-util__dbd__apr_dbd_freetds.c
View file

@ -20,7 +20,7 @@
/* This probably needs to change for different applications */ /* This probably needs to change for different applications */
#define MAX_COL_LEN 256 #define MAX_COL_LEN 256
@@ -67,6 +67,7 @@ @@ -67,6 +67,7 @@ struct apr_dbd_t {
apr_dbd_transaction_t *trans; apr_dbd_transaction_t *trans;
apr_pool_t *pool; apr_pool_t *pool;
const char *params; const char *params;
@ -28,7 +28,7 @@
RETCODE err; RETCODE err;
}; };
@@ -80,20 +81,20 @@ @@ -80,20 +81,20 @@ struct apr_dbd_results_t {
struct apr_dbd_row_t { struct apr_dbd_row_t {
apr_dbd_results_t *res; apr_dbd_results_t *res;
@ -56,7 +56,7 @@
/* execute a query that doesn't return a result set, mop up, /* execute a query that doesn't return a result set, mop up,
* and return and APR-flavoured status * and return and APR-flavoured status
@@ -102,7 +103,11 @@ @@ -102,7 +103,11 @@ static RETCODE freetds_exec(DBPROCESS *p
int want_results, int *nrows) int want_results, int *nrows)
{ {
/* TBD */ /* TBD */
@ -69,7 +69,7 @@
if (rv != SUCCEED) { if (rv != SUCCEED) {
return rv; return rv;
} }
@@ -143,6 +148,7 @@ @@ -143,6 +148,7 @@ static int dbd_freetds_select(apr_pool_t
* Ignore seek * Ignore seek
*/ */
@ -77,7 +77,7 @@
sql->err = freetds_exec(sql->proc, query, 1, NULL); sql->err = freetds_exec(sql->proc, query, 1, NULL);
if (!dbd_freetds_is_success(sql->err)) { if (!dbd_freetds_is_success(sql->err)) {
if (sql->trans) { if (sql->trans) {
@@ -190,51 +196,38 @@ @@ -190,51 +196,38 @@ static int dbd_freetds_select(apr_pool_t
#endif #endif
return (sql->err == SUCCEED) ? 0 : 1; return (sql->err == SUCCEED) ? 0 : 1;
} }
@ -151,7 +151,7 @@
} }
strcpy(p_out, p_in); strcpy(p_out, p_in);
return ret; return ret;
@@ -244,8 +237,7 @@ @@ -244,8 +237,7 @@ static int dbd_freetds_pselect(apr_pool_
apr_dbd_prepared_t *statement, apr_dbd_prepared_t *statement,
int seek, const char **values) int seek, const char **values)
{ {
@ -161,7 +161,7 @@
return dbd_freetds_select(pool, sql, results, query, seek); return dbd_freetds_select(pool, sql, results, query, seek);
} }
static int dbd_freetds_pvselect(apr_pool_t *pool, apr_dbd_t *sql, static int dbd_freetds_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
@@ -273,8 +265,7 @@ @@ -273,8 +265,7 @@ static int dbd_freetds_pquery(apr_pool_t
int *nrows, apr_dbd_prepared_t *statement, int *nrows, apr_dbd_prepared_t *statement,
const char **values) const char **values)
{ {
@ -171,7 +171,7 @@
return dbd_freetds_query(sql, nrows, query); return dbd_freetds_query(sql, nrows, query);
} }
static int dbd_freetds_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows, static int dbd_freetds_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
@@ -301,11 +292,13 @@ @@ -301,11 +292,13 @@ static int dbd_freetds_get_row(apr_pool_
RETCODE rv = 0; RETCODE rv = 0;
apr_dbd_row_t *row = *rowp; apr_dbd_row_t *row = *rowp;
int sequential = ((rownum >= 0) && res->random) ? 0 : 1; int sequential = ((rownum >= 0) && res->random) ? 0 : 1;
@ -185,7 +185,7 @@
} }
/* /*
else { else {
@@ -321,18 +314,37 @@ @@ -321,18 +314,37 @@ static int dbd_freetds_get_row(apr_pool_
rv = dbnextrow(res->proc); rv = dbnextrow(res->proc);
} }
else { else {
@ -226,7 +226,7 @@
} }
return 0; return 0;
@@ -340,24 +352,27 @@ @@ -340,24 +352,27 @@ static int dbd_freetds_get_row(apr_pool_
static const char *dbd_freetds_get_entry(const apr_dbd_row_t *row, int n) static const char *dbd_freetds_get_entry(const apr_dbd_row_t *row, int n)
{ {
@ -263,7 +263,7 @@
return apr_psprintf(sql->pool, "Error %d", sql->err); return apr_psprintf(sql->pool, "Error %d", sql->err);
} }
@@ -367,6 +382,7 @@ @@ -367,6 +382,7 @@ static int dbd_freetds_query(apr_dbd_t *
return sql->trans->errnum; return sql->trans->errnum;
} }
*nrows = 0; *nrows = 0;
@ -271,7 +271,7 @@
sql->err = freetds_exec(sql->proc, query, 0, nrows); sql->err = freetds_exec(sql->proc, query, 0, nrows);
if (sql->err != SUCCEED) { if (sql->err != SUCCEED) {
@@ -384,114 +400,39 @@ @@ -384,114 +400,39 @@ static const char *dbd_freetds_escape(ap
return arg; return arg;
} }
@ -406,7 +406,7 @@
} }
static int dbd_freetds_start_transaction(apr_pool_t *pool, apr_dbd_t *handle, static int dbd_freetds_start_transaction(apr_pool_t *pool, apr_dbd_t *handle,
@@ -541,9 +482,9 @@ @@ -541,9 +482,9 @@ static DBPROCESS *freetds_open(apr_pool_
DBPROCESS *process; DBPROCESS *process;
LOGINREC *login; LOGINREC *login;
static const char *delims = " \r\n\t;|,"; static const char *delims = " \r\n\t;|,";
@ -419,7 +419,7 @@
int vlen; int vlen;
int klen; int klen;
char *buf; char *buf;
@@ -564,7 +505,7 @@ @@ -564,7 +505,7 @@ static DBPROCESS *freetds_open(apr_pool_
} }
for (key = ptr-1; apr_isspace(*key); --key); for (key = ptr-1; apr_isspace(*key); --key);
klen = 0; klen = 0;
@ -428,7 +428,7 @@
--key; --key;
++klen; ++klen;
} }
@@ -631,6 +572,7 @@ @@ -631,6 +572,7 @@ static apr_dbd_t *dbd_freetds_open(apr_p
sql->pool = pool; sql->pool = pool;
sql->proc = process; sql->proc = process;
sql->params = params; sql->params = params;
@ -436,7 +436,7 @@
return sql; return sql;
} }
@@ -686,24 +628,73 @@ @@ -686,24 +628,73 @@ static int dbd_freetds_num_tuples(apr_db
static apr_status_t freetds_term(void *dummy) static apr_status_t freetds_term(void *dummy)
{ {
dbexit(); dbexit();
@ -519,7 +519,7 @@
dberrhandle(freetds_err_handler); dberrhandle(freetds_err_handler);
apr_pool_cleanup_register(pool, NULL, freetds_term, apr_pool_cleanup_null); apr_pool_cleanup_register(pool, NULL, freetds_term, apr_pool_cleanup_null);
} }
@@ -765,7 +756,11 @@ @@ -765,7 +756,11 @@ static apr_status_t dbd_freetds_datum_ge
#endif #endif
APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_freetds_driver = { APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_freetds_driver = {
@ -531,7 +531,7 @@
dbd_freetds_init, dbd_freetds_init,
dbd_freetds_native, dbd_freetds_native,
dbd_freetds_open, dbd_freetds_open,
@@ -787,19 +782,14 @@ @@ -787,19 +782,14 @@ APU_MODULE_DECLARE_DATA const apr_dbd_dr
dbd_freetds_pvselect, dbd_freetds_pvselect,
dbd_freetds_pquery, dbd_freetds_pquery,
dbd_freetds_pselect, dbd_freetds_pselect,

8
devel/apr1/files/patch-apr__configure
View file

@ -1,6 +1,6 @@
--- apr-1.5.1/configure.orig 2014-09-21 15:03:21 UTC --- apr-1.5.2/configure.orig 2015-04-25 12:04:18 UTC
+++ apr-1.5.1/configure +++ apr-1.5.2/configure
@@ -6624,11 +6624,7 @@ @@ -6624,11 +6624,7 @@ if test "x$apr_preload_done" != "xyes" ;
apr_lock_method="USE_FLOCK_SERIALIZE" apr_lock_method="USE_FLOCK_SERIALIZE"
fi fi
@ -13,7 +13,7 @@
# 502102 is when libc_r switched to libpthread (aka libkse). # 502102 is when libc_r switched to libpthread (aka libkse).
if test $os_version -ge "502102"; then if test $os_version -ge "502102"; then
apr_cv_pthreads_cflags="none" apr_cv_pthreads_cflags="none"
@@ -18814,11 +18810,7 @@ @@ -18841,11 +18837,7 @@ fi
# comparisons. # comparisons.
case $host in case $host in
*freebsd*) *freebsd*)