[Midnightbsd-cvs] mports [24918] trunk/devel/subversion: update subversion to 1.10.3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Feb 3 13:44:07 EST 2019
Revision: 24918
http://svnweb.midnightbsd.org/mports/?rev=24918
Author: laffer1
Date: 2019-02-03 13:44:07 -0500 (Sun, 03 Feb 2019)
Log Message:
-----------
update subversion to 1.10.3
Modified Paths:
--------------
trunk/devel/subversion/Makefile.common
trunk/devel/subversion/distinfo
trunk/devel/subversion/pkg-plist
Modified: trunk/devel/subversion/Makefile.common
===================================================================
--- trunk/devel/subversion/Makefile.common 2019-02-03 18:27:53 UTC (rev 24917)
+++ trunk/devel/subversion/Makefile.common 2019-02-03 18:44:07 UTC (rev 24918)
@@ -2,11 +2,10 @@
# $FreeBSD: head/devel/subversion/Makefile.common 447762 2017-08-11 14:02:22Z lev $
PORTNAME?= subversion
-PORTVERSION= 1.9.7
+PORTVERSION= 1.10.3
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= APACHE/subversion
-DIST_SUBDIR= subversion19
GNU_CONFIGURE= yes
USES+= cpe libtool pathfix pkgconfig shebangfix tar:bzip2
@@ -17,10 +16,13 @@
CPE_VENDOR= apache
-CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^9].[0-9]*
+CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[0-9].[0-9]* \
+ ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^1][0-9].[0-9]*
LIB_DEPENDS+= libapr-1.so:devel/apr1 \
- libexpat.so:textproc/expat2
+ libexpat.so:textproc/expat2 \
+ libutf8proc.so:textproc/utf8proc \
+ liblz4.so:archivers/liblz4
CONFIGURE_ARGS+= --without-swig \
--with-sqlite=/usr/ \
@@ -27,15 +29,15 @@
--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
CONFIGURE_TARGET= ${ARCH}-portbld-freebsd10.4
-.if defined(SVN_BUILD_ADDONS)
-CONFLICTS_BUILD+= ${PORTNAME}-1.[^9].[0-9]*
-LIB_DEPENDS+= libsvn_client-1.so:devel/subversion
-OPTIONS_NAME= devel_subversion
+.if defined(SVN_BUILD_BINDINGS)
+BUILD_DEPENDS+= swig3.0:devel/swig30
+CONFIGURE_ARGS+= --with-swig=${LOCALBASE}/bin/swig3.0
.endif
# ===============================================================
OPTIONS_SUB= yes
+BDB_CONFIGURE_ON= --enable-bdb6
BDB_CONFIGURE_OFF= --without-berkeley-db
BDB_USES= bdb
@@ -52,6 +54,11 @@
SERF_CONFIGURE_ON= --with-serf
SERF_LIB_DEPENDS= libserf-1.so:www/serf
+GPG_AGENT_CONFIGURE_OFF= --without-gpg-agent
+GPG_AGENT_CONFIGURE_ON= --with-gpg-agent
+GPG_AGENT_BUILD_DEPENDS= gpg-agent:security/gnupg
+GPG_AGENT_RUN_DEPENDS= gpg-agent:security/gnupg
+
STATIC_CONFIGURE_ON= --enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
# ===============================================================
@@ -66,7 +73,7 @@
CONFIGURE_ARGS+=--with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}
-.if ${ARCH} == "amd64"
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
CFLAGS+= -fpic -DPIC
.endif
Modified: trunk/devel/subversion/distinfo
===================================================================
--- trunk/devel/subversion/distinfo 2019-02-03 18:27:53 UTC (rev 24917)
+++ trunk/devel/subversion/distinfo 2019-02-03 18:44:07 UTC (rev 24918)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502460058
-SHA256 (subversion19/subversion-1.9.7.tar.bz2) = c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623
-SIZE (subversion19/subversion-1.9.7.tar.bz2) = 7881909
+TIMESTAMP = 1549218374
+SHA256 (subversion-1.10.3.tar.bz2) = 9f0daac8b84aefaa77ad54dd05ab578ecc939d8e72d08c0cd4f61315921dd9fc
+SIZE (subversion-1.10.3.tar.bz2) = 8374465
Modified: trunk/devel/subversion/pkg-plist
===================================================================
--- trunk/devel/subversion/pkg-plist 2019-02-03 18:27:53 UTC (rev 24917)
+++ trunk/devel/subversion/pkg-plist 2019-02-03 18:44:07 UTC (rev 24918)
@@ -1,10 +1,13 @@
%%TOOLS%%bin/fsfs-access-map
+%%TOOLS%%bin/fsfs-stats
bin/svn
-%%TOOLS%%bin/svnbench
+%%TOOLS%%bin/svn-mergeinfo-normalizer
%%TOOLS%%bin/svn-populate-node-origins-index
bin/svnadmin
%%TOOLS%%bin/svnauthz
%%TOOLS%%bin/svnauthz-validate
+%%TOOLS%%bin/svnbench
+%%TOOLS%%bin/svnconflict
%%TOOLS%%bin/svndiff
%%TOOLS%%bin/svndiff3
%%TOOLS%%bin/svndiff4
@@ -11,6 +14,7 @@
bin/svndumpfilter
bin/svnfsfs
bin/svnlook
+%%TOOLS%%bin/svnmover
bin/svnmucc
%%TOOLS%%bin/svnraisetreeconflict
bin/svnrdump
@@ -180,10 +184,14 @@
%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnclean.sh
%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnlog.sh
%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c
+%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/mount-tmpfs.c
+%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/rebuild-svn-bits.sh
+%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/serf.patch
%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svnbuild.sh
%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svncheck.sh
%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svncleanup.sh
%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svnenv.sh
+%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/twisted.patch
%%DATADIR%%/buildbot/slaves/svn-x64-centos/list-svn-deps.sh
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svnbuild.sh
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svncheck-bindings.sh
@@ -233,13 +241,24 @@
%%DATADIR%%/client-side/bash_completion
%%DATADIR%%/client-side/bash_completion_test
%%DATADIR%%/client-side/change-svn-wc-format.py
-%%DATADIR%%/client-side/detach.py
%%DATADIR%%/client-side/mergeinfo-sanitizer.py
%%DATADIR%%/client-side/server-version.py
%%DATADIR%%/client-side/svn-graph.pl
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/analyze-cmd.c
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/help-cmd.c
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/log.c
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/logic.c
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/missing-branches.c
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/normalize-cmd.c
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/remove-branches-cmd.c
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
+%%DATADIR%%/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
%%DATADIR%%/client-side/svn-ssl-fingerprints.sh
%%DATADIR%%/client-side/svn-vendor.py
%%DATADIR%%/client-side/svn-viewspec.py
+%%DATADIR%%/client-side/svnconflict/README
+%%DATADIR%%/client-side/svnconflict/svnconflict.c
%%DATADIR%%/client-side/wcfind
%%DATADIR%%/dev/analyze-svnlogs.py
%%DATADIR%%/dev/aprerr.txt
@@ -259,6 +278,7 @@
%%DATADIR%%/dev/contribulyze.py
%%DATADIR%%/dev/datecheck.py
%%DATADIR%%/dev/find-bad-style.py
+%%DATADIR%%/dev/find-control-statements.py
%%DATADIR%%/dev/find-unmoved-deprecated.sh
%%DATADIR%%/dev/fsfs-access-map.c
%%DATADIR%%/dev/gdb-py/README
@@ -296,6 +316,16 @@
%%DATADIR%%/dev/svn-dev.vim
%%DATADIR%%/dev/svn-entries.el
%%DATADIR%%/dev/svn-merge-revs.py
+%%DATADIR%%/dev/svnmover/linenoise/LICENSE
+%%DATADIR%%/dev/svnmover/linenoise/README.markdown
+%%DATADIR%%/dev/svnmover/linenoise/linenoise.c
+%%DATADIR%%/dev/svnmover/linenoise/linenoise.h
+%%DATADIR%%/dev/svnmover/merge3.c
+%%DATADIR%%/dev/svnmover/ra.c
+%%DATADIR%%/dev/svnmover/scanlog.c
+%%DATADIR%%/dev/svnmover/svnmover.c
+%%DATADIR%%/dev/svnmover/svnmover.h
+%%DATADIR%%/dev/svnmover/util.c
%%DATADIR%%/dev/svnqlite3-dump
%%DATADIR%%/dev/svnraisetreeconflict/svnraisetreeconflict.c
%%DATADIR%%/dev/trails.py
@@ -318,25 +348,39 @@
%%DATADIR%%/diff/diff.c
%%DATADIR%%/diff/diff3.c
%%DATADIR%%/diff/diff4.c
-%%DATADIR%%/dist/_gnupg.py
+%%DATADIR%%/dist/README.advisory
+%%DATADIR%%/dist/README.backport
+%%DATADIR%%/dist/advisory.py
+%%DATADIR%%/dist/backport/__init__.py
+%%DATADIR%%/dist/backport/merger.py
+%%DATADIR%%/dist/backport/status.py
+%%DATADIR%%/dist/backport_tests_data/backport_accept.dump
+%%DATADIR%%/dist/backport_tests_data/backport_branch_with_original_revision.dump
+%%DATADIR%%/dist/backport_tests_data/backport_branches.dump
+%%DATADIR%%/dist/backport_tests_data/backport_indented_entry.dump
+%%DATADIR%%/dist/backport_tests_data/backport_multirevisions.dump
+%%DATADIR%%/dist/backport_tests_data/backport_two_approveds.dump
+%%DATADIR%%/dist/backport_tests_data/backport_unicode_entry.dump
+%%DATADIR%%/dist/backport_tests_pl.py
+%%DATADIR%%/dist/backport_tests_py.py
%%DATADIR%%/dist/backport.pl
-%%DATADIR%%/dist/backport_accept.dump
-%%DATADIR%%/dist/backport_branches.dump
-%%DATADIR%%/dist/backport_indented_entry.dump
-%%DATADIR%%/dist/backport_multirevisions.dump
%%DATADIR%%/dist/backport_tests.py
-%%DATADIR%%/dist/backport_two_approveds.dump
%%DATADIR%%/dist/checksums.py
-%%DATADIR%%/dist/collect_sigs.py
+%%DATADIR%%/dist/detect-conflicting-backports.py
%%DATADIR%%/dist/dist.sh
-%%DATADIR%%/dist/download-release.sh
%%DATADIR%%/dist/extract-for-examination.sh
+%%DATADIR%%/dist/merge-approved-backports.py
%%DATADIR%%/dist/nightly.sh
%%DATADIR%%/dist/nominate.pl
%%DATADIR%%/dist/rat-excludes
%%DATADIR%%/dist/release.py
+%%DATADIR%%/dist/security/__init__.py
+%%DATADIR%%/dist/security/_gnupg.py
+%%DATADIR%%/dist/security/adviser.py
+%%DATADIR%%/dist/security/mailer.py
+%%DATADIR%%/dist/security/mailinglist.py
+%%DATADIR%%/dist/security/parser.py
%%DATADIR%%/dist/templates/download.ezt
-%%DATADIR%%/dist/templates/nightly-candidates.ezt
%%DATADIR%%/dist/templates/rc-news.ezt
%%DATADIR%%/dist/templates/rc-release-ann.ezt
%%DATADIR%%/dist/templates/stable-news.ezt
@@ -367,6 +411,7 @@
%%DATADIR%%/examples/svnshell.rb
%%DATADIR%%/examples/testwrite.c
%%DATADIR%%/examples/walk-config-auth.py
+%%DATADIR%%/hook-scripts/CVE-2017-9800-pre-commit.py
%%DATADIR%%/hook-scripts/commit-access-control.cfg.example
%%DATADIR%%/hook-scripts/commit-access-control.pl
%%DATADIR%%/hook-scripts/commit-email.rb
@@ -380,6 +425,8 @@
%%DATADIR%%/hook-scripts/mailer/tests/mailer-tweak.py
%%DATADIR%%/hook-scripts/mailer/tests/mailer.conf
%%DATADIR%%/hook-scripts/persist-ephemeral-txnprops.py
+%%DATADIR%%/hook-scripts/reject-detected-sha1-collisions.sh
+%%DATADIR%%/hook-scripts/reject-known-sha1-collisions.sh
%%DATADIR%%/hook-scripts/svn2feed.py
%%DATADIR%%/hook-scripts/svnperms.conf.example
%%DATADIR%%/hook-scripts/svnperms.py
More information about the Midnightbsd-cvs
mailing list