From bef8cbdf3e2f679e3b6e0b0000f417e16bf94639 Mon Sep 17 00:00:00 2001 From: Ariel Constenla-Haile Date: Fri, 7 Jun 2013 12:39:07 -0300 Subject: [PATCH 2/4] i121823 - Update serf to new version 1.2.1 --- ext_libraries/serf/makefile.mk | 2 +- ext_libraries/serf/serf-1.2.0.ldl.patch | 11 ------ ext_libraries/serf/serf-1.2.0.libs.patch | 11 ------ ext_libraries/serf/serf-1.2.0.logging.patch | 27 -------------- ext_libraries/serf/serf-1.2.1.ldl.patch | 11 ++++++ ext_libraries/serf/serf-1.2.1.libs.patch | 11 ++++++ ext_libraries/serf/serf-1.2.1.logging.patch | 27 ++++++++++++++ ext_libraries/serf/serf_version.mk | 2 +- ext_libraries/serf/win/Library_serf.mk | 58 ++++++++++++++--------------- ext_libraries/serf/win/Package_inc.mk | 2 +- main/external_deps.lst | 6 +-- 11 files changed, 84 insertions(+), 84 deletions(-) delete mode 100644 ext_libraries/serf/serf-1.2.0.ldl.patch delete mode 100644 ext_libraries/serf/serf-1.2.0.libs.patch delete mode 100644 ext_libraries/serf/serf-1.2.0.logging.patch create mode 100644 ext_libraries/serf/serf-1.2.1.ldl.patch create mode 100644 ext_libraries/serf/serf-1.2.1.libs.patch create mode 100644 ext_libraries/serf/serf-1.2.1.logging.patch diff --git a/ext_libraries/serf/makefile.mk b/ext_libraries/serf/makefile.mk index 86304d6..83605ec 100644 --- a/ext_libraries/serf/makefile.mk +++ b/ext_libraries/serf/makefile.mk @@ -44,7 +44,7 @@ LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINOR).$(SERF_MICRO) 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= diff --git a/ext_libraries/serf/serf-1.2.0.ldl.patch b/ext_libraries/serf/serf-1.2.0.ldl.patch deleted file mode 100644 index 2dfe267..0000000 --- a/ext_libraries/serf/serf-1.2.0.ldl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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@ --LIBS = @EXTRA_LIBS@ @SERF_LIBS@ -lz -lssl -lcrypto -+LIBS = @EXTRA_LIBS@ @SERF_LIBS@ -lz -lssl -lcrypto -ldl - - all: $(TARGET_LIB) $(PROGRAMS) - diff --git a/ext_libraries/serf/serf-1.2.0.libs.patch b/ext_libraries/serf/serf-1.2.0.libs.patch deleted file mode 100644 index 0bef6e8..0000000 --- a/ext_libraries/serf/serf-1.2.0.libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -- APR_ADDTO(libs, [`$apu_config --link-libtool --libs`]) -+ APR_ADDTO(libs, [`$apu_config --link-libtool`]) - fi - APR_ADDTO(libs, [`$apr_config --link-libtool --libs` $LIBS]) - diff --git a/ext_libraries/serf/serf-1.2.0.logging.patch b/ext_libraries/serf/serf-1.2.0.logging.patch deleted file mode 100644 index 6405a14..0000000 --- a/ext_libraries/serf/serf-1.2.0.logging.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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; diff --git a/ext_libraries/serf/serf-1.2.1.ldl.patch b/ext_libraries/serf/serf-1.2.1.ldl.patch new file mode 100644 index 0000000..9b2758d --- /dev/null +++ b/ext_libraries/serf/serf-1.2.1.ldl.patch @@ -0,0 +1,11 @@ +--- 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@ +-LIBS = @EXTRA_LIBS@ @SERF_LIBS@ -lz -lssl -lcrypto ++LIBS = @EXTRA_LIBS@ @SERF_LIBS@ -lz -lssl -lcrypto -ldl + + all: $(TARGET_LIB) $(PROGRAMS) + diff --git a/ext_libraries/serf/serf-1.2.1.libs.patch b/ext_libraries/serf/serf-1.2.1.libs.patch new file mode 100644 index 0000000..8224203 --- /dev/null +++ b/ext_libraries/serf/serf-1.2.1.libs.patch @@ -0,0 +1,11 @@ +--- 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 +- APR_ADDTO(libs, [`$apu_config --link-libtool --libs`]) ++ APR_ADDTO(libs, [`$apu_config --link-libtool`]) + fi + APR_ADDTO(libs, [`$apr_config --link-libtool --libs` $LIBS]) + diff --git a/ext_libraries/serf/serf-1.2.1.logging.patch b/ext_libraries/serf/serf-1.2.1.logging.patch new file mode 100644 index 0000000..a071443 --- /dev/null +++ b/ext_libraries/serf/serf-1.2.1.logging.patch @@ -0,0 +1,27 @@ +--- 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 + 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; diff --git a/ext_libraries/serf/serf_version.mk b/ext_libraries/serf/serf_version.mk index 447451d..4cf1379 100644 --- a/ext_libraries/serf/serf_version.mk +++ b/ext_libraries/serf/serf_version.mk @@ -21,4 +21,4 @@ SERF_MAJOR=1 SERF_MINOR=2 -SERF_MICRO=0 +SERF_MICRO=1 diff --git a/ext_libraries/serf/win/Library_serf.mk b/ext_libraries/serf/win/Library_serf.mk index 981a903..57938d6 100755 --- a/ext_libraries/serf/win/Library_serf.mk +++ b/ext_libraries/serf/win/Library_serf.mk @@ -59,33 +59,33 @@ $(eval $(call gb_Library_add_linked_libs,serf,\ )) $(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 \ )) diff --git a/ext_libraries/serf/win/Package_inc.mk b/ext_libraries/serf/win/Package_inc.mk index 66b8da9..7d47447 100755 --- a/ext_libraries/serf/win/Package_inc.mk +++ b/ext_libraries/serf/win/Package_inc.mk @@ -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 \ diff --git a/main/external_deps.lst b/main/external_deps.lst index 5e02b96..3c14624 100644 --- a/main/external_deps.lst +++ b/main/external_deps.lst @@ -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)) -- 1.8.1.4