svn commit: r403813 - in branches/2015Q4/devel/subversion17: . files

[Olli Hauer]

Author: ohauer
Date: Tue Dec 15 21:23:00 2015
New Revision: 403813
URL: https://svnweb.freebsd.org/changeset/ports/403813

Log:
  MFH: r403807
  
  - backport patch for CVE-2015-5343 [1]
  - sync 220_subversion.conf.sample.in with subversion 1.8/1.9
  - bump PORTREVISION
  
  [1]  http://subversion.apache.org/security/CVE-2015-5343-advisory.txt
  
  Approved by:	portmgr (feld@)

Added:
  branches/2015Q4/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c
     - copied unchanged from r403807, head/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c
Modified:
  branches/2015Q4/devel/subversion17/Makefile.common
  branches/2015Q4/devel/subversion17/files/220_subversion.conf.sample.in
  branches/2015Q4/devel/subversion17/files/pkg-message.in
Directory Properties:
  branches/2015Q4/   (props changed)

Modified: branches/2015Q4/devel/subversion17/Makefile.common
==============================================================================
--- branches/2015Q4/devel/subversion17/Makefile.common	Tue Dec 15 21:18:52 2015	(r403812)
+++ branches/2015Q4/devel/subversion17/Makefile.common	Tue Dec 15 21:23:00 2015	(r403813)
@@ -3,11 +3,15 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.7.22
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
 DIST_SUBDIR=	subversion17
-PKGNAMESUFFIX=	17
+#PKGNAMESUFFIX=	17
+
+DEPRECATED=	See https://subversion.apache.org/docs/release-notes/1.9.html#svn-1.7-deprecation
+EXPIRATION_DATE=2015-12-29
+
 
 USE_KDE4=	# Used below if KWallet support is enabled
 GNU_CONFIGURE=	yes

Modified: branches/2015Q4/devel/subversion17/files/220_subversion.conf.sample.in
==============================================================================
--- branches/2015Q4/devel/subversion17/files/220_subversion.conf.sample.in	Tue Dec 15 21:18:52 2015	(r403812)
+++ branches/2015Q4/devel/subversion17/files/220_subversion.conf.sample.in	Tue Dec 15 21:23:00 2015	(r403813)
@@ -57,6 +57,11 @@
 ##
 ##<IfModule dav_svn_module>
 ##<Location /svn/>
+##	<ifModule mime_module>
+##		RemoveEncoding  .gz .tgz .Z
+##		RemoveType      .gz .tgz .Z
+##	</ifModule>
+##
 ##	# Enable Subversion
 ##	DAV svn
 ##

Copied: branches/2015Q4/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c (from r403807, head/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q4/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c	Tue Dec 15 21:23:00 2015	(r403813, copy of r403807, head/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c)
@@ -0,0 +1,18 @@
+http://subversion.apache.org/security/CVE-2015-5343-advisory.txt
+================================================================
+--- subversion/mod_dav_svn/util.c.orig	2013-11-14 21:11:33 UTC
++++ subversion/mod_dav_svn/util.c
+@@ -753,7 +753,12 @@ request_body_to_string(svn_string_t **re
+ 
+   if (content_length)
+     {
+-      buf = svn_stringbuf_create_ensure(content_length, pool);
++      /* Do not allocate more than 1 MB until we receive request body. */
++      apr_size_t alloc_len = 1 * 1024 *1024;
++      if (content_length < alloc_len)
++        alloc_len = (apr_size_t) content_length;
++
++      buf = svn_stringbuf_create_ensure(alloc_len, pool);
+     }
+   else
+     {

Modified: branches/2015Q4/devel/subversion17/files/pkg-message.in
==============================================================================
--- branches/2015Q4/devel/subversion17/files/pkg-message.in	Tue Dec 15 21:18:52 2015	(r403812)
+++ branches/2015Q4/devel/subversion17/files/pkg-message.in	Tue Dec 15 21:23:00 2015	(r403813)
@@ -1,2 +1,6 @@
 The subversion dav modules are no longer activated in httpd.conf!
 There is now a dedicated modules file in %%APACHEETCDIR%%/modules.d
+
+Attention:
+subversion17 is deprecated and scheduled for removal!
+Please consider updating to subversion 1.8/1.9