debian/0000755000000000000000000000000012260312277007170 5ustar debian/libapr1.lintian-overrides0000644000000000000000000000006612241725655014113 0ustar libapr1: package-name-doesnt-match-sonames libapr-1-0 debian/libapr1.install0000644000000000000000000000003012241725655012112 0ustar usr/lib/*/libapr-1.so.* debian/symbols.common0000644000000000000000000003674612243770745012123 0ustar 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_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_escape_echo@Base 1.5.0 apr_escape_entity@Base 1.5.0 apr_escape_hex@Base 1.5.0 apr_escape_path@Base 1.5.0 apr_escape_path_segment@Base 1.5.0 apr_escape_shell@Base 1.5.0 apr_escape_urlencoded@Base 1.5.0 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_hash_this_key@Base 1.5.0 apr_hash_this_key_len@Base 1.5.0 apr_hash_this_val@Base 1.5.0 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_pescape_echo@Base 1.5.0 apr_pescape_entity@Base 1.5.0 apr_pescape_hex@Base 1.5.0 apr_pescape_path@Base 1.5.0 apr_pescape_path_segment@Base 1.5.0 apr_pescape_shell@Base 1.5.0 apr_pescape_urlencoded@Base 1.5.0 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_punescape_entity@Base 1.5.0 apr_punescape_hex@Base 1.5.0 apr_punescape_url@Base 1.5.0 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_attach_ex@Base 1.5.0 apr_shm_baseaddr_get@Base 1.2.7 apr_shm_create@Base 1.2.7 apr_shm_create_ex@Base 1.5.0 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_skiplist_add_index@Base 1.5.0 apr_skiplist_alloc@Base 1.5.0 apr_skiplist_destroy@Base 1.5.0 apr_skiplist_find@Base 1.5.0 apr_skiplist_find_compare@Base 1.5.0 apr_skiplist_free@Base 1.5.0 apr_skiplist_getlist@Base 1.5.0 apr_skiplist_init@Base 1.5.0 apr_skiplist_insert@Base 1.5.0 apr_skiplist_insert_compare@Base 1.5.0 apr_skiplist_merge@Base 1.5.0 apr_skiplist_next@Base 1.5.0 apr_skiplist_peek@Base 1.5.0 apr_skiplist_pop@Base 1.5.0 apr_skiplist_previous@Base 1.5.0 apr_skiplist_remove@Base 1.5.0 apr_skiplist_remove_all@Base 1.5.0 apr_skiplist_remove_compare@Base 1.5.0 apr_skiplist_set_compare@Base 1.5.0 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_is_wildcard@Base 1.5.0 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.4.8-2~ 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_getm@Base 1.5.0 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_unescape_entity@Base 1.5.0 apr_unescape_hex@Base 1.5.0 apr_unescape_url@Base 1.5.0 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 debian/patches/0000755000000000000000000000000012260311114010604 5ustar debian/patches/dont_override_external_buildflags0000644000000000000000000000133412241725655017513 0ustar # Don't force apr-using projects to use the compile flags used during # apr's compilation. Index: apr/build/apr_rules.mk.in =================================================================== --- apr.orig/build/apr_rules.mk.in 2010-04-21 17:20:26.000000000 +0200 +++ apr/build/apr_rules.mk.in 2013-11-01 21:22:19.655108671 +0100 @@ -41,10 +41,10 @@ # compilation and linking flags that are supposed to be set only by the user. # configure adds to them for tests, but we restore them at the end. # -CFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ -LDFLAGS=@LDFLAGS@ -LIBS=@LIBS@ +CFLAGS?=@CFLAGS@ +CPPFLAGS?=@CPPFLAGS@ +LDFLAGS?=@LDFLAGS@ +LIBS?=@LIBS@ DEFS=@DEFS@ # anything added to the standard flags by configure is moved to EXTRA_* debian/patches/omit_extra_libs.patch0000644000000000000000000000101212241725655015025 0ustar From: Stefan Fritsch Subject: #463399 --- apr-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: apr/apr-config.in =================================================================== --- apr.orig/apr-config.in +++ apr/apr-config.in @@ -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="$(cd @installbuilddir@/.. ; pwd)" debian/patches/series0000644000000000000000000000030612260311016012021 0ustar fix_apr-config.patch ship_find_apr.m4.patch fix-apr.pc.patch hurd_path_max.patch fix_doxygen.patch omit_extra_libs.patch hurd_shm_flock.patch dont_override_external_buildflags upstream_svn_r1552863 debian/patches/fix_apr-config.patch0000644000000000000000000000151112241725655014540 0ustar From: Subject: No description. --- apr-config.in | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) Index: apr/apr-config.in =================================================================== --- apr.orig/apr-config.in +++ apr/apr-config.in @@ -39,7 +39,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@" @@ -223,11 +223,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) debian/patches/fix_doxygen.patch0000644000000000000000000000337512241725655014202 0ustar From: Stefan Fritsch Subject: Fix generation of docs for out-of-tree builds and newer doxygen versions --- docs/doxygen.conf | 2 +- include/apr.h.in | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) Index: apr/docs/doxygen.conf =================================================================== --- apr.orig/docs/doxygen.conf +++ apr/docs/doxygen.conf @@ -1,6 +1,6 @@ PROJECT_NAME="Apache Portable Runtime" -INPUT=. +INPUT=../../include include QUIET=YES RECURSIVE=YES FILE_PATTERNS=*.h Index: apr/include/apr.h.in =================================================================== --- apr.orig/include/apr.h.in +++ apr/include/apr.h.in @@ -445,11 +445,11 @@ /** * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, * so that they follow the platform's calling convention. - * 
- *
+ */
+/**
+ * @code
  * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
- *
- *
+ * @endcode */ #define APR_THREAD_FUNC @apr_thread_func@ @@ -481,11 +481,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. - * 
- *
+ */
+/**
+ * @code
  * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- *
- *
+ * @endcode */ #define APR_DECLARE_NONSTD(type) type @@ -496,12 +496,12 @@ * @remark Note that the declaration and implementations use different forms, * but both must include the macro. * - * 
- *
+ */
+/**
+ * @code
  * extern APR_DECLARE_DATA type apr_variable;\n
  * APR_DECLARE_DATA type apr_variable = value;
- *
- *
+ * @endcode */ #define APR_DECLARE_DATA debian/patches/hurd_path_max.patch0000644000000000000000000000113512241725655014472 0ustar From: Stefan Fritsch Subject: #349418 --- include/apr.h.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: apr/include/apr.h.in =================================================================== --- apr.orig/include/apr.h.in +++ apr/include/apr.h.in @@ -594,7 +594,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 #define APR_DSOPATH "@shlibpath_var@" debian/patches/hurd_shm_flock.patch0000644000000000000000000000256112241725655014642 0ustar From: Pino Toscano Bug: #656880 # * hurd_shm_flock.diff # This patch disables all the methods for shared memory and file locking # found by the configure checks, forcing the only working ones. # This patch should stay Debian-specific, as it is not that suitable for # upstream inclusion. (As you can guess, ideally all of those # non-working methods should be ideally fixed in Hurd...) Index: apr/configure.in =================================================================== --- apr.orig/configure.in +++ apr/configure.in @@ -1188,6 +1188,13 @@ APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON) ;; esac +case $host_os in + gnu* ) + haveshmgetanon="0" + havemmapanon="0" + APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ZERO) + ;; +esac APR_END_DECISION AC_DEFINE_UNQUOTED($ac_decision) @@ -1256,6 +1263,13 @@ fi ;; esac +case $host_os in + gnu* ) + havemmapshm="0" + haveshmget="0" + APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_TMP) + ;; +esac APR_END_DECISION AC_DEFINE_UNQUOTED($ac_decision) @@ -2215,6 +2229,12 @@ if test "x$apr_lock_method" != "x"; then APR_DECISION_FORCE($apr_lock_method) fi +case $host_os in + gnu* ) + hasfcntlser="0" + APR_DECISION_OVERRIDE(USE_FLOCK_SERIALIZE) + ;; +esac APR_END_DECISION AC_DEFINE_UNQUOTED($ac_decision) debian/patches/ship_find_apr.m4.patch0000644000000000000000000000166512241725655015003 0ustar From: Tollef Fog Heen Subject: Install a set of random build files too --- Makefile.in | 9 +++++++++ 1 file changed, 9 insertions(+) Index: apr/Makefile.in =================================================================== --- apr.orig/Makefile.in +++ apr/Makefile.in @@ -90,6 +90,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 ); \ debian/patches/fix-apr.pc.patch0000644000000000000000000000110212241725655013610 0ustar From: Subject: No description. --- apr.pc.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: apr/apr.pc.in =================================================================== --- apr.orig/apr.pc.in +++ apr/apr.pc.in @@ -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} debian/patches/upstream_svn_r15528630000644000000000000000000010454512260311114014365 0ustar Index: apr/CHANGES =================================================================== --- apr.orig/CHANGES +++ apr/CHANGES @@ -1,4 +1,26 @@ -*- coding: utf-8 -*- +Changes backported from APR 1.5.x branch + + *) Fix apr_escape.c compilation errors on ebcdic platforms. + [Eric Covener] + + *) FreeBSD 10: Correct a regression in 1.5.0 which affected non- + blocking sockets in some applications, including httpd. [Jeff + Trawick] + + *) Windows cmake build: Fix incorrect installation of some .pdb + files. [Jeff Trawick] + + *) apr_skiplist: Add compatibility with C++ applications. + [Jeff Trawick] + + *) When using shmget-based shared memory, the ID used for ftok is + now an APR hash of the filename instead of the constant '1'. + PR 53996 [Jim Jagielski] + + *) Correct a regression in 1.5.0 which affected out-of-tree + builds on Unix. [Rainer Jung] + Changes for APR 1.5.0 *) Fix Linux kernel version check to recognize more versions, @@ -9,7 +31,7 @@ refers to the wildcard address for the protocol family (e.g., 0.0.0.0/INADDR_ANY for IPv4). [Jeff Trawick] - *) apr_file_dup2() on Windows: Fix debug RTL assertion in when + *) apr_file_dup2() on Windows: Fix debug RTL assertion when attempting to _commit(stdout) or _commit(stderr). [Mike Rumph ] Index: apr/CMakeLists.txt =================================================================== --- apr.orig/CMakeLists.txt +++ apr/CMakeLists.txt @@ -272,7 +272,7 @@ # libaprapp-1 and aprapp-1 are static ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) SET(install_targets ${install_targets} libaprapp-1) -SET(install_lib_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb) +SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb) SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS APR_APP) ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) Index: apr/Makefile.in =================================================================== --- apr.orig/Makefile.in +++ apr/Makefile.in @@ -18,7 +18,7 @@ INCDIR=./include OSDIR=$(top_srcdir)/include/arch/@OSDIR@ DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(top_blddir)/include/private # # Macros for target determination @@ -143,6 +143,7 @@ $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ + $(APR_MKDIR) include/private tools/gen_test_char@EXEEXT@ > $@ LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \ Index: apr/docs/canonical_filenames.html =================================================================== --- apr.orig/docs/canonical_filenames.html +++ apr/docs/canonical_filenames.html @@ -104,9 +104,9 @@ stat and case canonicalization calls to the OS.

The comparison operation provides that the APR can postpone correction -of case by simply relying upon the device and inode for equivilance. The +of case by simply relying upon the device and inode for equivalence. The stat implementation provides that two files are the same, while their -strings are not equivilant, and eliminates the need for the operating +strings are not equivalent, and eliminates the need for the operating system to return the proper form of the name.

In any case, returning the char* path, with a flag to request the proper @@ -153,4 +153,4 @@ - \ No newline at end of file + Index: apr/encoding/apr_escape.c =================================================================== --- apr.orig/encoding/apr_escape.c +++ apr/encoding/apr_escape.c @@ -30,11 +30,43 @@ #include "apr_lib.h" #include "apr_strings.h" -/* helper for Latin1 <-> entity encoding */ #if APR_CHARSET_EBCDIC -#include "apr_xlate.h" -#define RAW_ASCII_CHAR(ch) apr_xlate_conv_byte(ap_hdrs_from_ascii, \ - (unsigned char)ch) +static int convert_a2e[256] = { + 0x00, 0x01, 0x02, 0x03, 0x37, 0x2D, 0x2E, 0x2F, 0x16, 0x05, 0x15, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x3C, 0x3D, 0x32, 0x26, 0x18, 0x19, 0x3F, 0x27, 0x1C, 0x1D, 0x1E, 0x1F, + 0x40, 0x5A, 0x7F, 0x7B, 0x5B, 0x6C, 0x50, 0x7D, 0x4D, 0x5D, 0x5C, 0x4E, 0x6B, 0x60, 0x4B, 0x61, + 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0x7A, 0x5E, 0x4C, 0x7E, 0x6E, 0x6F, + 0x7C, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, + 0xD7, 0xD8, 0xD9, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xAD, 0xE0, 0xBD, 0x5F, 0x6D, + 0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, + 0x97, 0x98, 0x99, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xC0, 0x4F, 0xD0, 0xA1, 0x07, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x06, 0x17, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x09, 0x0A, 0x1B, + 0x30, 0x31, 0x1A, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3A, 0x3B, 0x04, 0x14, 0x3E, 0xFF, + 0x41, 0xAA, 0x4A, 0xB1, 0x9F, 0xB2, 0x6A, 0xB5, 0xBB, 0xB4, 0x9A, 0x8A, 0xB0, 0xCA, 0xAF, 0xBC, + 0x90, 0x8F, 0xEA, 0xFA, 0xBE, 0xA0, 0xB6, 0xB3, 0x9D, 0xDA, 0x9B, 0x8B, 0xB7, 0xB8, 0xB9, 0xAB, + 0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9E, 0x68, 0x74, 0x71, 0x72, 0x73, 0x78, 0x75, 0x76, 0x77, + 0xAC, 0x69, 0xED, 0xEE, 0xEB, 0xEF, 0xEC, 0xBF, 0x80, 0xFD, 0xFE, 0xFB, 0xFC, 0xBA, 0xAE, 0x59, + 0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9C, 0x48, 0x54, 0x51, 0x52, 0x53, 0x58, 0x55, 0x56, 0x57, + 0x8C, 0x49, 0xCD, 0xCE, 0xCB, 0xCF, 0xCC, 0xE1, 0x70, 0xDD, 0xDE, 0xDB, 0xDC, 0x8D, 0x8E, 0xDF }; + +static int convert_e2a[256] = { + 0x00, 0x01, 0x02, 0x03, 0x9C, 0x09, 0x86, 0x7F, 0x97, 0x8D, 0x8E, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x9D, 0x0A, 0x08, 0x87, 0x18, 0x19, 0x92, 0x8F, 0x1C, 0x1D, 0x1E, 0x1F, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x17, 0x1B, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x05, 0x06, 0x07, + 0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, 0x98, 0x99, 0x9A, 0x9B, 0x14, 0x15, 0x9E, 0x1A, + 0x20, 0xA0, 0xE2, 0xE4, 0xE0, 0xE1, 0xE3, 0xE5, 0xE7, 0xF1, 0xA2, 0x2E, 0x3C, 0x28, 0x2B, 0x7C, + 0x26, 0xE9, 0xEA, 0xEB, 0xE8, 0xED, 0xEE, 0xEF, 0xEC, 0xDF, 0x21, 0x24, 0x2A, 0x29, 0x3B, 0x5E, + 0x2D, 0x2F, 0xC2, 0xC4, 0xC0, 0xC1, 0xC3, 0xC5, 0xC7, 0xD1, 0xA6, 0x2C, 0x25, 0x5F, 0x3E, 0x3F, + 0xF8, 0xC9, 0xCA, 0xCB, 0xC8, 0xCD, 0xCE, 0xCF, 0xCC, 0x60, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22, + 0xD8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0xAB, 0xBB, 0xF0, 0xFD, 0xFE, 0xB1, + 0xB0, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0xAA, 0xBA, 0xE6, 0xB8, 0xC6, 0xA4, + 0xB5, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0xA1, 0xBF, 0xD0, 0x5B, 0xDE, 0xAE, + 0xAC, 0xA3, 0xA5, 0xB7, 0xA9, 0xA7, 0xB6, 0xBC, 0xBD, 0xBE, 0xDD, 0xA8, 0xAF, 0x5D, 0xB4, 0xD7, + 0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0xAD, 0xF4, 0xF6, 0xF2, 0xF3, 0xF5, + 0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0xB9, 0xFB, 0xFC, 0xF9, 0xFA, 0xFF, + 0x5C, 0xF7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0xB2, 0xD4, 0xD6, 0xD2, 0xD3, 0xD5, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0xB3, 0xDB, 0xDC, 0xD9, 0xDA, 0x9F }; +#define RAW_ASCII_CHAR(ch) convert_e2a[(unsigned char)ch] #else /* APR_CHARSET_EBCDIC */ #define RAW_ASCII_CHAR(ch) (ch) #endif /* !APR_CHARSET_EBCDIC */ @@ -139,8 +171,7 @@ xstr[2]=what[0]; xstr[3]=what[1]; xstr[4]='\0'; - digit = apr_xlate_conv_byte(ap_hdrs_from_ascii, - 0xFF & strtol(xstr, NULL, 16)); + digit = convert_a2e[0xFF & strtol(xstr, NULL, 16)]; #endif /*APR_CHARSET_EBCDIC*/ return (digit); } @@ -299,7 +330,7 @@ unsigned char *where) { #if APR_CHARSET_EBCDIC - what = apr_xlate_conv_byte(ap_hdrs_to_ascii, (unsigned char)what); + what = convert_e2a[(unsigned char)what]; #endif /*APR_CHARSET_EBCDIC*/ *where++ = prefix; *where++ = c2x_table[what >> 4]; Index: apr/include/apr_escape.h =================================================================== --- apr.orig/include/apr_escape.h +++ apr/include/apr_escape.h @@ -72,7 +72,7 @@ APR_DECLARE(const char *) apr_pescape_shell(apr_pool_t *p, const char *str) __attribute__((nonnull(1))); -/* +/** * Unescapes a URL, leaving reserved characters intact. * @param escaped Optional buffer to write the encoded string, can be * NULL @@ -93,7 +93,7 @@ apr_ssize_t slen, const char *forbid, const char *reserved, int plus, apr_size_t *len); -/* +/** * Unescapes a URL, leaving reserved characters intact, returning the * result from a pool. * @param p Pool to allocate from @@ -212,7 +212,7 @@ * double quote becomes '"" and the single quote becomes '''. * * If toasc is not zero, any non ascii character will be encoded as - * '%#ddd;', where ddd is the decimal code of the character. + * '%\#ddd;', where ddd is the decimal code of the character. * @param escaped Optional buffer to write the encoded string, can be * NULL * @param str The original string @@ -239,14 +239,14 @@ APR_DECLARE(const char *) apr_pescape_entity(apr_pool_t *p, const char *str, int toasc) __attribute__((nonnull(1))); -/* +/** * Decodes html entities or numeric character references in a string. If * the string to be unescaped is syntactically incorrect, then the * following fixups will be made: * unknown entities will be left undecoded; * references to unused numeric characters will be deleted. * In particular, � will not be decoded, but will be deleted. - * @param escaped Optional buffer to write the encoded string, can be + * @param unescaped Optional buffer to write the encoded string, can be * NULL * @param str The original string * @param slen The length of the original string, or APR_ESCAPE_STRING @@ -257,7 +257,7 @@ APR_DECLARE(apr_status_t) apr_unescape_entity(char *unescaped, const char *str, apr_ssize_t slen, apr_size_t *len); -/* +/** * Decodes html entities or numeric character references in a string. If * the string to be unescaped is syntactically incorrect, then the * following fixups will be made: @@ -275,10 +275,10 @@ /** * Escape control characters in a string, as performed by the shell's * 'echo' command. Characters are replaced as follows: - * \a alert (bell), \b backspace, \f form feed, \n new line, \r carriage - * return, \t horizontal tab, \v vertical tab, \\ backslash. + * \\a alert (bell), \\b backspace, \\f form feed, \\n new line, \\r carriage + * return, \\t horizontal tab, \\v vertical tab, \\ backslash. * - * Any non ascii character will be encoded as '\xHH', where HH is the hex + * Any non ascii character will be encoded as '\\xHH', where HH is the hex * code of the character. * * If quote is not zero, the double quote character will also be escaped. @@ -297,11 +297,11 @@ /** * Escape control characters in a string, as performed by the shell's * 'echo' command, and return the results from a pool. Characters are - * replaced as follows: \a alert (bell), \b backspace, \f form feed, - * \n new line, \r carriage return, \t horizontal tab, \v vertical tab, + * replaced as follows: \\a alert (bell), \\b backspace, \\f form feed, + * \\n new line, \\r carriage return, \\t horizontal tab, \\v vertical tab, * \\ backslash. * - * Any non ascii character will be encoded as '\xHH', where HH is the hex + * Any non ascii character will be encoded as '\\xHH', where HH is the hex * code of the character. * * If quote is not zero, the double quote character will also be escaped. @@ -342,7 +342,7 @@ /** * Convert hex encoded string to binary data. * @param dest The destination buffer, can be NULL - * @param src The original buffer + * @param str The original buffer * @param slen The length of the original buffer * @param colon If not zero, ignore colon characters between hex digits. * @param len If present, returns the length of the string Index: apr/include/apr_file_io.h =================================================================== --- apr.orig/include/apr_file_io.h +++ apr/include/apr_file_io.h @@ -237,8 +237,6 @@ * support, see WARNING below * @li #APR_FOPEN_SPARSE Platform dependent flag to enable sparse file * support, see WARNING below - * @li #APR_FOPEN_ROTATING Do file file rotation checking - * @li #APR_FOPEN_MANUAL_ROTATE Enable Manual rotation * @li #APR_FOPEN_NONBLOCK Platform dependent flag to enable * non blocking file io * @param perm Access permissions for file. Index: apr/include/apr_network_io.h =================================================================== --- apr.orig/include/apr_network_io.h +++ apr/include/apr_network_io.h @@ -405,6 +405,8 @@ * @param hostname The hostname. * @param sa The apr_sockaddr_t. * @param flags Special processing flags. + * @remark Results can vary significantly between platforms + * when processing wildcard socket addresses. */ APR_DECLARE(apr_status_t) apr_getnameinfo(char **hostname, apr_sockaddr_t *sa, Index: apr/include/apr_skiplist.h =================================================================== --- apr.orig/include/apr_skiplist.h +++ apr/include/apr_skiplist.h @@ -14,69 +14,246 @@ * limitations under the License. */ -#ifndef _APR_SKIPLIST_P_H -#define _APR_SKIPLIST_P_H +#ifndef APR_SKIPLIST_H +#define APR_SKIPLIST_H +/** + * @file apr_skiplist.h + * @brief APR skip list implementation + */ #include "apr.h" #include "apr_portable.h" #include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/** + * @defgroup apr_skiplist Skip list implementation + * Refer to http://en.wikipedia.org/wiki/Skip_list for information + * about the purpose of and ideas behind skip lists. + * @ingroup APR + * @{ + */ -/* This is the function type that must be implemented per object type - that is used in a skiplist for comparisons to maintain order */ +/** + * apr_skiplist_compare is the function type that must be implemented + * per object type that is used in a skip list for comparisons to maintain + * order + * */ typedef int (*apr_skiplist_compare) (void *, void *); + +/** + * apr_skiplist_freefunc is the function type that must be implemented + * to handle elements as they are removed from a skip list. + */ typedef void (*apr_skiplist_freefunc) (void *); +/** Opaque structure used to represent the skip list */ struct apr_skiplist; -struct apr_skiplistnode; +/** Opaque structure used to represent the skip list */ +typedef struct apr_skiplist apr_skiplist; +/** + * Opaque structure used to represent abstract nodes in the skip list + * (an abstraction above the raw elements which are collected in the + * skip list). + */ +struct apr_skiplistnode; +/** Opaque structure */ typedef struct apr_skiplistnode apr_skiplistnode; -typedef struct apr_skiplist apr_skiplist; +/** + * Allocate memory using the same mechanism as the skip list. + * @param sl The skip list + * @param size The amount to allocate + * @remark If a pool was provided to apr_skiplist_init(), memory will + * be allocated from the pool or from a free list maintained with + * the skip list. Otherwise, memory will be allocated using the + * C standard library heap functions. + */ APR_DECLARE(void *) apr_skiplist_alloc(apr_skiplist *sl, size_t size); +/** + * Free memory using the same mechanism as the skip list. + * @param sl The skip list + * @param mem The object to free + * @remark If a pool was provided to apr_skiplist_init(), memory will + * be added to a free list maintained with the skip list and be available + * to operations on the skip list or to other calls to apr_skiplist_alloc(). + * Otherwise, memory will be freed using the C standard library heap + * functions. + */ APR_DECLARE(void) apr_skiplist_free(apr_skiplist *sl, void *mem); +/** + * Allocate a new skip list + * @param sl The pointer in which to return the newly created skip list + * @param p The pool from which to allocate the skip list (optional). + * @remark Unlike most APR functions, a pool is optional. If no pool + * is provided, the C standard library heap functions will be used instead. + */ APR_DECLARE(apr_status_t) apr_skiplist_init(apr_skiplist **sl, apr_pool_t *p); -APR_DECLARE(void) apr_skiplist_set_compare(apr_skiplist *sl, apr_skiplist_compare, - apr_skiplist_compare); +/** + * Set the comparison functions to be used for searching the skip list. + * @param sl The skip list + * @param XXX1 FIXME + * @param XXX2 FIXME + * + * @remark If existing comparison functions are being replaced, the index + * will be replaced during this call. That is a potentially expensive + * operation. + */ +APR_DECLARE(void) apr_skiplist_set_compare(apr_skiplist *sl, apr_skiplist_compare XXX1, + apr_skiplist_compare XXX2); -APR_DECLARE(void) apr_skiplist_add_index(apr_skiplist *sl, apr_skiplist_compare, - apr_skiplist_compare); +/** + * Set the indexing functions to the specified comparison functions and + * rebuild the index. + * @param sl The skip list + * @param XXX1 FIXME + * @param XXX2 FIXME + * + * @remark If an index already exists, it will not be replaced and the + * comparison functions will not be changed. + */ +APR_DECLARE(void) apr_skiplist_add_index(apr_skiplist *sl, apr_skiplist_compare XXX1, + apr_skiplist_compare XXX2); +/** + * Return the list maintained by the skip list abstraction. + * @param sl The skip list + */ APR_DECLARE(apr_skiplistnode *) apr_skiplist_getlist(apr_skiplist *sl); +/** + * Return the next matching element in the skip list using the specified + * comparison function. + * @param sl The skip list + * @param data The value to search for + * @param iter A pointer to the returned skip list node representing the element + * found + * @param func The comparison function to use + */ APR_DECLARE(void *) apr_skiplist_find_compare(apr_skiplist *sl, void *data, apr_skiplistnode **iter, apr_skiplist_compare func); +/** + * Return the next matching element in the skip list using the current comparison + * function. + * @param sl The skip list + * @param data The value to search for + * @param iter A pointer to the returned skip list node representing the element + * found + */ APR_DECLARE(void *) apr_skiplist_find(apr_skiplist *sl, void *data, apr_skiplistnode **iter); +/** + * Return the next element in the skip list. + * @param sl The skip list + * @param iter On entry, a pointer to the skip list node to start with; on return, + * a pointer to the skip list node representing the element returned + * @remark If iter points to a NULL value on entry, NULL will be returned. + */ APR_DECLARE(void *) apr_skiplist_next(apr_skiplist *sl, apr_skiplistnode **iter); +/** + * Return the previous element in the skip list. + * @param sl The skip list + * @param iter On entry, a pointer to the skip list node to start with; on return, + * a pointer to the skip list node representing the element returned + * @remark If iter points to a NULL value on entry, NULL will be returned. + */ APR_DECLARE(void *) apr_skiplist_previous(apr_skiplist *sl, apr_skiplistnode **iter); - +/** + * Insert an element into the skip list using the specified comparison function. + * @param sl The skip list + * @param data The element to insert + * @param comp The comparison function to use for placement into the skip list + */ APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert_compare(apr_skiplist *sl, void *data, apr_skiplist_compare comp); +/** + * Insert an element into the skip list using the existing comparison function. + * @param sl The skip list + * @param data The element to insert + * @remark If no comparison function has been set for the skip list, the element + * will not be inserted and NULL will be returned. + */ APR_DECLARE(apr_skiplistnode *) apr_skiplist_insert(apr_skiplist* sl, void *data); +/** + * Remove an element from the skip list using the specified comparison function for + * locating the element. + * @param sl The skip list + * @param data The element to remove + * @param myfree A function to be called for each removed element + * @param comp The comparison function to use for placement into the skip list + * @remark If the element is not found, 0 will be returned. Otherwise, the heightXXX + * will be returned. + */ APR_DECLARE(int) apr_skiplist_remove_compare(apr_skiplist *sl, void *data, apr_skiplist_freefunc myfree, apr_skiplist_compare comp); +/** + * Remove an element from the skip list using the existing comparison function for + * locating the element. + * @param sl The skip list + * @param data The element to remove + * @param myfree A function to be called for each removed element + * @remark If the element is not found, 0 will be returned. Otherwise, the heightXXX + * will be returned. + * @remark If no comparison function has been set for the skip list, the element + * will not be removed and 0 will be returned. + */ APR_DECLARE(int) apr_skiplist_remove(apr_skiplist *sl, void *data, apr_skiplist_freefunc myfree); +/** + * Remove all elements from the skip list. + * @param sl The skip list + * @param myfree A function to be called for each removed element + */ APR_DECLARE(void) apr_skiplist_remove_all(apr_skiplist *sl, apr_skiplist_freefunc myfree); +/** + * Remove each element from the skip list. + * @param sl The skip list + * @param myfree A function to be called for each removed element + */ APR_DECLARE(void) apr_skiplist_destroy(apr_skiplist *sl, apr_skiplist_freefunc myfree); -APR_DECLARE(void *) apr_skiplist_pop(apr_skiplist *a, apr_skiplist_freefunc myfree); +/** + * Return the first element in the skip list, leaving the element in the skip list. + * @param sl The skip list + * @param myfree A function to be called for the removed element + * @remark NULL will be returned if there are no elements + */ +APR_DECLARE(void *) apr_skiplist_pop(apr_skiplist *sl, apr_skiplist_freefunc myfree); -APR_DECLARE(void *) apr_skiplist_peek(apr_skiplist *a); +/** + * Return the first element in the skip list, leaving the element in the skip list. + * @param sl The skip list + * @remark NULL will be returned if there are no elements + */ +APR_DECLARE(void *) apr_skiplist_peek(apr_skiplist *sl); +/** + * Merge two skip lists. XXX SEMANTICS + * @param sl1 One of two skip lists to be merged + * @param sl2 The other of two skip lists to be merged + */ APR_DECLARE(apr_skiplist *) apr_skiplist_merge(apr_skiplist *sl1, apr_skiplist *sl2); +/** @} */ + +#ifdef __cplusplus +} #endif + +#endif /* ! APR_SKIPLIST_H */ Index: apr/include/apr_version.h =================================================================== --- apr.orig/include/apr_version.h +++ apr/include/apr_version.h @@ -62,14 +62,14 @@ * The Patch Level never includes API changes, simply bug fixes. * Reset to 0 when upgrading APR_MINOR_VERSION */ -#define APR_PATCH_VERSION 0 +#define APR_PATCH_VERSION 1 /** * The symbol APR_IS_DEV_VERSION is only defined for internal, * "development" copies of APR. It is undefined for released versions * of APR. */ -/* #define APR_IS_DEV_VERSION */ +#define APR_IS_DEV_VERSION /** * Check at compile time if the APR version is at least a certain Index: apr/include/arch/netware/apr_private.h =================================================================== --- apr.orig/include/arch/netware/apr_private.h +++ apr/include/arch/netware/apr_private.h @@ -79,7 +79,7 @@ #define HAVE_GETPASS_R 1 /* * Hack around older NDKs which have only the getpassword() function, - * a threadsafe, API-equivilant of getpass_r(). + * a threadsafe, API-equivalent of getpass_r(). */ #if (CURRENT_NDK_THRESHOLD < 709060000) #define getpass_r getpassword Index: apr/network_io/unix/socket_util.c =================================================================== --- apr.orig/network_io/unix/socket_util.c +++ apr/network_io/unix/socket_util.c @@ -46,7 +46,8 @@ /* Some other error -> unexpected error. */ return rv; } - else if (nfds == 1 && pfds[0].rtnevents == APR_POLLIN) { + /* Many platforms return only APR_POLLIN; OS X returns APR_POLLHUP|APR_POLLIN */ + else if (nfds == 1 && (pfds[0].rtnevents & APR_POLLIN) == APR_POLLIN) { apr_sockaddr_t unused; apr_size_t len = 1; char buf; Index: apr/network_io/unix/sockets.c =================================================================== --- apr.orig/network_io/unix/sockets.c +++ apr/network_io/unix/sockets.c @@ -207,7 +207,20 @@ sa.salen = sizeof(sa.sa); #ifdef HAVE_ACCEPT4 - s = accept4(sock->socketdes, (struct sockaddr *)&sa.sa, &sa.salen, SOCK_CLOEXEC); + { + int flags = SOCK_CLOEXEC; + +#if defined(SOCK_NONBLOCK) && APR_O_NONBLOCK_INHERITED + /* With FreeBSD accept4() (avail in 10+), O_NONBLOCK is not inherited + * (unlike Linux). Mimic the accept() behavior here in a way that + * may help other platforms. + */ + if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) { + flags |= SOCK_NONBLOCK; + } +#endif + s = accept4(sock->socketdes, (struct sockaddr *)&sa.sa, &sa.salen, flags); + } #else s = accept(sock->socketdes, (struct sockaddr *)&sa.sa, &sa.salen); #endif Index: apr/shmem/unix/shm.c =================================================================== --- apr.orig/shmem/unix/shm.c +++ apr/shmem/unix/shm.c @@ -20,6 +20,7 @@ #include "apr_errno.h" #include "apr_user.h" #include "apr_strings.h" +#include "apr_hash.h" static apr_status_t shm_cleanup_owner(void *m_) { @@ -103,6 +104,7 @@ #if APR_USE_SHMEM_SHMGET apr_size_t nbytes; key_t shmkey; + apr_ssize_t slen; #endif #if APR_USE_SHMEM_MMAP_ZERO || APR_USE_SHMEM_SHMGET || \ APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM @@ -312,7 +314,9 @@ /* ftok() (on solaris at least) requires that the file actually * exist before calling ftok(). */ - shmkey = ftok(filename, 1); + slen = strlen(filename); + shmkey = ftok(filename, + (int)apr_hashfunc_default(filename, &slen)); if (shmkey == (key_t)-1) { apr_file_close(file); return errno; @@ -382,6 +386,7 @@ apr_file_t *file; key_t shmkey; int shmid; + apr_ssize_t slen; #endif #if APR_USE_SHMEM_MMAP_TMP @@ -401,7 +406,9 @@ /* ftok() (on solaris at least) requires that the file actually * exist before calling ftok(). */ - shmkey = ftok(filename, 1); + slen = strlen(filename); + shmkey = ftok(filename, + (int)apr_hashfunc_default(filename, &slen)); if (shmkey == (key_t)-1) { goto shm_remove_failed; } @@ -533,6 +540,7 @@ apr_file_t *file; /* file where metadata is stored */ apr_size_t nbytes; key_t shmkey; + apr_ssize_t slen; new_m = apr_palloc(pool, sizeof(apr_shm_t)); @@ -555,7 +563,9 @@ new_m->filename = apr_pstrdup(pool, filename); new_m->pool = pool; - shmkey = ftok(filename, 1); + slen = strlen(filename); + shmkey = ftok(filename, + (int)apr_hashfunc_default(filename, &slen)); if (shmkey == (key_t)-1) { return errno; } Index: apr/test/sockchild.c =================================================================== --- apr.orig/test/sockchild.c +++ apr/test/sockchild.c @@ -69,8 +69,14 @@ exit((int)length); } - else if (!strcmp("write", argv[1])) { + else if (!strcmp("write", argv[1]) + || !strcmp("write_after_delay", argv[1])) { apr_size_t length = strlen(DATASTR); + + if (!strcmp("write_after_delay", argv[1])) { + apr_sleep(apr_time_from_sec(2)); + } + apr_socket_send(sock, DATASTR, &length); apr_socket_close(sock); Index: apr/test/testatomic.c =================================================================== --- apr.orig/test/testatomic.c +++ apr/test/testatomic.c @@ -167,6 +167,17 @@ ABTS_INT_EQUAL(tc, 27, y32); } +static void test_add32_neg(abts_case *tc, void *data) +{ + apr_uint32_t oldval; + apr_uint32_t y32; + + apr_atomic_set32(&y32, 23); + oldval = apr_atomic_add32(&y32, -10); + ABTS_INT_EQUAL(tc, 23, oldval); + ABTS_INT_EQUAL(tc, 13, y32); +} + static void test_inc32(abts_case *tc, void *data) { apr_uint32_t oldval; @@ -509,6 +520,7 @@ abts_run_test(suite, test_casptr_equal_nonnull, NULL); abts_run_test(suite, test_casptr_notequal, NULL); abts_run_test(suite, test_add32, NULL); + abts_run_test(suite, test_add32_neg, NULL); abts_run_test(suite, test_inc32, NULL); abts_run_test(suite, test_set_add_inc_sub, NULL); abts_run_test(suite, test_wrap_zero, NULL); Index: apr/test/testescape.c =================================================================== --- apr.orig/test/testescape.c +++ apr/test/testescape.c @@ -166,6 +166,7 @@ apr_psprintf(pool, "size mismatch (%" APR_SIZE_T_FMT "!=%" APR_SIZE_T_FMT ")", len, strlen(dest) + 1), (len == strlen(dest) + 1)); +#if !APR_CHARSET_EBCDIC src = "Hello"; dest = apr_pescape_entity(pool, src, 1); ABTS_PTR_EQUAL(tc, src, dest); @@ -209,6 +210,7 @@ ABTS_ASSERT(tc, apr_psprintf(pool, "size mismatch (%" APR_SIZE_T_FMT "!=%" APR_SIZE_T_FMT ")", len, strlen(dest) + 1), (len == strlen(dest) + 1)); +#endif src = "Hello"; dest = apr_pescape_echo(pool, src, 0); Index: apr/test/testmmap.c =================================================================== --- apr.orig/test/testmmap.c +++ apr/test/testmmap.c @@ -26,16 +26,16 @@ * length on a platform? */ #define PATH_LEN 255 -#define TEST_STRING "This is the MMAP data file."APR_EOL_STR #if !APR_HAS_MMAP static void not_implemented(abts_case *tc, void *data) { - ABTS_NOT_IMPL(tc, "User functions"); + ABTS_NOT_IMPL(tc, "MMAP functions"); } #else +static char test_string[256]; /* read from the datafile */ static apr_mmap_t *themmap = NULL; static apr_file_t *thefile = NULL; static char *file1; @@ -69,6 +69,17 @@ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); } +static void read_expected_contents(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_size_t nbytes = sizeof(test_string) - 1; + + rv = apr_file_read(thefile, test_string, &nbytes); + ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); + test_string[nbytes] = '\0'; + thisfsize = strlen(test_string); +} + static void test_file_open(abts_case *tc, void *data) { apr_status_t rv; @@ -105,7 +116,7 @@ ABTS_SIZE_EQUAL(tc, thisfsize, themmap->size); /* Must use nEquals since the string is not guaranteed to be NULL terminated */ - ABTS_STR_NEQUAL(tc, themmap->mm, TEST_STRING, thisfsize); + ABTS_STR_NEQUAL(tc, themmap->mm, test_string, thisfsize); } static void test_mmap_delete(abts_case *tc, void *data) @@ -127,7 +138,7 @@ ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); /* Must use nEquals since the string is not guaranteed to be NULL terminated */ - ABTS_STR_NEQUAL(tc, addr, TEST_STRING + 5, thisfsize-5); + ABTS_STR_NEQUAL(tc, addr, test_string + 5, thisfsize-5); } #endif @@ -136,10 +147,9 @@ suite = ADD_SUITE(suite) #if APR_HAS_MMAP - thisfsize = strlen(TEST_STRING); - abts_run_test(suite, create_filename, NULL); abts_run_test(suite, test_file_open, NULL); + abts_run_test(suite, read_expected_contents, NULL); abts_run_test(suite, test_get_filesize, NULL); abts_run_test(suite, test_mmap_create, NULL); abts_run_test(suite, test_mmap_contents, NULL); Index: apr/test/testsock.c =================================================================== --- apr.orig/test/testsock.c +++ apr/test/testsock.c @@ -23,6 +23,8 @@ #include "apr_lib.h" #include "apr_strings.h" #include "apr_poll.h" +#define APR_WANT_BYTEFUNC +#include "apr_want.h" static void launch_child(abts_case *tc, apr_proc_t *proc, const char *arg1, apr_pool_t *p) { @@ -350,8 +352,8 @@ APR_ASSERT_SUCCESS(tc, "create subpool", apr_pool_create(&subp, p)); - if ((ld = setup_socket(tc)) != APR_SUCCESS) - return; + ld = setup_socket(tc); + if (!ld) return; APR_ASSERT_SUCCESS(tc, "get local address of bound socket", @@ -438,6 +440,54 @@ apr_pool_destroy(subp); } +/* Make sure that setting a connected socket non-blocking works + * when the listening socket was non-blocking. + * If APR thinks that non-blocking is inherited but it really + * isn't, this testcase will fail. + */ +static void test_nonblock_inheritance(abts_case *tc, void *data) +{ + apr_status_t rv; + apr_socket_t *sock; + apr_socket_t *sock2; + apr_proc_t proc; + char buffer[10]; + apr_size_t length; + int tries; + + sock = setup_socket(tc); + if (!sock) return; + + rv = apr_socket_opt_set(sock, APR_SO_NONBLOCK, 1); + APR_ASSERT_SUCCESS(tc, "Could not make listening socket nonblocking", rv); + + launch_child(tc, &proc, "write_after_delay", p); + + tries = 10; + while (tries--) { + rv = apr_socket_accept(&sock2, sock, p); + if (!APR_STATUS_IS_EAGAIN(rv)) { + break; + } + apr_sleep(apr_time_from_msec(50)); + } + APR_ASSERT_SUCCESS(tc, "Problem with receiving connection", rv); + + rv = apr_socket_opt_set(sock2, APR_SO_NONBLOCK, 1); + APR_ASSERT_SUCCESS(tc, "Could not make connected socket nonblocking", rv); + + length = sizeof buffer; + rv = apr_socket_recv(sock2, buffer, &length); + ABTS_ASSERT(tc, "should have gotten EAGAIN", APR_STATUS_IS_EAGAIN(rv)); + + wait_child(tc, &proc); + + rv = apr_socket_close(sock2); + APR_ASSERT_SUCCESS(tc, "Problem closing connected socket", rv); + rv = apr_socket_close(sock); + APR_ASSERT_SUCCESS(tc, "Problem closing socket", rv); +} + abts_suite *testsock(abts_suite *suite) { suite = ADD_SUITE(suite) @@ -451,6 +501,7 @@ abts_run_test(suite, test_timeout, NULL); abts_run_test(suite, test_print_addr, NULL); abts_run_test(suite, test_get_addr, NULL); + abts_run_test(suite, test_nonblock_inheritance, NULL); return suite; } debian/rules0000755000000000000000000001160312243767403010257 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 SHELL=/bin/bash BUILDDIR := debian/build DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # The 'build' target needs special handling because there there is a directory # named 'build'. .PHONY: build build %: dh $@ -B$(BUILDDIR) --parallel --with autotools_dev # # configure # CONFFLAGS := LTFLAGS=--no-silent \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --enable-layout=Debian \ --includedir=/usr/include/apr-1.0 \ --with-installbuilddir=/usr/share/apr-1.0/build \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --enable-nonportable-atomics \ --enable-allocator-uses-mmap \ ac_cv_prog_AWK=mawk # apr_cv_mutex_robust_shared causes hangs in procmutex test on arm(el|hf) and alpha ifneq (,$(findstring armel,$(DEB_HOST_ARCH))) CONFFLAGS += apr_cv_mutex_robust_shared=no endif ifneq (,$(findstring armhf,$(DEB_HOST_ARCH))) CONFFLAGS += apr_cv_mutex_robust_shared=no endif ifneq (,$(findstring alpha,$(DEB_HOST_ARCH))) CONFFLAGS += apr_cv_mutex_robust_shared=no endif # SH4 cannot use proc_pthread. ifneq (,$(findstring sh4,$(DEB_HOST_ARCH))) CONFFLAGS += apr_cv_hasprocpthreadser=no ac_cv_define_PTHREAD_PROCESS_SHARED=no endif # multicast not supported on Hurd ifeq (hurd,$(DEB_HOST_ARCH_OS)) CONFFLAGS += apr_cv_struct_ipmreq=no endif # some minimal cross-building support ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) ifeq ($(DEB_HOST_ARCH_OS),linux) CONFFLAGS += ac_cv_file__dev_zero=yes \ ac_cv_func_setpgrp_void=yes \ apr_cv_epoll=yes \ ac_cv_struct_rlimit=yes \ apr_cv_tcp_nodelay_with_cork=yes \ apr_cv_process_shared_works=yes endif ifeq ($(DEB_HOST_ARCH_BITS),32) CONFFLAGS += ac_cv_sizeof_struct_iovec=8 else ifeq ($(DEB_HOST_ARCH_BITS),64) CONFFLAGS += ac_cv_sizeof_struct_iovec=16 endif endif # files that are modified by buildconf and need to be restored during clean SAVE_FILES := configure build/libtool.m4 build/ltmain.sh override_dh_auto_configure: mkdir -p $(BUILDDIR)/docs for f in $(SAVE_FILES) ; do [ -e $$f.dr-orig ] || cp -p $$f $$f.dr-orig ; done ./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) && CONFIG_SHELL=/bin/bash /bin/bash $(CURDIR)/configure $(CONFFLAGS) ifeq (linux,$(DEB_HOST_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 ! df /dev/shm/.|grep -q ^tmpfs ;\ 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 # ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif override_dh_auto_build: $(MAKE) -j$(NUMJOBS) -C $(BUILDDIR) all dox # # test # ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) # 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 ) override_dh_auto_test: $(MAKE) -C $(BUILDDIR)/test -j$(NUMJOBS) all 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 else override_dh_auto_test: endif # # install # override_dh_auto_install: dh_auto_install --destdir=debian/tmp perl -p -i -e "s,^dependency_libs=.*,dependency_libs=''," debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libapr-1.la if ! head -n 1 debian/tmp/usr/share/apr-1.0/build/libtool | grep -q /bin/bash ; then \ echo ERROR: The built libtool uses /bin/sh instead of /bin/bash ; \ exit 1 ; \ fi override_dh_strip: dh_strip --dbg-package=libapr1-dbg override_dh_makeshlibs: dh_makeshlibs -- -Idebian/symbols.$(DEB_HOST_ARCH_OS) override_dh_auto_clean: dh_auto_clean rm -rf $(BUILDDIR) for f in $(SAVE_FILES) ; do [ ! -e $$f.dr-orig ] || mv $$f.dr-orig $$f ; done debian/gbp.conf0000644000000000000000000000010712241725655010614 0ustar [DEFAULT] pristine-tar = True builder=dpkg-buildpackage -i\.git -I.git debian/source/0000755000000000000000000000000012241725655010477 5ustar debian/source/format0000644000000000000000000000001412241725655011705 0ustar 3.0 (quilt) debian/libapr1.symbols0000644000000000000000000000007312241725655012143 0ustar here for the purpose of tricking debhelper...bwahahahaha. debian/apr-1-config.10000644000000000000000000000420712241725655011447 0ustar .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 for the Debian project (but may be used by others). debian/compat0000644000000000000000000000000212241725655010375 0ustar 9 debian/libapr1-dev.manpages0000644000000000000000000000002612241725655013020 0ustar debian/apr-1-config.1 debian/copyright0000644000000000000000000001446612241725655011145 0ustar This package was debianized by Thom May 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 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. debian/changelog0000644000000000000000000004446212260311522011044 0ustar apr (1.5.0-1) unstable; urgency=low * New upstream version * Pull changes from upstream 1.5.x branch up to r1552863 to fix problems on the FreeBSD 10 kernel with accept4() and non-blocking sockets. -- Stefan Fritsch Mon, 30 Dec 2013 16:37:54 +0100 apr (1.4.8-3) unstable; urgency=low * Re-add the logic to force use of bash for configure/libtool. Otherwise, if the package is build with /bin/sh -> /bin/bash, the shipped libtool won't work on systems with /bin/sh -> /bin/dash. This got lost in 1.4.8-2. Closes: #730196 -- Stefan Fritsch Sat, 23 Nov 2013 00:57:30 +0100 apr (1.4.8-2) unstable; urgency=low * Merge some changes from Ubuntu's 1.4.8-1ubuntu1: - Fix the confusion between HOST and BUILD variables in rules. - Add a set of autoconf preseeds that are only used when cross-building. * Change cross-building preseeds to only apply on linux. * Cherry-pick fix for O_NONBLOCK configure check from upstream 1.4.x branch. * Switch build system to dh - No longer hard-codes -fstack-protector on unsupported platforms. Closes: #717231 - Bump Standards-Version (no additional changes). * Support multi-arch. * Enable sctp support on Linux. * Change apr_rules.mk to not force CFLAGS, etc. to the values used during apr's compilation. * Fix accept4() configure test to work on Hurd. Closes: #715028 -- Stefan Fritsch Wed, 06 Nov 2013 19:37:05 +0100 apr (1.4.8-1) unstable; urgency=low * New upstream release * Remove the test debug output added in 1.4.6-3. The bug was #673711 in eglibc and has been fixed some time ago. -- Stefan Fritsch Thu, 04 Jul 2013 23:25:10 +0200 apr (1.4.6-4) unstable; urgency=low * Make the /dev/shm sanity check during build work if it is a symbolic link. * Remove the ancient ino_t configure sanity test that causes a FTBFS on x32. Closes: #701193 * Don't override CFLAGS and LDFLAGS during build. This fixes the debug information being useless. Closes: #703466 -- Stefan Fritsch Sat, 11 May 2013 15:06:24 +0200 apr (1.4.6-3) unstable; urgency=low * Fix some issues with resolving loopback addresses of a protocol family that is not otherwise configured on a host. Many thanks to Jean-Michel Vourgère and Aurelien Jarno for debugging this. Closes: #500558, #629899 LP: #397393 * Pull updates from upstream branch 1.4.x up to r1343251 * Add some debug output in order to debug test failures on kfreebsd-i386. -- Stefan Fritsch Mon, 28 May 2012 16:02:12 +0200 apr (1.4.6-2) unstable; urgency=low * Enable use of some new APIs. The minimal required linux kernel version is now 2.6.28. * Improvements for Hurd (closes: #656880): - Re-enable test suite - Update build hints, disable non-working shm and flock methods. Thanks to Pino Toscano for the patches. * Switch VCS to git. * Switch to source format 3.0, debhelper 9. Thanks to Jari Aalto for the patch. Closes: #664299 * Remove sendfile LFS patch that was only necessary for 2.4 kernels. * Fix some lintian warnings (dh_prep, build-indep/build-arch targets). * Bump Standards-Version (no changes). -- Stefan Fritsch Sun, 20 May 2012 21:39:17 +0200 apr (1.4.6-1) unstable; urgency=low * New upstream release: - Fixes apr_file_trunc() bug which could lead to subversion repository corruption. Closes: #664451 - Adds randomization to hashes. CVE-2012-0840 (but not known to be exploitable in httpd or svn). Closes: #655435 * Remove Tollef Fog Heen and Ryan Niebur from uploaders. Thanks for your work in the past. -- Stefan Fritsch Sun, 18 Mar 2012 23:22:59 +0100 apr (1.4.5-1.1) unstable; urgency=low * Non-maintainer upload. * Disable robust pthread mutexes on armhf causes testprocmutex to hang on non-SMP cores. (Closes: #650350) -- Hector Oron Thu, 01 Dec 2011 00:04:08 +0000 apr (1.4.5-1) unstable; urgency=high * New upstream version: - Fix regression introduced by fix for CVE-2011-0419: apr_fnmatch may consume 100% CPU. CVE-2011-1928. Closes: #627182 * Fix allocator using mmap crashing on non-4k-page platforms. Thanks to Lifeng Sun for the patch. Closes: #627532 -- Stefan Fritsch Sat, 21 May 2011 20:49:17 +0200 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 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 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 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 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 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 Tue, 17 Aug 2010 23:16:56 +0200 apr (1.4.2-3) unstable; urgency=low * Upload to unstable. -- Stefan Fritsch 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 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 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 Thu, 06 Aug 2009 13:00:03 -0500 apr (1.3.7-1) unstable; urgency=low * New upstream release. -- Stefan Fritsch 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 Tue, 23 Jun 2009 22:15:02 +0200 apr (1.3.5-1) unstable; urgency=low * New upstream version (really) -- Stefan Fritsch 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Tue, 3 Jan 2006 13:01:56 +0000 apr1.0 (1.2.2-1) unstable; urgency=low * New upstream release -- Thom May Thu, 29 Dec 2005 17:05:42 +0000 apr1.0 (1.1.1-1) unstable; urgency=low * New upstream release -- Thom May 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 Wed, 17 Nov 2004 11:51:32 -0800 debian/libapr1-dev.links0000644000000000000000000000015212241725655012345 0ustar usr/bin/apr-1-config usr/bin/apr-config usr/share/man/man1/apr-1-config.1 usr/share/man/man1/apr-config.1 debian/control0000644000000000000000000000350312241725655010603 0ustar Source: apr Section: libs Priority: optional Maintainer: Debian Apache Maintainers Uploaders: Peter Samuelson , Stefan Fritsch Build-Depends: debhelper (>= 9), autoconf, autotools-dev, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python, libsctp-dev [linux-any] Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-apache/apr.git Vcs-Git: git://git.debian.org/git/pkg-apache/apr.git Homepage: http://apr.apache.org/ Package: libapr1 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same 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}, libsctp-dev [linux-any] 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 Multi-Arch: same 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. debian/watch0000644000000000000000000000007612241725655010233 0ustar version=3 http://www.apache.org/dist/apr/apr-(1\..*)\.tar\.gz debian/libapr1-dev.install0000644000000000000000000000024012241725655012671 0ustar usr/include/apr-1.0 usr/lib/*/libapr*a usr/lib/*/libapr-1.so usr/lib/*/pkgconfig usr/bin usr/share/apr-1.0 debian/build/docs/dox/html usr/share/doc/libapr1-dev debian/symbols.kfreebsd0000644000000000000000000000015112241725655012373 0ustar #include "symbols.common" apr_pollcb_provider_kqueue@Base 1.4.2 apr_pollset_provider_kqueue@Base 1.4.2 debian/symbols.linux0000644000000000000000000000020712241725655011747 0ustar #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 debian/symbols.hurd0000644000000000000000000000007212241725655011552 0ustar #include "symbols.common" apr_socket_sendfile@Base 1.2.7