diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28c8a68 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/wso2-wsf-cpp-src-2.1.0-trimmed.tar.gz diff --git a/2.4_client_ip_API_change.patch b/2.4_client_ip_API_change.patch new file mode 100644 index 0000000..3afa68b --- /dev/null +++ b/2.4_client_ip_API_change.patch @@ -0,0 +1,16 @@ +diff --git a/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c b/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c +index dac9c4e..e92fca6 100644 +--- a/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c ++++ b/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c +@@ -266,7 +266,11 @@ axis2_apache2_worker_process_request( + out_stream = axutil_stream_create_basic(env); + AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Client HTTP version %s", http_version); + ++ #if AP_SERVER_MAJORVERSION_NUMBER >= 2 && AP_SERVER_MINORVERSION_NUMBER > 2 ++ peer_ip = request->connection->client_ip; ++ #else + peer_ip = request->connection->remote_ip; ++ #endif + + if(peer_ip) + { diff --git a/axis2c_initBuffer_curl.patch b/axis2c_initBuffer_curl.patch new file mode 100644 index 0000000..08b9caa --- /dev/null +++ b/axis2c_initBuffer_curl.patch @@ -0,0 +1,20 @@ +--- a/wsf_c/axis2c/src/core/transport/http/sender/libcurl/axis2_libcurl.c ++++ b/wsf_c/axis2c/src/core/transport/http/sender/libcurl/axis2_libcurl.c +@@ -111,7 +111,7 @@ axis2_libcurl_send( + axis2_char_t *buffer = NULL; + unsigned int buffer_size = 0; + int content_length = -1; +- axis2_char_t *content_type; ++ axis2_char_t *content_type = NULL; + axis2_char_t *content_len = AXIS2_HTTP_HEADER_CONTENT_LENGTH_; + const axis2_char_t *char_set_enc = NULL; + axis2_char_t *content = AXIS2_HTTP_HEADER_CONTENT_TYPE_; +@@ -140,7 +140,7 @@ axis2_libcurl_send( + + handler = data->handler; + curl_easy_reset(handler); +- curl_easy_setopt(handler, CURLOPT_ERRORBUFFER, &data->errorbuffer); ++ curl_easy_setopt(handler, CURLOPT_ERRORBUFFER, data->errorbuffer); + headers = curl_slist_append(headers, AXIS2_HTTP_HEADER_USER_AGENT_AXIS2C); + headers = curl_slist_append(headers, AXIS2_HTTP_HEADER_ACCEPT_); + headers = curl_slist_append(headers, AXIS2_HTTP_HEADER_EXPECT_); diff --git a/axis2c_respectConst_sslCTX.patch b/axis2c_respectConst_sslCTX.patch new file mode 100644 index 0000000..e2b0727 --- /dev/null +++ b/axis2c_respectConst_sslCTX.patch @@ -0,0 +1,23 @@ +--- a/wsf_c/axis2c/src/core/transport/http/sender/ssl/ssl_utils.c ++++ b/wsf_c/axis2c/src/core/transport/http/sender/ssl/ssl_utils.c +@@ -41,7 +41,6 @@ axis2_ssl_utils_initialize_ctx( + axis2_char_t * key_file, + axis2_char_t * ssl_pp) + { +- SSL_METHOD *meth = NULL; + SSL_CTX *ctx = NULL; + axis2_char_t *ca_file = server_cert; + +@@ -63,7 +62,11 @@ axis2_ssl_utils_initialize_ctx( + } + + /* Create our context */ +- meth = SSLv23_method(); ++ # if defined OPENSSL_VERSION_NUMBER && (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++ const SSL_METHOD *meth = SSLv23_method(); ++ # else ++ SSL_METHOD *meth = SSLv23_method(); ++ # endif + ctx = SSL_CTX_new(meth); + + /* Load our keys and certificates diff --git a/axis2c_useENV_as_repopath.patch b/axis2c_useENV_as_repopath.patch new file mode 100644 index 0000000..3150328 --- /dev/null +++ b/axis2c_useENV_as_repopath.patch @@ -0,0 +1,34 @@ +diff --git a/wsf_c/axis2c/src/core/transport/http/server/simple_axis2_server/http_server_main.c b/wsf_c/axis2c/src/core/transport/http/server/simple_axis2_server/http_server_main.c +index 5fab472..a37455d 100644 +--- a/wsf_c/axis2c/src/core/transport/http/server/simple_axis2_server/http_server_main.c ++++ b/wsf_c/axis2c/src/core/transport/http/server/simple_axis2_server/http_server_main.c +@@ -110,7 +110,11 @@ main( + unsigned int file_flag = 0; + axutil_log_levels_t log_level = AXIS2_LOG_LEVEL_DEBUG; + const axis2_char_t *log_file = "axis2.log"; +- const axis2_char_t *repo_path = DEFAULT_REPO_PATH; ++ axis2_char_t *repo_loc = AXIS2_GETENV("AXIS2C_HOME"); ++ if (! repo_loc) { ++ repo_loc = DEFAULT_REPO_PATH; ++ } ++ const axis2_char_t *repo_path = repo_loc; + int port = 9090; + axis2_status_t status; + +diff --git a/wsf_c/axis2c/src/core/transport/tcp/server/simple_tcp_server/tcp_server_main.c b/wsf_c/axis2c/src/core/transport/tcp/server/simple_tcp_server/tcp_server_main.c +index 206c223..0040df9 100644 +--- a/wsf_c/axis2c/src/core/transport/tcp/server/simple_tcp_server/tcp_server_main.c ++++ b/wsf_c/axis2c/src/core/transport/tcp/server/simple_tcp_server/tcp_server_main.c +@@ -112,7 +112,11 @@ main( + axutil_log_levels_t log_level = AXIS2_LOG_LEVEL_DEBUG; + const axis2_char_t *log_file = AXIS2_TCP_SERVER_LOG_FILE_NAME; + int port = AXIS2_TCP_SERVER_PORT; +- const axis2_char_t *repo_path = AXIS2_TCP_SERVER_REPO_PATH; ++ axis2_char_t *repo_loc = AXIS2_GETENV("AXIS2C_HOME"); ++ if (! repo_loc) { ++ repo_loc = AXIS2_TCP_SERVER_REPO_PATH; ++ } ++ const axis2_char_t *repo_path = repo_loc; + + while((c = AXIS2_GETOPT(argc, argv, ":p:r:ht:l:s:f:")) != -1) + { diff --git a/dead.package b/dead.package deleted file mode 100644 index 6dc51c6..0000000 --- a/dead.package +++ /dev/null @@ -1,3 +0,0 @@ -2017-03-12: Retired orphaned package, because it was orphaned for -more than six weeks. - diff --git a/generic_streams_for_ssl.patch b/generic_streams_for_ssl.patch new file mode 100644 index 0000000..8b412f3 --- /dev/null +++ b/generic_streams_for_ssl.patch @@ -0,0 +1,147 @@ +From 8dee396e09770f2e7af1195e35c23f688b069bb7 Mon Sep 17 00:00:00 2001 +From: Peter MacKinnon +Date: Fri, 8 Jul 2011 17:45:07 -0400 +Subject: [PATCH] Changes to make streams "peek" so that we can introduce + SSL_peek + +--- + .../transport/http/common/simple_http_svr_conn.c | 2 +- + wsf_c/axis2c/util/include/axutil_stream.h | 44 ++++++++++++++++++++ + wsf_c/axis2c/util/src/stream.c | 21 +++++++++ + 3 files changed, 66 insertions(+), 1 deletions(-) + +diff --git a/wsf_c/axis2c/src/core/transport/http/common/simple_http_svr_conn.c b/wsf_c/axis2c/src/core/transport/http/common/simple_http_svr_conn.c +index a68c48e..958be28 100644 +--- a/wsf_c/axis2c/src/core/transport/http/common/simple_http_svr_conn.c ++++ b/wsf_c/axis2c/src/core/transport/http/common/simple_http_svr_conn.c +@@ -421,7 +421,7 @@ axis2_simple_http_svr_conn_read_line( + int read = -1; + + /* peek for 2047 characters to verify whether it contains CRLF character */ +- while((read = axutil_stream_peek_socket(svr_conn->stream, env, tmp_buf, 2048 - 1)) > 0) ++ while((read = axutil_stream_peek(svr_conn->stream, env, tmp_buf, 2048 - 1)) > 0) + { + axis2_char_t *start = tmp_buf; + axis2_char_t *end = NULL; +diff --git a/wsf_c/axis2c/util/include/axutil_stream.h b/wsf_c/axis2c/util/include/axutil_stream.h +index 729f1e3..8b35788 100644 +--- a/wsf_c/axis2c/util/include/axutil_stream.h ++++ b/wsf_c/axis2c/util/include/axutil_stream.h +@@ -76,6 +76,15 @@ extern "C" + const axutil_env_t * env, + int count); + ++ typedef int( ++ AXIS2_CALL ++ * AXUTIL_STREAM_PEEK)( ++ axutil_stream_t * stream, ++ const axutil_env_t * env, ++ void *buffer, ++ int count); ++ ++ + struct axutil_stream + { + axutil_stream_type_t stream_type; +@@ -130,6 +139,21 @@ extern "C" + axutil_stream_t * stream, + const axutil_env_t * env, + int count); ++ ++ /** ++ * peeks into stream ++ * @param buffer buffer into which the content is to be read ++ * @param count size of the buffer ++ * @return no: of bytes read ++ */ ++ int( ++ AXIS2_CALL ++ * peek)( ++ axutil_stream_t * stream, ++ const axutil_env_t * env, ++ void *buffer, ++ size_t count); ++ + }; + + /** +@@ -184,6 +208,19 @@ extern "C" + int count); + + /** ++ * peeks into stream ++ * @param buffer buffer into which the content is to be read ++ * @param count size of the buffer ++ * @return no: of bytes read ++ */ ++ AXIS2_EXTERN int AXIS2_CALL ++ axutil_stream_peek( ++ axutil_stream_t * stream, ++ const axutil_env_t * env, ++ void *buffer, ++ int count); ++ ++ /** + * Returns the length of the stream (applicable only to basic stream) + * @return Length of the buffer if its type is basic, else -1 + * (we can't define a length of a stream unless it is just a buffer) +@@ -285,6 +322,13 @@ extern "C" + const axutil_env_t * env, + AXUTIL_STREAM_SKIP func); + ++ AXIS2_EXTERN axis2_status_t AXIS2_CALL ++ axutil_stream_set_peek( ++ axutil_stream_t * stream, ++ const axutil_env_t * env, ++ AXUTIL_STREAM_PEEK func); ++ ++ + /** @} */ + + #ifdef __cplusplus +diff --git a/wsf_c/axis2c/util/src/stream.c b/wsf_c/axis2c/util/src/stream.c +index 1034a03..4db5054 100644 +--- a/wsf_c/axis2c/util/src/stream.c ++++ b/wsf_c/axis2c/util/src/stream.c +@@ -501,6 +501,7 @@ axutil_stream_create_socket( + stream->read = axutil_stream_read_socket; + stream->write = axutil_stream_write_socket; + stream->skip = axutil_stream_skip_socket; ++ stream->peek = axutil_stream_peek_socket; + stream->stream_type = AXIS2_STREAM_SOCKET; + stream->socket = socket; + stream->fp = NULL; +@@ -689,6 +690,16 @@ axutil_stream_set_skip( + return AXIS2_SUCCESS; + } + ++AXIS2_EXTERN axis2_status_t AXIS2_CALL ++axutil_stream_set_peek( ++ axutil_stream_t *stream, ++ const axutil_env_t *env, ++ AXUTIL_STREAM_PEEK func) ++{ ++ stream->peek = func; ++ return AXIS2_SUCCESS; ++} ++ + AXIS2_EXTERN int AXIS2_CALL + axutil_stream_read( + axutil_stream_t *stream, +@@ -717,3 +728,13 @@ axutil_stream_skip( + { + return stream->skip(stream, env, count); + } ++ ++AXIS2_EXTERN int AXIS2_CALL ++axutil_stream_peek( ++ axutil_stream_t *stream, ++ const axutil_env_t *env, ++ void *buffer, ++ int count) ++{ ++ return stream->peek(stream, env, buffer, count); ++} +-- +1.7.4.4 + diff --git a/literal_lib_name.patch b/literal_lib_name.patch new file mode 100644 index 0000000..f1d85c5 --- /dev/null +++ b/literal_lib_name.patch @@ -0,0 +1,17 @@ +--- /root/rpmbuild/BUILD/wso2-wsf-cpp-src-2.1.0/wsf_c/axis2c/util/src/dll_desc.c 2009-10-13 15:03:42.000000000 -0400 ++++ ./wsf_c/axis2c/util/src/dll_desc.c 2011-04-21 10:29:10.539022415 -0400 +@@ -291,6 +291,14 @@ + + AXIS2_ENV_CHECK(env, NULL); + ++ /* allow config to give a literal lib name since it may want a ++ * versioned lib like "libfoo.so.0" */ ++ if (temp_name = axutil_strstr(class_name,AXIS2_LIB_SUFFIX)) { ++ /* assume the class_name is the literal lib file name */ ++ dll_desc->dll_name = axutil_strdup(env,class_name); ++ return dll_desc->dll_name; ++ } ++ + temp_name = axutil_stracat(env, AXIS2_LIB_PREFIX, class_name); + dll_desc->dll_name = axutil_stracat(env, temp_name, AXIS2_LIB_SUFFIX); + AXIS2_FREE(env->allocator, temp_name); diff --git a/msg_rcvr_lib.patch b/msg_rcvr_lib.patch new file mode 100644 index 0000000..d09639a --- /dev/null +++ b/msg_rcvr_lib.patch @@ -0,0 +1,29 @@ +--- /root/rpmbuild/BUILD/wso2-wsf-cpp-src-2.1.0/wsf_c/axis2c/src/core/deployment/desc_builder.c 2009-10-13 15:03:16.000000000 -0400 ++++ ./wsf_c/axis2c/src/core/deployment/desc_builder.c 2011-04-10 11:20:29.545157342 -0400 +@@ -972,8 +972,23 @@ + msg_recv_dll_name = axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env, + class_name); + repos_name = axis2_dep_engine_get_repos_path(desc_builder->engine, env); +- temp_path = axutil_stracat(env, repos_name, AXIS2_PATH_SEP_STR); +- temp_path2 = axutil_stracat(env, temp_path, AXIS2_LIB_FOLDER); ++ if (!repos_name) { ++ /* TODO: pmackinn - if we rely solely on an axis2.xml repo then the engine still expects ++ * to find a message receiver shared lib in a "lib" dir off some unspecified repo folder; ++ * so we must tell it to instead look at what we specified for a libDir param in the axis2.xml */ ++ axutil_param_t* lib_dir_param = axis2_conf_get_param(conf, env, AXIS2_LIB_DIR); ++ if (lib_dir_param) { ++ temp_path2 = (axis2_char_t *)axutil_param_get_value(lib_dir_param, env); ++ } ++ else { ++ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Unable to resolve lib dir for deployment engine"); ++ return NULL; ++ } ++ } ++ else { ++ temp_path = axutil_stracat(env, repos_name, AXIS2_PATH_SEP_STR); ++ temp_path2 = axutil_stracat(env, temp_path, AXIS2_LIB_FOLDER); ++ } + temp_path3 = axutil_stracat(env, temp_path2, AXIS2_PATH_SEP_STR); + dll_name = axutil_stracat(env, temp_path3, msg_recv_dll_name); + AXIS2_FREE(env->allocator, temp_path); + diff --git a/prevent_free_of_static_chars.patch b/prevent_free_of_static_chars.patch new file mode 100644 index 0000000..fbcf6c4 --- /dev/null +++ b/prevent_free_of_static_chars.patch @@ -0,0 +1,46 @@ +From 35055f4b07f06621f43a704285cb90b5d80dff9f Mon Sep 17 00:00:00 2001 +From: Peter MacKinnon +Date: Fri, 16 Sep 2011 11:12:38 -0400 +Subject: [PATCH] Fix to prevent free of static chars in fault_value_str + +--- + src/msg_recv/wsf_cpp_msg_recv.cpp | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/msg_recv/wsf_cpp_msg_recv.cpp b/src/msg_recv/wsf_cpp_msg_recv.cpp +index bd0575b..abfcd60 100644 +--- a/src/msg_recv/wsf_cpp_msg_recv.cpp ++++ b/src/msg_recv/wsf_cpp_msg_recv.cpp +@@ -417,7 +417,7 @@ wsf_cpp_msg_recv_invoke_business_logic_sync( + + if (status != AXIS2_SUCCESS || is_fault) + { +- const axis2_char_t *fault_value_str = axutil_stracat(Environment::getEnv(),soapEnvelopePrefix, ":Sender"); ++ const axis2_char_t *fault_value_str = NULL; + const axis2_char_t *fault_reason_str = NULL; + const axis2_char_t *err_msg = NULL; + +@@ -436,6 +436,9 @@ wsf_cpp_msg_recv_invoke_business_logic_sync( + AXIOM_SOAP12_SOAP_FAULT_VALUE_RECEIVER; + } + } ++ else { ++ fault_value_str = axutil_stracat(Environment::getEnv(),soapEnvelopePrefix, ":Sender"); ++ } + + err_msg = AXIS2_ERROR_GET_MESSAGE(env->error); + if (err_msg) +@@ -450,7 +453,9 @@ wsf_cpp_msg_recv_invoke_business_logic_sync( + soap_fault = axiom_soap_fault_create_default_fault(env, out_body, fault_value_str, + fault_reason_str, soap_version); + +- AXIS2_FREE((Environment::getEnv()->allocator), (void*)fault_value_str); ++ if (skel_invoked) { ++ AXIS2_FREE((Environment::getEnv()->allocator), (void*)fault_value_str); ++ } + + if (fault_node) + { +-- +1.7.4.4 + diff --git a/rampartc-c14n-new.patch b/rampartc-c14n-new.patch new file mode 100644 index 0000000..3647525 --- /dev/null +++ b/rampartc-c14n-new.patch @@ -0,0 +1,67 @@ +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/omxmlsec/c14n/c14n.c 2012-08-21 16:59:45.351092451 -0400 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/src/omxmlsec/c14n/c14n.c 2012-08-21 16:56:03.135112332 -0400 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -466,6 +467,11 @@ + const c14n_ctx_t *ctx); + + static axis2_status_t ++c14n_apply_on_data_source ( ++ const axiom_node_t *node, ++ const c14n_ctx_t *ctx); ++ ++static axis2_status_t + c14n_apply_on_node( + axiom_node_t *node, + c14n_ctx_t *ctx); +@@ -786,6 +792,9 @@ + c14n_apply_on_comment(node, ctx->outbuffer, ctx->env); + break; + } ++ case AXIOM_DATA_SOURCE: ++ c14n_apply_on_data_source(node, ctx); ++ break; + case AXIOM_DOCTYPE: + case AXIOM_PROCESSING_INSTRUCTION: + default: +@@ -904,6 +913,34 @@ + return res; + } + ++static axis2_status_t ++c14n_apply_on_data_source ( ++ const axiom_node_t *node, ++ const c14n_ctx_t *ctx ++) ++{ ++ axiom_data_source_t *src = NULL; ++ src = (axiom_data_source_t *)axiom_node_get_data_element((axiom_node_t *)node, ctx->env); ++ ++ if (src == NULL) ++ return AXIS2_FAILURE; ++ ++ axutil_stream_t *stream = axiom_data_source_get_stream(src, ctx->env); ++ ++ if(stream == NULL) ++ return AXIS2_FAILURE; ++ ++ axis2_char_t* buf = axutil_stream_get_buffer(stream, ctx->env); ++ int buflen = axutil_stream_get_len(stream, ctx->env); ++ if(buf == NULL || buflen < 0) ++ return AXIS2_FAILURE; ++ ++ buf[buflen] = '\0'; /* buflen is an index here*/ ++ C14N_BUFFER_ADD_STRING_WITH_LENGTH(ctx->outbuffer, ctx->env, buf, axutil_strlen(buf)); ++ ++ return AXIS2_SUCCESS; ++} ++ + static int + ns_uri_compare( + const void *ns1, diff --git a/rampartc-timestamp.patch b/rampartc-timestamp.patch new file mode 100644 index 0000000..370a3e6 --- /dev/null +++ b/rampartc-timestamp.patch @@ -0,0 +1,12 @@ +diff -ur wso2-wsf-cpp-src-2.1.0.orig/wsf_c/rampartc/src/util/rampart_timestamp_token.c wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/util/rampart_timestamp_token.c +--- wso2-wsf-cpp-src-2.1.0.orig/wsf_c/rampartc/src/util/rampart_timestamp_token.c 2009-10-13 15:04:10.000000000 -0400 ++++ wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/util/rampart_timestamp_token.c 2012-07-17 17:45:46.455243717 -0400 +@@ -207,7 +207,7 @@ + rampart_set_security_processed_result(env, msg_ctx,RAMPART_SPR_TS_EXPIRES, expires_val); + + /* Check whether time has expired or not */ +- validity = rampart_compare_date_time(env, created_val, expires_val); ++ validity = rampart_compare_date_time(env, current_val, expires_val); + if (validity == AXIS2_FAILURE) + { + /* this means created_value > expires_value. Which is not valid */ diff --git a/remove_exit0_calls_for_rpmlint.patch b/remove_exit0_calls_for_rpmlint.patch new file mode 100644 index 0000000..6530976 --- /dev/null +++ b/remove_exit0_calls_for_rpmlint.patch @@ -0,0 +1,34 @@ +diff --git a/src/main/Environment.cpp b/src/main/Environment.cpp +index bc9f852..cd7a431 100644 +--- a/src/main/Environment.cpp ++++ b/src/main/Environment.cpp +@@ -65,7 +65,6 @@ const axutil_env_t* WSF_CALL Environment::getEnv() + }else + { + printf("Environment creation failed"); +- exit(0); + } + } + return env; +@@ -120,8 +119,6 @@ void WSF_CALL Environment::initialize(std::string logFileName, axutil_log_levels + axutil_env_t *env = axutil_env_create_all(logFileName.c_str(), logLevel); + if(env){ + setEnv(env); +- }else{ +- exit(0); + } + } + +diff --git a/wsf_c/axis2c/util/src/dir_handler.c b/wsf_c/axis2c/util/src/dir_handler.c +index 4a5e51e..d75b2e4 100644 +--- a/wsf_c/axis2c/util/src/dir_handler.c ++++ b/wsf_c/axis2c/util/src/dir_handler.c +@@ -200,7 +200,7 @@ axutil_dir_handler_list_service_or_module_dirs( + AXIS2_ENV_CHECK(env, NULL); + file_list = axutil_array_list_create(env, 0); + if(!AXIS2_GETCWD(cwd, 500)) +- exit(1); ++ return NULL; + + /* pathname is path of services directory or modules directory. */ + chdir_result = AXIS2_CHDIR(pathname); diff --git a/sources b/sources new file mode 100644 index 0000000..d8fac43 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +3443064be85c80cae1fc7f6826ffd8e7 wso2-wsf-cpp-src-2.1.0-trimmed.tar.gz diff --git a/wso2-build-fixes.patch b/wso2-build-fixes.patch new file mode 100644 index 0000000..4fca32c --- /dev/null +++ b/wso2-build-fixes.patch @@ -0,0 +1,319 @@ +diff -Naur wso2-wsf-cpp-src-2.1.0/Makefile.am wso2-wsf-cpp-src-2.1.0.new/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/Makefile.am 2009-10-13 14:19:31.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/Makefile.am 2011-03-04 13:46:27.000000000 -0600 +@@ -10,12 +10,12 @@ + sh dist_hook.sh + + install-data-hook: +- rm -rf $(prefix)/samples/* +- mv $(prefix)/docs $(prefix)/wsf_c +- mkdir $(prefix)/docs +- mv $(prefix)/wsf_c $(prefix)/docs/wsf_c +- mkdir $(prefix)/docs/cpp +- cp -rf docs $(prefix)/docs/cpp ++ rm -rf $(DESTDIR)/$(prefix)/samples/* ++ mv $(DESTDIR)/$(prefix)/docs $(DESTDIR)/$(prefix)/wsf_c ++ mkdir $(DESTDIR)/$(prefix)/docs ++ mv $(DESTDIR)/$(prefix)/wsf_c $(DESTDIR)/$(prefix)/docs/wsf_c ++ mkdir $(DESTDIR)/$(prefix)/docs/cpp ++ cp -rf docs $(DESTDIR)/$(prefix)/docs/cpp + + EXTRA_DIST=README.INSTALL.LINUX README.INSTALL.WINDOWS README.SAMPLES build.bat init.bat clean.bat configure.in docs NOTICE LICENSE + +diff -Naur wso2-wsf-cpp-src-2.1.0/Makefile.in wso2-wsf-cpp-src-2.1.0.new/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/Makefile.in 2009-10-13 14:19:31.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/Makefile.in 2011-03-04 13:47:06.000000000 -0600 +@@ -707,12 +707,12 @@ + sh dist_hook.sh + + install-data-hook: +- rm -rf $(prefix)/samples/* +- mv $(prefix)/docs $(prefix)/wsf_c +- mkdir $(prefix)/docs +- mv $(prefix)/wsf_c $(prefix)/docs/wsf_c +- mkdir $(prefix)/docs/cpp +- cp -rf docs $(prefix)/docs/cpp ++ rm -rf $(DESTDIR)/$(prefix)/samples/* ++ mv $(DESTDIR)/$(prefix)/docs $(DESTDIR)/$(prefix)/wsf_c ++ mkdir $(DESTDIR)/$(prefix)/docs ++ mv $(DESTDIR)/$(prefix)/wsf_c $(DESTDIR)/$(prefix)/docs/wsf_c ++ mkdir $(DESTDIR)/$(prefix)/docs/cpp ++ cp -rf docs $(DESTDIR)/$(prefix)/docs/cpp + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/axis2c/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/axis2c/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/axis2c/Makefile.am 2009-10-13 14:04:32.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/axis2c/Makefile.am 2011-03-04 17:29:15.000000000 -0600 +@@ -30,6 +30,6 @@ + rm -rf axis2c-bin-${PACKAGE_VERSION}-linux + + install-data-hook: +- mkdir -p $(samplesdir)/src/axis2c +- cp -rf samples/* $(samplesdir)/src/axis2c ++ mkdir -p $(DESTDIR)/$(samplesdir)/src/axis2c ++ cp -rf samples/* $(DESTDIR)/$(samplesdir)/src/axis2c + +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/axis2c/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/axis2c/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/axis2c/Makefile.in 2009-10-13 14:22:40.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/axis2c/Makefile.in 2011-03-04 17:29:22.000000000 -0600 +@@ -823,8 +823,8 @@ + rm -rf axis2c-bin-${PACKAGE_VERSION}-linux + + install-data-hook: +- mkdir -p $(samplesdir)/src/axis2c +- cp -rf samples/* $(samplesdir)/src/axis2c ++ mkdir -p $(DESTDIR)/$(samplesdir)/src/axis2c ++ cp -rf samples/* $(DESTDIR)/$(samplesdir)/src/axis2c + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/Makefile.am 2009-10-13 14:03:11.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/Makefile.am 2011-03-04 17:28:49.000000000 -0600 +@@ -21,12 +21,12 @@ + rm -rf `find $(samplesdir)/ -type d -name autom4te.cache` + + install-data-hook: +- cp -rf docs/* $(docsdir) +- rm -rf `find $(samplesdir)/ -type d -name *.svn` +- rm -rf `find $(samplesdir)/ -type d -name *.libs` +- rm -rf `find $(samplesdir)/ -type d -name *.deps` +- rm -rf `find $(samplesdir)/ -type f -name Makefile` +- rm -rf `find $(samplesdir)/ -type d -name autom4te.cache` ++ cp -rf docs/* $(DESTDIR)/$(docsdir) ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type d -name *.svn` ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type d -name *.libs` ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type d -name *.deps` ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type f -name Makefile` ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type d -name autom4te.cache` + + EXTRA_DIST=build_samples.sh config build.bat clean.bat docs CREDITS NOTICE examples LICENSE configure.in link_samples.sh link.sh build/build_optional.bat build/optional.mk build/init.bat build/versions.in test build/codegen + +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/Makefile.in 2009-10-13 14:22:23.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/Makefile.in 2011-03-04 17:29:57.000000000 -0600 +@@ -725,12 +725,12 @@ + rm -rf `find $(samplesdir)/ -type d -name autom4te.cache` + + install-data-hook: +- cp -rf docs/* $(docsdir) +- rm -rf `find $(samplesdir)/ -type d -name *.svn` +- rm -rf `find $(samplesdir)/ -type d -name *.libs` +- rm -rf `find $(samplesdir)/ -type d -name *.deps` +- rm -rf `find $(samplesdir)/ -type f -name Makefile` +- rm -rf `find $(samplesdir)/ -type d -name autom4te.cache` ++ cp -rf docs/* $(DESTDIR)/$(docsdir) ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type d -name *.svn` ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type d -name *.libs` ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type d -name *.deps` ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type f -name Makefile` ++ rm -rf `find $(DESTDIR)/$(samplesdir)/ -type d -name autom4te.cache` + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/issued_token/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/issued_token/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/issued_token/Makefile.am 2009-10-13 14:32:23.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/issued_token/Makefile.am 2011-03-04 13:48:17.000000000 -0600 +@@ -24,4 +24,4 @@ + EXTRA_DIST = update_n_run.sh + + install-data-hook: +- cp update_n_run.sh $(prefix)/samples/bin/rampartc/issues_token_update_n_run.sh ++ cp update_n_run.sh $(DESTDIR)/$(prefix)/samples/bin/rampartc/issues_token_update_n_run.sh +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/issued_token/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/issued_token/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/issued_token/Makefile.in 2009-10-13 14:37:00.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/issued_token/Makefile.in 2011-03-04 13:48:24.000000000 -0600 +@@ -490,7 +490,7 @@ + + + install-data-hook: +- cp update_n_run.sh $(prefix)/samples/bin/rampartc/issues_token_update_n_run.sh ++ cp update_n_run.sh $(DESTDIR)/$(prefix)/samples/bin/rampartc/issues_token_update_n_run.sh + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/saml_echo/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/saml_echo/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/saml_echo/Makefile.am 2009-10-13 14:32:23.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/saml_echo/Makefile.am 2011-03-04 13:48:48.000000000 -0600 +@@ -24,4 +24,4 @@ + EXTRA_DIST = update_n_run.sh update_n_run.bat + + install-data-hook: +- cp update_n_run.sh $(prefix)/samples/bin/rampartc/saml_echo_update_n_run.sh ++ cp update_n_run.sh $(DESTDIR)/$(prefix)/samples/bin/rampartc/saml_echo_update_n_run.sh +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/saml_echo/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/saml_echo/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/saml_echo/Makefile.in 2009-10-13 14:37:00.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/saml_echo/Makefile.in 2011-03-04 13:48:58.000000000 -0600 +@@ -490,7 +490,7 @@ + + + install-data-hook: +- cp update_n_run.sh $(prefix)/samples/bin/rampartc/saml_echo_update_n_run.sh ++ cp update_n_run.sh $(DESTDIR)/$(prefix)/samples/bin/rampartc/saml_echo_update_n_run.sh + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/saml_protect/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/saml_protect/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/saml_protect/Makefile.am 2009-10-13 14:32:23.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/saml_protect/Makefile.am 2011-03-04 13:48:29.000000000 -0600 +@@ -24,4 +24,4 @@ + EXTRA_DIST = update_n_run.sh update_n_run.bat + + install-data-hook: +- cp update_n_run.sh $(prefix)/samples/bin/rampartc/saml_protect_update_n_run.sh ++ cp update_n_run.sh $(DESTDIR)/$(prefix)/samples/bin/rampartc/saml_protect_update_n_run.sh +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/saml_protect/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/saml_protect/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/client/saml_protect/Makefile.in 2009-10-13 14:37:00.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/client/saml_protect/Makefile.in 2011-03-04 13:48:38.000000000 -0600 +@@ -490,7 +490,7 @@ + + + install-data-hook: +- cp update_n_run.sh $(prefix)/samples/bin/rampartc/saml_protect_update_n_run.sh ++ cp update_n_run.sh $(DESTDIR)/$(prefix)/samples/bin/rampartc/saml_protect_update_n_run.sh + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/Makefile.am 2009-10-13 14:04:05.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/Makefile.am 2011-03-04 13:48:10.000000000 -0600 +@@ -4,8 +4,8 @@ + data_DATA= + + install-data-hook: +- cp -rf secpolicy/* $(datadir) +- find $(datadir) -type d -name ".svn" | xargs rm -rf ++ cp -rf secpolicy/* $(DESTDIR)/$(datadir) ++ find $(DESTDIR)/$(datadir) -type d -name ".svn" | xargs rm -rf + + EXTRA_DIST=secpolicy omxmlsec data ABOUT_SAMPLES build.sh + +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/samples/Makefile.in 2009-10-13 14:37:02.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/samples/Makefile.in 2011-03-04 13:49:15.000000000 -0600 +@@ -752,8 +752,8 @@ + + + install-data-hook: +- cp -rf secpolicy/* $(datadir) +- find $(datadir) -type d -name ".svn" | xargs rm -rf ++ cp -rf secpolicy/* $(DESTDIR)/$(datadir) ++ find $(DESTDIR)/$(datadir) -type d -name ".svn" | xargs rm -rf + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/rahas/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/src/rahas/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/rahas/Makefile.am 2009-10-13 14:04:09.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/src/rahas/Makefile.am 2011-03-04 13:49:23.000000000 -0600 +@@ -23,5 +23,5 @@ + @AXIOMINC@ + + install-data-hook: +- mv $(prefix)/modules/rahas/rahas_module.xml $(prefix)/modules/rahas/module.xml ++ mv $(DESTDIR)/$(prefix)/modules/rahas/rahas_module.xml $(DESTDIR)/$(prefix)/modules/rahas/module.xml + +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/rahas/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/src/rahas/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/rahas/Makefile.in 2009-10-13 14:35:30.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/src/rahas/Makefile.in 2011-03-04 13:49:31.000000000 -0600 +@@ -593,7 +593,7 @@ + + + install-data-hook: +- mv $(prefix)/modules/rahas/rahas_module.xml $(prefix)/modules/rahas/module.xml ++ mv $(DESTDIR)/$(prefix)/modules/rahas/rahas_module.xml $(DESTDIR)/$(prefix)/modules/rahas/module.xml + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/util/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/src/util/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/util/Makefile.am 2009-10-13 14:04:09.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/src/util/Makefile.am 2011-03-04 15:56:21.000000000 -0600 +@@ -1,6 +1,6 @@ + TESTS = + +-prglibdir=$(prefix)/lib ++prglibdir=$(libdir) + + prglib_LTLIBRARIES = librampart.la + +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/util/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/src/util/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/rampartc/src/util/Makefile.in 2009-10-13 14:35:30.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/rampartc/src/util/Makefile.in 2011-03-04 15:49:07.000000000 -0600 +@@ -207,7 +207,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-prglibdir = $(prefix)/lib ++prglibdir = @libdir@ + prglib_LTLIBRARIES = librampart.la + librampart_la_SOURCES = rampart_crypto_util.c \ + rampart_util.c rampart_handler_util.c rampart_username_token.c rampart_timestamp_token.c \ +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/sandesha2c/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/sandesha2c/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/sandesha2c/Makefile.am 2009-10-13 14:04:32.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/sandesha2c/Makefile.am 2011-03-04 17:29:00.000000000 -0600 +@@ -20,7 +20,7 @@ + scripts_DATA=config/*.bat config/*.sh + + install-data-hook: +- mkdir -p $(samplesdir) +- cp -rf samples/* $(samplesdir) ++ mkdir -p $(DESTDIR)/$(samplesdir) ++ cp -rf samples/* $(DESTDIR)/$(samplesdir) + + +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/sandesha2c/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/sandesha2c/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/sandesha2c/Makefile.in 2009-10-13 14:35:44.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/sandesha2c/Makefile.in 2011-03-04 17:29:08.000000000 -0600 +@@ -786,8 +786,8 @@ + + + install-data-hook: +- mkdir -p $(samplesdir) +- cp -rf samples/* $(samplesdir) ++ mkdir -p $(DESTDIR)/$(samplesdir) ++ cp -rf samples/* $(DESTDIR)/$(samplesdir) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/sandesha2c/src/client/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/sandesha2c/src/client/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/sandesha2c/src/client/Makefile.am 2009-10-13 14:03:58.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/sandesha2c/src/client/Makefile.am 2011-03-04 15:57:13.000000000 -0600 +@@ -1,4 +1,4 @@ +-prglibdir=$(prefix)/lib ++prglibdir=$(libdir) + prglib_LTLIBRARIES = libsandesha2_client.la + + libsandesha2_client_la_SOURCES = \ +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/sandesha2c/src/client/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/sandesha2c/src/client/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/sandesha2c/src/client/Makefile.in 2009-10-13 14:35:43.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/sandesha2c/src/client/Makefile.in 2011-03-04 15:57:31.000000000 -0600 +@@ -190,7 +190,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-prglibdir = $(prefix)/lib ++prglibdir = @libdir@ + prglib_LTLIBRARIES = libsandesha2_client.la + libsandesha2_client_la_SOURCES = \ + sequence_report.c \ +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/savanc/src/client/Makefile.am wso2-wsf-cpp-src-2.1.0.new/wsf_c/savanc/src/client/Makefile.am +--- wso2-wsf-cpp-src-2.1.0/wsf_c/savanc/src/client/Makefile.am 2009-10-13 14:04:24.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/savanc/src/client/Makefile.am 2011-03-04 15:57:54.000000000 -0600 +@@ -1,4 +1,4 @@ +-prglibdir=$(prefix)/lib ++prglibdir=$(libdir) + prglib_LTLIBRARIES = libsavan_client.la + + libsavan_client_la_SOURCES = savan_client.c +diff -Naur wso2-wsf-cpp-src-2.1.0/wsf_c/savanc/src/client/Makefile.in wso2-wsf-cpp-src-2.1.0.new/wsf_c/savanc/src/client/Makefile.in +--- wso2-wsf-cpp-src-2.1.0/wsf_c/savanc/src/client/Makefile.in 2009-10-13 14:35:14.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.new/wsf_c/savanc/src/client/Makefile.in 2011-03-04 15:58:16.000000000 -0600 +@@ -206,7 +206,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-prglibdir = $(prefix)/lib ++prglibdir = @libdir@ + prglib_LTLIBRARIES = libsavan_client.la + libsavan_client_la_SOURCES = savan_client.c + libsavan_client_la_LIBADD = $(top_builddir)/src/util/libsavan_util.la \ diff --git a/wso2-nobuild-minizip.patch b/wso2-nobuild-minizip.patch new file mode 100644 index 0000000..87f13e4 --- /dev/null +++ b/wso2-nobuild-minizip.patch @@ -0,0 +1,31 @@ +diff -Naur wso2-wsf-cpp-src-2.1.0.patched/wsf_c/axis2c/util/configure wso2-wsf-cpp-src-2.1.0.nominizip/wsf_c/axis2c/util/configure +--- wso2-wsf-cpp-src-2.1.0.patched/wsf_c/axis2c/util/configure 2009-10-13 14:23:00.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.nominizip/wsf_c/axis2c/util/configure 2011-04-13 13:05:56.000000000 -0500 +@@ -21669,7 +21669,7 @@ + + + +-ac_config_files="$ac_config_files Makefile src/Makefile src/platforms/unix/Makefile src/minizip/Makefile src/stomp/Makefile include/Makefile test/Makefile test/util/Makefile test/allocator/Makefile test/date_time/Makefile test/duration/Makefile test/link_list/Makefile test/properties/Makefile test/rand/Makefile test/stack/Makefile test/string_util/Makefile test/uri/Makefile test/url/Makefile test/utils/Makefile" ++ac_config_files="$ac_config_files Makefile src/Makefile src/platforms/unix/Makefile src/stomp/Makefile include/Makefile test/Makefile test/util/Makefile test/allocator/Makefile test/date_time/Makefile test/duration/Makefile test/link_list/Makefile test/properties/Makefile test/rand/Makefile test/stack/Makefile test/string_util/Makefile test/uri/Makefile test/url/Makefile test/utils/Makefile" + + + cat >confcache <<\_ACEOF +@@ -22331,7 +22331,6 @@ + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/platforms/unix/Makefile") CONFIG_FILES="$CONFIG_FILES src/platforms/unix/Makefile" ;; +- "src/minizip/Makefile") CONFIG_FILES="$CONFIG_FILES src/minizip/Makefile" ;; + "src/stomp/Makefile") CONFIG_FILES="$CONFIG_FILES src/stomp/Makefile" ;; + "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; +diff -Naur wso2-wsf-cpp-src-2.1.0.patched/wsf_c/axis2c/util/configure.ac wso2-wsf-cpp-src-2.1.0.nominizip/wsf_c/axis2c/util/configure.ac +--- wso2-wsf-cpp-src-2.1.0.patched/wsf_c/axis2c/util/configure.ac 2009-10-13 14:20:19.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.nominizip/wsf_c/axis2c/util/configure.ac 2011-04-13 13:05:00.000000000 -0500 +@@ -232,7 +232,6 @@ + AC_CONFIG_FILES([Makefile \ + src/Makefile \ + src/platforms/unix/Makefile \ +- src/minizip/Makefile \ + src/stomp/Makefile \ + include/Makefile \ + test/Makefile \ diff --git a/wso2-nobuild-sqlite3.patch b/wso2-nobuild-sqlite3.patch new file mode 100644 index 0000000..7598ed6 --- /dev/null +++ b/wso2-nobuild-sqlite3.patch @@ -0,0 +1,101 @@ +diff -Naur wso2-wsf-cpp-src-2.1.0.patched/wsf_c/sandesha2c/src/storage/sqlite/Makefile.am wso2-wsf-cpp-src-2.1.0.nosqlite/wsf_c/sandesha2c/src/storage/sqlite/Makefile.am +--- wso2-wsf-cpp-src-2.1.0.patched/wsf_c/sandesha2c/src/storage/sqlite/Makefile.am 2009-10-13 14:03:57.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.nosqlite/wsf_c/sandesha2c/src/storage/sqlite/Makefile.am 2011-04-13 13:26:31.000000000 -0500 +@@ -8,8 +8,7 @@ + permanent_seq_property_mgr.c \ + permanent_storage_mgr.c \ + permanent_bean_mgr.c \ +- msg_store_bean.c \ +- sqlite3.c ++ msg_store_bean.c + + INCLUDES = -I$(top_builddir)/include \ + -I$(top_builddir)/include/sandesha2 \ +@@ -20,6 +19,5 @@ + @UTILINC@ + + EXTRA_DIST=sandesha2_permanent_bean_mgr.h \ +- sandesha2_sqls.h \ +- sqlite3.h ++ sandesha2_sqls.h + +diff -Naur wso2-wsf-cpp-src-2.1.0.patched/wsf_c/sandesha2c/src/storage/sqlite/Makefile.in wso2-wsf-cpp-src-2.1.0.nosqlite/wsf_c/sandesha2c/src/storage/sqlite/Makefile.in +--- wso2-wsf-cpp-src-2.1.0.patched/wsf_c/sandesha2c/src/storage/sqlite/Makefile.in 2009-10-13 14:35:44.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.nosqlite/wsf_c/sandesha2c/src/storage/sqlite/Makefile.in 2011-04-13 13:26:45.000000000 -0500 +@@ -48,7 +48,7 @@ + permanent_invoker_mgr.lo permanent_sender_mgr.lo \ + permanent_next_msg_mgr.lo permanent_seq_property_mgr.lo \ + permanent_storage_mgr.lo permanent_bean_mgr.lo \ +- msg_store_bean.lo sqlite3.lo ++ msg_store_bean.lo + libsandesha2_permanent_la_OBJECTS = \ + $(am_libsandesha2_permanent_la_OBJECTS) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +@@ -195,8 +195,7 @@ + permanent_seq_property_mgr.c \ + permanent_storage_mgr.c \ + permanent_bean_mgr.c \ +- msg_store_bean.c \ +- sqlite3.c ++ msg_store_bean.c + + INCLUDES = -I$(top_builddir)/include \ + -I$(top_builddir)/include/sandesha2 \ +@@ -207,8 +206,7 @@ + @UTILINC@ + + EXTRA_DIST = sandesha2_permanent_bean_mgr.h \ +- sandesha2_sqls.h \ +- sqlite3.h ++ sandesha2_sqls.h + + all: all-am + +@@ -269,7 +267,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/permanent_sender_mgr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/permanent_seq_property_mgr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/permanent_storage_mgr.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +diff -Naur wso2-wsf-cpp-src-2.1.0.patched/wsf_c/savanc/src/subs_mgrs/sqlite/Makefile.am wso2-wsf-cpp-src-2.1.0.nosqlite/wsf_c/savanc/src/subs_mgrs/sqlite/Makefile.am +--- wso2-wsf-cpp-src-2.1.0.patched/wsf_c/savanc/src/subs_mgrs/sqlite/Makefile.am 2009-10-13 14:04:25.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.nosqlite/wsf_c/savanc/src/subs_mgrs/sqlite/Makefile.am 2011-04-13 13:28:36.000000000 -0500 +@@ -1,6 +1,6 @@ + lib_LTLIBRARIES = libsavan_subs_mgr.la + +-libsavan_subs_mgr_la_SOURCES = subs_mgr.c sqlite3.c ++libsavan_subs_mgr_la_SOURCES = subs_mgr.c + + libsavan_subs_mgr_la_LIBADD = ../common/libsavan_common_subs_mgr.la + +diff -Naur wso2-wsf-cpp-src-2.1.0.patched/wsf_c/savanc/src/subs_mgrs/sqlite/Makefile.in wso2-wsf-cpp-src-2.1.0.nosqlite/wsf_c/savanc/src/subs_mgrs/sqlite/Makefile.in +--- wso2-wsf-cpp-src-2.1.0.patched/wsf_c/savanc/src/subs_mgrs/sqlite/Makefile.in 2009-10-13 14:35:15.000000000 -0500 ++++ wso2-wsf-cpp-src-2.1.0.nosqlite/wsf_c/savanc/src/subs_mgrs/sqlite/Makefile.in 2011-04-13 13:29:06.000000000 -0500 +@@ -53,7 +53,7 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) + libsavan_subs_mgr_la_DEPENDENCIES = \ + ../common/libsavan_common_subs_mgr.la +-am_libsavan_subs_mgr_la_OBJECTS = subs_mgr.lo sqlite3.lo ++am_libsavan_subs_mgr_la_OBJECTS = subs_mgr.lo + libsavan_subs_mgr_la_OBJECTS = $(am_libsavan_subs_mgr_la_OBJECTS) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -206,7 +206,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + lib_LTLIBRARIES = libsavan_subs_mgr.la +-libsavan_subs_mgr_la_SOURCES = subs_mgr.c sqlite3.c ++libsavan_subs_mgr_la_SOURCES = subs_mgr.c + libsavan_subs_mgr_la_LIBADD = ../common/libsavan_common_subs_mgr.la + INCLUDES = -I$(top_builddir)/include \ + -I$(top_builddir)/include/savan \ +@@ -286,7 +286,6 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subs_mgr.Plo@am__quote@ + + .c.o: diff --git a/wso2-trim-tarball.sh b/wso2-trim-tarball.sh new file mode 100755 index 0000000..e6cab49 --- /dev/null +++ b/wso2-trim-tarball.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +input="wso2-wsf-cpp-src-$1.tar.gz" + +if [ ! -f $input ] ; then + echo "$0: $input is not a regular file"; + exit 1; +fi + +echo "Processing $input" + +echo "...extracting $input" +tar xzf $input + +cd wso2-wsf-cpp-src-$1 + +for f in \ + wsf_c/axis2c/util/src/minizip \ + wsf_c/sandesha2c/src/storage/sqlite/sqlite3.h \ + wsf_c/sandesha2c/src/storage/sqlite/sqlite3.c \ + wsf_c/savanc/include/sqlite3.h \ + wsf_c/savanc/src/subs_mgrs/sqlite/sqlite3.c \ + wsf_c/docs/savanc/api/sqlite3_8h-source.html; +do + echo "...removing $f"; + rm -rf $f; +done; + +patch -p1 < ../wso2-nobuild-minizip.patch +patch -p1 < ../wso2-nobuild-sqlite3.patch + +echo "...creating wso2-wsf-cpp-src-$1-trimmed.tar.gz" +cd .. +tar czfsp wso2-wsf-cpp-src-$1-trimmed.tar.gz wso2-wsf-cpp-src-$1 + +echo "...cleaning up" +rm -rf wso2-wsf-cpp-src-$1 + diff --git a/wso2-wsf-cpp.spec b/wso2-wsf-cpp.spec new file mode 100644 index 0000000..d066b62 --- /dev/null +++ b/wso2-wsf-cpp.spec @@ -0,0 +1,767 @@ +%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} +%global pkg_name wso2-wsf-cpp +%global axis_name wso2-axis2 +%global pkg_ver 2.1.0 + +%if 0%{?fedora} > 0 +# Build/package everything on fedora +%global package_rampart 1 +%global build_savan 1 +%global build_sandesha2 1 +%global build_wsclient 1 +%global package_http_module 1 +%global package_axis_http_server 1 +%global package_axis2_modules 1 +%else +%global package_rampart 0 +%global build_savan 0 +%global build_sandesha2 0 +%global build_wsclient 0 +%global package_http_module 0 +%global package_axis_http_server 0 +%global package_axis2_modules 0 +%endif + +Name: %{pkg_name} +Summary: WSO2 Web Services Framework for C++ +Version: %{pkg_ver} +Release: 23%{?dist} +Group: Development/Tools +License: ASL 2.0 +URL: http://wso2.org/library/wsf/cpp +# Original source tarball +#Source0: http://wso2.org/products/download/wsf/cpp/2.1.0/wso2-wsf-cpp-src-2.1.0.tar.gz +Source0: wso2-wsf-cpp-src-2.1.0-trimmed.tar.gz +Source1: wso2-trim-tarball.sh +# Remove minizip build references, used by wso2-trim-tarball.sh +Source2: wso2-nobuild-minizip.patch +# Remove sqlite3 build references, used by wso2-trim-tarball.sh +Source3: wso2-nobuild-sqlite3.patch +# Push DESTDIR to all installable components and allow proper setting of the +# libary install directory from configure +# https://wso2.org/jira/browse/WSFCPP-137 +Patch0: wso2-build-fixes.patch +# Allow definition of library path for services +# https://issues.apache.org/jira/browse/AXIS2C-1544 +Patch1: msg_rcvr_lib.patch +# Allow shared libs to be loaded using literal filenames as well as original inferred style +# https://issues.apache.org/jira/browse/AXIS2C-1549 +Patch2: literal_lib_name.patch +# Make stream support more complete for SSL +# https://issues.apache.org/jira/browse/AXIS2C-1556 +Patch3: generic_streams_for_ssl.patch +# Fix free of static buffer +# https://wso2.org/jira/browse/WSFCPP-138 +Patch4: prevent_free_of_static_chars.patch +# 2.4 client_ip API change +# https://bugzilla.redhat.com/show_bug.cgi?id=833173 +Patch5: 2.4_client_ip_API_change.patch +# Remove exit(0) calls in Environment.cpp for rpmlint +Patch6: remove_exit0_calls_for_rpmlint.patch +# https://issues.apache.org/jira/browse/AXIS2C-1522 +Patch7: axis2c_initBuffer_curl.patch +# https://issues.apache.org/jira/browse/AXIS2C-1512 +Patch8: axis2c_useENV_as_repopath.patch +# https://issues.apache.org/jira/browse/AXIS2C-1521 +Patch9: axis2c_respectConst_sslCTX.patch +# https://issues.apache.org/jira/browse/RAMPARTC-139 +Patch10: rampartc-timestamp.patch +# https://issues.apache.org/jira/browse/RAMPARTC-154 +Patch11: rampartc-c14n-new.patch +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: openssl-devel +BuildRequires: httpd-devel +BuildRequires: apr-devel +BuildRequires: libxml2-devel +BuildRequires: sqlite-devel +BuildRequires: dos2unix +Requires: %{axis_name} = %{version}-%{release} + +%description +WSO2 Web Services Framework for C++. WSO2 WSF/C++ is a standards compliant, +enterprise grade, open source, C++ library for providing and consuming Web +services in C++. WSO2 WSF/C++ is a complete solution for building and +deploying Web services, and is the C++ library with a wide range of +WS-* specification implementations, including MTOM, WS-Addressing, WS-Policy, +WS-Security, WS-SecurityPolicy, WS-Reliable Messaging and WS-Events + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-,root,root) +%doc README NEWS LICENSE NOTICE INSTALL README.INSTALL.LINUX README.SAMPLES +%_libdir/libwsf_cpp_msg_recv.so.* +%_libdir/libwso2_wsf.so.* +%_libdir/libneethi.so.* +%_libdir/libneethi_util.so.* + +%package devel +Summary: WSO2 Web Services Framework for C++ development files +Group: Development/Tools +Requires: %{pkg_name} = %{version}-%{release} + +%description devel +WSO2 Web Services Framework for C++. WSO2 WSF/C++ is a standards compliant, +enterprise grade, open source, C++ library for providing and consuming Web +services in C++. WSO2 WSF/C++ is a complete solution for building and +deploying Web services, and is the C++ library with a wide range of +WS-* specification implementations, including MTOM, WS-Addressing, WS-Policy, +WS-Security, WS-SecurityPolicy, WS-Reliable Messaging and WS-Events. + +This package contains header files and documentation for developing with +the WSO2 Web Services Framework for C++ + +%files devel +%defattr(-,root,root) +%doc docs +%_includedir/%{pkg_name}/*.h +%_libdir/libwsf_cpp_msg_recv.so +%_libdir/libwso2_wsf.so +%_libdir/libneethi.so +%_libdir/libneethi_util.so + +%if %{package_rampart} +%package -n %{pkg_name}-security +Summary: WSO2 Security for Web Services Framework for C++ +Group: Development/Tools +Requires: wso2-rampart = %{version}-%{release} + +%description -n %{pkg_name}-security +A security library for WSO2 + +%post -n %{pkg_name}-security +/sbin/ldconfig + +%postun -n %{pkg_name}-security +/sbin/ldconfig + +%files -n %{pkg_name}-security +%defattr(-,root,root) +%doc LICENSE +%_libdir/libwso2_wsf_security.so.* + +%package -n %{pkg_name}-security-devel +Summary: WSO2 Security for Web Services Framework for C++ +Group: Development/Tools +Requires: %{pkg_name}-security = %{version}-%{release} +Requires: %{pkg_name}-devel = %{version}-%{release} +Requires: wso2-rampart-devel = %{version}-%{release} + +%description -n %{pkg_name}-security-devel +A security library for WSO2 development + +%files -n %{pkg_name}-security-devel +%defattr(-,root,root) +%doc LICENSE +%_libdir/libwso2_wsf_security.so +%endif + +%if %{build_wsclient} +%package -n wso2-wsclient +Summary: A web service client +Group: System Environment/Daemons +Requires: %{pkg_name} = %{pkg_ver} +Requires: %{axis_name} = %{pkg_ver} +Requires: wso2-rampart = %{pkg_ver} + +%description -n wso2-wsclient +A Web Services client + +%files -n wso2-wsclient +%defattr(-,root,root) +%doc wsf_c/wsclient/LICENSE wsf_c/wsclient/README wsf_c/wsclient/docs +%_bindir/wsclient +%endif + +%if %{package_http_module} +%package -n mod_%{axis_name} +Summary: An Apache HTTPD module which adds axis2 support +Group: System Environment/Daemons +Requires: httpd +Requires: apr +Requires: httpd-mmn = %{_httpd_mmn} + +%description -n mod_%{axis_name} +An Apache HTTPD module that adds support for axis2 WebServices. This package +is a modified version of the module provided by the developers of WSO2 + +%files -n mod_%{axis_name} +%defattr(-,root,root) +%doc wsf_c/axis2c/LICENSE +%doc wsf_c/axis2c/src/core/transport/xmpp/samples/server/axis2.xml +%_libdir/httpd/modules/mod_axis2.so +%endif + +%if %{package_axis2_modules} +%package -n %{axis_name}-modules +Summary: Modules for the WSO2 modified Apache Axis2/C +Group: Development/Tools +Requires: %{axis_name} = %{version}-%{release} + +%description -n %{axis_name}-modules +Apache Axis2/C is a Web services engine implementing the Axis2 architecture +in C. Axis2/C can be used to provide and consume WebServices and supports +SOAP 1.1, 1.2, and REST style WebServices. Axis2/C also supports MTOM. + +This package contains modules included in the Axis2/C distribution + +%files -n %{axis_name}-modules +%defattr(-,root,root) +%dir %_libdir/%{axis_name}/modules +%doc wsf_c/axis2c/LICENSE wsf_c/axis2c/AUTHORS wsf_c/axis2c/CREDITS wsf_c/axis2c/INSTALL wsf_c/axis2c/NEWS wsf_c/axis2c/NOTICE wsf_c/axis2c/README +%_libdir/%{axis_name}/modules/addressing/libaxis2_mod_addr.so +%_libdir/%{axis_name}/modules/addressing/module.xml +%_libdir/%{axis_name}/modules/logging/libaxis2_mod_log.so +%_libdir/%{axis_name}/modules/logging/module.xml +%endif + +%package -n %{axis_name} +Summary: WSO2 modified Apache Axis2/C +Group: Development/Tools +Requires: %{pkg_name} = %{version}-%{release} +Requires: pkgconfig + +%description -n %{axis_name} +Apache Axis2/C is a Web services engine implementing the Axis2 architecture +in C. Axis2/C can be used to provide and consume WebServices and supports +SOAP 1.1, 1.2, and REST style WebServices. Axis2/C also supports MTOM. + +This package is a modified version of Apache Axis2/C provided by the +developers of WSO2 + +%post -n %{axis_name} +/sbin/ldconfig + +%postun -n %{axis_name} +/sbin/ldconfig + +%files -n %{axis_name} +%defattr(-,root,root) +%doc wsf_c/axis2c/LICENSE wsf_c/axis2c/AUTHORS wsf_c/axis2c/CREDITS wsf_c/axis2c/INSTALL wsf_c/axis2c/NEWS wsf_c/axis2c/NOTICE wsf_c/axis2c/README +%dir %_libdir/%{axis_name}/modules +%_libdir/libaxis2_axiom.so.* +%_libdir/libaxis2_engine.so.* +%_libdir/libaxis2_http_common.so.* +%_libdir/libaxis2_http_receiver.so.* +%_libdir/libaxis2_http_sender.so.* +%_libdir/libaxis2_parser.so.* +%_libdir/libaxis2_xpath.so.* +%_libdir/libaxutil.so.* +%_libdir/libguththila.so.* +%_bindir/tcpmon + +%if %{package_axis_http_server} +%package -n %{axis_name}-http-server +Summary: WSO2's axis basic http server +Group: Development/Tools +Requires: %{axis_name} = %{pkg_ver} + +%description -n %{axis_name}-http-server +The basic web server included as part of WSO2's axis + +%files -n %{axis_name}-http-server +%defattr(-,root,root) +%doc wsf_c/axis2c/LICENSE +%_bindir/axis2_http_server +%endif + +%package -n %{axis_name}-devel +Summary: WSO2's version of Apache Axis2/C development files +Group: Development/Tools +Requires: %{axis_name} = %{version}-%{release} + +%description -n %{axis_name}-devel +Apache Axis2/C is a Web services engine implementing the Axis2 architecture +in C. Axis2/C can be used to provide and consume WebServices and supports +SOAP 1.1, 1.2, and REST style WebServices. Axis2/C also supports MTOM. + +This package contains header files and documentation for developing with +WSO2's version of Apache Axis2/C + +%files -n %{axis_name}-devel +%defattr(-,root,root) +%doc wsf_c/docs/axis2c +%_includedir/axis2-1.6.0/*.h +%_includedir/axis2-1.6.0/platforms/*.h +%_includedir/axis2-1.6.0/platforms/unix/*.h +%_libdir/libaxis2_axiom.so +%_libdir/libaxis2_engine.so +%_libdir/libaxis2_http_common.so +%_libdir/libaxis2_http_receiver.so +%_libdir/libaxis2_http_sender.so +%_libdir/libaxis2_parser.so +%_libdir/libaxis2_xpath.so +%_libdir/libaxutil.so +%_libdir/libguththila.so +%_libdir/pkgconfig/axis2c.pc + +%if %{package_rampart} +%package -n wso2-rampart +Summary: A security module for Apache Axis2/C +Group: Development/Tools +Requires: %{axis_name} +Requires: openssl + +%description -n wso2-rampart +Apache Rampart/C is the security module for Apache Axis2/C featuring many +different means to secure SOAP messages including SOAP message encryption +and signature as specified in WS-Security Specification. In addition Apache +Rampart/C configurations are based on security policy assertions as per +WS-Security Policy specification. + +This package is a modified version of Apache Rampart/C provided by the +developers of WSO2 + +%post -n wso2-rampart +/sbin/ldconfig + +%postun -n wso2-rampart +/sbin/ldconfig + +%files -n wso2-rampart +%defattr(-,root,root) +%doc wsf_c/rampartc/LICENSE wsf_c/rampartc/AUTHORS wsf_c/rampartc/NEWS wsf_c/rampartc/NOTICE wsf_c/rampartc/README +%_libdir/librampart.so.* +%_libdir/%{axis_name}/modules/rahas/libmod_rahas.so +%_libdir/%{axis_name}/modules/rahas/module.xml +%_libdir/%{axis_name}/modules/rampart/libmod_rampart.so +%_libdir/%{axis_name}/modules/rampart/module.xml + +%package -n wso2-rampart-devel +Summary: WSO2's version of Apache Rampart/C development files +Group: Development/Tools +Requires: wso2-rampart = %{version}-%{release} + +%description -n wso2-rampart-devel +Apache Rampart/C is the security module for Apache Axis2/C featuring many +different means to secure SOAP messages including SOAP message encryption +and signature as specified in WS-Security Specification. In addition Apache +Rampart/C configurations are based on security policy assertions as per +WS-Security Policy specification. + +This package contains header files and documentation for developing with +WSO2's version of Apache Rampart/C + +%files -n wso2-rampart-devel +%defattr(-,root,root) +%doc wsf_c/docs/rampartc +%_includedir/rampart-1.3.0/*.h +%_libdir/librampart.so +%endif + +%if %{build_savan} +%package -n wso2-savan +Summary: A C implementation of the WS-Eventing specification +Group: Development/Tools +Requires: %{axis_name} + +%description -n wso2-savan +Apache Savan/C is a C implementation of the WS-Eventing specification which is +built on top of Axis2/C. Savan/C adds WS-Eventing capability to Web services +hosted using Axis2/C. + +This package is a modified version of Apache Savan/C provided by the +developers of WSO2 + +%post -n wso2-savan +/sbin/ldconfig + +%postun -n wso2-savan +/sbin/ldconfig + +%files -n wso2-savan +%defattr(-,root,root) +%doc wsf_c/savanc/LICENSE wsf_c/savanc/AUTHORS wsf_c/savanc/INSTALL wsf_c/savanc/NEWS wsf_c/savanc/README +%_libdir/libsavan_client.so.* +%_libdir/libsavan_msgreceivers.so.* +%_libdir/libsavan_subs_mgr.so.* +%_libdir/libsavan_util.so.* +%_libdir/%{axis_name}/modules/savan/libmod_savan.so +%_libdir/%{axis_name}/modules/savan/module.xml + +%package -n wso2-savan-devel +Summary: WSO2's version of Apache Savan/C development files +Group: Development/Tools +Requires: wso2-savan = %{version}-%{release} + +%description -n wso2-savan-devel +Apache Savan/C is a C implementation of the WS-Eventing specification which is +built on top of Axis2/C. Savan/C adds WS-Eventing capability to Web services +hosted using Axis2/C. + +This package contains header files and documentation for developing with +WSO2's version of Apache Savan/C + +%files -n wso2-savan-devel +%defattr(-,root,root) +%doc wsf_c/docs/savanc +%_includedir/savan-1.0/*.h +%_libdir/libsavan_client.so +%_libdir/libsavan_msgreceivers.so +%_libdir/libsavan_subs_mgr.so +%_libdir/libsavan_util.so +%endif + +%if %{build_sandesha2} +%package -n wso2-sandesha2 +Summary: A C implementation of WS-ReliableMessaging specification +Group: Development/Tools +Requires: %{axis_name} +Requires: sqlite + +%description -n wso2-sandesha2 +Apache Sandesha2/C is a C implementation of WS-ReliableMessaging specification +built on top of the Apache Axis2/C Web services engine. Sandesha2/C adds +reliable messaging capability for Web services hosted using Axis2/C. +Sandesha2/C can also be used with an Axis2/C client to interact with already +hosted Web services in a reliable manner. + +This package is a modified version of Apache Sandesha2/C provided by the +developers of WSO2 + +%post -n wso2-sandesha2 +/sbin/ldconfig + +%postun -n wso2-sandesha2 +/sbin/ldconfig + +%files -n wso2-sandesha2 +%defattr(-,root,root) +%doc wsf_c/sandesha2c/LICENSE wsf_c/sandesha2c/AUTHORS wsf_c/sandesha2c/INSTALL wsf_c/sandesha2c/NEWS wsf_c/sandesha2c/README +%_libdir/libsandesha2_client.so.* +%_libdir/%{axis_name}/modules/sandesha2/libsandesha2.so +%_libdir/%{axis_name}/modules/sandesha2/module.xml + +%package -n wso2-sandesha2-devel +Summary: WSO2's version of Apache Sandesha2/C development files +Group: Development/Tools +Requires: wso2-sandesha2 = %{version}-%{release} + +%description -n wso2-sandesha2-devel +Apache Sandesha2/C is a C implementation of WS-ReliableMessaging specification +built on top of the Apache Axis2/C Web services engine. Sandesha2/C adds +reliable messaging capability for Web services hosted using Axis2/C. +Sandesha2/C can also be used with an Axis2/C client to interact with already +hosted Web services in a reliable manner. + +This package contains header files and documentation for developing with +WSO2's version of Apache Sandesha2/C + +%files -n wso2-sandesha2-devel +%defattr(-,root,root) +%doc wsf_c/docs/sandesha2c +%_includedir/sandesha2-0.91/*.h +%_libdir/libsandesha2_client.so +%endif + +%prep +%setup -q -n %{name}-src-%{version} +# Fix non-unix end-of-line characters in docs +dos2unix wsf_c/axis2c/NEWS +dos2unix wsf_c/axis2c/INSTALL +dos2unix wsf_c/axis2c/src/core/transport/xmpp/samples/server/axis2.xml +dos2unix docs/style.css +dos2unix NOTICE +dos2unix README +dos2unix NEWS + +# Fix spurrious executable perms on doc files +chmod a-x wsf_c/docs/axis2c/*.cgi +%if %{package_rampart} +chmod a-x wsf_c/docs/rampartc/*.cgi +%endif +%if %{build_sandesha2} +chmod a-x wsf_c/docs/sandesha2c/*.cgi +%endif +%if %{build_savan} +chmod a-x wsf_c/docs/savanc/images/*.gif +chmod a-x wsf_c/docs/savanc/images/*.png +chmod a-x wsf_c/docs/savanc/images/logos/*.png +%endif +chmod a-x docs/api/html/installdox +%if %{build_wsclient} +chmod a-x wsf_c/wsclient/LICENSE +%endif + +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 + +%build +%if %{build_sandesha2} +sandesha2="--enable-sandesha" +%else +sandesha2="--disable-sandesha" +%endif + +%if %{build_savan} +savan="--enable-savan" +%else +savan="--disable-savan" +%endif + +%if %{build_wsclient} +wsclient="--enable-wsclient" +%else +wsclient="--disable-wsclient" +%endif + +export CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $RPM_OPT_FLAGS" +export CXXFLAGS=$CFLAGS +#%configure --enable-multi-thread=no --with-axis2=`pwd`/wsf_c/axis2c/include --with-apache2=%{_includedir}/httpd --with-apr=%{_includedir}/apr-1 --with-sqlite=%{_includedir} --without-archive --enable-openssl --enable-libxml2 --disable-static --disable-rpath --bindir=%{_bindir} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --includedir=%{_includedir} --datarootdir=%{_datadir}/%{pkg_name}-%{pkg_ver} --docdir=%{_datadir}/doc/%{pkg_name}-%{pkg_ver} --prefix=%{_prefix} $sandesha2 $savan $wsclient $rampart +%configure --enable-multi-thread=no --with-axis2=`pwd`/wsf_c/axis2c/include --with-apache2=%{_includedir}/httpd --with-apr=%{_includedir}/apr-1 --with-sqlite=%{_includedir} --without-archive --enable-openssl --enable-libxml2 --disable-static --disable-rpath --sysconfdir=%{_sysconfdir} --includedir=%{_includedir} --datarootdir=%{_datadir}/%{pkg_name}-%{pkg_ver} $sandesha2 $savan $wsclient $rampart + +# Remove rpath +find . -name libtool | xargs sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' +find . -name libtool | xargs sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' + +make + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +# Remove unneeded files +rm -rf %{buildroot}/%{_includedir}/axis2-1.6.0/platforms/windows +# This file is empty in the install. It probably shouldn't be, but it's an +# issue with the installation script +rm -rf %{buildroot}/%{_prefix}/AUTHORS +# This is a duplicate of the LICENSE file +rm -rf %{buildroot}/%{_prefix}/COPYING +rm -rf %{buildroot}/%{_prefix}/LICENSE +# Remove the installed doc files. The doc files are pulled from the build +# directory, not buildroot +rm -rf %{buildroot}/%{_prefix}/docs +rm -rf %{buildroot}/%{_datadir}/%{pkg_name}-%{pkg_ver} +rm -rf %{buildroot}/%{_prefix}/modules/sandesha2/LICENSE +rm -f %{buildroot}/%{_prefix}/CREDITS +rm -f %{buildroot}/%{_prefix}/INSTALL +rm -f %{buildroot}/%{_prefix}/LICENSE +rm -f %{buildroot}/%{_prefix}/NEWS +rm -f %{buildroot}/%{_prefix}/NOTICE +rm -f %{buildroot}/%{_prefix}/README +rm -f %{buildroot}/%{_prefix}/README.INSTALL.LINUX +rm -f %{buildroot}/%{_prefix}/README.SAMPLES +rm -f %{buildroot}/%{_prefix}/axis2.xml +# Remove libtool archives +rm -f %{buildroot}/%{_libdir}/*.la +# Remove duplicate files +for i in AUTHORS COPYING CREDITS INSTALL LICENSE NEWS README; do + rm -f %{buildroot}/%{_datadir}/${i} +done + + +# Fix the location and information in the pkgconfig +sed -i "s/lib64\/wso2-wsf-cpp/lib64/" %{buildroot}/%{_libdir}/pkgconfig/axis2c.pc + +# Break into separate directories for packaging +%if %{package_http_module} +mkdir -p -m0755 %{buildroot}/%{_libdir}/httpd/modules +%endif +mkdir -p -m0755 %{buildroot}/%{_includedir}/%{pkg_name} +mkdir -p -m0755 %{buildroot}/%{_datadir}/%{pkg_name} +mkdir -p -m0755 %{buildroot}/%{_libdir}/%{axis_name} + +%if !%{package_axis_http_server} +rm -f %{buildroot}/%{_prefix}/bin/axis2_http_server +%endif + +# Move the modules directory +mv %{buildroot}/%{_prefix}/modules %{buildroot}/%{_libdir}/%{axis_name} + +%if %{package_http_module} +# Fix the broken apache module names +pushd %{buildroot}/%{_libdir} +rm -f libmod_axis2.so libmod_axis2.so.0 +mv -f libmod_axis2.so.0.6.0 mod_axis2.so +popd +mv -f %{buildroot}/%{_libdir}/mod_axis2.so %{buildroot}/%{_libdir}/httpd/modules +%else +rm -f %{buildroot}/%{_libdir}/libmod_axis2* +%endif + +%if %{package_axis2_modules} +pushd %{buildroot}/%{_libdir}/%{axis_name}/modules/addressing +rm -f libaxis2_mod_addr.so libaxis2_mod_addr.so.0 +rm -f libaxis2_mod_addr.la +mv -f libaxis2_mod_addr.so.0.6.0 libaxis2_mod_addr.so +popd +pushd %{buildroot}/%{_libdir}/%{axis_name}/modules/logging +rm -f libaxis2_mod_log.so libaxis2_mod_log.so.0 +rm -f libaxis2_mod_log.la +mv -f libaxis2_mod_log.so.0.6.0 libaxis2_mod_log.so +popd +%else +rm -rf %{buildroot}/%{_libdir}/%{axis_name}/modules/addressing/* +rm -rf %{buildroot}/%{_libdir}/%{axis_name}/modules/logging/* +%endif +mv %{buildroot}/%{_bindir}/tools/tcpmon/* %{buildroot}/%{_bindir} + +%if %{build_savan} +pushd %{buildroot}/%{_libdir}/%{axis_name}/modules/savan +rm -f libmod_savan.la *.so *.so.0 +mv -f libmod_savan.so.0.0.0 libmod_savan.so +popd +%else +rm -f %{buildroot}/%{_libdir}/%{axis_name}/modules/savan/* +%endif + +%if %{build_sandesha2} +pushd %{buildroot}/%{_libdir}/%{axis_name}/modules/sandesha2 +rm -f libsandesha2.la *.so *.so.0 +mv -f libsandesha2.so.0.0.0 libsandesha2.so +popd +%else +rm -f %{buildroot}/%{_libdir}/%{axis_name}/modules/sandesha2/* +%endif + +%if %{package_rampart} +pushd %{buildroot}/%{_libdir}/%{axis_name}/modules/rampart +rm -f libmod_rampart.la *.so *.so.0 +mv -f libmod_rampart.so.0.3.0 libmod_rampart.so +popd +pushd %{buildroot}/%{_libdir}/%{axis_name}/modules/rahas +rm -f libmod_rahas.la *.so *.so.0 +mv -f libmod_rahas.so.0.3.0 libmod_rahas.so +popd +%else +rm -f %{buildroot}/%{_libdir}/%{axis_name}/modules/rampart/* +rm -f %{buildroot}/%{_libdir}/%{axis_name}/modules/rahas/* +rm -fr %{buildroot}/%{_includedir}/rampart-1.3.0 +rm -fr %{buildroot}/%{_libdir}/librampart.* +rm -fr %{buildroot}/%{_libdir}/libwso2_wsf_security.* +%endif +mv -f %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/%{pkg_name} + +%clean +rm -rf %{buildroot} + +%changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.1.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 2.1.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 2.1.0-21 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Aug 18 2014 Fedora Release Engineering - 2.1.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.1.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 baude - 2.1.0-18 +- Changed configure to use the macro function + +* Thu Jan 23 2014 Joe Orton - 2.1.0-17 +- fix _httpd_mmn expansion in absence of httpd-devel + +* Sun Aug 04 2013 Fedora Release Engineering - 2.1.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 2.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Aug 24 2012 Peter MacKinnon - 2.1.0-14 +- Added rampartc-timestamp.patch +- Added rampartc-c14n-new.patch + +* Fri Aug 24 2012 Peter MacKinnon - 2.1.0-13 +- Assigned modules dir to package +- Added RPM_OPT_FLAGS +- Added axis2c_initBuffer_curl.patch +- Added axis2c_useENV_as_repopath.patch +- Added axis2c_respectConst_sslCTX.patch + +* Sun Jul 22 2012 Fedora Release Engineering - 2.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jul 12 2012 Peter MacKinnon - 2.1.0-11 +- Added FORTIFY_SOURCE flag +- Added patch to remove exit(0) calls in wsf shared libs + +* Thu Jul 12 2012 Peter MacKinnon - 2.1.0-10 +- Fixed typo in patch file + +* Thu Jul 12 2012 Peter MacKinnon - 2.1.0-9 +- Added missing Requires: httpd-mmn + +* Wed Jul 11 2012 Pete MacKinnon - 2.1.0-8 +- Added patch for 2.4 httpd API change + +* Tue Feb 28 2012 Fedora Release Engineering - 2.1.0-7 +- Rebuilt for c++ ABI breakage + +* Sat Jan 14 2012 Fedora Release Engineering - 2.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Sep 26 2011 Robert Rati - 2.1.0-5 +- Added patch to fix a free of a static buffer + +* Tue Aug 16 2011 Robert Rati - 2.1.0-4 +- Added generic stream patch +- Created security package to separate rampart dependency + +* Wed Apr 27 2011 Robert Rati - 2.1.0-3 +- Moved libmod* files to subdirs in %_libdir for appropriate loading into axis2 +- Included default module.xml configs for axis2 modules, removed from doc +- Split Axis2/C modules into a separate package + +* Mon Apr 25 2011 Robert Rati - 2.1.0-2 +- Improved library name loading issue in the engine + +* Tue Apr 12 2011 Robert Rati - 2.1.0-1 +- Removed all libtool archives +- Removed codegen patch that wasn't built +- Added check for building on fedora +- Added upstream source URL +- Added BuildRequires for sqlite-devel +- Build from a trimmed tarball that excludes minizip and sqlite3 +- Fixed httpd module packaging to be only axis2 modules + +* Mon Apr 11 2011 Robert Rati - 2.1.0-0.7 +- Don't strip binaries, allow creation of debuginfo package +- Allow building of wsclient +- Removed rpath +- Added patch to allow configuration of library location for the engine + +* Tue Apr 5 2011 Robert Rati - 2.1.0-0.6 +- Re-enabled setting want_sandesha2 and want_savan +- Removed want_axis2 and want_rampart flags. They must be built +- Move axis2_http_server to its own package + +* Tue Mar 15 2011 Robert Rati - 2.1.0-0.5 +- Fixed setting of libdir with configure + +* Tue Mar 15 2011 Robert Rati - 2.1.0-0.4 +- Fixed rpmlint issues +- Moved libs out of subdirs +- Reorganized spec +- Added disable-savan and disable-sandesha to the configure line +- Enabled rampart +- Fixed axis2c dep + +* Wed Mar 10 2011 Robert Rati - 2.1.0-0.3 +- Added option to control building the apache modules +- Added BuildRoot definition for older rpm versions + +* Tue Mar 9 2011 Robert Rati - 2.1.0-0.2 +- Defaulted to only packaging the wso2 and axis related packages + +* Tue Mar 9 2011 Robert Rati - 2.1.0-0.1 +- Inital packaging