new file mode 100644

@@ -0,0 +1,195 @@

+Patches:

+========

+

+  Patch for Subversion 1.9.4:

+[[[

+Index: subversion/libsvn_ra_serf/xml.c

+

+===================================================================

+

+--- subversion/libsvn_ra_serf/xml.c	(revision 1768981)

+@@ -988,6 +988,30 @@ expat_cdata(void *userData, const char *data, int len)

+ #endif

+ }

+ 

++#if XML_VERSION_AT_LEAST(1, 95, 8)

++static void

++expat_entity_declaration(void *userData,

++                         const XML_Char *entityName,

++                         int is_parameter_entity,

++                         const XML_Char *value,

++                         int value_length,

++                         const XML_Char *base,

++                         const XML_Char *systemId,

++                         const XML_Char *publicId,

++                         const XML_Char *notationName)

++{

++  struct expat_ctx_t *ectx = userData;

++ 

++  /* Stop the parser if an entity declaration is hit. */

++  XML_StopParser(ectx->parser, 0 /* resumable */);

++}

++#else

++/* A noop default_handler. */

++static void

++expat_default_handler(void *userData, const XML_Char *s, int len)

++{

++}

++#endif

+

+ /* Implements svn_ra_serf__response_handler_t */

+ static svn_error_t *

+ expat_response_handler(serf_request_t *request,

+@@ -1042,6 +1066,12 @@

+

+       XML_SetUserData(ectx->parser, ectx);

+       XML_SetElementHandler(ectx->parser, expat_start, expat_end);

+       XML_SetCharacterDataHandler(ectx->parser, expat_cdata);

++

++#if XML_VERSION_AT_LEAST(1, 95, 8)

++      XML_SetEntityDeclHandler(ectx->parser, expat_entity_declaration);

++#else

++      XML_SetDefaultHandler(ectx->parser, expat_default_handler);

++#endif

+     }

+ 

+   while (1)

+Index: subversion/libsvn_subr/xml.c

+

+===================================================================

+

+--- subversion/libsvn_subr/xml.c	(revision 1768981)

+@@ -46,6 +46,14 @@

+ #error Expat is unusable -- it has been compiled for wide characters

+ #endif

+ 

++#ifndef XML_VERSION_AT_LEAST

++#define XML_VERSION_AT_LEAST(major,minor,patch)                  \

++(((major) < XML_MAJOR_VERSION)                                       \

++ || ((major) == XML_MAJOR_VERSION && (minor) < XML_MINOR_VERSION)    \

++ || ((major) == XML_MAJOR_VERSION && (minor) == XML_MINOR_VERSION && \

++     (patch) <= XML_MICRO_VERSION))

++#endif /* XML_VERSION_AT_LEAST */

++

+ const char *

+ svn_xml__compiled_version(void)

+ {

+@@ -361,6 +369,28 @@ static void expat_data_handler(void *userData, const XML_Char *s, int len)

+   (*svn_parser->data_handler)(svn_parser->baton, s, (apr_size_t)len);

+ }

+ 

++#if XML_VERSION_AT_LEAST(1, 95, 8)

++static void expat_entity_declaration(void *userData,

++                                     const XML_Char *entityName,

++                                     int is_parameter_entity,

++                                     const XML_Char *value,

++                                     int value_length,

++                                     const XML_Char *base,

++                                     const XML_Char *systemId,

++                                     const XML_Char *publicId,

++                                     const XML_Char *notationName)

++{

++  svn_xml_parser_t *svn_parser = userData;

++

++  /* Stop the parser if an entity declaration is hit. */

++  XML_StopParser(svn_parser->parser, 0 /* resumable */);

++}

++#else

++/* A noop default_handler. */

++static void expat_default_handler(void *userData, const XML_Char *s, int len)

++{

++}

++#endif

+ 

+ /*** Making a parser. ***/

+ 

+@@ -382,6 +412,12 @@ svn_xml_make_parser(void *baton,

+   XML_SetCharacterDataHandler(parser,

+                               data_handler ? expat_data_handler : NULL);

+ 

++#if XML_VERSION_AT_LEAST(1, 95, 8)

++  XML_SetEntityDeclHandler(parser, expat_entity_declaration);

++#else

++  XML_SetDefaultHandler(parser, expat_default_handler);

++#endif

++

+   /* ### we probably don't want this pool; or at least we should pass it

+      ### to the callbacks and clear it periodically.  */

+   subpool = svn_pool_create(pool);

+@@ -499,7 +499,9 @@ void svn_xml_signal_bailout(svn_error_t *error,

+   /* This will cause the current XML_Parse() call to finish quickly! */

+   XML_SetElementHandler(svn_parser->parser, NULL, NULL);

+   XML_SetCharacterDataHandler(svn_parser->parser, NULL);

+-

++#if XML_VERSION_AT_LEAST(1, 95, 8)

++  XML_SetEntityDeclHandler(svn_parser->parser, NULL);

++#endif

+   /* Once outside of XML_Parse(), the existence of this field will

+      cause svn_delta_parse()'s main read-loop to return error. */

+   svn_parser->error = error;

+Index: tools/server-side/mod_dontdothat/mod_dontdothat.c

+===================================================================

+--- tools/server-side/mod_dontdothat/mod_dontdothat.c	(revision 1768981)

+@@ -42,6 +42,14 @@

+ 

+ extern module AP_MODULE_DECLARE_DATA dontdothat_module;

+ 

++#ifndef XML_VERSION_AT_LEAST

++#define XML_VERSION_AT_LEAST(major,minor,patch)                  \

++(((major) < XML_MAJOR_VERSION)                                       \

++ || ((major) == XML_MAJOR_VERSION && (minor) < XML_MINOR_VERSION)    \

++ || ((major) == XML_MAJOR_VERSION && (minor) == XML_MINOR_VERSION && \

++     (patch) <= XML_MICRO_VERSION))

++#endif /* XML_VERSION_AT_LEAST */

++

+ typedef struct dontdothat_config_rec {

+   const char *config_file;

+   const char *base_path;

+@@ -559,6 +559,31 @@ end_element(void *baton, const char *name)

+     }

+ }

+ 

++#if XML_VERSION_AT_LEAST(1, 95, 8)

++static void

++expat_entity_declaration(void *userData,

++                         const XML_Char *entityName,

++                         int is_parameter_entity,

++                         const XML_Char *value,

++                         int value_length,

++                         const XML_Char *base,

++                         const XML_Char *systemId,

++                         const XML_Char *publicId,

++                         const XML_Char *notationName)

++{

++  dontdothat_filter_ctx *ctx = userData;

++

++  /* Stop the parser if an entity declaration is hit. */

++  XML_StopParser(ctx->xmlp, 0 /* resumable */);

++}

++#else

++/* A noop default_handler. */

++static void

++expat_default_handler(void *userData, const XML_Char *s, int len)

++{

++}

++#endif

++

+ static svn_boolean_t

+ is_valid_wildcard(const char *wc)

+ {

+@@ -729,6 +729,12 @@ dontdothat_insert_filters(request_rec *r)

+       XML_SetElementHandler(ctx->xmlp, start_element, end_element);

+       XML_SetCharacterDataHandler(ctx->xmlp, cdata);

+ 

++#if XML_VERSION_AT_LEAST(1, 95, 8)

++      XML_SetEntityDeclHandler(ctx->xmlp, expat_entity_declaration);

++#else

++      XML_SetDefaultHandler(ctx->xmlp, expat_default_handler);

++#endif

++

+       ap_add_input_filter("DONTDOTHAT_FILTER", ctx, r, r->connection);

+     }

+ }

@@ -1,7 +1,7 @@

 Summary:        The Apache Subversion control system

 Name:           subversion

 Version:        1.9.4

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        Apache License 2.0

 URL:            http://subversion.apache.org/

 Group:          Utilities/System

@@ -10,6 +10,7 @@ Distribution:   Photon

 Source0:        http://archive.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2

 %define sha1    subversion=bc7d51fdda43bea01e1272dfe9d23d0a9d6cd11c

 Patch0:         subversion-CVE-2017-9800.patch

+Patch1:         subversion-CVE-2016-8734.patch

 Requires:       apr

 Requires:       apr-util

 BuildRequires:  apr-devel

@@ -31,6 +32,7 @@ Requires:   %{name} = %{version}

 %prep

 %setup -q

 %patch0 -p1

+%patch1 -p0

 %build

 ./configure --prefix=%{_prefix}         \

             --disable-static            \

@@ -54,6 +56,8 @@ make -j1 DESTDIR=%{buildroot} install

 %exclude %{_libdir}/debug/

 %changelog

+*   Thu Dec 07 2017 Xiaolin Li <xiaolinl@vmware.com> 1.9.4-4

+-   Fix CVE-2016-8734

 *   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 1.9.4-3

 -   Release bump for expat version update

 *   Mon Aug 28 2017 Xiaolin Li <xiaolinl@vmware.com> 1.9.4-2