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/06/15 06:15:07 UTC
svn commit: r1493303 - in /openoffice/trunk: ext_libraries/serf/
ext_libraries/serf/win/ main/
Author: arielch
Date: Sat Jun 15 04:15:06 2013
New Revision: 1493303
URL: http://svn.apache.org/r1493303
Log:
i121823 - Update serf to new version 1.2.1
Added:
openoffice/trunk/ext_libraries/serf/serf-1.2.1.ldl.patch (contents, props changed)
- copied, changed from r1493159, openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch
openoffice/trunk/ext_libraries/serf/serf-1.2.1.libs.patch (contents, props changed)
- copied, changed from r1493159, openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch
openoffice/trunk/ext_libraries/serf/serf-1.2.1.logging.patch (contents, props changed)
- copied, changed from r1493159, openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.patch
Removed:
openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch
openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch
openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.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=1493303&r1=1493302&r2=1493303&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/serf/makefile.mk Sat Jun 15 04:15:06 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=30b29bd9214d50887abcc20cf82096aaaf5d1d61
+TARFILE_MD5=f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
PATCH_FILES=
Copied: openoffice/trunk/ext_libraries/serf/serf-1.2.1.ldl.patch (from r1493159, openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/serf-1.2.1.ldl.patch?p2=openoffice/trunk/ext_libraries/serf/serf-1.2.1.ldl.patch&p1=openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch&r1=1493159&r2=1493303&rev=1493303&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/serf-1.2.0.ldl.patch (original)
+++ openoffice/trunk/ext_libraries/serf/serf-1.2.1.ldl.patch Sat Jun 15 04:15:06 2013
@@ -1,6 +1,6 @@
---- 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@
+--- misc/serf-1.2.1/Makefile.in 2013-06-03 15:21:14.000000000 -0300
++++ misc/build/serf-1.2.1/Makefile.in 2013-06-07 12:31:04.416862903 -0300
+@@ -56,7 +56,7 @@ MKDIR = @mkdir_p@
INSTALL = @INSTALL@
LDFLAGS = @EXTRA_LDFLAGS@ @LDFLAGS@
Propchange: openoffice/trunk/ext_libraries/serf/serf-1.2.1.ldl.patch
------------------------------------------------------------------------------
svn:eol-style = native
Copied: openoffice/trunk/ext_libraries/serf/serf-1.2.1.libs.patch (from r1493159, openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/serf/serf-1.2.1.libs.patch?p2=openoffice/trunk/ext_libraries/serf/serf-1.2.1.libs.patch&p1=openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch&r1=1493159&r2=1493303&rev=1493303&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/serf-1.2.0.libs.patch (original)
+++ openoffice/trunk/ext_libraries/serf/serf-1.2.1.libs.patch Sat Jun 15 04:15:06 2013
@@ -1,6 +1,6 @@
---- 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)
+--- misc/serf-1.2.1/configure.in 2013-06-03 14:52:41.000000000 -0300
++++ misc/build/serf-1.2.1/configure.in 2013-06-07 12:27:36.914098933 -0300
+@@ -257,7 +257,7 @@ AC_SEARCH_LIBS(fabs, m)
libs=""
if test -n "$apu_config"; then
Propchange: openoffice/trunk/ext_libraries/serf/serf-1.2.1.libs.patch
------------------------------------------------------------------------------
svn:eol-style = native
Copied: openoffice/trunk/ext_libraries/serf/serf-1.2.1.logging.patch (from r1493159, 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.1.logging.patch?p2=openoffice/trunk/ext_libraries/serf/serf-1.2.1.logging.patch&p1=openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.patch&r1=1493159&r2=1493303&rev=1493303&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/serf-1.2.0.logging.patch (original)
+++ openoffice/trunk/ext_libraries/serf/serf-1.2.1.logging.patch Sat Jun 15 04:15:06 2013
@@ -1,5 +1,5 @@
---- 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
+--- misc/serf-1.2.1/serf_private.h 2013-06-03 14:22:51.000000000 -0300
++++ misc/build/serf-1.2.1/serf_private.h 2013-06-07 12:33:34.432688365 -0300
@@ -32,12 +32,18 @@
/* Internal logging facilities, set flag to 1 to enable console logging for
Propchange: openoffice/trunk/ext_libraries/serf/serf-1.2.1.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=1493303&r1=1493302&r2=1493303&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/serf_version.mk (original)
+++ openoffice/trunk/ext_libraries/serf/serf_version.mk Sat Jun 15 04:15:06 2013
@@ -21,4 +21,4 @@
SERF_MAJOR=1
SERF_MINOR=2
-SERF_MICRO=0
+SERF_MICRO=1
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=1493303&r1=1493302&r2=1493303&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/win/Library_serf.mk (original)
+++ openoffice/trunk/ext_libraries/serf/win/Library_serf.mk Sat Jun 15 04:15:06 2013
@@ -59,33 +59,33 @@ $(eval $(call gb_Library_add_linked_libs
))
$(eval $(call gb_Library_add_cobjects,serf,\
- 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 \
+ serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth \
+ serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_basic \
+ serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_digest \
+ serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb \
+ serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb_gss \
+ serf/$(INPATH)/misc/build/serf-1.2.1/auth/auth_kerb_sspi \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/aggregate_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/allocator \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/barrier_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/bwtp_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/chunk_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/dechunk_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/deflate_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/file_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/headers_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/iovec_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/limit_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/mmap_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/request_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/response_body_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/response_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/simple_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/socket_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/buckets/ssl_buckets \
+ serf/$(INPATH)/misc/build/serf-1.2.1/context \
+ serf/$(INPATH)/misc/build/serf-1.2.1/incoming \
+ serf/$(INPATH)/misc/build/serf-1.2.1/outgoing \
+ serf/$(INPATH)/misc/build/serf-1.2.1/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=1493303&r1=1493302&r2=1493303&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/serf/win/Package_inc.mk (original)
+++ openoffice/trunk/ext_libraries/serf/win/Package_inc.mk Sat Jun 15 04:15:06 2013
@@ -19,7 +19,7 @@
# *
# *************************************************************/
-$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.0))
+$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.1))
$(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=1493303&r1=1493302&r2=1493303&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sat Jun 15 04:15:06 2013
@@ -126,9 +126,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61
- name = serf-1.2.0.tar.bz2
- URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2
+ SHA1 = f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
+ name = serf-1.2.1.tar.bz2
+ URL1 = http://serf.googlecode.com/files/serf-1.2.1.tar.bz2
URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))