sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to latest & newest version 1.10.0

Browse source
This commit is contained in:
Lev A. Serebryakov 2018-04-16 11:53:03 +00:00
parent 4e78b4797f
commit abd6045fe6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=467478
13 changed files with 471 additions and 402 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
devel/p5-subversion/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PKGNAMEPREFIX= p5-
PORTREVISION= 2
PORTREVISION= 0
MAINTAINER= lev@FreeBSD.org
COMMENT= Perl bindings for Version control system
@ -33,6 +33,9 @@ CONFIGURE_ARGS+= --without-gnome-keyring \
ALL_TARGET= swig-pl-lib swig-pl
INSTALL_TARGET= install-swig-pl
#CPPFLAGS+= -I${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE \
# -Isubversion/bindings/swig/proxy
pre-install:
${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile

2
devel/py-subversion/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PORTREVISION= 2
PORTREVISION= 0
MAINTAINER= lev@FreeBSD.org
COMMENT= Python bindings for version control system

2
devel/ruby-subversion/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PKGNAMEPREFIX= ruby-
PORTREVISION= 2
PORTREVISION= 0
MAINTAINER= lev@FreeBSD.org
COMMENT= Ruby bindings for version control system

15
devel/subversion/Makefile
View file

@ -1,13 +1,13 @@
# Created by: rooneg@electricjellyfish.net
# $FreeBSD$
PORTREVISION= 4
PORTREVISION= 0
MAINTAINER= lev@FreeBSD.org
COMMENT= Version control system
CONFLICTS_INSTALL= subversion-1.[^9].[0-9]* \
subversion1[^9]-1.[^9].[0-9]*
CONFLICTS_INSTALL= subversion-1.[0-9].[0-9]* \
subversion1[0-9]-1.[0-9].[0-9]*
USE_RC_SUBR= svnserve
@ -27,7 +27,7 @@ OPTIONS_DEFINE= \
TEST \
TOOLS
OPTIONS_DEFAULT=FREEBSD_TEMPLATE \
OPTIONS_DEFAULT=FREEBSD_TEMPLATE LZ4 \
SERF TOOLS
FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
@ -82,12 +82,6 @@ BUILD_DEPENDS+= ${OLD_LIB_DEPENDS}
LIB_DEPENDS=
.endif
.if ${PORT_OPTIONS:MBDB}
CONFIGURE_ARGS+= --enable-bdb6
.else
CONFIGURE_ARGS+= --without-berkeley-db
.endif
.if make(repository)
WITH_REPOSITORY_CREATION= yes
.endif
@ -230,7 +224,6 @@ _mkrepos: .USE
.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

14
devel/subversion/Makefile.common
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= subversion
PORTVERSION= 1.9.7
PORTVERSION= 1.10.0
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= APACHE/subversion
@ -17,11 +17,13 @@ LICENSE= APACHE20
CPE_VENDOR= apache
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^9].[0-9]*
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[0-9].[0-9]*
LIB_DEPENDS+= libapr-1.so:devel/apr1 \
libsqlite3.so:databases/sqlite3 \
libexpat.so:textproc/expat2
libexpat.so:textproc/expat2 \
libutf8proc.so:textproc/utf8proc \
liblz4.so:archivers/liblz4
CONFIGURE_ARGS+= --without-swig \
--with-sqlite=${LOCALBASE} \
@ -33,9 +35,15 @@ LIB_DEPENDS+= libsvn_client-1.so:devel/subversion
OPTIONS_NAME= devel_subversion
.endif
.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

6
devel/subversion/distinfo
View file

@ -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 = 1523631526
SHA256 (subversion19/subversion-1.10.0.tar.bz2) = 2cf23f3abb837dea0585a6b0ebd70e80e01f95bddef7c1aa097c18e3eaa6b584
SIZE (subversion19/subversion-1.10.0.tar.bz2) = 8369823

590
devel/subversion/files/build-outputs.mk.addons
View file

File diff suppressed because one or more lines are too long

11
devel/subversion/files/extra-patch-build.conf
View file

@ -1,11 +0,0 @@
--- build.conf.orig 2015-06-24 07:03:20.000000000 +0300
+++ build.conf 2015-10-15 01:22:08.204721000 +0300
@@ -422,7 +422,7 @@
path = tools/server-side/mod_dontdothat
nonlibs = mod_dav_svn apr aprutil
libs = libsvn_subr xml libhttpd
-install = tools
+install = apache-mod
# The Subversion FSFS repository manipulation tool
[svnfsfs]

153
devel/subversion/files/patch-subversion_libsvn_subr_gpg_agent.c
View file

@ -1,153 +0,0 @@
--- subversion/libsvn_subr/gpg_agent.c.orig 2016-11-14 04:00:09 UTC
+++ subversion/libsvn_subr/gpg_agent.c
@@ -65,9 +65,12 @@
#include <sys/un.h>
#include <apr_pools.h>
+#include <apr_strings.h>
+#include <apr_user.h>
#include "svn_auth.h"
#include "svn_config.h"
#include "svn_error.h"
+#include "svn_io.h"
#include "svn_pools.h"
#include "svn_cmdline.h"
#include "svn_checksum.h"
@@ -225,30 +228,31 @@ bye_gpg_agent(int sd)
close(sd);
}
-/* Locate a running GPG Agent, and return an open file descriptor
- * for communication with the agent in *NEW_SD. If no running agent
- * can be found, set *NEW_SD to -1. */
-static svn_error_t *
-find_running_gpg_agent(int *new_sd, apr_pool_t *pool)
+/* This implements a method of finding the socket which is a mix of the
+ * description from GPG 1.x's gpg-agent man page under the
+ * --use-standard-socket option and the logic from GPG 2.x's socket discovery
+ * code in common/homedir.c.
+ *
+ * The man page says the standard socket is "named 'S.gpg-agent' located
+ * in the home directory." GPG's home directory is either the directory
+ * specified by $GNUPGHOME or ~/.gnupg. GPG >= 2.1.13 will check for a
+ * socket under (/var)/run/UID/gnupg before ~/.gnupg if no environment
+ * variables are set.
+ *
+ * $GPG_AGENT_INFO takes precedence, if set, otherwise $GNUPGHOME will be
+ * used. For GPG >= 2.1.13, $GNUPGHOME will be used directly only if it
+ * refers to the canonical home -- ~/.gnupg. Otherwise, the path specified
+ * by $GNUPGHOME is hashed (SHA1 + z-base-32) and the socket is expected to
+ * be present under (/var)/run/UID/gnupg/d.HASH. This last mechanism is not
+ * yet supported here. */
+static const char *
+find_gpg_agent_socket(apr_pool_t *result_pool, apr_pool_t *scratch_pool)
{
- char *buffer;
char *gpg_agent_info = NULL;
char *gnupghome = NULL;
const char *socket_name = NULL;
- const char *request = NULL;
- const char *p = NULL;
- char *ep = NULL;
- int sd;
- *new_sd = -1;
-
- /* This implements the method of finding the socket as described in
- * the gpg-agent man page under the --use-standard-socket option.
- * The manage page says the standard socket is "named 'S.gpg-agent' located
- * in the home directory." GPG's home directory is either the directory
- * specified by $GNUPGHOME or ~/.gnupg. */
- gpg_agent_info = getenv("GPG_AGENT_INFO");
- if (gpg_agent_info != NULL)
+ if ((gpg_agent_info = getenv("GPG_AGENT_INFO")) != NULL)
{
apr_array_header_t *socket_details;
@@ -256,25 +260,77 @@ find_running_gpg_agent(int *new_sd, apr_pool_t *pool)
* The path to the socket, the pid of the gpg-agent process and
* finally the version of the protocol the agent talks. */
socket_details = svn_cstring_split(gpg_agent_info, ":", TRUE,
- pool);
+ scratch_pool);
socket_name = APR_ARRAY_IDX(socket_details, 0, const char *);
}
else if ((gnupghome = getenv("GNUPGHOME")) != NULL)
{
- const char *homedir = svn_dirent_canonicalize(gnupghome, pool);
- socket_name = svn_dirent_join(homedir, "S.gpg-agent", pool);
+ const char *homedir = svn_dirent_canonicalize(gnupghome, scratch_pool);
+ socket_name = svn_dirent_join(homedir, "S.gpg-agent", scratch_pool);
}
else
{
- const char *homedir = svn_user_get_homedir(pool);
+ int i = 0;
+ const char *maybe_socket[] = {NULL, NULL, NULL, NULL};
+ const char *homedir;
- if (!homedir)
- return SVN_NO_ERROR;
+#ifdef APR_HAS_USER
+ apr_uid_t uid;
+ apr_gid_t gid;
- homedir = svn_dirent_canonicalize(homedir, pool);
- socket_name = svn_dirent_join_many(pool, homedir, ".gnupg",
- "S.gpg-agent", SVN_VA_NULL);
+ if (apr_uid_current(&uid, &gid, scratch_pool) == APR_SUCCESS)
+ {
+ const char *uidbuf = apr_psprintf(scratch_pool, "%lu",
+ (unsigned long)uid);
+ maybe_socket[i++] = svn_dirent_join_many(scratch_pool, "/run/user",
+ uidbuf, "gnupg",
+ "S.gpg-agent",
+ SVN_VA_NULL);
+ maybe_socket[i++] = svn_dirent_join_many(scratch_pool,
+ "/var/run/user",
+ uidbuf, "gnupg",
+ "S.gpg-agent",
+ SVN_VA_NULL);
+ }
+#endif
+
+ homedir = svn_user_get_homedir(scratch_pool);
+ if (homedir)
+ maybe_socket[i++] = svn_dirent_join_many(scratch_pool, homedir,
+ ".gnupg", "S.gpg-agent",
+ SVN_VA_NULL);
+
+ for (i = 0; !socket_name && maybe_socket[i]; i++)
+ {
+ apr_finfo_t finfo;
+ svn_error_t *err = svn_io_stat(&finfo, maybe_socket[i],
+ APR_FINFO_TYPE, scratch_pool);
+ if (!err && finfo.filetype == APR_SOCK)
+ socket_name = maybe_socket[i];
+ svn_error_clear(err);
+ }
}
+
+ if (socket_name)
+ socket_name = apr_pstrdup(result_pool, socket_name);
+
+ return socket_name;
+}
+
+/* Locate a running GPG Agent, and return an open file descriptor
+ * for communication with the agent in *NEW_SD. If no running agent
+ * can be found, set *NEW_SD to -1. */
+static svn_error_t *
+find_running_gpg_agent(int *new_sd, apr_pool_t *pool)
+{
+ char *buffer;
+ const char *socket_name = find_gpg_agent_socket(pool, pool);
+ const char *request = NULL;
+ const char *p = NULL;
+ char *ep = NULL;
+ int sd;
+
+ *new_sd = -1;
if (socket_name != NULL)
{

69
devel/subversion/pkg-plist
View file

@ -1,16 +1,20 @@
%%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
bin/svndumpfilter
bin/svnfsfs
bin/svnlook
%%TOOLS%%bin/svnmover
bin/svnmucc
%%TOOLS%%bin/svnraisetreeconflict
bin/svnrdump
@ -180,10 +184,14 @@ libdata/pkgconfig/libsvn_wc.pc
%%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 @@ libdata/pkgconfig/libsvn_wc.pc
%%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 @@ libdata/pkgconfig/libsvn_wc.pc
%%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 @@ libdata/pkgconfig/libsvn_wc.pc
%%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 @@ libdata/pkgconfig/libsvn_wc.pc
%%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 @@ libdata/pkgconfig/libsvn_wc.pc
%%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 @@ libdata/pkgconfig/libsvn_wc.pc
%%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

2
java/java-subversion/Makefile
View file

@ -3,7 +3,7 @@
PKGNAMEPREFIX= java-
CATEGORIES= java
PORTREVISION= 2
PORTREVISION= 0
MAINTAINER= lev@FreeBSD.org
COMMENT= Java bindings for Version control system

2
www/mod_dav_svn/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= mod_dav_svn
DISTNAME= subversion-${PORTVERSION}
PORTREVISION= 2
PORTREVISION= 0
CATEGORIES= www

2
www/mod_dav_svn/pkg-plist
View file

@ -1,4 +1,4 @@
@sample %%APACHEETCDIR%%/modules.d/220_subversion.conf.sample
%%APACHEMODDIR%%/mod_dav_svn.so
%%APACHEMODDIR%%/mod_authz_svn.so
%%APACHEMODDIR%%/mod_dontdothat.so