[Midnightbsd-cvs] mports [18221] trunk/devel/mercurial: mercurial 3.3.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Mar 18 08:29:52 EDT 2015
Revision: 18221
http://svnweb.midnightbsd.org/mports/?rev=18221
Author: laffer1
Date: 2015-03-18 08:29:51 -0400 (Wed, 18 Mar 2015)
Log Message:
-----------
mercurial 3.3.2
Modified Paths:
--------------
trunk/devel/mercurial/Makefile
trunk/devel/mercurial/distinfo
trunk/devel/mercurial/pkg-plist
Added Paths:
-----------
trunk/devel/mercurial/files/extra-patch-authormapsuffix
trunk/devel/mercurial/files/patch-mercurial_sslutil.py
Modified: trunk/devel/mercurial/Makefile
===================================================================
--- trunk/devel/mercurial/Makefile 2015-03-18 12:24:17 UTC (rev 18220)
+++ trunk/devel/mercurial/Makefile 2015-03-18 12:29:51 UTC (rev 18221)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= mercurial
-PORTVERSION= 2.9.2
+PORTVERSION= 3.3.2
CATEGORIES= devel python
MASTER_SITES= http://mercurial.selenic.com/release/
@@ -9,20 +9,26 @@
COMMENT= Fast, lightweight source control management system
LICENSE= gpl2
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_PYTHON= 2
USE_PYDISTUTILS=yes
USES= shebangfix
-OPTIONS_DEFINE= CA_BUNDLE DATA DOCS NLS
+OPTIONS_DEFINE= CA_BUNDLE DATA DOCS NLS FREEBSD
OPTIONS_DEFAULT=DATA
OPTIONS_SUB= yes
-CA_BUNDLE_DESC= Install CA Certificates
+CA_BUNDLE_DESC= Install CA Certificates
+CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+FREEBSD_DESC= Patches used internally by the FreeBSD Project
+FREEBSD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-authormapsuffix
+NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-setup.py
+NLS_USES= gettext
+
CONTRIB_FILES= bash_completion \
casesmash.py \
check-code.py \
- convert-repo \
debugcmdserver.py \
debugshell.py \
dumprevlog \
@@ -35,16 +41,13 @@
hgsh/Makefile \
hgsh/hgsh.c \
mercurial.el \
- mergetools.hgrc \
mq.el \
perf.py \
pylintrc \
python-hook-examples.py \
- sample.hgrc \
simplemerge \
tcsh_completion \
tcsh_completion_build.sh \
- tmplrewrite.py \
undumprevlog \
zsh_completion \
vim/HGAnnotate.vim \
@@ -55,11 +58,6 @@
vim/patchreview.vim
DOCS= CONTRIBUTORS README
-SHEBANG_FILES= contrib/tmplrewrite.py
-
-CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-NLS_USES= gettext
-
.include <bsd.mport.options.mk>
.if ${PORT_OPTIONS:MDATA}
@@ -66,10 +64,6 @@
SUB_FILES= pkg-message
.endif
-.if !${PORT_OPTIONS:MNLS}
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-setup.py
-.endif
-
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
Modified: trunk/devel/mercurial/distinfo
===================================================================
--- trunk/devel/mercurial/distinfo 2015-03-18 12:24:17 UTC (rev 18220)
+++ trunk/devel/mercurial/distinfo 2015-03-18 12:29:51 UTC (rev 18221)
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.9.2.tar.gz) = 86462b3a1518e137cfe813dc273b8acb120ad71230a1813c0dc9335223b38f53
-SIZE (mercurial-2.9.2.tar.gz) = 3855689
+SHA256 (mercurial-3.3.2.tar.gz) = 67c617c740ac706f923371a26f02339b27cd6c36e5d3fb2ccad0dc02361527fa
+SIZE (mercurial-3.3.2.tar.gz) = 4165131
Added: trunk/devel/mercurial/files/extra-patch-authormapsuffix
===================================================================
--- trunk/devel/mercurial/files/extra-patch-authormapsuffix (rev 0)
+++ trunk/devel/mercurial/files/extra-patch-authormapsuffix 2015-03-18 12:29:51 UTC (rev 18221)
@@ -0,0 +1,46 @@
+--- ./hgext/convert/__init__.py.orig 2014-08-01 23:22:55.000000000 +0000
++++ ./hgext/convert/__init__.py 2014-08-17 09:14:36.000000000 +0000
+@@ -27,6 +27,7 @@
+ ('d', 'dest-type', '', _('destination repository type'), _('TYPE')),
+ ('r', 'rev', '', _('import up to source revision REV'), _('REV')),
+ ('A', 'authormap', '', _('remap usernames using this file'), _('FILE')),
++ ('', 'authormapsuffix', '', _('append this suffix to remapped author names'), _('SUFFIX')),
+ ('', 'filemap', '', _('remap file names using contents of file'),
+ _('FILE')),
+ ('', 'splicemap', '', _('splice synthesized history into place'),
+--- ./hgext/convert/convcmd.py.orig 2014-08-01 23:22:55.000000000 +0000
++++ ./hgext/convert/convcmd.py 2014-08-02 06:58:26.000000000 +0000
+@@ -103,12 +103,15 @@
+ self.commitcache = {}
+ self.authors = {}
+ self.authorfile = None
++ self.authormapsuffix = ''
+
+ # Record converted revisions persistently: maps source revision
+ # ID to target revision ID (both strings). (This is how
+ # incremental conversions work.)
+ self.map = mapfile(ui, revmapfile)
+
++ if opts.get('authormapsuffix'):
++ self.authormapsuffix = opts.get('authormapsuffix')
+ # Read first the dst author map if any
+ authorfile = self.dest.authorfile()
+ if authorfile and os.path.exists(authorfile):
+@@ -360,7 +363,7 @@
+ continue
+
+ srcauthor = srcauthor.strip()
+- dstauthor = dstauthor.strip()
++ dstauthor = dstauthor.strip() + self.authormapsuffix
+ if self.authors.get(srcauthor) in (None, dstauthor):
+ msg = _('mapping author %s to %s\n')
+ self.ui.debug(msg % (srcauthor, dstauthor))
+@@ -374,7 +377,7 @@
+
+ def cachecommit(self, rev):
+ commit = self.source.getcommit(rev)
+- commit.author = self.authors.get(commit.author, commit.author)
++ commit.author = self.authors.get(commit.author, commit.author + self.authormapsuffix)
+ # If commit.branch is None, this commit is coming from the source
+ # repository's default branch and destined for the default branch in the
+ # destination repository. For such commits, passing a literal "None"
Property changes on: trunk/devel/mercurial/files/extra-patch-authormapsuffix
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/mercurial/files/patch-mercurial_sslutil.py
===================================================================
--- trunk/devel/mercurial/files/patch-mercurial_sslutil.py (rev 0)
+++ trunk/devel/mercurial/files/patch-mercurial_sslutil.py 2015-03-18 12:29:51 UTC (rev 18221)
@@ -0,0 +1,18 @@
+Change condition in order to prevent SSLv2 and SSLv3 protocols.
+Taken from ${PYTHON_LIBDIR}/ssl.py file (found in 'create_default_context'
+function).
+
+--- mercurial/sslutil.py.orig 2015-02-02 02:20:50 UTC
++++ mercurial/sslutil.py
+@@ -29,7 +29,10 @@ try:
+ # maintainers for us, but that breaks too many things to
+ # do it in a hurry.
+ sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+- sslcontext.options &= ssl.OP_NO_SSLv2 & ssl.OP_NO_SSLv3
++ # SSLv2 is considered harmful
++ sslcontext.options |= ssl.OP_NO_SSLv2
++ # SSLv3 has problematic security issue
++ sslcontext.options |= ssl.OP_NO_SSLv3
+ if certfile is not None:
+ sslcontext.load_cert_chain(certfile, keyfile)
+ sslcontext.verify_mode = cert_reqs
Property changes on: trunk/devel/mercurial/files/patch-mercurial_sslutil.py
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/mercurial/pkg-plist
===================================================================
--- trunk/devel/mercurial/pkg-plist 2015-03-18 12:24:17 UTC (rev 18220)
+++ trunk/devel/mercurial/pkg-plist 2015-03-18 12:29:51 UTC (rev 18221)
@@ -98,9 +98,6 @@
%%PYTHON_SITELIBDIR%%/hgext/histedit.py
%%PYTHON_SITELIBDIR%%/hgext/histedit.pyc
%%PYTHON_SITELIBDIR%%/hgext/histedit.pyo
-%%PYTHON_SITELIBDIR%%/hgext/interhg.py
-%%PYTHON_SITELIBDIR%%/hgext/interhg.pyc
-%%PYTHON_SITELIBDIR%%/hgext/interhg.pyo
%%PYTHON_SITELIBDIR%%/hgext/keyword.py
%%PYTHON_SITELIBDIR%%/hgext/keyword.pyc
%%PYTHON_SITELIBDIR%%/hgext/keyword.pyo
@@ -211,6 +208,9 @@
%%PYTHON_SITELIBDIR%%/mercurial/branchmap.py
%%PYTHON_SITELIBDIR%%/mercurial/branchmap.pyc
%%PYTHON_SITELIBDIR%%/mercurial/branchmap.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/bundle2.py
+%%PYTHON_SITELIBDIR%%/mercurial/bundle2.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/bundle2.pyo
%%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.py
%%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.pyc
%%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.pyo
@@ -247,12 +247,10 @@
%%PYTHON_SITELIBDIR%%/mercurial/dagutil.py
%%PYTHON_SITELIBDIR%%/mercurial/dagutil.pyc
%%PYTHON_SITELIBDIR%%/mercurial/dagutil.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/default.d/mergetools.rc
%%PYTHON_SITELIBDIR%%/mercurial/demandimport.py
%%PYTHON_SITELIBDIR%%/mercurial/demandimport.pyc
%%PYTHON_SITELIBDIR%%/mercurial/demandimport.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/dicthelpers.py
-%%PYTHON_SITELIBDIR%%/mercurial/dicthelpers.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/dicthelpers.pyo
%%PYTHON_SITELIBDIR%%/mercurial/diffhelpers.so
%%PYTHON_SITELIBDIR%%/mercurial/dirstate.py
%%PYTHON_SITELIBDIR%%/mercurial/dirstate.pyc
@@ -263,6 +261,7 @@
%%PYTHON_SITELIBDIR%%/mercurial/dispatch.py
%%PYTHON_SITELIBDIR%%/mercurial/dispatch.pyc
%%PYTHON_SITELIBDIR%%/mercurial/dispatch.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/dummycert.pem
%%PYTHON_SITELIBDIR%%/mercurial/encoding.py
%%PYTHON_SITELIBDIR%%/mercurial/encoding.pyc
%%PYTHON_SITELIBDIR%%/mercurial/encoding.pyo
@@ -269,6 +268,9 @@
%%PYTHON_SITELIBDIR%%/mercurial/error.py
%%PYTHON_SITELIBDIR%%/mercurial/error.pyc
%%PYTHON_SITELIBDIR%%/mercurial/error.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/exchange.py
+%%PYTHON_SITELIBDIR%%/mercurial/exchange.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/exchange.pyo
%%PYTHON_SITELIBDIR%%/mercurial/extensions.py
%%PYTHON_SITELIBDIR%%/mercurial/extensions.pyc
%%PYTHON_SITELIBDIR%%/mercurial/extensions.pyo
@@ -421,6 +423,9 @@
%%PYTHON_SITELIBDIR%%/mercurial/minirst.pyc
%%PYTHON_SITELIBDIR%%/mercurial/minirst.pyo
%%PYTHON_SITELIBDIR%%/mercurial/mpatch.so
+%%PYTHON_SITELIBDIR%%/mercurial/namespaces.py
+%%PYTHON_SITELIBDIR%%/mercurial/namespaces.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/namespaces.pyo
%%PYTHON_SITELIBDIR%%/mercurial/node.py
%%PYTHON_SITELIBDIR%%/mercurial/node.pyc
%%PYTHON_SITELIBDIR%%/mercurial/node.pyo
@@ -507,6 +512,9 @@
%%PYTHON_SITELIBDIR%%/mercurial/subrepo.py
%%PYTHON_SITELIBDIR%%/mercurial/subrepo.pyc
%%PYTHON_SITELIBDIR%%/mercurial/subrepo.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/tagmerge.py
+%%PYTHON_SITELIBDIR%%/mercurial/tagmerge.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/tagmerge.pyo
%%PYTHON_SITELIBDIR%%/mercurial/tags.py
%%PYTHON_SITELIBDIR%%/mercurial/tags.pyc
%%PYTHON_SITELIBDIR%%/mercurial/tags.pyo
@@ -713,7 +721,6 @@
%%DATA%%%%DATADIR%%/contrib/bash_completion
%%DATA%%%%DATADIR%%/contrib/casesmash.py
%%DATA%%%%DATADIR%%/contrib/check-code.py
-%%DATA%%%%DATADIR%%/contrib/convert-repo
%%DATA%%%%DATADIR%%/contrib/debugcmdserver.py
%%DATA%%%%DATADIR%%/contrib/debugshell.py
%%DATA%%%%DATADIR%%/contrib/dumprevlog
@@ -726,16 +733,13 @@
%%DATA%%%%DATADIR%%/contrib/hgsh/Makefile
%%DATA%%%%DATADIR%%/contrib/hgsh/hgsh.c
%%DATA%%%%DATADIR%%/contrib/mercurial.el
-%%DATA%%%%DATADIR%%/contrib/mergetools.hgrc
%%DATA%%%%DATADIR%%/contrib/mq.el
%%DATA%%%%DATADIR%%/contrib/perf.py
%%DATA%%%%DATADIR%%/contrib/pylintrc
%%DATA%%%%DATADIR%%/contrib/python-hook-examples.py
-%%DATA%%%%DATADIR%%/contrib/sample.hgrc
%%DATA%%%%DATADIR%%/contrib/simplemerge
%%DATA%%%%DATADIR%%/contrib/tcsh_completion
%%DATA%%%%DATADIR%%/contrib/tcsh_completion_build.sh
-%%DATA%%%%DATADIR%%/contrib/tmplrewrite.py
%%DATA%%%%DATADIR%%/contrib/undumprevlog
%%DATA%%%%DATADIR%%/contrib/vim/HGAnnotate.vim
%%DATA%%%%DATADIR%%/contrib/vim/hg-menu.vim
@@ -747,54 +751,3 @@
%%DATA%%%%DATADIR%%/www/hgweb.cgi
%%DATA%%%%DATADIR%%/www/hgweb.fcgi
%%DATA%%%%DATADIR%%/www/hgweb.wsgi
-%%DATA%%@dirrm %%DATADIR%%/www
-%%DATA%%@dirrm %%DATADIR%%/contrib/vim
-%%DATA%%@dirrm %%DATADIR%%/contrib/hgsh
-%%DATA%%@dirrm %%DATADIR%%/contrib/hgfixes
-%%DATA%%@dirrm %%DATADIR%%/contrib
-%%DATA%%@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/static
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/spartan
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/rss
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/raw
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/paper
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/coal
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/atom
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/sv/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/sv
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ru/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ru
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ro/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ro
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da
-%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/httpclient
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial/help
- at dirrm %%PYTHON_SITELIBDIR%%/mercurial
- at dirrm %%PYTHON_SITELIBDIR%%/hgext/zeroconf
- at dirrm %%PYTHON_SITELIBDIR%%/hgext/largefiles
- at dirrm %%PYTHON_SITELIBDIR%%/hgext/highlight
- at dirrm %%PYTHON_SITELIBDIR%%/hgext/convert
- at dirrm %%PYTHON_SITELIBDIR%%/hgext
More information about the Midnightbsd-cvs
mailing list