[wso2-wsf-cpp/f18] - Assigned modules dir to package - Added RPM_OPT_FLAGS - Added axis2c_initBuffer_curl.patch - Added

Peter MacKinnon pmackinn at fedoraproject.org
Fri Aug 24 19:34:31 UTC 2012 

commit 3a3c48fd867ea37cefc38b0a97dc02212a47d189
Author: Peter MacKinnon <pmackinn at redhat.com>
Date:   Fri Aug 24 15:32:52 2012 -0400

    - 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

 axis2c_initBuffer_curl.patch     |   20 ++++++++++++++++++++
 axis2c_respectConst_sslCTX.patch |   23 +++++++++++++++++++++++
 axis2c_useENV_as_repopath.patch  |   34 ++++++++++++++++++++++++++++++++++
 wso2-wsf-cpp.spec                |   24 ++++++++++++++++++++++--
 4 files changed, 99 insertions(+), 2 deletions(-)
---
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/wso2-wsf-cpp.spec b/wso2-wsf-cpp.spec
index 8dcb74c..f004d53 100644
--- a/wso2-wsf-cpp.spec
+++ b/wso2-wsf-cpp.spec
@@ -25,7 +25,7 @@
 Name: %{pkg_name}
 Summary: WSO2 Web Services Framework for C++
 Version: %{pkg_ver}
-Release: 12%{?dist}
+Release: 13%{?dist}
 Group: Development/Tools
 License: ASL 2.0
 URL: http://wso2.org/library/wsf/cpp
@@ -58,6 +58,15 @@ Patch4: prevent_free_of_static_chars.patch
 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
+# TODO: problems with ramapartc project fork
+# https://issues.apache.org/jira/browse/RAMPARTC-154
+#Patch10: rampart-trunk-c14n.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: openssl-devel
 BuildRequires: httpd-devel
@@ -201,6 +210,7 @@ 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
@@ -483,6 +493,9 @@ chmod a-x wsf_c/wsclient/LICENSE
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 %if %{build_sandesha2}
@@ -503,7 +516,7 @@ wsclient="--enable-wsclient"
 wsclient="--disable-wsclient"
 %endif
 
-export CFLAGS="-O2 -D_FORTIFY_SOURCE=2"
+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
 
@@ -628,6 +641,13 @@ mv -f %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/%{pkg_name}
 rm -rf %{buildroot}
 
 %changelog
+* Fri Aug 24 2012  Peter MacKinnon <pmackinn at redhat.com> - 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 <rel-eng at lists.fedoraproject.org> - 2.1.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

More information about the scm-commits mailing list