svn commit: r447767 - in head/devel/subversion18: . files

[Lev A. Serebryakov]

Author: lev
Date: Fri Aug 11 14:30:24 2017
New Revision: 447767
URL: https://svnweb.freebsd.org/changeset/ports/447767

Log:
   Update to 1.8.19
  
  Security:	http://subversion.apache.org/security/CVE-2017-9800-advisory.txt

Modified:
  head/devel/subversion18/Makefile
  head/devel/subversion18/Makefile.common
  head/devel/subversion18/distinfo
  head/devel/subversion18/files/patch-Makefile.in

Modified: head/devel/subversion18/Makefile
==============================================================================
--- head/devel/subversion18/Makefile	Fri Aug 11 14:27:55 2017	(r447766)
+++ head/devel/subversion18/Makefile	Fri Aug 11 14:30:24 2017	(r447767)
@@ -45,6 +45,11 @@ P4_STYLE_MARKERS_EXTRA_PATCHES=	${PATCHDIR}/extra-patc
 FREEBSD_TEMPLATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd-template
 SVNSERVE_WRAPPER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-svnserve-wrapper
 
+USES+=			shebangfix
+python_CMD=		${LOCALBASE}/bin/python2
+python_OLD_CMD+=	"/bin/env python"
+SHEBANG_REGEX=		./tools/.*
+
 .include "Makefile.common"
 
 SVNREPOS?=	/home/svn/repos

Modified: head/devel/subversion18/Makefile.common
==============================================================================
--- head/devel/subversion18/Makefile.common	Fri Aug 11 14:27:55 2017	(r447766)
+++ head/devel/subversion18/Makefile.common	Fri Aug 11 14:30:24 2017	(r447767)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	subversion
-PORTVERSION=	1.8.17
+PORTVERSION=	1.8.19
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
@@ -56,6 +56,8 @@ SERF_CONFIGURE_ON=		--with-serf
 SERF_LIB_DEPENDS=		libserf-1.so:www/serf
 
 STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
+
+LD_FLAGS+=			-lm
 
 # ===============================================================
 .include <bsd.port.options.mk>

Modified: head/devel/subversion18/distinfo
==============================================================================
--- head/devel/subversion18/distinfo	Fri Aug 11 14:27:55 2017	(r447766)
+++ head/devel/subversion18/distinfo	Fri Aug 11 14:30:24 2017	(r447767)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480510093
-SHA256 (subversion18/subversion-1.8.17.tar.bz2) = de119538d29a5f2c028984cb54a55a4af3e9c32fa9316331bcbe5719e474a090
-SIZE (subversion18/subversion-1.8.17.tar.bz2) = 6924354
+TIMESTAMP = 1502460184
+SHA256 (subversion18/subversion-1.8.19.tar.bz2) = 56e869b0db59519867f7077849c9c0962c599974f1412ea235eab7f98c20e6be
+SIZE (subversion18/subversion-1.8.19.tar.bz2) = 6856860

Modified: head/devel/subversion18/files/patch-Makefile.in
==============================================================================
--- head/devel/subversion18/files/patch-Makefile.in	Fri Aug 11 14:27:55 2017	(r447766)
+++ head/devel/subversion18/files/patch-Makefile.in	Fri Aug 11 14:30:24 2017	(r447767)
@@ -1,10 +1,22 @@
-========================================================================
-This patch is required to build SVN Apache modules with staging support
-========================================================================
---- ./Makefile.in.orig	2013-10-21 21:12:04.000000000 +0200
-+++ ./Makefile.in	2013-10-21 21:13:30.000000000 +0200
-@@ -85,7 +85,7 @@
- swig_pydir_extra = @libdir@/svn-python/svn
+--- Makefile.in.orig	2017-08-11 17:19:41.952532000 +0300
++++ Makefile.in	2017-08-11 17:24:02.745960000 +0300
+@@ -50,7 +50,7 @@
+ SVN_MAGIC_LIBS = @SVN_MAGIC_LIBS@
+ SVN_SASL_LIBS = @SVN_SASL_LIBS@
+ SVN_SERF_LIBS = @SVN_SERF_LIBS@
+-SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@
++SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@ -lm
+ SVN_XML_LIBS = @SVN_XML_LIBS@
+ SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
+ 
+@@ -81,11 +81,11 @@
+ swig_rb_libdir = @libdir@
+ 
+ ### these possibly need further discussion
+-swig_pydir = @libdir@/svn-python/libsvn
+-swig_pydir_extra = @libdir@/svn-python/svn
++swig_pydir = /libsvn
++swig_pydir_extra = /svn
  swig_pldir = @libdir@/svn-perl
  swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
 -toolsdir = @bindir@/svn-tools