--- apr-1.4.4.orig/debian/libapr1.lintian-overrides
+++ apr-1.4.4/debian/libapr1.lintian-overrides
@@ -0,0 +1 @@
+libapr1: package-name-doesnt-match-sonames libapr-1-0
--- apr-1.4.4.orig/debian/libapr1.install
+++ apr-1.4.4/debian/libapr1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libapr-1.so.* usr/lib/
--- apr-1.4.4.orig/debian/symbols.common
+++ apr-1.4.4/debian/symbols.common
@@ -0,0 +1,473 @@
+libapr-1.so.0 libapr1 #MINVER#
+ apr__SHA256_Data@Base 1.2.7
+ apr__SHA256_End@Base 1.2.7
+ apr__SHA256_Final@Base 1.2.7
+ apr__SHA256_Init@Base 1.2.7
+ apr__SHA256_Transform@Base 1.2.7
+ apr__SHA256_Update@Base 1.2.7
+ apr__SHA384_Data@Base 1.2.7
+ apr__SHA384_End@Base 1.2.7
+ apr__SHA384_Final@Base 1.2.7
+ apr__SHA384_Init@Base 1.2.7
+ apr__SHA384_Update@Base 1.2.7
+ apr__SHA512_Data@Base 1.2.7
+ apr__SHA512_End@Base 1.2.7
+ apr__SHA512_Final@Base 1.2.7
+ apr__SHA512_Init@Base 1.2.7
+ apr__SHA512_Last@Base 1.2.7
+ apr__SHA512_Transform@Base 1.2.7
+ apr__SHA512_Update@Base 1.2.7
+ apr_allocator_alloc@Base 1.2.7
+ apr_allocator_create@Base 1.2.7
+ apr_allocator_destroy@Base 1.2.7
+ apr_allocator_free@Base 1.2.7
+ apr_allocator_max_free_set@Base 1.2.7
+ apr_allocator_mutex_get@Base 1.2.7
+ apr_allocator_mutex_set@Base 1.2.7
+ apr_allocator_owner_get@Base 1.2.7
+ apr_allocator_owner_set@Base 1.2.7
+ apr_app_initialize@Base 1.2.7
+ apr_array_append@Base 1.2.7
+ apr_array_cat@Base 1.2.7
+ apr_array_clear@Base 1.3.2
+ apr_array_copy@Base 1.2.7
+ apr_array_copy_hdr@Base 1.2.7
+ apr_array_make@Base 1.2.7
+ apr_array_pop@Base 1.2.7
+ apr_array_pstrcat@Base 1.2.7
+ apr_array_push@Base 1.2.7
+ apr_atoi64@Base 1.2.7
+ apr_atomic_add32@Base 1.2.7
+ apr_atomic_cas32@Base 1.2.7
+ apr_atomic_casptr@Base 1.2.7
+ apr_atomic_dec32@Base 1.2.7
+ apr_atomic_inc32@Base 1.2.7
+ apr_atomic_init@Base 1.2.7
+ apr_atomic_read32@Base 1.2.7
+ apr_atomic_set32@Base 1.2.7
+ apr_atomic_sub32@Base 1.2.7
+ apr_atomic_xchg32@Base 1.2.7
+ apr_atomic_xchgptr@Base 1.3.2
+ apr_collapse_spaces@Base 1.2.7
+ apr_cpystrn@Base 1.2.7
+ apr_crypto_sha256_new@Base 1.2.7
+ apr_ctime@Base 1.2.7
+ apr_day_snames@Base 1.2.7
+ apr_dir_close@Base 1.2.7
+ apr_dir_make@Base 1.2.7
+ apr_dir_make_recursive@Base 1.2.7
+ apr_dir_open@Base 1.2.7
+ apr_dir_read@Base 1.2.7
+ apr_dir_remove@Base 1.2.7
+ apr_dir_rewind@Base 1.2.7
+ apr_dso_error@Base 1.2.7
+ apr_dso_load@Base 1.2.7
+ apr_dso_sym@Base 1.2.7
+ apr_dso_unload@Base 1.2.7
+ apr_env_delete@Base 1.2.7
+ apr_env_get@Base 1.2.7
+ apr_env_set@Base 1.2.7
+ apr_file_append@Base 1.2.7
+ apr_file_attrs_set@Base 1.2.7
+ apr_file_buffer_set@Base 1.3.2
+ apr_file_buffer_size_get@Base 1.3.2
+ apr_file_close@Base 1.2.7
+ apr_file_copy@Base 1.2.7
+ apr_file_data_get@Base 1.2.7
+ apr_file_data_set@Base 1.2.7
+ apr_file_datasync@Base 1.4.2
+ apr_file_dup2@Base 1.2.7
+ apr_file_dup@Base 1.2.7
+ apr_file_eof@Base 1.2.7
+ apr_file_flags_get@Base 1.2.7
+ apr_file_flush@Base 1.2.7
+ apr_file_flush_locked@Base 1.2.11
+ apr_file_getc@Base 1.2.7
+ apr_file_gets@Base 1.2.7
+ apr_file_info_get@Base 1.2.7
+ apr_file_info_get_locked@Base 1.2.11
+ apr_file_inherit_set@Base 1.2.7
+ apr_file_inherit_unset@Base 1.2.7
+ apr_file_link@Base 1.4.2
+ apr_file_lock@Base 1.2.7
+ apr_file_mktemp@Base 1.2.7
+ apr_file_mtime_set@Base 1.2.7
+ apr_file_name_get@Base 1.2.7
+ apr_file_namedpipe_create@Base 1.2.7
+ apr_file_open@Base 1.2.7
+ apr_file_open_flags_stderr@Base 1.3.2
+ apr_file_open_flags_stdin@Base 1.3.2
+ apr_file_open_flags_stdout@Base 1.3.2
+ apr_file_open_stderr@Base 1.2.7
+ apr_file_open_stdin@Base 1.2.7
+ apr_file_open_stdout@Base 1.2.7
+ apr_file_perms_set@Base 1.2.7
+ apr_file_pipe_create@Base 1.2.7
+ apr_file_pipe_create_ex@Base 1.3.2
+ apr_file_pipe_timeout_get@Base 1.2.7
+ apr_file_pipe_timeout_set@Base 1.2.7
+ apr_file_pool_get@Base 1.2.7
+ apr_file_printf@Base 1.2.7
+ apr_file_putc@Base 1.2.7
+ apr_file_puts@Base 1.2.7
+ apr_file_read@Base 1.2.7
+ apr_file_read_full@Base 1.2.7
+ apr_file_remove@Base 1.2.7
+ apr_file_rename@Base 1.2.7
+ apr_file_seek@Base 1.2.7
+ apr_file_setaside@Base 1.2.7
+ apr_file_sync@Base 1.4.2
+ apr_file_trunc@Base 1.2.7
+ apr_file_ungetc@Base 1.2.7
+ apr_file_unlock@Base 1.2.7
+ apr_file_write@Base 1.2.7
+ apr_file_write_full@Base 1.2.7
+ apr_file_writev@Base 1.2.7
+ apr_file_writev_full@Base 1.2.7
+ apr_filepath_encoding@Base 1.2.7
+ apr_filepath_get@Base 1.2.7
+ apr_filepath_list_merge@Base 1.2.7
+ apr_filepath_list_merge_impl@Base 1.2.7
+ apr_filepath_list_split@Base 1.2.7
+ apr_filepath_list_split_impl@Base 1.2.7
+ apr_filepath_merge@Base 1.2.7
+ apr_filepath_name_get@Base 1.2.7
+ apr_filepath_root@Base 1.2.7
+ apr_filepath_set@Base 1.2.7
+ apr_fnmatch@Base 1.2.7
+ apr_fnmatch_test@Base 1.2.7
+ apr_generate_random_bytes@Base 1.2.7
+ apr_gethostname@Base 1.2.7
+ apr_getnameinfo@Base 1.2.7
+ apr_getopt@Base 1.2.7
+ apr_getopt_init@Base 1.2.7
+ apr_getopt_long@Base 1.2.7
+ apr_getservbyname@Base 1.2.7
+ apr_gid_get@Base 1.2.7
+ apr_gid_name_get@Base 1.2.7
+ apr_global_mutex_child_init@Base 1.2.7
+ apr_global_mutex_create@Base 1.2.7
+ apr_global_mutex_destroy@Base 1.2.7
+ apr_global_mutex_lock@Base 1.2.7
+ apr_global_mutex_lockfile@Base 1.4.2
+ apr_global_mutex_name@Base 1.4.2
+ apr_global_mutex_pool_get@Base 1.2.7
+ apr_global_mutex_trylock@Base 1.2.7
+ apr_global_mutex_unlock@Base 1.2.7
+ apr_hash_clear@Base 1.3.2
+ apr_hash_copy@Base 1.2.7
+ apr_hash_count@Base 1.2.7
+ apr_hash_do@Base 1.4.2
+ apr_hash_first@Base 1.2.7
+ apr_hash_get@Base 1.2.7
+ apr_hash_make@Base 1.2.7
+ apr_hash_make_custom@Base 1.2.7
+ apr_hash_merge@Base 1.2.7
+ apr_hash_next@Base 1.2.7
+ apr_hash_overlay@Base 1.2.7
+ apr_hash_pool_get@Base 1.2.7
+ apr_hash_set@Base 1.2.7
+ apr_hash_this@Base 1.2.7
+ apr_hashfunc_default@Base 1.2.7
+ apr_inet_ntop@Base 1.2.7
+ apr_inet_pton@Base 1.2.7
+ apr_initialize@Base 1.2.7
+ apr_ipsubnet_create@Base 1.2.7
+ apr_ipsubnet_test@Base 1.2.7
+ apr_is_empty_array@Base 1.2.7
+ apr_is_empty_table@Base 1.2.7
+ apr_itoa@Base 1.2.7
+ apr_ltoa@Base 1.2.7
+ apr_match_glob@Base 1.2.7
+ apr_mcast_hops@Base 1.2.7
+ apr_mcast_interface@Base 1.2.7
+ apr_mcast_join@Base 1.2.7
+ apr_mcast_leave@Base 1.2.7
+ apr_mcast_loopback@Base 1.2.7
+ apr_mmap_create@Base 1.2.7
+ apr_mmap_delete@Base 1.2.7
+ apr_mmap_dup@Base 1.2.7
+ apr_mmap_offset@Base 1.2.7
+ apr_month_snames@Base 1.2.7
+ apr_off_t_toa@Base 1.2.7
+ apr_os_default_encoding@Base 1.2.7
+ apr_os_dir_get@Base 1.2.7
+ apr_os_dir_put@Base 1.2.7
+ apr_os_dso_handle_get@Base 1.2.7
+ apr_os_dso_handle_put@Base 1.2.7
+ apr_os_exp_time_get@Base 1.2.7
+ apr_os_exp_time_put@Base 1.2.7
+ apr_os_file_get@Base 1.2.7
+ apr_os_file_put@Base 1.2.7
+ apr_os_global_mutex_get@Base 1.2.7
+ apr_os_imp_time_get@Base 1.2.7
+ apr_os_imp_time_put@Base 1.2.7
+ apr_os_locale_encoding@Base 1.2.7
+ apr_os_pipe_put@Base 1.2.7
+ apr_os_pipe_put_ex@Base 1.2.7
+ apr_os_proc_mutex_get@Base 1.2.7
+ apr_os_proc_mutex_put@Base 1.2.7
+ apr_os_shm_get@Base 1.2.7
+ apr_os_shm_put@Base 1.2.7
+ apr_os_sock_get@Base 1.2.7
+ apr_os_sock_make@Base 1.2.7
+ apr_os_sock_put@Base 1.2.7
+ apr_os_thread_current@Base 1.2.7
+ apr_os_thread_equal@Base 1.2.7
+ apr_os_thread_get@Base 1.2.7
+ apr_os_thread_put@Base 1.2.7
+ apr_os_threadkey_get@Base 1.2.7
+ apr_os_threadkey_put@Base 1.2.7
+ apr_os_uuid_get@Base 1.2.7
+ apr_palloc@Base 1.2.7
+ apr_palloc_debug@Base 1.2.7
+ apr_parse_addr_port@Base 1.2.7
+ apr_password_get@Base 1.2.7
+ apr_pcalloc@Base 1.2.7
+ apr_pcalloc_debug@Base 1.2.7
+ apr_pmemdup@Base 1.2.7
+ apr_poll@Base 1.2.7
+ apr_poll_method_defname@Base 1.4.2
+ apr_pollcb_add@Base 1.3.2
+ apr_pollcb_create@Base 1.3.2
+ apr_pollcb_create_ex@Base 1.4.2
+ apr_pollcb_poll@Base 1.3.2
+ apr_pollcb_provider_poll@Base 1.4.2
+ apr_pollcb_remove@Base 1.3.2
+ apr_pollset_add@Base 1.2.7
+ apr_pollset_create@Base 1.2.7
+ apr_pollset_create_ex@Base 1.4.2
+ apr_pollset_destroy@Base 1.2.7
+ apr_pollset_drain_wakeup_pipe@Base 1.4.2
+ apr_pollset_method_name@Base 1.4.2
+ apr_pollset_poll@Base 1.2.7
+ apr_pollset_provider_poll@Base 1.4.2
+ apr_pollset_provider_select@Base 1.4.2
+ apr_pollset_remove@Base 1.2.7
+ apr_pollset_wakeup@Base 1.4.2
+ apr_pool_abort_get@Base 1.2.7
+ apr_pool_abort_set@Base 1.2.7
+ apr_pool_allocator_get@Base 1.2.7
+ apr_pool_child_cleanup_set@Base 1.2.7
+ apr_pool_cleanup_for_exec@Base 1.2.7
+ apr_pool_cleanup_kill@Base 1.2.7
+ apr_pool_cleanup_null@Base 1.2.7
+ apr_pool_cleanup_register@Base 1.2.7
+ apr_pool_cleanup_run@Base 1.2.7
+ apr_pool_clear@Base 1.2.7
+ apr_pool_clear_debug@Base 1.2.7
+ apr_pool_create_core_ex@Base 1.3.2
+ apr_pool_create_core_ex_debug@Base 1.3.2
+ apr_pool_create_ex@Base 1.2.7
+ apr_pool_create_ex_debug@Base 1.2.7
+ apr_pool_create_unmanaged_ex@Base 1.3.3
+ apr_pool_create_unmanaged_ex_debug@Base 1.3.3
+ apr_pool_destroy@Base 1.2.7
+ apr_pool_destroy_debug@Base 1.2.7
+ apr_pool_initialize@Base 1.2.7
+ apr_pool_is_ancestor@Base 1.2.7
+ apr_pool_note_subprocess@Base 1.2.7
+ apr_pool_parent_get@Base 1.2.7
+ apr_pool_pre_cleanup_register@Base 1.3.2
+ apr_pool_tag@Base 1.2.7
+ apr_pool_terminate@Base 1.2.7
+ apr_pool_userdata_get@Base 1.2.7
+ apr_pool_userdata_set@Base 1.2.7
+ apr_pool_userdata_setn@Base 1.2.7
+ apr_proc_create@Base 1.2.7
+ apr_proc_detach@Base 1.2.7
+ apr_proc_fork@Base 1.2.7
+ apr_proc_kill@Base 1.2.7
+ apr_proc_mutex_child_init@Base 1.2.7
+ apr_proc_mutex_cleanup@Base 1.2.7
+ apr_proc_mutex_create@Base 1.2.7
+ apr_proc_mutex_defname@Base 1.2.7
+ apr_proc_mutex_destroy@Base 1.2.7
+ apr_proc_mutex_lock@Base 1.2.7
+ apr_proc_mutex_lockfile@Base 1.2.7
+ apr_proc_mutex_name@Base 1.2.7
+ apr_proc_mutex_pool_get@Base 1.2.7
+ apr_proc_mutex_trylock@Base 1.2.7
+ apr_proc_mutex_unix_setup_lock@Base 1.2.7
+ apr_proc_mutex_unlock@Base 1.2.7
+ apr_proc_other_child_alert@Base 1.2.7
+ apr_proc_other_child_refresh@Base 1.2.7
+ apr_proc_other_child_refresh_all@Base 1.2.7
+ apr_proc_other_child_register@Base 1.2.7
+ apr_proc_other_child_unregister@Base 1.2.7
+ apr_proc_wait@Base 1.2.7
+ apr_proc_wait_all_procs@Base 1.2.7
+ apr_procattr_addrspace_set@Base 1.2.7
+ apr_procattr_child_err_set@Base 1.2.7
+ apr_procattr_child_errfn_set@Base 1.2.7
+ apr_procattr_child_in_set@Base 1.2.7
+ apr_procattr_child_out_set@Base 1.2.7
+ apr_procattr_cmdtype_set@Base 1.2.7
+ apr_procattr_create@Base 1.2.7
+ apr_procattr_detach_set@Base 1.2.7
+ apr_procattr_dir_set@Base 1.2.7
+ apr_procattr_error_check_set@Base 1.2.7
+ apr_procattr_group_set@Base 1.2.7
+ apr_procattr_io_set@Base 1.2.7
+ apr_procattr_limit_set@Base 1.2.7
+ apr_procattr_user_set@Base 1.2.7
+ apr_psprintf@Base 1.2.7
+ apr_pstrcat@Base 1.2.7
+ apr_pstrcatv@Base 1.2.7
+ apr_pstrdup@Base 1.2.7
+ apr_pstrmemdup@Base 1.2.7
+ apr_pstrndup@Base 1.2.7
+ apr_pvsprintf@Base 1.2.7
+ apr_random_add_entropy@Base 1.2.7
+ apr_random_after_fork@Base 1.2.7
+ apr_random_barrier@Base 1.2.7
+ apr_random_init@Base 1.2.7
+ apr_random_insecure_bytes@Base 1.2.7
+ apr_random_insecure_ready@Base 1.2.7
+ apr_random_secure_bytes@Base 1.2.7
+ apr_random_secure_ready@Base 1.2.7
+ apr_random_standard_new@Base 1.2.7
+ apr_rfc822_date@Base 1.2.7
+ apr_setup_signal_thread@Base 1.2.7
+ apr_shm_attach@Base 1.2.7
+ apr_shm_baseaddr_get@Base 1.2.7
+ apr_shm_create@Base 1.2.7
+ apr_shm_destroy@Base 1.2.7
+ apr_shm_detach@Base 1.2.7
+ apr_shm_pool_get@Base 1.2.7
+ apr_shm_remove@Base 1.2.7
+ apr_shm_size_get@Base 1.2.7
+ apr_signal@Base 1.2.7
+ apr_signal_block@Base 1.2.7
+ apr_signal_description_get@Base 1.2.7
+ apr_signal_init@Base 1.2.7
+ apr_signal_thread@Base 1.2.7
+ apr_signal_unblock@Base 1.2.7
+ apr_sleep@Base 1.2.7
+ apr_snprintf@Base 1.2.7
+ apr_sockaddr_equal@Base 1.2.7
+ apr_sockaddr_info_get@Base 1.2.7
+ apr_sockaddr_ip_get@Base 1.2.7
+ apr_sockaddr_ip_getbuf@Base 1.3.2
+ apr_sockaddr_vars_set@Base 1.2.7
+ apr_socket_accept@Base 1.2.7
+ apr_socket_addr_get@Base 1.2.7
+ apr_socket_atmark@Base 1.2.7
+ apr_socket_atreadeof@Base 1.4.2
+ apr_socket_bind@Base 1.2.7
+ apr_socket_close@Base 1.2.7
+ apr_socket_connect@Base 1.2.7
+ apr_socket_create@Base 1.2.7
+ apr_socket_data_get@Base 1.2.7
+ apr_socket_data_set@Base 1.2.7
+ apr_socket_inherit_set@Base 1.2.7
+ apr_socket_inherit_unset@Base 1.2.7
+ apr_socket_listen@Base 1.2.7
+ apr_socket_opt_get@Base 1.2.7
+ apr_socket_opt_set@Base 1.2.7
+ apr_socket_pool_get@Base 1.2.7
+ apr_socket_protocol_get@Base 1.2.7
+ apr_socket_recv@Base 1.2.7
+ apr_socket_recvfrom@Base 1.2.7
+ apr_socket_send@Base 1.2.7
+ apr_socket_sendto@Base 1.2.7
+ apr_socket_sendv@Base 1.2.7
+ apr_socket_shutdown@Base 1.2.7
+ apr_socket_timeout_get@Base 1.2.7
+ apr_socket_timeout_set@Base 1.2.7
+ apr_socket_type_get@Base 1.2.7
+ apr_stat@Base 1.2.7
+ apr_strerror@Base 1.2.7
+ apr_strfsize@Base 1.2.7
+ apr_strftime@Base 1.2.7
+ apr_strnatcasecmp@Base 1.2.7
+ apr_strnatcmp@Base 1.2.7
+ apr_strtoff@Base 1.2.7
+ apr_strtoi64@Base 1.2.7
+ apr_strtok@Base 1.2.7
+ apr_table_add@Base 1.2.7
+ apr_table_addn@Base 1.2.7
+ apr_table_clear@Base 1.2.7
+ apr_table_clone@Base 1.3.2
+ apr_table_compress@Base 1.2.7
+ apr_table_copy@Base 1.2.7
+ apr_table_do@Base 1.2.7
+ apr_table_elts@Base 1.2.7
+ apr_table_get@Base 1.2.7
+ apr_table_make@Base 1.2.7
+ apr_table_merge@Base 1.2.7
+ apr_table_mergen@Base 1.2.7
+ apr_table_overlap@Base 1.2.7
+ apr_table_overlay@Base 1.2.7
+ apr_table_set@Base 1.2.7
+ apr_table_setn@Base 1.2.7
+ apr_table_unset@Base 1.2.7
+ apr_table_vdo@Base 1.2.7
+ apr_temp_dir_get@Base 1.2.7
+ apr_terminate2@Base 1.2.7
+ apr_terminate@Base 1.2.7
+ apr_thread_cond_broadcast@Base 1.2.7
+ apr_thread_cond_create@Base 1.2.7
+ apr_thread_cond_destroy@Base 1.2.7
+ apr_thread_cond_pool_get@Base 1.2.7
+ apr_thread_cond_signal@Base 1.2.7
+ apr_thread_cond_timedwait@Base 1.2.7
+ apr_thread_cond_wait@Base 1.2.7
+ apr_thread_create@Base 1.2.7
+ apr_thread_data_get@Base 1.2.7
+ apr_thread_data_set@Base 1.2.7
+ apr_thread_detach@Base 1.2.7
+ apr_thread_exit@Base 1.2.7
+ apr_thread_join@Base 1.2.7
+ apr_thread_mutex_create@Base 1.2.7
+ apr_thread_mutex_destroy@Base 1.2.7
+ apr_thread_mutex_lock@Base 1.2.7
+ apr_thread_mutex_pool_get@Base 1.2.7
+ apr_thread_mutex_trylock@Base 1.2.7
+ apr_thread_mutex_unlock@Base 1.2.7
+ apr_thread_once@Base 1.2.7
+ apr_thread_once_init@Base 1.2.7
+ apr_thread_pool_get@Base 1.2.7
+ apr_thread_rwlock_create@Base 1.2.7
+ apr_thread_rwlock_destroy@Base 1.2.7
+ apr_thread_rwlock_pool_get@Base 1.2.7
+ apr_thread_rwlock_rdlock@Base 1.2.7
+ apr_thread_rwlock_tryrdlock@Base 1.2.7
+ apr_thread_rwlock_trywrlock@Base 1.2.7
+ apr_thread_rwlock_unlock@Base 1.2.7
+ apr_thread_rwlock_wrlock@Base 1.2.7
+ apr_thread_yield@Base 1.2.7
+ apr_threadattr_create@Base 1.2.7
+ apr_threadattr_detach_get@Base 1.2.7
+ apr_threadattr_detach_set@Base 1.2.7
+ apr_threadattr_guardsize_set@Base 1.2.7
+ apr_threadattr_stacksize_set@Base 1.2.7
+ apr_threadkey_data_get@Base 1.2.7
+ apr_threadkey_data_set@Base 1.2.7
+ apr_threadkey_private_create@Base 1.2.7
+ apr_threadkey_private_delete@Base 1.2.7
+ apr_threadkey_private_get@Base 1.2.7
+ apr_threadkey_private_set@Base 1.2.7
+ apr_time_ansi_put@Base 1.2.7
+ apr_time_clock_hires@Base 1.2.7
+ apr_time_exp_get@Base 1.2.7
+ apr_time_exp_gmt@Base 1.2.7
+ apr_time_exp_gmt_get@Base 1.2.7
+ apr_time_exp_lt@Base 1.2.7
+ apr_time_exp_tz@Base 1.2.7
+ apr_time_now@Base 1.2.7
+ apr_tokenize_to_argv@Base 1.2.7
+ apr_uid_current@Base 1.2.7
+ apr_uid_get@Base 1.2.7
+ apr_uid_homepath_get@Base 1.2.7
+ apr_uid_name_get@Base 1.2.7
+ apr_unix_child_file_cleanup@Base 1.2.11
+ apr_unix_file_cleanup@Base 1.2.7
+ apr_unix_mode2perms@Base 1.2.7
+ apr_unix_perms2mode@Base 1.2.7
+ apr_unix_setup_time@Base 1.2.7
+ apr_version@Base 1.2.7
+ apr_version_string@Base 1.2.7
+ apr_vformatter@Base 1.2.7
+ apr_vsnprintf@Base 1.2.7
+ apr_wait_for_io_or_timeout@Base 1.2.7
--- apr-1.4.4.orig/debian/ino_t_test.c
+++ apr-1.4.4/debian/ino_t_test.c
@@ -0,0 +1,22 @@
+#include <stdio.h>
+#include <sys/types.h>
+#include "apr_file_info.h"
+
+/* this was the old definition of apr_ino_t until 1.2.11-1 */
+#if defined(__alpha__) || defined(__FreeBSD_kernel__)
+typedef unsigned int              old_apr_ino_t;
+#else
+typedef unsigned long int         old_apr_ino_t;
+#endif
+
+int main (void)
+{
+	size_t s0 = sizeof(apr_ino_t), s1 = sizeof(old_apr_ino_t);
+	if (s0 == s1)
+		return 0;
+	fprintf(stderr, "***\n"
+			"*** 'apr_ino_t' size is %zu, expected %zu\n"
+			"*** Please report this to the Debian Apache maintainers\n"
+			"***\n", s0, s1);
+	return 1;
+}
--- apr-1.4.4.orig/debian/rules
+++ apr-1.4.4/debian/rules
@@ -0,0 +1,175 @@
+#!/usr/bin/make -f
+
+# Turn on VERBOSE output
+#export DH_VERBOSE=1
+
+#enable dpatch
+include /usr/share/dpatch/dpatch.make
+
+# These are used for cross-compiling and for saving the configure script
+# # from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH       ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+BUILDDIR := build-$(DEB_BUILD_ARCH)
+
+CFLAGS := $(CFLAGS) -pipe -Wall -g
+
+# hardening options
+H_CFLAGS := -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
+H_LDFLAGS := -Wl,-z,relro
+
+# 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
+
+# apr_cv_mutex_robust_shared causes hangs in procmutex test on armel and alpha
+# let's just disable this for squeeze
+ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_mutex_robust_shared=no
+endif
+ifneq (,$(findstring alpha,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_mutex_robust_shared=no
+endif
+
+# SH4 cannot use proc_pthread.
+ifneq (,$(findstring sh4,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_hasprocpthreadser=no ac_cv_define_PTHREAD_PROCESS_SHARED=no
+endif
+
+# Enable debug builds
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+  CFLAGS += -O0
+else
+  ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+  else
+    CFLAGS += -O2
+  endif
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+ifeq (,$(findstring notest,$(DEB_BUILD_OPTIONS))$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	TEST_TARGET = test
+else
+	TEST_TARGET =
+endif
+
+# disable tests on hurd until they are fixed (#530286)
+ifeq (hurd, $(DEB_BUILD_ARCH_OS))
+	TEST_TARGET =
+endif
+
+SHELL=/bin/bash
+
+$(BUILDDIR)/config.status: patch-stamp
+	dh_testdir
+	mkdir -p $(BUILDDIR)/docs
+	./buildconf
+	# we need to force the use of bash here. Otherwise, if apr is built with
+	# /bin/sh -> /bin/bash, the resulting libtool will not work on systems
+	# where /bin/sh -> /bin/dash
+	cd $(BUILDDIR) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFFLAGS) CONFIG_SHELL=/bin/bash /bin/bash ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --includedir=\$${prefix}/usr/include/apr-1.0 --with-installbuilddir=\$${prefix}/usr/share/apr-1.0/build  --enable-nonportable-atomics --enable-allocator-uses-mmap
+	# Determine whether upstream's configure gives the same definition of apr_ino_t as we had until 1.2.11-1
+	rm -f debian/ino_t_test
+	gcc -I$(CURDIR)/include -I$(BUILDDIR)/include `$(BUILDDIR)/apr-1-config --cppflags` -o debian/ino_t_test debian/ino_t_test.c
+	debian/ino_t_test
+	rm -f debian/ino_t_test
+ifeq (hurd, $(DEB_BUILD_ARCH_OS))
+	# multicast not supported on Hurd
+	sed -i '/HAVE_STRUCT_IPMREQ/ d' $(BUILDDIR)/include/arch/unix/apr_private.h
+endif
+ifeq (linux, $(DEB_BUILD_ARCH_OS))
+	if grep -q APR_HAS_POSIXSEM_SERIALIZE.*0 $(BUILDDIR)/include/apr.h ;\
+	then \
+		echo "WARNING: This is Linux but configure did not detect POSIX semaphores." ;\
+		if [ "$(stat -c '%d' /dev/shm)" = "$(stat -c '%d' /dev)" ] ;\
+		then \
+			echo "ERROR: POSIX semaphores not usable and /dev/shm not mounted." ;\
+			echo "ERROR: Aborting." ;\
+			echo "HINT: If you are using pbuilder or cowbuilder, add /dev/shm to BINDMOUNTS" ;\
+			echo "HINT: in pbuilderrc" ;\
+			exit 1 ;\
+		fi ;\
+	fi
+endif
+
+build: patch-stamp build-stamp
+
+build-stamp: $(BUILDDIR)/config.status
+	dh_testdir
+
+	$(MAKE) -C $(BUILDDIR) CFLAGS="$(H_CFLAGS)" LDFLAGS="$(H_LDFLAGS)"
+	$(MAKE) -C $(BUILDDIR) dox
+
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp test-stamp debian/ino_t_test
+	rm -f configure build/lt* build/libtool.m4 build-outputs.mk include/arch/unix/apr_private.h.in
+	rm -rf $(BUILDDIR)
+
+	dh_clean
+
+test: test-stamp
+
+# the testsockets test will fail on vservers (no 127.0.0.1) or if ipv6 is
+# enabled in the kernel but not configured on any interface
+IGNORE_TESTSOCK = $(shell IGN=false; \
+	/sbin/ifconfig|grep -q 127.0.0.1 || IGN=true; \
+	grep -q ipv6 /proc/net/protocols && ( /sbin/ifconfig|grep -q inet6 || IGN=true ) ; \
+	echo $$IGN )
+
+test-stamp: build
+	dh_testdir
+	$(MAKE) -C $(BUILDDIR)/test all CFLAGS="$(H_CFLAGS)" LDFLAGS="$(H_LDFLAGS)"
+	cd $(BUILDDIR)/test && ./testall -v testsockets testsock || $(IGNORE_TESTSOCK)
+	cd $(BUILDDIR)/test && ( ulimit -S -s 8192 ; ./testall -v testatomic)
+	cd $(BUILDDIR)/test && ./testall -v -x testsockets testsock testatomic
+	touch $@
+
+install: build $(TEST_TARGET)
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -a
+
+	$(MAKE) -C $(BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
+	perl -p -i -e "s,^dependency_libs=.*,dependency_libs=''," $(CURDIR)/debian/tmp/usr/lib/libapr-1.la
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGES
+	dh_installdocs
+	dh_install -a
+	dh_installman -plibapr1-dev debian/apr-1-config.1
+	dh_link
+	dh_strip --dbg-package=libapr1-dbg
+	dh_lintian
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs -- -Idebian/symbols.$(DEB_BUILD_ARCH_OS)
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- apr-1.4.4.orig/debian/libapr1.symbols
+++ apr-1.4.4/debian/libapr1.symbols
@@ -0,0 +1,2 @@
+here for the purpose of tricking debhelper...bwahahahaha.
+
--- apr-1.4.4.orig/debian/apr-1-config.1
+++ apr-1.4.4/debian/apr-1-config.1
@@ -0,0 +1,92 @@
+.TH APR-1-CONFIG "1" "March 2006" "apr-1-config 1.2.2" "User Commands"
+.SH NAME
+apr-1-config \- Return metainformation about apr library
+.SH SYNOPSIS
+.B apr-1-config
+[\fIOPTION\fR]
+.SH DESCRIPTION
+The
+.I apr-1-config
+program  is used to retrieve information about the
+.I apr
+library in the system.  It is typically used to compile
+and link against the library.
+.PP
+When linking with libtool, an application should do something like:
+.IP
+APR_LIBS="`apr\-1\-config \fB\-\-link\-libtool\fR \fB\-\-libs\fR`"
+.PP
+or when linking directly:
+.IP
+APR_LIBS="`apr\-1\-config \fB\-\-link\-ld\fR \fB\-\-libs\fR`"
+.PP
+An application should use the results of \fB\-\-cflags\fR, \fB\-\-cppflags\fR, \fB\-\-includes\fR,
+and \fB\-\-ldflags\fR in their build process.
+.SH OPTIONS
+Known values for OPTION are:
+.TP
+\fB\-\-prefix\fR[=\fIDIR\fR]
+change prefix to DIR
+.TP
+\fB\-\-bindir\fR
+print location where binaries are installed
+.TP
+\fB\-\-includedir\fR
+print location where headers are installed
+.TP
+\fB\-\-cc\fR
+print C compiler name
+.TP
+\fB\-\-cpp\fR
+print C preprocessor name and any required options
+.TP
+\fB\-\-cflags\fR
+print C compiler flags
+.TP
+\fB\-\-cppflags\fR
+print C preprocessor flags
+.TP
+\fB\-\-includes\fR
+print include information
+.TP
+\fB\-\-ldflags\fR
+print linker flags
+.TP
+\fB\-\-libs\fR
+print additional libraries to link against
+.TP
+\fB\-\-srcdir\fR
+print APR source directory
+.HP
+\fB\-\-installbuilddir\fR print APR build helper directory
+.TP
+\fB\-\-link\-ld\fR
+print link switch(es) for linking to APR
+.TP
+\fB\-\-link\-libtool\fR
+print the libtool inputs for linking to APR
+.TP
+\fB\-\-shlib\-path\-var\fR
+print the name of the shared library path env var
+.TP
+\fB\-\-apr\-la\-file\fR
+print the path to the .la file, if available
+.TP
+\fB\-\-apr\-so\-ext\fR
+print the extensions of shared objects on this platform
+.TP
+\fB\-\-apr\-lib\-target\fR
+print the libtool target information
+.TP
+\fB\-\-apr\-libtool\fR
+print the path to APR's libtool
+.TP
+\fB\-\-version\fR
+print the APR's version as a dotted triple
+.TP
+\fB\-\-help\fR
+print the help
+.SH AUTHOR
+This manual page was written by Vincent Danjean
+<Vincent.Danjean@ens-lyon.org> for the Debian project (but may be used
+by others).
--- apr-1.4.4.orig/debian/compat
+++ apr-1.4.4/debian/compat
@@ -0,0 +1 @@
+5
--- apr-1.4.4.orig/debian/copyright
+++ apr-1.4.4/debian/copyright
@@ -0,0 +1,141 @@
+This package was debianized by Thom May <thom@debian.org> on
+Wed, 17 Nov 2004 11:27:14 -0800
+
+It was downloaded from http://httpd.apache.org/download.cgi
+
+Upstream Authors: The Apache Software Foundation - http://apr.apache.org/
+
+Copyright:
+
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. The ASF licenses this work to You under the Apache License,
+Version 2.0 (the "License"); you may not use this work except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+On a Debian system, the license can be found at
+/usr/share/common-licenses/Apache-2.0 .
+
+
+APACHE PORTABLE RUNTIME SUBCOMPONENTS: 
+
+The Apache Portable Runtime includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
+file_io/unix/mktemp.c, strings/apr_strings.c:
+
+/* 
+ * Copyright (c) 1987, 1993, 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+
+From dso/aix/dso.c:
+
+ *  Based on libdl (dlfcn.c/dlfcn.h) which is
+ *  Copyright (c) 1992,1993,1995,1996,1997,1988
+ *  Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
+ *
+ *  Not derived from licensed software.
+ *
+ *  Permission is granted to freely use, copy, modify, and redistribute
+ *  this software, provided that the author is not construed to be liable
+ *  for any results of using the software, alterations are clearly marked
+ *  as such, and this notice is not modified.
+
+From strings/apr_strnatcmp.c, include/apr_strings.h:
+
+  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
+  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+
+From test/CuTest.c, test/CuTest.h:
+
+ * Copyright (c) 2002-2006 Asim Jalis
+ * 
+ * This library is released under the zlib/libpng license as described at
+ * 
+ * http://www.opensource.org/licenses/zlib-license.html
+ * 
+ * Here is the statement of the license:
+ * 
+ * This software is provided 'as-is', without any express or implied warranty. 
+ * In no event will the authors be held liable for any damages arising from 
+ * the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose, 
+ * including commercial applications, and to alter it and redistribute it 
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not 
+ * claim that you wrote the original software. If you use this software in a 
+ * product, an acknowledgment in the product documentation would be 
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source distribution.
--- apr-1.4.4.orig/debian/changelog
+++ apr-1.4.4/debian/changelog
@@ -0,0 +1,428 @@
+apr (1.4.4-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fix potential DoS in apr_fnmatch (CVE-2011-0419)
+  * Enable experimental allocator using mmap instead of malloc. This makes
+    Apache HTTPD's MaxMemFree directive actually work and hopefully reduces
+    memory fragmentation.
+  * Bump standards-version (no changes).
+  * Reword some short descriptions to make lintian happy.
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 12 May 2011 22:43:36 +0200
+
+apr (1.4.2-8) unstable; urgency=low
+
+  * Fix apr_ino_t changing size depending on -D_FILE_OFFSET_BITS on
+    kfreebsd-*. Closes: #616323
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 05 Mar 2011 21:14:02 +0100
+
+apr (1.4.2-7) unstable; urgency=low
+
+  * Add a workaround for a problem related to strict aliasing that causes
+    gcc 4.5 to create incorrect code in some cases. Closes: #609163
+    LP: #697105
+  * Bump standards version to 3.9.1:
+    - empty dependency_libs section in libapr-1.la
+
+ -- Stefan Fritsch <sf@debian.org>  Sat, 05 Feb 2011 18:22:58 +0100
+
+apr (1.4.2-6) unstable; urgency=low
+
+  * Also disable robust pthread mutexes on alpha, to fix hang in the test
+    suite on Linux 2.6.32.
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 30 Aug 2010 23:42:23 +0200
+
+apr (1.4.2-5) unstable; urgency=medium
+
+  * Fix FTBFS on armel: Disable robust pthread mutexes on armel, as they
+    cause a hang in the test suite on Linux 2.6.32.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 29 Aug 2010 22:00:11 +0200
+
+apr (1.4.2-4) unstable; urgency=low
+
+  * Fix building with libtool 1.x. Closes: #575380
+  * Fix pool life-time issue with apr_socket_addr_get(), resulting in a memory
+    leak in Apache mod_proxy.
+  * Under Linux, if configure does not detect POSIX semaphores due to /dev/shm
+    not being mounted, abort the build. Closes: #591286
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 17 Aug 2010 23:16:56 +0200
+
+apr (1.4.2-3) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 31 Jan 2010 10:56:45 +0100
+
+apr (1.4.2-2) experimental; urgency=low
+
+  * Fix FTBFS on kfreebsd: Create os specific symbols file: With *_epoll on
+    linux, with *_kqueue on kfreebsd, with neither on hurd.
+  * Bump Standards-Version:
+    - In the rules file, use the DEB_*_ARCH* instead of the DEB_*_GNU*
+      variables, where applicable.
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 28 Jan 2010 20:28:07 +0100
+
+apr (1.4.2-1) experimental; urgency=low
+
+  [ Stefan Fritsch ]
+  * 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.
+
+  [ Peter Samuelson ]
+  * Apply patch from Nobuhiro Iwamatsu to disable some pthread
+    functionality on SH4.  (Closes: #549153)
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 28 Jan 2010 07:33:48 +0100
+
+apr (1.3.8-1) unstable; urgency=high
+
+  [ Stefan Fritsch ]
+  * Enable -fstack-protector for arm/armel. A workaround has been added to
+    gcc.
+
+  [ Peter Samuelson ]
+  * New upstream security release.
+    - Fix CVE-2009-2412, overflow in pool allocations due to alignment.
+
+ -- Peter Samuelson <peter@p12n.org>  Thu, 06 Aug 2009 13:00:03 -0500
+
+apr (1.3.7-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 24 Jul 2009 11:12:20 +0200
+
+apr (1.3.5-2) unstable; urgency=low
+
+  * Mark non-inheritable file descriptors with FD_CLOEXEC, to prevent leaking
+    them to processes exec'ed by applications that fail to use the apr API
+    correctly (i.e. mod_php). Closes: #366124
+  * Bump standards-version (no changes).
+  * Override soname lintian warning (too late to change that).
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 23 Jun 2009 22:15:02 +0200
+
+apr (1.3.5-1) unstable; urgency=low
+
+  * New upstream version (really)
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 08 Jun 2009 18:45:15 +0200
+
+apr (1.3.4-1) unstable; urgency=low
+
+  * New upstream version
+  * Fix FTBFS on hurd (thanks to Marc Dequènes, closes: #530286)
+    - define _GNU_SOURCE earlier
+    - disable tests on hurd for now
+    - Deactivate missing multicast support on Hurd (by removing
+      HAVE_STRUCT_IPMREQ manually). 
+  * Omit spurious libs from apr-1-config --libs output (closes: #463399)
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 07 Jun 2009 21:15:32 +0200
+
+apr (1.3.3-4) unstable; urgency=low
+
+  [ Ryan Niebur ]
+  * change the -dbg package's section to debug
+  * Fix building with newer libtool, thanks to John Wright for the patch
+    (Closes: #526346)
+  * use a symbols file without apr_socket_sendfile on kfreebsd based
+    architectures, fixing FTBFS (Closes: #520857)
+  * support nocheck in DEB_BUILD_OPTIONS
+  * Debian Policy 3.8.1
+
+  [ Stefan Fritsch ]
+  * Force use of bash in the embedded libtool
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 10 May 2009 10:14:43 +0200
+
+apr (1.3.3-3) unstable; urgency=low
+
+  * Reduce stack size for the 'testatomic' test since it may otherwise run out
+    of virtual memory on some buildds. This sometimes caused FTBFS on hppa.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 27 Feb 2009 14:58:02 +0100
+
+apr (1.3.3-2) unstable; urgency=low
+
+  [ Ryan Niebur ]
+  * added support for parallel in DEB_BUILD_OPTIONS
+  * add me to Uploaders
+
+  [ Stefan Fritsch ]
+  * Correct description for libapr1-dbg (closes: #508144).
+  * Work around flock bug on hppa. This fixes the last remaining test failure,
+    testprocmutex (closes: #492295).
+  * Upload to unstable.
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 23 Feb 2009 22:44:07 +0100
+
+apr (1.3.3-1) experimental; urgency=low
+
+  * New upstream release.
+  * Not only ignore testsockets but also testsock to fix some more build
+    failures.
+  * Add some debugging output for m68k test problems (#495400).
+  * Add -Wformat to CFLAGS to actually make use of -Wformat-security.
+
+ -- Stefan Fritsch <sf@debian.org>  Fri, 26 Sep 2008 19:52:14 +0200
+
+apr (1.3.2-3) experimental; urgency=low
+
+  * Add netbase to build-deps to fix testsock test.
+  * Ignore testsockets test only on vservers and if IPv6 is not configured.
+  * Rerun buildconf during package build. This fixes FTBFS on powerpc (because
+    of broken autoconf used by upstream, see #490820).
+  * Remove kfreebsd hack no longer necessary with 1.3.x.
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 04 Aug 2008 22:50:30 +0200
+
+apr (1.3.2-2) experimental; urgency=low
+
+  * Make tests more verbose to make debugging FTBFS easier.
+  * Ignore testsock and testsockets tests which seem to fail if IPv6 is not
+    configured.
+  * Change watch file to www.apache.org, which is more reliable than
+    www.eu.apache.org.
+
+ -- Stefan Fritsch <sf@debian.org>  Sun, 27 Jul 2008 10:19:00 +0200
+
+apr (1.3.2-1) experimental; urgency=low
+
+  [ Ryan Niebur ]
+  * new upstream version
+  * use symbol files
+
+  [ Stefan Fritsch ]
+  * Upload to experimental
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 23 Jul 2008 20:49:02 +0200
+
+apr (1.2.12-6) UNRELEASED; urgency=low
+
+  [ Ryan Niebur ]
+  * Upgraded to policy version 3.8.0
+    - Added support for noopt in DEB_BUILD_OPTIONS
+    - Added a README.source
+
+  [ Stefan Fritsch ]
+  * Add upstream homepage to debian/control.
+
+ -- Ryan Niebur <RyanRyan52@gmail.com>  Fri, 27 Jun 2008 14:39:29 -0700
+
+apr (1.2.12-5) unstable; urgency=low
+
+  * Actually switch to /dev/urandom instead of only adding a non-functional
+    patch. Closes: #501497
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 08 Oct 2008 00:06:56 +0200
+
+apr (1.2.12-4) unstable; urgency=medium
+
+  * Use /dev/urandom instead of /dev/random (like 1.3.* does).
+  * Update watch file to recognize 1.3.*.
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 18 Jun 2008 23:12:35 +0200
+
+apr (1.2.12-3) unstable; urgency=low
+
+  * Enable hardening options in a way that does not include them in
+    apr-config, which was a bad idea.
+  * Point to /usr/share/common-licenses instead of including the license in the
+    copyright file.
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 11 Jun 2008 19:19:52 +0200
+
+apr (1.2.12-2) unstable; urgency=high
+
+  * Urgency high for RC bug fix.
+  * Do not use -fstack-protector on arm and armel, since it is completely
+    broken (see #469517). Closes: #477772
+  * Remove unneded libtool build dependency.
+
+ -- Stefan Fritsch <sf@debian.org>  Wed, 30 Apr 2008 20:46:17 +0200
+
+apr (1.2.12-1) unstable; urgency=low
+
+  * New upstream version.
+    - Remove 020_lfs_ino_t.dpatch now done by upstream configure. Adjust
+      ino_t_test.c to check that this is the same definition of apr_ino_t as
+      we had before.
+  * Enable hardening options: -fstack-protector -Wformat-security
+    -D_FORTIFY_SOURCE=2 -Wl,-z,relro
+  * Disable SCTP for now, in order to get a consistent build result in unclean
+    build environments.
+  * Remove Thom May, Fabio M. Di Nitto, Daniel Stone, and Adam Conrad from the
+    uploaders field (thanks for your work).
+  * Fix some lintian warnings:
+    - Bump Standards-Version to 3.7.3 (no changes).
+    - Remove obsolete XS- from VCS tags.
+    - Remove empty /usr/share/doc/libapr1.0 directory.
+    - Provide patch description.
+  * Point VCS tags in debian control to trunk, to make them useful with
+    debcheckout.
+
+ -- Stefan Fritsch <sf@debian.org>  Tue, 01 Apr 2008 22:17:47 +0200
+
+apr (1.2.11-1) unstable; urgency=low
+
+  * New upstream version (Closes: #441969)
+  * Enable epoll (Closes: #441635). This means we don't support Linux 2.4
+    kernels anymore. Therefore we can also enable tcp_nodelay_with_cork.
+  * Fix generation of docs (Closes: #413684, #442794)
+  * Don't ship LaTeX source files in .deb
+  * Build with -D_REENTRANT on kfreebsd (Closes: #301417)
+  * Fix FTBFS on hurd because of missing PATH_MAX (Closes: #349418)
+  * Do not build everything twice by using the correct path to config.status
+    in debian/rules
+  * Add myself to Uploaders
+  * Add svn repository information to debian/control
+
+ -- Stefan Fritsch <sf@debian.org>  Thu, 20 Sep 2007 20:56:37 +0200
+
+apr (1.2.9-1) unstable; urgency=low
+
+  * Acknowledge NMUs - thanks, Andi.
+
+  [ Peter Samuelson ]
+  * New upstream version.  Minor bugfixes, no new features.
+    - Update 015_sendfile_lfs.dpatch
+    - Remove obsolete 099_config_guess_sub_update.dpatch
+  * 020_lfs_ino_t.dpatch: update to support kfreebsd-amd64.
+    Thanks to Petr Salinger.  (Closes: #405564)
+  * Standards-Version: 3.7.2 (from 3.6.2.2) - no changes.
+  * Rename Source-Version substvar to binary:Version, for great justice.
+  * libapr1-dev Suggests: python, in case someone wants to use the
+    application build infrastructure in /usr/share/apr-1.0/build.
+  * debian/rules: small cleanups.
+  * Add watch file.
+  * Add myself to Uploaders.
+
+ -- Peter Samuelson <peter@p12n.org>  Fri, 22 Jun 2007 14:03:20 -0500
+
+apr (1.2.7-8.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Apply better working 015_sendfile_lfs.dpatch this time.
+    Again Closes: #396631
+
+ -- Andreas Barth <aba@not.so.argh.org>  Wed, 20 Dec 2006 08:19:19 +0000
+
+apr (1.2.7-8.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix 0-lenght files. Take 015_sendfile_lfs.dpatch from svn for this.
+    Closes: #396631
+
+ -- Andreas Barth <aba@not.so.argh.org>  Sat,  9 Dec 2006 20:39:59 +0000
+
+apr (1.2.7-8) unstable; urgency=low
+
+  [ Peter Samuelson ]
+  * Small kludge^Wtweak to apr_file_info.h to make the ABI stable across
+    LFS/non-LFS preprocessor flags.  (See: #397402)
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 15 Nov 2006 00:17:02 +0100
+
+apr (1.2.7-7) unstable; urgency=low
+
+  * Update rules to ensure we don't turn on features that aren't available on
+    2.4 kernels for !amd64 kernels.  Closes: #392049
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Tue,  7 Nov 2006 01:21:27 +0100
+
+apr (1.2.7-6) unstable; urgency=low
+
+  * Update 011_fix_apr-config to give out the libtool used to build apr
+    with.  Fixes Apache 2.2 FTBFS when we remove all the evil libtool
+    hacks there too.
+  * Make -dbg package Priority: extra as per overrides.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 27 Sep 2006 22:16:51 +0200
+
+apr (1.2.7-5) unstable; urgency=low
+
+  * Add doxygen to build-deps.
+  * Add sendfile hurd patch.  Closes: #349416
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 27 Sep 2006 19:32:10 +0200
+
+apr (1.2.7-4) unstable; urgency=low
+
+  * No longer force apr_lock_method.  Closes: #384117
+  * Use srcdir != builddir.
+  * Add docs to -dev package.  Closes: #388146
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 27 Sep 2006 17:26:56 +0200
+
+apr (1.2.7-3) unstable; urgency=low
+
+  * Fix override disparity
+  * Backport of patch to work around kernel problems with sendfile on 64bit
+    platforms
+  * Update config.{guess,sub} to make libtool happier.  This fixes the
+    problem reported in #369881.  Closes: #369881.
+  * Remove some of the libtool hacks since they're no longer needed with
+    the newer config.{guess,sub}
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Mon,  1 May 2006 17:06:37 +0200
+
+apr (1.2.7-2) unstable; urgency=low
+
+  * Ship get-version.sh too, needed by apr-util.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 28 Apr 2006 22:57:43 +0200
+
+apr (1.2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add apr-1-config man page.  Closes: #357174, thanks to Vincent Danjean
+    for the conversion job.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 28 Apr 2006 19:45:08 +0000
+
+apr (1.2.2-3) unstable; urgency=low
+
+  * Rename source package to match upstream.
+  * Rename binary packages to libapr1 etc.
+  * Add conflicts for old packages.
+  * libapr1-dev Depends: uuid-dev.
+  * Add uuid-dev to Build-Dep:
+  * Enable non-portable atomics.
+  * Update Standards-Version: no changes.
+  * Add apr-config compatibility symlink.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Thu, 26 Jan 2006 12:42:30 +0100
+
+apr1.0 (1.2.2-2) unstable; urgency=low
+
+  * Up to debhelper v5
+  * Add call to dh_installdocs; not sure why I was not doing this already.
+
+ -- Thom May <thom@debian.org>  Tue,  3 Jan 2006 13:01:56 +0000
+
+apr1.0 (1.2.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thom May <thom@debian.org>  Thu, 29 Dec 2005 17:05:42 +0000
+
+apr1.0 (1.1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thom May <thom@debian.org>  Sun,  8 May 2005 17:12:09 +0100
+
+apr1.0 (1.1.0-1) unstable; urgency=low
+
+  * New Upstream Release
+  * First Package Release
+
+ -- Thom May <thom@debian.org>  Wed, 17 Nov 2004 11:51:32 -0800
--- apr-1.4.4.orig/debian/libapr1.dirs
+++ apr-1.4.4/debian/libapr1.dirs
@@ -0,0 +1 @@
+usr/lib
--- apr-1.4.4.orig/debian/libapr1-dev.links
+++ apr-1.4.4/debian/libapr1-dev.links
@@ -0,0 +1,2 @@
+usr/bin/apr-1-config usr/bin/apr-config
+usr/share/man/man1/apr-1-config.1 usr/share/man/man1/apr-config.1
--- apr-1.4.4.orig/debian/control
+++ apr-1.4.4/debian/control
@@ -0,0 +1,44 @@
+Source: apr
+Section: libs
+Priority: optional
+Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
+Uploaders: Tollef Fog Heen <tfheen@debian.org>, Peter Samuelson <peter@p12n.org>, Stefan Fritsch <sf@debian.org>, Ryan Niebur <ryanryan52@gmail.com>
+Build-Depends: debhelper (>> 6.0.7), autoconf, autotools-dev, dpatch, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python
+Standards-Version: 3.9.2
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apr
+Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apr
+Homepage: http://apr.apache.org/
+
+Package: libapr1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libapr1.0
+Description: Apache Portable Runtime Library
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+
+Package: libapr1-dev
+Architecture: any
+Section: libdevel
+Depends: libapr1 (= ${binary:Version}), uuid-dev, ${misc:Depends}
+Suggests: python
+Conflicts: libapr1.0-dev, libapr0-dev
+Description: Apache Portable Runtime Library - Development Headers
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ This package contains development headers for APR.
+
+Package: libapr1-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libapr1 (= ${binary:Version}), ${misc:Depends}
+Description: Apache Portable Runtime Library - Debugging Symbols
+ APR is Apache's Portable Runtime Library, designed to be a support library 
+ that provides a predictable and consistent interface to underlying 
+ platform-specific implementations. 
+ .
+ This package contains the debugging symbols for APR.
--- apr-1.4.4.orig/debian/libapr1-dev.dirs
+++ apr-1.4.4/debian/libapr1-dev.dirs
@@ -0,0 +1,4 @@
+usr/include/apr-1.0
+usr/lib
+usr/lib/pkgconfig
+usr/bin
--- apr-1.4.4.orig/debian/watch
+++ apr-1.4.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/apr/apr-(1\..*)\.tar\.gz
--- apr-1.4.4.orig/debian/libapr1-dev.install
+++ apr-1.4.4/debian/libapr1-dev.install
@@ -0,0 +1,7 @@
+debian/tmp/usr/include/apr-1.0
+debian/tmp/usr/lib/libapr*a
+debian/tmp/usr/lib/libapr-1.so
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/bin
+debian/tmp/usr/share/apr-1.0/
+build-*/docs/dox/html usr/share/doc/libapr1-dev
--- apr-1.4.4.orig/debian/symbols.kfreebsd
+++ apr-1.4.4/debian/symbols.kfreebsd
@@ -0,0 +1,3 @@
+#include "symbols.common"
+ apr_pollcb_provider_kqueue@Base 1.4.2
+ apr_pollset_provider_kqueue@Base 1.4.2
--- apr-1.4.4.orig/debian/README.source
+++ apr-1.4.4/debian/README.source
@@ -0,0 +1,17 @@
+Debian-apache uses dpatch to make changes to the upstream source.
+
+To apply all of the patches run:
+./debian/rules patch
+
+To unapply all of the patches run:
+./debian/rules unpatch
+
+To add (or edit) a patch run:
+dpatch-edit-patch name_of_patch_goes_here
+#make your changes
+exit
+
+dpatch will make a new patch in debian/patches/ if one with that name doesn't already exist, otherwise it will change the existing one.
+To make it get used add it to debian/patches/00list .
+
+To make a patch not get used remove it from debian/patches/00list .
--- apr-1.4.4.orig/debian/symbols.linux
+++ apr-1.4.4/debian/symbols.linux
@@ -0,0 +1,4 @@
+#include "symbols.common"
+ apr_socket_sendfile@Base 1.2.7
+ apr_pollcb_provider_epoll@Base 1.4.2
+ apr_pollset_provider_epoll@Base 1.4.2
--- apr-1.4.4.orig/debian/symbols.hurd
+++ apr-1.4.4/debian/symbols.hurd
@@ -0,0 +1,2 @@
+#include "symbols.common"
+ apr_socket_sendfile@Base 1.2.7
--- apr-1.4.4.orig/debian/patches/022_hurd_path_max.dpatch
+++ apr-1.4.4/debian/patches/022_hurd_path_max.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 022_hurd_path_max.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: #349418
+
+@DPATCH@
+diff -urNad apr-1.2.11~/include/apr.h.in apr-1.2.11/include/apr.h.in
+--- apr-1.2.11~/include/apr.h.in	2007-07-25 05:12:02.000000000 +0200
++++ apr-1.2.11/include/apr.h.in	2007-09-12 22:08:30.464437530 +0200
+@@ -389,7 +389,8 @@
+ #elif defined(_POSIX_PATH_MAX)
+ #define APR_PATH_MAX       _POSIX_PATH_MAX
+ #else
+-#error no decision has been made on APR_PATH_MAX for your platform
++#warning no decision has been made on APR_PATH_MAX for your platform
++#define APR_PATH_MAX 4096
+ #endif
+ 
+ /** @} */
--- apr-1.4.4.orig/debian/patches/025_GNU_SOURCE_earlier.dpatch
+++ apr-1.4.4/debian/patches/025_GNU_SOURCE_earlier.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 025_define_GNU_SOURCE_earlier.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: _GNU_SOURCE needs to be #defined before #including stuff
+## DP: (causing FTBFS on hurd, #530286)
+
+@DPATCH@
+diff -urNad trunk~/include/apr.h.in trunk/include/apr.h.in
+--- trunk~/include/apr.h.in	2009-06-07 19:10:19.000000000 +0200
++++ trunk/include/apr.h.in	2009-06-07 20:50:52.261954142 +0200
+@@ -33,6 +33,10 @@
+  * for Win32 or Netware by those build environments, respectively.
+  */
+ 
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE 1
++#endif
++
+ /**
+  * @defgroup APR Apache Portability Runtime library
+  * @{
--- apr-1.4.4.orig/debian/patches/026_omit_extra_libs.dpatch
+++ apr-1.4.4/debian/patches/026_omit_extra_libs.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 026_omit_extra_libs.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: #463399
+
+@DPATCH@
+diff -urNad trunk~/apr-config.in trunk/apr-config.in
+--- trunk~/apr-config.in	2009-06-07 21:08:49.000000000 +0200
++++ trunk/apr-config.in	2009-06-07 21:10:50.573842471 +0200
+@@ -36,7 +36,7 @@
+ CPPFLAGS="@EXTRA_CPPFLAGS@"
+ CFLAGS="@EXTRA_CFLAGS@"
+ LDFLAGS="@EXTRA_LDFLAGS@"
+-LIBS="@EXTRA_LIBS@"
++LIBS=""
+ EXTRA_INCLUDES="@EXTRA_INCLUDES@"
+ SHLIBPATH_VAR="@shlibpath_var@"
+ APR_SOURCE_DIR="@apr_srcdir@"
--- apr-1.4.4.orig/debian/patches/011_fix_apr-config.dpatch
+++ apr-1.4.4/debian/patches/011_fix_apr-config.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 011_fix_apr-config.dpatch by  <tfheen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+Index: apr-config.in
+--- a/apr-config.in
++++ b/apr-config.in
+@@ -38,7 +38,7 @@
+ LIBS="@EXTRA_LIBS@"
+ EXTRA_INCLUDES="@EXTRA_INCLUDES@"
+ SHLIBPATH_VAR="@shlibpath_var@"
+-APR_SOURCE_DIR="@apr_srcdir@"
++APR_SOURCE_DIR="$(cd @installbuilddir@/.. ; pwd)"
+ APR_BUILD_DIR="@apr_builddir@"
+ APR_SO_EXT="@so_ext@"
+ APR_LIB_TARGET="@export_lib_target@"
+@@ -222,11 +222,7 @@
+     exit 0
+     ;;
+     --apr-libtool)
+-    if test "$location" = "installed"; then
+-        echo "${installbuilddir}/libtool"
+-    else
+-        echo "$APR_BUILD_DIR/libtool"
+-    fi
++        echo "$installbuilddir/libtool"
+     exit 0
+     ;;
+     --help)
--- apr-1.4.4.orig/debian/patches/015_sendfile_lfs.dpatch
+++ apr-1.4.4/debian/patches/015_sendfile_lfs.dpatch
@@ -0,0 +1,140 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 015_sendfile_lfs.dpatch by <thom@debian.org> <peter@p12n.org>
+##
+## DP: Detect sendfile64() at runtime (not present on 2.4 kernels.)
+
+@DPATCH@
+Index: network_io/unix/sendrecv.c
+--- a/network_io/unix/sendrecv.c
++++ b/network_io/unix/sendrecv.c
+@@ -243,39 +243,77 @@
+ 
+ #if defined(__linux__) && defined(HAVE_WRITEV)
+ 
+-apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
+-                                 apr_hdtr_t *hdtr, apr_off_t *offset,
+-                                 apr_size_t *len, apr_int32_t flags)
++/* Helper function for apr_socket_sendfile.
++ * Takes care of sendfile vs. sendfile64 (must be detected at runtime),
++ * EINTR restarting, and other details.  NOTE: does not necessarily
++ * update 'off', as callers don't need this.
++ */
++static
++ssize_t do_sendfile(int out, int in, apr_off_t *off, apr_size_t len)
+ {
+-    int rv, nbytes = 0, total_hdrbytes, i;
+-    apr_status_t arv;
++#if !APR_HAS_LARGE_FILES
++    ssize_t ret;
++    do
++	ret = sendfile(out, in, off, len);
++    while (ret == -1 && errno == EINTR);
++    return ret;
++#else
+ 
+-#if APR_HAS_LARGE_FILES && defined(HAVE_SENDFILE64)
+-    apr_off_t off = *offset;
+-#define sendfile sendfile64
++#ifdef HAVE_SENDFILE64
++    static int sendfile64_enosys;  /* sendfile64() syscall not found */
++#endif
++    off_t offtmp;
++    ssize_t ret;
+ 
+-#elif APR_HAS_LARGE_FILES && SIZEOF_OFF_T == 4
+-    /* 64-bit apr_off_t but no sendfile64(): fail if trying to send
+-     * past the 2Gb limit. */
+-    off_t off;
+-    
+-    if ((apr_int64_t)*offset + *len > INT_MAX) {
+-        return EINVAL;
++    /* Multiple reports have shown sendfile failing with EINVAL if
++     * passed a >=2Gb count value on some 64-bit kernels.  It won't
++     * noticably hurt performance to limit each call to <2Gb at a time,
++     * so avoid that issue here.  (Round down to a common page size.) */
++    if (sizeof(off_t) == 8 && len > INT_MAX)
++        len = INT_MAX - 8191;
++
++    /* The simple and common case: we don't cross the LFS barrier */
++    if (sizeof(off_t) == 8 || (apr_int64_t)*off + len <= INT_MAX) {
++        offtmp = *off;
++        do
++            ret = sendfile(out, in, &offtmp, len);
++        while (ret == -1 && errno == EINTR);
++        return ret;
+     }
+-    
+-    off = *offset;
+ 
+-#else
+-    off_t off = *offset;
++    /* From here down we know it's a 32-bit runtime */
++#ifdef HAVE_SENDFILE64
++    if (!sendfile64_enosys) {
++        do
++            ret = sendfile64(out, in, off, len);
++        while (ret == -1 && errno == EINTR);
+ 
+-    /* Multiple reports have shown sendfile failing with EINVAL if
+-     * passed a >=2Gb count value on some 64-bit kernels.  It won't
+-     * noticably hurt performance to limit each call to <2Gb at a
+-     * time, so avoid that issue here: */
+-    if (sizeof(off_t) == 8 && *len > INT_MAX) {
+-        *len = INT_MAX;
++        if (ret != -1 || errno != ENOSYS)
++            return ret;
++
++        sendfile64_enosys = 1;
+     }
+ #endif
++    if (*off > INT_MAX) {
++        errno = EINVAL;
++        return -1;
++    }
++    offtmp = *off;
++    do
++	ret = sendfile(out, in, &offtmp, len);
++    while (ret == -1 && errno == EINTR);
++    return ret;
++#endif /* APR_HAS_LARGE_FILES */
++}
++
++
++apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
++                                 apr_hdtr_t *hdtr, apr_off_t *offset,
++                                 apr_size_t *len, apr_int32_t flags)
++{
++    int rv, nbytes = 0, total_hdrbytes, i;
++    apr_status_t arv;
++    apr_off_t off = *offset;
+ 
+     if (!hdtr) {
+         hdtr = &no_hdtr;
+@@ -321,12 +359,10 @@
+         goto do_select;
+     }
+ 
+-    do {
+-        rv = sendfile(sock->socketdes,    /* socket */
++    rv = do_sendfile(sock->socketdes,    /* socket */
+                       file->filedes, /* open file descriptor of the file to be sent */
+                       &off,    /* where in the file to start */
+                       *len);   /* number of bytes to send */
+-    } while (rv == -1 && errno == EINTR);
+ 
+     while ((rv == -1) && (errno == EAGAIN || errno == EWOULDBLOCK) 
+                       && (sock->timeout > 0)) {
+@@ -337,12 +373,10 @@
+             return arv;
+         }
+         else {
+-            do {
+-                rv = sendfile(sock->socketdes,    /* socket */
++	    rv = do_sendfile(sock->socketdes,    /* socket */
+                               file->filedes, /* open file descriptor of the file to be sent */
+                               &off,    /* where in the file to start */
+                               *len);    /* number of bytes to send */
+-            } while (rv == -1 && errno == EINTR);
+         }
+     }
+ 
--- apr-1.4.4.orig/debian/patches/016_sendfile_hurd.dpatch
+++ apr-1.4.4/debian/patches/016_sendfile_hurd.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 016_sendfile_hurd.dpatch by  <tfheen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+Index: network_io/unix/sendrecv.c
+--- a/network_io/unix/sendrecv.c
++++ b/network_io/unix/sendrecv.c
+@@ -238,7 +238,7 @@
+ /* Define a structure to pass in when we have a NULL header value */
+ static apr_hdtr_t no_hdtr;
+ 
+-#if defined(__linux__) && defined(HAVE_WRITEV)
++#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
+ 
+ /* Helper function for apr_socket_sendfile.
+  * Takes care of sendfile vs. sendfile64 (must be detected at runtime),
--- apr-1.4.4.orig/debian/patches/00list
+++ apr-1.4.4/debian/patches/00list
@@ -0,0 +1,9 @@
+011_fix_apr-config
+013_ship_find_apr.m4
+014_fix-apr.pc
+015_sendfile_lfs
+016_sendfile_hurd
+022_hurd_path_max.dpatch
+023_fix_doxygen.dpatch
+025_GNU_SOURCE_earlier.dpatch
+026_omit_extra_libs.dpatch
--- apr-1.4.4.orig/debian/patches/023_fix_doxygen.dpatch
+++ apr-1.4.4/debian/patches/023_fix_doxygen.dpatch
@@ -0,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 023_fix_doxygen.dpatch by Stefan Fritsch <sf@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix generation of docs for out-of-tree builds and newer doxygen versions
+
+@DPATCH@
+diff -urNad apr~/docs/doxygen.conf apr/docs/doxygen.conf
+--- apr~/docs/doxygen.conf	2005-02-07 15:12:15.000000000 -0800
++++ apr/docs/doxygen.conf	2008-06-27 20:11:39.000000000 -0700
+@@ -1,6 +1,6 @@
+ PROJECT_NAME="Apache Portable Runtime"
+ 
+-INPUT=.
++INPUT=../include include
+ QUIET=YES
+ RECURSIVE=YES
+ FILE_PATTERNS=*.h
+diff -urNad apr~/include/apr.h.in apr/include/apr.h.in
+--- apr~/include/apr.h.in	2008-05-29 08:47:52.000000000 -0700
++++ apr/include/apr.h.in	2008-06-27 20:17:17.000000000 -0700
+@@ -374,11 +374,11 @@
+ /** 
+  * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
+  * so that they follow the platform's calling convention.
+- * <PRE>
+- *
++ */
++/**
++ * @code
+  * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
+- *
+- * </PRE>
++ * @endcode
+  */
+ #define APR_THREAD_FUNC
+ 
+@@ -410,11 +410,11 @@
+  * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
+  * @see APR_DECLARE @see APR_DECLARE_DATA
+  * @remark Both the declaration and implementations must use the same macro.
+- * <PRE>
+- *
++ */
++/**
++ * @code
+  * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
+- *
+- * </PRE>
++ * @endcode
+  */
+ #define APR_DECLARE_NONSTD(type)     type
+ 
+@@ -425,12 +425,12 @@
+  * @remark Note that the declaration and implementations use different forms,
+  * but both must include the macro.
+  * 
+- * <PRE>
+- *
++ */
++/**
++ * @code
+  * extern APR_DECLARE_DATA type apr_variable;\n
+  * APR_DECLARE_DATA type apr_variable = value;
+- *
+- * </PRE>
++ * @endcode
+  */
+ #define APR_DECLARE_DATA
+ 
--- apr-1.4.4.orig/debian/patches/013_ship_find_apr.m4.dpatch
+++ apr-1.4.4/debian/patches/013_ship_find_apr.m4.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 013_ship_find_apr.m4.dpatch by Tollef Fog Heen <tfheen@err.no>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Install a set of random build files too
+
+@DPATCH@
+diff -urNad apr1.0-1.2.2~/Makefile.in apr1.0-1.2.2/Makefile.in
+--- apr1.0-1.2.2~/Makefile.in	2005-02-04 12:55:44.000000000 +0100
++++ apr1.0-1.2.2/Makefile.in	2006-01-26 20:19:44.000000000 +0100
+@@ -85,6 +85,15 @@
+ 	done
+ 	$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
+ 	$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
++
++	if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
++	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
++	fi
++	for file in find_apr.m4 apr_common.m4 install.sh gen-build.py get-version.sh ; do \
++		$(LIBTOOL) --mode=install cp $(top_srcdir)/build/$$file \
++	    $(DESTDIR)$(installbuilddir)/$$file	; \
++	done
++
+ 	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
+             for i in $(INSTALL_SUBDIRS); do \
+ 	        ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
--- apr-1.4.4.orig/debian/patches/014_fix-apr.pc.dpatch
+++ apr-1.4.4/debian/patches/014_fix-apr.pc.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 014_fix-apr.pc.dpatch by  <tfheen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad apr1.0-1.2.2~/apr.pc.in apr1.0-1.2.2/apr.pc.in
+--- apr1.0-1.2.2~/apr.pc.in	2006-01-27 17:28:12.000000000 +0100
++++ apr1.0-1.2.2/apr.pc.in	2006-01-27 17:31:18.000000000 +0100
+@@ -7,5 +7,6 @@
+ Name: APR
+ Description: The Apache Portable Runtime library
+ Version: @APR_DOTTED_VERSION@
+-Libs: -L${libdir} -l@APR_LIBNAME@ @EXTRA_LIBS@
+-Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir}
++Libs: -L${libdir} -l@APR_LIBNAME@
++Libs.private: @EXTRA_LIBS@
++Cflags: @EXTRA_CPPFLAGS@ -I${includedir}
--- apr-1.4.4.orig/debian/source/format
+++ apr-1.4.4/debian/source/format
@@ -0,0 +1 @@
+1.0