[Pkg-apache-commits] r1122 - in /trunk/apr: changelog patches/00list patches/023_fix_doxygen.dpatch patches/027_no_new_syscalls.dpatch rules symbols.common
sf at alioth.debian.org
sf at alioth.debian.org
Thu Jan 28 06:25:34 UTC 2010
Author: sf
Date: Thu Jan 28 06:25:32 2010
New Revision: 1122
URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1122
Log:
new upstream version
Removed:
trunk/apr/patches/027_no_new_syscalls.dpatch
Modified:
trunk/apr/changelog
trunk/apr/patches/00list
trunk/apr/patches/023_fix_doxygen.dpatch
trunk/apr/rules
trunk/apr/symbols.common
Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=1122&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Thu Jan 28 06:25:32 2010
@@ -1,5 +1,9 @@
-apr (1.3.8-2) UNRELEASED; urgency=low
-
+apr (1.4.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Enable use of O_CLOEXEC. This raises the minimum required kernel version
+ to 2.6.23. Disable the other new APIs (which would require 2.6.27 or
+ 2.6.28) by using configure flags instead of patching the source.
* Apply patch from Nobuhiro Iwamatsu to disable some pthread
functionality on SH4. (Closes: #549153)
Modified: trunk/apr/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/00list?rev=1122&op=diff
==============================================================================
--- trunk/apr/patches/00list (original)
+++ trunk/apr/patches/00list Thu Jan 28 06:25:32 2010
@@ -7,4 +7,3 @@
023_fix_doxygen.dpatch
025_GNU_SOURCE_earlier.dpatch
026_omit_extra_libs.dpatch
-027_no_new_syscalls.dpatch
Modified: trunk/apr/patches/023_fix_doxygen.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/023_fix_doxygen.dpatch?rev=1122&op=diff
==============================================================================
--- trunk/apr/patches/023_fix_doxygen.dpatch (original)
+++ trunk/apr/patches/023_fix_doxygen.dpatch Thu Jan 28 06:25:32 2010
@@ -68,27 +68,3 @@
*/
#define APR_DECLARE_DATA
-diff -urNad apr~/include/apr_hash.h apr/include/apr_hash.h
---- apr~/include/apr_hash.h 2006-09-12 07:09:28.000000000 -0700
-+++ apr/include/apr_hash.h 2008-06-27 20:12:50.000000000 -0700
-@@ -128,10 +128,7 @@
- * progress at the same time.
- */
- /**
-- * @example
-- *
-- * <PRE>
-- *
-+ * @code
- * int sum_values(apr_pool_t *p, apr_hash_t *ht)
- * {
- * apr_hash_index_t *hi;
-@@ -143,7 +140,7 @@
- * }
- * return sum;
- * }
-- * </PRE>
-+ * @endcode
- */
- APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_pool_t *p, apr_hash_t *ht);
-
Modified: trunk/apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/rules?rev=1122&op=diff
==============================================================================
--- trunk/apr/rules (original)
+++ trunk/apr/rules Thu Jan 28 06:25:32 2010
@@ -21,7 +21,14 @@
H_CFLAGS := -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
H_LDFLAGS := -Wl,-z,relro
-CONFFLAGS += ac_cv_prog_AWK=mawk apr_cv_sctp=no
+# API to min kernel map:
+# 2.6.27: dup3, SOCK_CLOEXEC, epoll_create1
+# 2.6.28: accept4
+CONFFLAGS += ac_cv_prog_AWK=mawk apr_cv_sctp=no \
+ apr_cv_sock_cloexec=no \
+ apr_cv_epoll_create1=no \
+ apr_cv_dup3=no \
+ apr_cv_accept4=no
# SH4 cannot use proc_pthread.
ifneq (,$(findstring sh4,$(DEB_BUILD_ARCH)))
Modified: trunk/apr/symbols.common
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/symbols.common?rev=1122&op=diff
==============================================================================
--- trunk/apr/symbols.common (original)
+++ trunk/apr/symbols.common Thu Jan 28 06:25:32 2010
@@ -75,6 +75,7 @@
apr_file_copy at Base 1.2.7
apr_file_data_get at Base 1.2.7
apr_file_data_set at Base 1.2.7
+ apr_file_datasync at Base 1.4.2
apr_file_dup2 at Base 1.2.7
apr_file_dup at Base 1.2.7
apr_file_eof at Base 1.2.7
@@ -87,6 +88,7 @@
apr_file_info_get_locked at Base 1.2.11
apr_file_inherit_set at Base 1.2.7
apr_file_inherit_unset at Base 1.2.7
+ apr_file_link at Base 1.4.2
apr_file_lock at Base 1.2.7
apr_file_mktemp at Base 1.2.7
apr_file_mtime_set at Base 1.2.7
@@ -114,6 +116,7 @@
apr_file_rename at Base 1.2.7
apr_file_seek at Base 1.2.7
apr_file_setaside at Base 1.2.7
+ apr_file_sync at Base 1.4.2
apr_file_trunc at Base 1.2.7
apr_file_ungetc at Base 1.2.7
apr_file_unlock at Base 1.2.7
@@ -146,12 +149,15 @@
apr_global_mutex_create at Base 1.2.7
apr_global_mutex_destroy at Base 1.2.7
apr_global_mutex_lock at Base 1.2.7
+ apr_global_mutex_lockfile at Base 1.4.2
+ apr_global_mutex_name at Base 1.4.2
apr_global_mutex_pool_get at Base 1.2.7
apr_global_mutex_trylock at Base 1.2.7
apr_global_mutex_unlock at Base 1.2.7
apr_hash_clear at Base 1.3.2
apr_hash_copy at Base 1.2.7
apr_hash_count at Base 1.2.7
+ apr_hash_do at Base 1.4.2
apr_hash_first at Base 1.2.7
apr_hash_get at Base 1.2.7
apr_hash_make at Base 1.2.7
@@ -221,15 +227,26 @@
apr_pcalloc_debug at Base 1.2.7
apr_pmemdup at Base 1.2.7
apr_poll at Base 1.2.7
+ apr_poll_method_defname at Base 1.4.2
apr_pollcb_add at Base 1.3.2
apr_pollcb_create at Base 1.3.2
+ apr_pollcb_create_ex at Base 1.4.2
apr_pollcb_poll at Base 1.3.2
+ apr_pollcb_provider_epoll at Base 1.4.2
+ apr_pollcb_provider_poll at Base 1.4.2
apr_pollcb_remove at Base 1.3.2
apr_pollset_add at Base 1.2.7
apr_pollset_create at Base 1.2.7
+ apr_pollset_create_ex at Base 1.4.2
apr_pollset_destroy at Base 1.2.7
+ apr_pollset_drain_wakeup_pipe at Base 1.4.2
+ apr_pollset_method_name at Base 1.4.2
apr_pollset_poll at Base 1.2.7
+ apr_pollset_provider_epoll at Base 1.4.2
+ apr_pollset_provider_poll at Base 1.4.2
+ apr_pollset_provider_select at Base 1.4.2
apr_pollset_remove at Base 1.2.7
+ apr_pollset_wakeup at Base 1.4.2
apr_pool_abort_get at Base 1.2.7
apr_pool_abort_set at Base 1.2.7
apr_pool_allocator_get at Base 1.2.7
@@ -338,6 +355,7 @@
apr_socket_accept at Base 1.2.7
apr_socket_addr_get at Base 1.2.7
apr_socket_atmark at Base 1.2.7
+ apr_socket_atreadeof at Base 1.4.2
apr_socket_bind at Base 1.2.7
apr_socket_close at Base 1.2.7
apr_socket_connect at Base 1.2.7
More information about the Pkg-apache-commits
mailing list