Index: head/devel/p5-subversion/Makefile =================================================================== --- head/devel/p5-subversion/Makefile (revision 481743) +++ head/devel/p5-subversion/Makefile (revision 481744) @@ -1,31 +1,31 @@ # Created by: Autrijus Tang # $FreeBSD$ PKGNAMEPREFIX= p5- MAINTAINER= lev@FreeBSD.org COMMENT= Perl bindings for Version control system USES= perl5 USE_PERL5= build run -PORTREVISION_110= 1 +PORTREVISION_110= 0 PORTREVISION_19= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= perl5 CONFIGURE_ARGS+= --without-gnome-keyring \ --without-kwallet \ --with-apxs=no ALL_TARGET= swig-pl-lib swig-pl INSTALL_TARGET= install-swig-pl pre-install: ${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile .include Index: head/devel/py-subversion/Makefile =================================================================== --- head/devel/py-subversion/Makefile (revision 481743) +++ head/devel/py-subversion/Makefile (revision 481744) @@ -1,29 +1,29 @@ # Created by: thinker@branda.to # $FreeBSD$ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PORTREVISION= 0 MAINTAINER= lev@FreeBSD.org COMMENT= Python bindings for version control system USES+= python USE_PYTHON= flavors py3kplist -PORTREVISION_110= 1 +PORTREVISION_110= 0 PORTREVISION_19= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= python CONFIGURE_ARGS+= --without-gnome-keyring \ --without-kwallet \ --with-apxs=no ALL_TARGET= swig-py-lib swig-py INSTALL_TARGET= install-swig-py .include Index: head/devel/ruby-subversion/Makefile =================================================================== --- head/devel/ruby-subversion/Makefile (revision 481743) +++ head/devel/ruby-subversion/Makefile (revision 481744) @@ -1,29 +1,29 @@ # Created by: Hiroyuki Iwatsuki # $FreeBSD$ PKGNAMEPREFIX= ruby- MAINTAINER= lev@FreeBSD.org COMMENT= Ruby bindings for version control system BROKEN_powerpc64= fails to compile: swigutil_rb.c: 'ruby_errinfo' undeclared USE_RUBY= yes -PORTREVISION_110= 1 +PORTREVISION_110= 0 PORTREVISION_19= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= ruby CONFIGURE_ARGS+= --without-gnome-keyring \ --without-kwallet \ --with-apxs=no ALL_TARGET= swig-rb-lib swig-rb INSTALL_TARGET= install-swig-rb .include Index: head/devel/subversion/Makefile =================================================================== --- head/devel/subversion/Makefile (revision 481743) +++ head/devel/subversion/Makefile (revision 481744) @@ -1,231 +1,227 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system CONFLICTS_INSTALL= subversion-1.[0-9].[0-9]* \ subversion1[0-9]-1.[0-9].[0-9]* USE_RC_SUBR= svnserve PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ DOCS \ FREEBSD_TEMPLATE\ GPG_AGENT \ MAINTAINER_DEBUG\ NLS \ SASL \ SERF \ STATIC \ SVNSERVE_WRAPPER\ TEST \ TOOLS -OPTIONS_DEFAULT=FREEBSD_TEMPLATE LZ4 \ - SERF TOOLS +OPTIONS_DEFAULT=FREEBSD_TEMPLATE SERF TOOLS FREEBSD_TEMPLATE_DESC= FreeBSD Project log template GPG_AGENT_DESC= Enable GPG agent password store MAINTAINER_DEBUG_DESC= Build debug version SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= Build static version (no shared libs) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools # Patches required for use with the FreeBSD Project repository only FREEBSD_TEMPLATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd-template SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper USES+= shebangfix python:2.7,env python_OLD_CMD+= "/bin/env python" SHEBANG_REGEX= ./tools/.* .include "Makefile.common" SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs SVNGROUP?= svn SVNUSER?= svn CONFIGURE_ARGS+= --without-gnome-keyring \ --without-kwallet \ --with-apxs=no .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} SUB_LIST+= SVNSERVE_BIN_EXT=".bin" PLIST_SUB+= NO_SVNSERVE_WRAPPER="@comment " .else SUB_LIST+= SVNSERVE_BIN_EXT="" PLIST_SUB+= NO_SVNSERVE_WRAPPER="" .endif .if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .endif .if ${PORT_OPTIONS:MSTATIC} . if ${PORT_OPTIONS:MNLS} USES+= gettext-tools . endif . if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes . endif OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= .endif .if make(repository) WITH_REPOSITORY_CREATION= yes .endif .if defined(WITH_REPOSITORY_CREATION) MKREPOS_TARGET= _mkrepos .endif pre-everything:: @${ECHO_MSG} "" .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group." @${ECHO_MSG} "Make sure that all committers are its members." @${ECHO_MSG} "" @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with user '${SVNUSER}' and group '${SVNGROUP}'." @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @${ECHO_MSG} "" @${ECHO_MSG} "Make sure that:" @${ECHO_MSG} "* all your svn users are members of a common group" @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${ECHO_MSG} " subdirectories of your repository" @${ECHO_MSG} "* the above subdirectories are writable by this group" .endif @${ECHO_MSG} "" .if ${PORT_OPTIONS:MSTATIC} @${ECHO_MSG} "Static binaries will be built." .endif # STATIC @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: .if ${PORT_OPTIONS:MBDB} @BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \ if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5 or 6) support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif .if ${PORT_OPTIONS:MSTATIC} - @if ${GREP} -q ucol_close ${LOCALBASE}/lib/libsqlite3.a ; then \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "You cannot build static subversion if your SQLite3 is built with ICU enabled."; \ - ${ECHO_MSG} "Please, reinstall 'devel/sqlite3' port with disabled ICU support."; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ - fi +LIBS_SQLITE3!= pkgconf --libs --static sqlite3 +LIBS+= ${LIBS_SQLITE3} +# for work with ICU +LIBS+= -lc++ -lm .endif post-configure: # Enable GNOME Keyring / KWallet support in main code, as it is harmless @${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h # ugly hack: save tools directory so we don't have to cleanup before installing @${CP} -R ${WRKSRC}/tools ${WRKSRC}/tools.examples @${CHMOD} -R a-st,o+rX ${WRKSRC}/tools.examples # takes a long time, and will fail but gives maintainer a good oversight .if ${PORT_OPTIONS:MTEST} test: build -@make check -C ${WRKSRC} .endif post-build-TOOLS-on: @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} post-install: ${MKREPOS_TARGET} -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-STATIC-off: -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so post-install-SVNSERVE_WRAPPER-on: @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample post-install-TOOLS-on: @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* # =============================================================================== repository: _mkrepos _SVNGRPFILES= db locks locks/db.lock locks/db-logs.lock SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,} _mkrepos: .USE .if !exists(${SVNREPOS}) .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \ ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \ else \ if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \ then \ ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \ else \ ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi @if /usr/sbin/pw usershow "${SVNUSER}" >/dev/null 2>&1; then \ ${ECHO_MSG} "You already have a user \"${SVNUSER}\", so I will use it."; \ else \ if /usr/sbin/pw useradd ${SVNUSER} -h -; \ then \ ${ECHO_MSG} "Added user \"${SVNUSER}\"."; \ else \ ${ECHO_MSG} "Adding user \"${SVNUSER}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi .endif @${MKDIR} ${SVNREPOS} @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES} @${CHMOD} g+w ${SVNGRPFILES} @for i in ${SVNREPOS}/db/* ; do \ i=$${i##*/}; \ case $$i in \ DB_CONFIG|fs-type|uuid) ;; \ *) ${CHOWN} -R ${SVNUSER}:${SVNGROUP} ${SVNREPOS}/db/$$i; \ ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \ ;; \ esac; \ done .endif .endif svn-build-outputs-hack: (cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf) (cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include Index: head/devel/subversion/Makefile.common =================================================================== --- head/devel/subversion/Makefile.common (revision 481743) +++ head/devel/subversion/Makefile.common (revision 481744) @@ -1,122 +1,122 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.10.2 +PORTVERSION= 1.10.3 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion GNU_CONFIGURE= yes USES+= cpe libtool pathfix pkgconfig shebangfix tar:bzip2 SHEBANG_FILES= tools/server-side/svnpubsub/rc.d/svnpubsub.solaris \ tools/server-side/svnpubsub/rc.d/svnwcsub.solaris LICENSE= APACHE20 CPE_VENDOR= apache 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 \ libsqlite3.so:databases/sqlite3 \ libexpat.so:textproc/expat2 \ libutf8proc.so:textproc/utf8proc \ liblz4.so:archivers/liblz4 CONFIGURE_ARGS+= --without-swig \ --with-sqlite=${LOCALBASE} \ --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat .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 MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext SASL_CONFIGURE_OFF= --without-sasl SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SERF_CONFIGURE_OFF= --without-serf 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" # =============================================================== .include .if ${PORT_OPTIONS:MMAINTAINER_DEBUG} WITH_DEBUG= yes .endif APR_CONFIG= ${LOCALBASE}/bin/apr-1-config APU_CONFIG= ${LOCALBASE}/bin/apu-1-config CONFIGURE_ARGS+=--with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG} .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fpic -DPIC .endif OPTIONS_FILE_UNSET?="" OPTIONS_FILE_SET?="" .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION) CFLAGS+= -DHAS_ORGANIZATION_NAME .endif .include pre-everything:: .if defined(SVN_BUILD_ADDONS) .if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} .endif .endif pre-patch: .if defined(SVN_BUILD_ADDONS) @${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk .endif post-patch: .if ${PREFIX} != "/usr" @${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c @${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h .endif @${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h .endif # shebangfix @${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \ -e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \ '1s|#\!/bin/b|#\!/usr/local/bin/b|' \ -e '1s|#\!/bin/env|#\!/usr/bin/env|' \ -e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|' # remove all .bak files to clean the stage @${FIND} ${WRKSRC} -name '*.bak' -delete Index: head/devel/subversion/distinfo =================================================================== --- head/devel/subversion/distinfo (revision 481743) +++ head/devel/subversion/distinfo (revision 481744) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532350986 -SHA256 (subversion-1.10.2.tar.bz2) = 5b35e3a858d948de9e8892bf494893c9f7886782f6abbe166c0487c19cf6ed88 -SIZE (subversion-1.10.2.tar.bz2) = 8369762 +TIMESTAMP = 1539183639 +SHA256 (subversion-1.10.3.tar.bz2) = 9f0daac8b84aefaa77ad54dd05ab578ecc939d8e72d08c0cd4f61315921dd9fc +SIZE (subversion-1.10.3.tar.bz2) = 8374465 Index: head/devel/subversion/files/patch-subversion-libsvn_client-conflicts.c =================================================================== --- head/devel/subversion/files/patch-subversion-libsvn_client-conflicts.c (revision 481743) +++ head/devel/subversion/files/patch-subversion-libsvn_client-conflicts.c (nonexistent) @@ -1,98 +0,0 @@ -Upstream patch: fix automatic conflict resolution for files removed from -the merge target when the merge source and merge target have no proper -common ancestor. See . - ---- subversion/libsvn_client/conflicts.c.orig 2018-07-12 04:00:15 UTC -+++ subversion/libsvn_client/conflicts.c -@@ -1059,6 +1059,9 @@ find_deleted_rev(void *baton, - { - apr_array_header_t *moves; - -+ if (b->moves_table == NULL) -+ return SVN_NO_ERROR; -+ - moves = apr_hash_get(b->moves_table, &log_entry->revision, - sizeof(svn_revnum_t)); - if (moves) -@@ -2223,8 +2226,8 @@ find_operative_moves(apr_array_header_t - * If the node was replaced rather than deleted, set *REPLACING_NODE_KIND to - * the node kind of the replacing node. Else, set it to svn_node_unknown. - * Only request the log for revisions up to END_REV from the server. -- * If the deleted node was moved, provide heads of move chains in *MOVES. -- * If the node was not moved,set *MOVES to NULL. -+ * If MOVES it not NULL, and the deleted node was moved, provide heads of -+ * move chains in *MOVES, or, if the node was not moved, set *MOVES to NULL. - */ - static svn_error_t * - find_revision_for_suspected_deletion(svn_revnum_t *deleted_rev, -@@ -2261,10 +2264,11 @@ find_revision_for_suspected_deletion(svn - scratch_pool)); - victim_abspath = svn_client_conflict_get_local_abspath(conflict); - -- SVN_ERR(find_moves_in_revision_range(&moves_table, parent_repos_relpath, -- repos_root_url, repos_uuid, -- victim_abspath, start_rev, end_rev, -- ctx, result_pool, scratch_pool)); -+ if (moves) -+ SVN_ERR(find_moves_in_revision_range(&moves_table, parent_repos_relpath, -+ repos_root_url, repos_uuid, -+ victim_abspath, start_rev, end_rev, -+ ctx, result_pool, scratch_pool)); - - url = svn_path_url_add_component2(repos_root_url, parent_repos_relpath, - scratch_pool); -@@ -2289,7 +2293,8 @@ find_revision_for_suspected_deletion(svn - b.repos_root_url = repos_root_url; - b.repos_uuid = repos_uuid; - b.ctx = ctx; -- b.moves_table = moves_table; -+ if (moves) -+ b.moves_table = moves_table; - b.result_pool = result_pool; - SVN_ERR(svn_ra__dup_session(&b.extra_ra_session, ra_session, NULL, - scratch_pool, scratch_pool)); -@@ -2319,7 +2324,7 @@ find_revision_for_suspected_deletion(svn - { - struct repos_move_info *move = b.move; - -- if (move) -+ if (moves && move) - { - *deleted_rev = move->rev; - *deleted_rev_author = move->rev_author; -@@ -2337,7 +2342,8 @@ find_revision_for_suspected_deletion(svn - *deleted_rev = SVN_INVALID_REVNUM; - *deleted_rev_author = NULL; - *replacing_node_kind = svn_node_unknown; -- *moves = NULL; -+ if (moves) -+ *moves = NULL; - } - return SVN_NO_ERROR; - } -@@ -2346,10 +2352,11 @@ find_revision_for_suspected_deletion(svn - *deleted_rev = b.deleted_rev; - *deleted_rev_author = b.deleted_rev_author; - *replacing_node_kind = b.replacing_node_kind; -- SVN_ERR(find_operative_moves(moves, moves_table, -- b.deleted_repos_relpath, b.deleted_rev, -- ra_session, repos_root_url, -- result_pool, scratch_pool)); -+ if (moves) -+ SVN_ERR(find_operative_moves(moves, moves_table, -+ b.deleted_repos_relpath, b.deleted_rev, -+ ra_session, repos_root_url, -+ result_pool, scratch_pool)); - } - - return SVN_NO_ERROR; -@@ -2693,7 +2700,8 @@ conflict_tree_get_details_local_missing( - end_rev = 0; /* ### We might walk through all of history... */ - - SVN_ERR(find_revision_for_suspected_deletion( -- &deleted_rev, &deleted_rev_author, &replacing_node_kind, &moves, -+ &deleted_rev, &deleted_rev_author, &replacing_node_kind, -+ yca_loc ? &moves : NULL, - conflict, deleted_basename, parent_repos_relpath, - parent_peg_rev, end_rev, related_repos_relpath, related_peg_rev, - ctx, conflict->pool, scratch_pool)); Property changes on: head/devel/subversion/files/patch-subversion-libsvn_client-conflicts.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/subversion/files/extra-patch-fbsd-template =================================================================== --- head/devel/subversion/files/extra-patch-fbsd-template (revision 481743) +++ head/devel/subversion/files/extra-patch-fbsd-template (revision 481744) @@ -1,164 +1,164 @@ --- subversion/svn/util.c.orig 2015-02-28 13:37:27.000000000 +0300 +++ subversion/svn/util.c 2016-03-19 16:53:13.016472654 +0300 @@ -66,6 +66,9 @@ #include "private/svn_client_private.h" #include "private/svn_cmdline_private.h" #include "private/svn_string_private.h" +#ifdef HAS_ORGANIZATION_NAME +#include "freebsd-organization.h" +#endif @@ -331,6 +334,71 @@ } +/* + * Since we're adding freebsd-specific tokens to the log message, + * clean out any leftovers to avoid accidently sending them to other + * projects that won't be expecting them. + */ + +static const char *prefixes[] = { + "PR:", + "Submitted by:", + "Reported by:", + "Reviewed by:", + "Approved by:", + "Obtained from:", + "MFC after:", + "MFH:", + "Relnotes:", + "Security:", + "Sponsored by:", + "Differential Revision:", +}; + +void +cleanmsg(apr_size_t *l, char *s) +{ + int i; + char *pos; + char *kw; + char *p; + int empty; + + for (i = 0; i < sizeof(prefixes) / sizeof(prefixes[0]); i++) { + pos = s; + while ((kw = strstr(pos, prefixes[i])) != NULL) { + /* Check to see if keyword is at start of line (or buffer) */ + if (!(kw == s || kw[-1] == '\r' || kw[-1] == '\n')) { + pos = kw + 1; + continue; + } + p = kw + strlen(prefixes[i]); + empty = 1; + while (1) { + if (*p == ' ' || *p == '\t') { + p++; + continue; + } + if (*p == '\0' || *p == '\r' || *p == '\n') + break; + empty = 0; + break; + } + if (empty && (*p == '\r' || *p == '\n')) { + memmove(kw, p + 1, strlen(p + 1) + 1); + if (l) + *l -= (p + 1 - kw); + } else if (empty) { + *kw = '\0'; + if (l) + *l -= (p - kw); + } else { + pos = p; + } + } + } +} + #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * @@ -343,11 +411,56 @@ svn_stringbuf_t *default_msg = NULL; struct log_msg_baton *lmb = baton; svn_stringbuf_t *message = NULL; + svn_config_t *cfg; + const char *mfc_after, *sponsored_by; + + cfg = lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_CONFIG) : NULL; /* Set default message. */ default_msg = svn_stringbuf_create(APR_EOL_STR, pool); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Reported by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "MFC after:\t"); + svn_config_get(cfg, &mfc_after, SVN_CONFIG_SECTION_MISCELLANY, "freebsd-mfc-after", NULL); + if (mfc_after != NULL) + svn_stringbuf_appendcstr(default_msg, mfc_after); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t"); + svn_config_get(cfg, &sponsored_by, SVN_CONFIG_SECTION_MISCELLANY, "freebsd-sponsored-by", +#ifdef HAS_ORGANIZATION_NAME + ORGANIZATION_NAME); +#else + NULL); +#endif + if (sponsored_by != NULL) + svn_stringbuf_appendcstr(default_msg, sponsored_by); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX); - svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above: 76 columns --|" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> PR: If and which Problem Report is related." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Submitted by: If someone else sent in the change." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Reported by: If someone else reported the issue." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Reviewed by: If someone else reviewed your modification." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Approved by: If you needed approval for this commit." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> MFH: Ports tree branch name. Request approval for merge." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization (each collaborator)." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed)." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); *tmp_file = NULL; if (lmb->message) @@ -362,6 +475,7 @@ /* Strip off the EOF marker text and the junk that follows it. */ truncate_buffer_at_prefix(&(log_msg_str->len), (char *)log_msg_str->data, EDITOR_EOF_PREFIX); + cleanmsg(NULL, (char*)log_msg_str->data); *log_msg = log_msg_str->data; return SVN_NO_ERROR; @@ -472,6 +586,13 @@ if (message) truncate_buffer_at_prefix(&message->len, message->data, EDITOR_EOF_PREFIX); + /* + * Since we're adding freebsd-specific tokens to the log message, + * clean out any leftovers to avoid accidently sending them to other + * projects that won't be expecting them. + */ + if (message) + cleanmsg(&message->len, message->data); if (message) { Index: head/java/java-subversion/Makefile =================================================================== --- head/java/java-subversion/Makefile (revision 481743) +++ head/java/java-subversion/Makefile (revision 481744) @@ -1,48 +1,48 @@ # Created by: Lev Serebryakov # $FreeBSD$ PKGNAMEPREFIX= java- CATEGORIES= java MAINTAINER= lev@FreeBSD.org COMMENT= Java bindings for Version control system USES+= compiler USE_JAVA= yes JAVA_VERSION= 1.7+ JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes -PORTREVISION_110= 1 +PORTREVISION_110= 0 PORTREVISION_19= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CONFIGURE_ARGS+= --enable-javahl \ --with-jdk=${JAVA_HOME} \ --with-jikes=no \ --without-gnome-keyring \ --without-kwallet \ --with-apxs=no MAKE_JOBS_UNSAFE= yes ALL_TARGET= javahl INSTALL_TARGET= install-javahl post-configure: .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} "s#^LT_CXX_LIBADD = .*#LT_CXX_LIBADD =#" ${WRKSRC}/Makefile .else @${DO_NADA} .endif pre-build: @${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes .include Index: head/security/subversion-gnome-keyring/Makefile =================================================================== --- head/security/subversion-gnome-keyring/Makefile (revision 481743) +++ head/security/subversion-gnome-keyring/Makefile (revision 481744) @@ -1,29 +1,29 @@ # Created by: Autrijus Tang # $FreeBSD$ PKGNAMESUFFIX= -gnome-keyring CATEGORIES= security gnome MAINTAINER= lev@FreeBSD.org COMMENT= Gnome Keyring integration for Version control system -PORTREVISION_110= 4 +PORTREVISION_110= 0 PORTREVISION_19= 0 .include "${.CURDIR}/../../devel/subversion/Makefile.addons" .if ${WITH_SUBVERSION_VER} == 19 LIB_DEPENDS+= libgnome-keyring.so:security/libgnome-keyring .else LIB_DEPENDS+= libsecret-1.so:security/libsecret .endif CONFIGURE_ARGS+= --with-gnome-keyring ALL_TARGET= gnome-keyring-lib INSTALL_TARGET= install-gnome-keyring-lib post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .include Index: head/security/subversion-kwallet/Makefile =================================================================== --- head/security/subversion-kwallet/Makefile (revision 481743) +++ head/security/subversion-kwallet/Makefile (revision 481744) @@ -1,30 +1,30 @@ # Created by: Autrijus Tang # $FreeBSD$ PKGNAMESUFFIX= -kwallet CATEGORIES= security kde MAINTAINER= lev@FreeBSD.org COMMENT= KDE KWallet integration for Version control system USE_KDE= kdelibs runtime USES+= kde:4 -PORTREVISION_110= 6 +PORTREVISION_110= 0 PORTREVISION_19= 0 .include "${.CURDIR}/../../devel/subversion/Makefile.addons" .if ${WITH_SUBVERSION_VER} == 19 CONFIGURE_ARGS+= --with-kwallet=${KDE_PREFIX} .else CONFIGURE_ARGS+= --with-kwallet=${KDE_PREFIX}/include/kde4:${KDE_PREFIX}/lib .endif ALL_TARGET= kwallet-lib INSTALL_TARGET= install-kwallet-lib post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .include Index: head/www/mod_dav_svn/Makefile =================================================================== --- head/www/mod_dav_svn/Makefile (revision 481743) +++ head/www/mod_dav_svn/Makefile (revision 481744) @@ -1,35 +1,35 @@ # Created by: lev@FreeBSD.org # $FreeBSD$ PORTNAME= mod_dav_svn DISTNAME= subversion-${PORTVERSION} CATEGORIES= www MAINTAINER= lev@FreeBSD.org COMMENT= Apache module for subversion serving USES= apache:2.2+ -PORTREVISION_110= 1 +PORTREVISION_110= 0 PORTREVISION_19= 0 .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CONFIGURE_ARGS+= --with-apxs=${APXS} \ --with-apache-libexecdir \ --without-gnome-keyring \ --without-kwallet SUB_FILES+= 220_subversion.conf.sample PLIST_SUB+= SED=${SED} ALL_TARGET= apache-mod INSTALL_TARGET= install-mods-shared post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${INSTALL_DATA} ${WRKDIR}/220_subversion.conf.sample \ ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d .include