CVS commit: pkgsrc/devel/py-mercurial

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun 17 11:24:12 UTC 2018

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile Makefile.version distinfo
Removed Files:
        pkgsrc/devel/py-mercurial/patches: patch-mercurial_bundle2.py
            patch-tests_test-bundle.t patch-tests_test-clonebundles.t
            patch-tests_test-http-bad-server.t
            patch-tests_test-lfs-serve-access.t
            patch-tests_test-obsolete-changeset-exchange.t
            patch-tests_test-patchbomb.t patch-tests_test-rebase-conflicts.t
            patch-tests_test-strip.t

Log Message:
py-mercurial: update to 4.6.1.

Mercurial 4.6.1 (2018-06-06)

This is a regularly-scheduled bugfix release that also contains security fixes.

1.1. Security Fixes

Multiple issues found in mpatch.c with a fuzzer:

    OVE-20180430-0001
    OVE-20180430-0002
    OVE-20180430-0004

With the following fixes:

    mpatch: be more careful about parsing binary patch data (SEC)
    mpatch: protect against underflow in mpatch_apply (SEC)
    mpatch: ensure fragment start isn't past the end of orig (SEC)
    mpatch: fix UB in int overflows in gather() (SEC)
    mpatch: fix UB integer overflows in discard() (SEC)
    mpatch: avoid integer overflow in mpatch_decode (SEC)
    mpatch: avoid integer overflow in combine() (SEC)

No exploits are known at the time, however, it is highly recommended that all users upgrade.

1.2. Bug Fixes

Also included in this release are the following,

    zstandard: pull in bug fixes from upstream 0.9.1 (issue5884)
    bundle2: fix old clients from reading newer format (issue5872)
    bdiff: fix xdiff long/int64 conversion (issue5885)
    push: continue without locking on lock failure other than EEXIST (issue5882)
    lfs: fix crash in command server (issue5902)
    hghave: fix deadlock in test runner
    rebase: fix error when computing obsoletenotrebased (issue5907)
    rebase: prioritize indicating an interrupted rebase over update (issue5838)
    revset: pass in lookup function to matchany() (issue5879)


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/devel/py-mercurial/Makefile.version
cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/py-mercurial/patches/patch-mercurial_bundle2.py \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-bundle.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-clonebundles.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-http-bad-server.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-lfs-serve-access.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-obsolete-changeset-exchange.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-patchbomb.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-rebase-conflicts.t \
    pkgsrc/devel/py-mercurial/patches/patch-tests_test-strip.t

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.22 pkgsrc/devel/py-mercurial/Makefile:1.23
--- pkgsrc/devel/py-mercurial/Makefile:1.22     Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/Makefile  Sun Jun 17 11:24:12 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2018/05/25 13:04:56 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2018/06/17 11:24:12 wiz Exp $
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  https://www.mercurial-scm.org/release/
 

Index: pkgsrc/devel/py-mercurial/Makefile.version
diff -u pkgsrc/devel/py-mercurial/Makefile.version:1.61 pkgsrc/devel/py-mercurial/Makefile.version:1.62
--- pkgsrc/devel/py-mercurial/Makefile.version:1.61     Sun May 20 10:23:02 2018
+++ pkgsrc/devel/py-mercurial/Makefile.version  Sun Jun 17 11:24:12 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.61 2018/05/20 10:23:02 wiz Exp $
+# $NetBSD: Makefile.version,v 1.62 2018/06/17 11:24:12 wiz Exp $
 
-VERSION=       4.6
+VERSION=       4.6.1
 
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 4.3
 # see also https://www.mercurial-scm.org/wiki/SupportedPythonVersions

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.65 pkgsrc/devel/py-mercurial/distinfo:1.66
--- pkgsrc/devel/py-mercurial/distinfo:1.65     Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/distinfo  Sun Jun 17 11:24:12 2018
@@ -1,15 +1,6 @@
-$NetBSD: distinfo,v 1.65 2018/05/25 13:04:56 joerg Exp $
+$NetBSD: distinfo,v 1.66 2018/06/17 11:24:12 wiz Exp $
 
-SHA1 (mercurial-4.6.tar.gz) = 00b218892e244e549c6a1987a43e831951d7df2e
-RMD160 (mercurial-4.6.tar.gz) = 8ec766dc74c65d6540290c1d1f6e5093fae0a7e8
-SHA512 (mercurial-4.6.tar.gz) = 2a7e94a338727afc97aab9c33ce4810a17088f5f477a83b581dcbf594e455062e69e6a3782f1665b24ffc011963b0eead6f7e637a63f241d256378d30b006c45
-Size (mercurial-4.6.tar.gz) = 6226745 bytes
-SHA1 (patch-mercurial_bundle2.py) = 34548c7e02933bed8613d8732c0c5dcea01841f1
-SHA1 (patch-tests_test-bundle.t) = 6dca93568f21ae407aad03cb5e8c820385d5f998
-SHA1 (patch-tests_test-clonebundles.t) = 0beb9bcd172513d60fd0ba790b1aef524ae60087
-SHA1 (patch-tests_test-http-bad-server.t) = 110f43f13d639ad75a1a9ce3ae7a1cfdecef3ed6
-SHA1 (patch-tests_test-lfs-serve-access.t) = a3a08489c3f1a72835bbd0d2f598146c3c9a2316
-SHA1 (patch-tests_test-obsolete-changeset-exchange.t) = 4ae81fe1f76d30558197ac8276e0889440483e75
-SHA1 (patch-tests_test-patchbomb.t) = a71d8925eaa79b9d12821654e6eed8a997dc1f34
-SHA1 (patch-tests_test-rebase-conflicts.t) = 037be577490e66506ca793857308ea6dcd89d9b8
-SHA1 (patch-tests_test-strip.t) = 9fd2985744d915e57644be358d1b139a37891720
+SHA1 (mercurial-4.6.1.tar.gz) = df2bb1487e6a64c7321a93767baf43c6ca1e9b5f
+RMD160 (mercurial-4.6.1.tar.gz) = a9dd32a52d7b46f81d27d89625004b8f09c83552
+SHA512 (mercurial-4.6.1.tar.gz) = 0c7737ca803691b135b4906cc527b20595e314009096d8a19f37814ee192b182e7c5360fbf993f632d6071da1f9fca38677e7190c14ed92bafa8add72a4a27d9
+Size (mercurial-4.6.1.tar.gz) = 6407380 bytes