You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2013/03/03 15:33:18 UTC
svn commit: r1452047 - in /openoffice/trunk: ext_libraries/serf/
ext_libraries/serf/win/ main/
Author: arielch
Date: Sun Mar 3 14:33:17 2013
New Revision: 1452047
URL: http://svn.apache.org/r1452047
Log:
i121823 - update serf to new version 1.2.0
Added:
openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch (contents, props changed)
- copied, changed from r1452033, openoffice/trunk/ext_libraries/serf/serf-1.1.0.ldl.patch
openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch (contents, props changed)
- copied, changed from r1452033, openoffice/trunk/ext_libraries/serf/serf-1.1.0.libs.patch
openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.patch (with props)
Removed:
openoffice/trunk/ext_libraries/serf/serf-1.1.0.ldl.patch
openoffice/trunk/ext_libraries/serf/serf-1.1.0.libs.patch
Modified:
openoffice/trunk/ext_libraries/serf/makefile.mk
openoffice/trunk/ext_libraries/serf/serf_version.mk
openoffice/trunk/ext_libraries/serf/win/Library_serf.mk
openoffice/trunk/ext_libraries/serf/win/Package_inc.mk
openoffice/trunk/main/external_deps.lst
Modified: openoffice/trunk/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/makefile.mk?rev=1452047&r1=1452046&r2=1452047&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/serf/makefile.mk Sun Mar 3 14:33:17 2013
@@ -44,7 +44,7 @@ LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINO
TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
# This is the SHA1 checksum, not MD5 but tg_ext.mk does not now about this and,
# thankfully, does not care.
-TARFILE_MD5=231af70b7567a753b49df4216743010c193884b7
+TARFILE_MD5=30b29bd9214d50887abcc20cf82096aaaf5d1d61
PATCH_FILES=
@@ -76,6 +76,12 @@ PATCH_FILES+=$(TARFILE_NAME).libs.patch
PATCH_FILES+=$(TARFILE_NAME).ldl.patch
.ENDIF
+# Export ENABLE_SERF_LOGGING=YES to enable serf logging
+.IF "$(ENABLE_SERF_LOGGING)" == "YES"
+PATCH_FILES+=$(TARFILE_NAME).logging.patch
+CDEFS+=-DENABLE_SERF_VERBOSE -DSERF_VERBOSE
+.ENDIF
+
CONFIGURE_DIR=
CONFIGURE_ACTION=autoconf && .$/configure
Copied: openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch (from r1452033, openoffice/trunk/ext_libraries/serf/serf-1.1.0.ldl.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch?p2=openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch&p1=openoffice/trunk/ext_libraries/serf/serf-1.1.0.ldl.patch&r1=1452033&r2=1452047&rev=1452047&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/serf-1.1.0.ldl.patch (original)
+++ openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch Sun Mar 3 14:33:17 2013
@@ -1,6 +1,6 @@
---- misc/serf-1.1.0/Makefile.in 2011-07-13 04:30:42.000000000 +0200
-+++ misc/build/serf-1.1.0/Makefile.in 2012-01-27 10:23:38.508100604 +0100
-@@ -54,7 +54,7 @@
+--- misc/serf-1.2.0/Makefile.in 2012-12-13 16:43:09.000000000 -0300
++++ misc/build/serf-1.2.0/Makefile.in 2013-02-25 11:11:04.107764814 -0300
+@@ -55,7 +55,7 @@ MKDIR = @mkdir_p@
INSTALL = @INSTALL@
LDFLAGS = @EXTRA_LDFLAGS@ @LDFLAGS@
Propchange: openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch
------------------------------------------------------------------------------
svn:eol-style = native
Copied: openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch (from r1452033, openoffice/trunk/ext_libraries/serf/serf-1.1.0.libs.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch?p2=openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch&p1=openoffice/trunk/ext_libraries/serf/serf-1.1.0.libs.patch&r1=1452033&r2=1452047&rev=1452047&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/serf-1.1.0.libs.patch (original)
+++ openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch Sun Mar 3 14:33:17 2013
@@ -1,6 +1,6 @@
---- misc/serf-1.1.0/configure.in 2011-07-13 03:10:50.000000000 +0200
-+++ misc/build/serf-1.1.0/configure.in 2012-01-30 17:45:16.000000000 +0100
-@@ -199,7 +199,7 @@
+--- misc/serf-1.2.0/configure.in 2012-12-08 16:45:28.000000000 -0300
++++ misc/build/serf-1.2.0/configure.in 2013-02-25 11:11:04.106764823 -0300
+@@ -199,7 +199,7 @@ AC_SEARCH_LIBS(fabs, m)
libs=""
if test -n "$apu_config"; then
Propchange: openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.patch?rev=1452047&view=auto
==============================================================================
--- openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.patch (added)
+++ openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.patch Sun Mar 3 14:33:17 2013
@@ -0,0 +1,27 @@
+--- misc/serf-1.2.0/serf_private.h 2012-11-09 12:31:43.000000000 -0300
++++ misc/build/serf-1.2.0/serf_private.h 2013-02-26 04:02:51.927213864 -0300
+@@ -32,12 +32,18 @@
+
+ /* Internal logging facilities, set flag to 1 to enable console logging for
+ the selected component. */
+-#define SSL_VERBOSE 0
+-#define SSL_MSG_VERBOSE 0 /* logs decrypted requests and responses. */
+-#define SOCK_VERBOSE 0
+-#define SOCK_MSG_VERBOSE 0 /* logs bytes received from or written to a socket. */
+-#define CONN_VERBOSE 0
+-#define AUTH_VERBOSE 0
++#ifdef ENABLE_SERF_VERBOSE
++#define SERF_VERBOSE_FLAG 1
++#else
++#define SERF_VERBOSE_FLAG 0
++#endif
++
++#define SSL_VERBOSE SERF_VERBOSE_FLAG
++#define SSL_MSG_VERBOSE SERF_VERBOSE_FLAG /* logs decrypted requests and responses. */
++#define SOCK_VERBOSE SERF_VERBOSE_FLAG
++#define SOCK_MSG_VERBOSE SERF_VERBOSE_FLAG /* logs bytes received from or written to a socket. */
++#define CONN_VERBOSE SERF_VERBOSE_FLAG
++#define AUTH_VERBOSE SERF_VERBOSE_FLAG
+
+
+ typedef struct serf__authn_scheme_t serf__authn_scheme_t;
Propchange: openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openoffice/trunk/ext_libraries/serf/serf_version.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/serf_version.mk?rev=1452047&r1=1452046&r2=1452047&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/serf_version.mk (original)
+++ openoffice/trunk/ext_libraries/serf/serf_version.mk Sun Mar 3 14:33:17 2013
@@ -20,5 +20,5 @@
#**************************************************************
SERF_MAJOR=1
-SERF_MINOR=1
+SERF_MINOR=2
SERF_MICRO=0
Modified: openoffice/trunk/ext_libraries/serf/win/Library_serf.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/win/Library_serf.mk?rev=1452047&r1=1452046&r2=1452047&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/win/Library_serf.mk (original)
+++ openoffice/trunk/ext_libraries/serf/win/Library_serf.mk Sun Mar 3 14:33:17 2013
@@ -59,31 +59,33 @@ $(eval $(call gb_Library_add_linked_libs
))
$(eval $(call gb_Library_add_cobjects,serf,\
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/aggregate_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/request_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/simple_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/file_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/mmap_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/socket_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/response_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/headers_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/allocator \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/dechunk_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/deflate_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/limit_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/ssl_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/barrier_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/chunk_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/bwtp_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/buckets/iovec_buckets \
- serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth \
- serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_basic \
- serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_digest \
- serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_kerb \
- serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_kerb_gss \
- serf/$(INPATH)/misc/build/serf-1.1.0/context \
- serf/$(INPATH)/misc/build/serf-1.1.0/incoming \
- serf/$(INPATH)/misc/build/serf-1.1.0/outgoing \
- serf/$(INPATH)/misc/build/serf-1.1.0/ssltunnel \
+ serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth \
+ serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_basic \
+ serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_digest \
+ serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb \
+ serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_gss \
+ serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_sspi \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/aggregate_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/allocator \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/barrier_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/bwtp_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/chunk_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/dechunk_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/deflate_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/file_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/headers_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/iovec_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/limit_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/mmap_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/request_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_body_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/simple_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/socket_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/buckets/ssl_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.0/context \
+ serf/$(INPATH)/misc/build/serf-1.2.0/incoming \
+ serf/$(INPATH)/misc/build/serf-1.2.0/outgoing \
+ serf/$(INPATH)/misc/build/serf-1.2.0/ssltunnel \
))
Modified: openoffice/trunk/ext_libraries/serf/win/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/win/Package_inc.mk?rev=1452047&r1=1452046&r2=1452047&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/win/Package_inc.mk (original)
+++ openoffice/trunk/ext_libraries/serf/win/Package_inc.mk Sun Mar 3 14:33:17 2013
@@ -19,7 +19,7 @@
# *
# *************************************************************/
-$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.1.0))
+$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.0))
$(eval $(call gb_Package_add_files, serf_inc, inc/serf, \
serf.h \
serf_bucket_types.h \
Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1452047&r1=1452046&r2=1452047&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sun Mar 3 14:33:17 2013
@@ -126,9 +126,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- SHA1 = 231af70b7567a753b49df4216743010c193884b7
- name = serf-1.1.0.tar.bz2
- URL1 = http://serf.googlecode.com/files/serf-1.1.0.tar.bz2
+ SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61
+ name = serf-1.2.0.tar.bz2
+ URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2
URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))