diff options
| author | lev <lev@FreeBSD.org> | 2017-08-11 22:30:24 +0800 |
|---|---|---|
| committer | lev <lev@FreeBSD.org> | 2017-08-11 22:30:24 +0800 |
| commit | 0151b9cf37f2763038bdb2aaa2d9ef209332585a (patch) | |
| tree | 7956d02f2031a37c30b414444099e17d937f47df | |
| parent | 7d1ec413fb9a94b7d2756f409466b8c96c049285 (diff) | |
| download | freebsd-ports-gnome-0151b9cf37f2763038bdb2aaa2d9ef209332585a.tar.gz freebsd-ports-gnome-0151b9cf37f2763038bdb2aaa2d9ef209332585a.tar.zst freebsd-ports-gnome-0151b9cf37f2763038bdb2aaa2d9ef209332585a.zip | |
Update to 1.8.19
Security: http://subversion.apache.org/security/CVE-2017-9800-advisory.txt
| -rw-r--r-- | devel/subversion18/Makefile | 5 | ||||
| -rw-r--r-- | devel/subversion18/Makefile.common | 4 | ||||
| -rw-r--r-- | devel/subversion18/distinfo | 6 | ||||
| -rw-r--r-- | devel/subversion18/files/patch-Makefile.in | 26 |
4 files changed, 30 insertions, 11 deletions
diff --git a/devel/subversion18/Makefile b/devel/subversion18/Makefile index 1e9d4d30cbf6..943abba477d1 100644 --- a/devel/subversion18/Makefile +++ b/devel/subversion18/Makefile @@ -45,6 +45,11 @@ P4_STYLE_MARKERS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-3way-conflict-markers 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 diff --git a/devel/subversion18/Makefile.common b/devel/subversion18/Makefile.common index 30c699c345bd..91b11623cd77 100644 --- a/devel/subversion18/Makefile.common +++ b/devel/subversion18/Makefile.common @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.8.17 +PORTVERSION= 1.8.19 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion @@ -57,6 +57,8 @@ 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> diff --git a/devel/subversion18/distinfo b/devel/subversion18/distinfo index 697910489e5d..ec8f684532fa 100644 --- a/devel/subversion18/distinfo +++ b/devel/subversion18/distinfo @@ -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 diff --git a/devel/subversion18/files/patch-Makefile.in b/devel/subversion18/files/patch-Makefile.in index ac484ac2d08e..860cc8f9c6e9 100644 --- a/devel/subversion18/files/patch-Makefile.in +++ b/devel/subversion18/files/patch-Makefile.in @@ -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 |