sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f5aecb22cee63db636962c2db3511d17ed63bcce)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f5aecb22cee63db636962c2db3511d17ed63bcce)
Date: Tue, 24 Jan 2017 20:41:28 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

crypto/nss/DETAILS | 4
crypto/nss/HISTORY | 6
crypto/nss/PREPARE | 2
crypto/nss/PRE_BUILD | 9
crypto/nss/nss-3.28.1-standalone-1.patch | 246
++++++++++
http/firefox/DEPENDS | 2
http/firefox/DETAILS | 6
http/firefox/HISTORY | 10
http/firefox/patches/0001-add-extra-bracket-to-not-confuse-sed.patch | 25 -
http/firefox/patches/firefox-50.0-system_graphite2_harfbuzz-1.patch | 10
http/firefox/patches/update_h2_curve.patch | 30 -
11 files changed, 275 insertions(+), 75 deletions(-)

New commits:
commit f5aecb22cee63db636962c2db3511d17ed63bcce
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 51.0, SECURITY_PATCH++

commit c62a6984df6b54cee4907fc310afbcce19dc9ef0
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

crypto/nss: version 3.28.1

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 21a8695..9e0afcc 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -54,6 +54,10 @@ case $NSS_BRANCH in
3.27)
VERSION=3.27.1

SOURCE_HASH=sha512:b52bc18e42cab78a325a8c4fcf2894ca879cecbb657a852baf460551ed9727f145bc328ebb61a43a1605b457f923a1495707ac4aee27be70220463818ed8db8d
+ ;;
+ 3.28)
+ VERSION=3.28.1
+
SOURCE_HASH=sha512:f10c8e404741fafe5e5772dc754ff4503ec1826942db5fbc13b99155fcac50f29e1405dd249b69a27f27ebcfef73849b1f0f636a2076ab761384e8a0ed9a2b8b
esac
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 2d05d65..ec025dd 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,9 @@
+2017-01-24 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PREPARE: added 3.28 branch
+ * PRE_BUILD: switched to regular expression check, added appropriate
+ patch for 3.28 branch
+ * nss-3.28.1-standalone-1.patch: added from BLFS project
+
2016-10-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.27.1
* PREPARE: add 3.27 branch
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 3c9de46..9076f1d 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,5 +1,5 @@
config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?" \
- DEFAULT 3.14 3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23
3.24 3.25 3.27 &&
+ DEFAULT 3.14 3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23
3.24 3.25 3.27 3.28 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
NSS_BRANCH=3.20
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index d2a9a2b..0baf3b9 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -8,13 +8,10 @@ elif [[ $NSS_BRANCH == "3.15" ]] || [[ $NSS_BRANCH ==
"3.16" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
elif [[ $NSS_BRANCH == "3.14" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
-elif [[ $NSS_BRANCH == "3.21" ]] ||
- [[ $NSS_BRANCH == "3.22" ]] ||
- [[ $NSS_BRANCH == "3.23" ]] ||
- [[ $NSS_BRANCH == "3.24" ]] ||
- [[ $NSS_BRANCH == "3.25" ]] ||
- [[ $NSS_BRANCH == "3.27" ]]; then
+elif [[ $NSS_BRANCH =~ 3.2[1-7] ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.21-standalone-1.patch
+elif [[ $NSS_BRANCH == "3.28" ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/nss-3.28.1-standalone-1.patch
else
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
fi &&
diff --git a/crypto/nss/nss-3.28.1-standalone-1.patch
b/crypto/nss/nss-3.28.1-standalone-1.patch
new file mode 100644
index 0000000..5a66e38
--- /dev/null
+++ b/crypto/nss/nss-3.28.1-standalone-1.patch
@@ -0,0 +1,246 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2016-12-27
+Initial Package Version: 3.12.4
+Upstream Status: Not applicable
+Origin: Self, rediffed for nss-3.28.
+Description: Adds auto-generated nss.pc and nss-config script,
and
+ allows building without nspr in the source tree.
+
+diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
+--- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600
++++ nss-3.28/nss/Makefile 2016-12-26 22:24:52.695146032 -0600
+@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_nspr all latest
++nss_build_all: all latest
+
+ nss_clean_all: clobber_nspr clobber
+
+diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
+--- nss-3.28-orig/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ nss-3.28/nss/config/Makefile 2016-12-26 22:20:40.008205774 -0600
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH = ..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++ # Create the nss.pc file
++ mkdir -p $(DIST)/lib/pkgconfig
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@exec_prefix@,\$${prefix}," \
++ -e "s,@libdir@,\$${prefix}/lib," \
++ -e "s,@includedir@,\$${prefix}/include/nss," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss.pc.in > nss.pc
++ chmod 0644 nss.pc
++ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
++
++ # Create the nss-config script
++ mkdir -p $(DIST)/bin
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss-config.in > nss-config
++ chmod 0755 nss-config
++ ln -sf ../../../nss/config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+diff -Naurp nss-3.28-orig/nss/config/nss-config.in
nss-3.28/nss/config/nss-config.in
+--- nss-3.28-orig/nss/config/nss-config.in 1969-12-31 18:00:00.000000000
-0600
++++ nss-3.28/nss/config/nss-config.in 2016-12-26 22:20:40.008205774 -0600
+@@ -0,0 +1,153 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ nssutil
++ smime
++ ssl
++ softokn
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_nss=yes
++lib_nssutil=yes
++lib_smime=yes
++lib_ssl=yes
++lib_softokn=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ nssutil)
++ lib_nssutil=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ softokn)
++ lib_softokn=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++ includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++ libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs="-L$libdir"
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_softokn"; then
++ libdirs="$libdirs -lsoftokn${major_version}"
++ fi
++ echo $libdirs
++fi
++
+diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in
+--- nss-3.28-orig/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
++++ nss-3.28/nss/config/nss.pc.in 2016-12-26 22:22:53.300694346 -0600
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.10
++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@
-lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@
-lsoftokn@NSS_MAJOR_VERSION@
++Cflags: -I${includedir}
++
+diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn
+--- nss-3.28-orig/nss/manifest.mn 2016-12-21 05:56:27.000000000 -0600
++++ nss-3.28/nss/manifest.mn 2016-12-26 22:24:12.278991843 -0600
+@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd gtests
++DIRS = coreconf lib cmd gtests config
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 54bf5c7..945579a 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -26,7 +26,7 @@ depends -sub APNG libpng "--enable-system-png"
&&
depends librsvg2 "--enable-svg" &&

depends nspr "--with-system-nspr" &&
-depends -sub "3.27.x" nss "--with-system-nss" &&
+depends -sub "3.28.x" nss "--with-system-nss" &&

depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY ENABLE_DBSTAT_VTAB"
sqlite "--enable-system-sqlite" &&

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 032df5f..7c975b0 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,10 +1,10 @@
SPELL=firefox
- VERSION=50.1.0
+ VERSION=51.0
SOURCE=${SPELL}-${VERSION}.source.tar.xz
-
SOURCE_HASH=sha512:370d2e9b8c4b1b59c3394659c3a7f0f79e6a911ccd9f32095b50b3a22d087132b1f7cb87b734f7497c4381b1df6df80d120b4b87c13eecc425cc66f56acccba5
+
SOURCE_HASH=sha512:4406f840a7a2b4e76a74e846d702b717618fb5b677f1c6df864c3428033dd22aad295d656f1fc57e581fd202d894c5483a16691a60b6ca7710315b157b812467

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=http://ftp.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
- SECURITY_PATCH=101
+ SECURITY_PATCH=102
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index c55ed83..63a3e3a 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,11 @@
+2017-01-24 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 51.0, SECURITY_PATCH++, (CVE-2017-53[73-96])
+ * DEPENDS: needs 3.28.x branch of nss now
+ * patches/0001-add-extra-bracket-to-not-confuse-sed.patch,
+ potches/update_h2_curve.patch: removed, fixed by upstream
+ * patches/firefox-50.0-system_graphite2_harfbuzz-1.patch: updated to
+ current version
+
2017-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* patches/0001-add-extra-bracket-to-not-confuse-sed.patch: fix error
when
building with sed version 4.3
@@ -6,7 +14,7 @@
2017-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: don't pass obsolete pgo flag

-2016-12-13 Pavel Vinogradov <public AT sourcemage.org>
+2016-12-13 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 50.1.0, SECURITY_PATCH++

2016-12-10 Thomas Orgis <sobukus AT sourcemage.org>
diff --git
a/http/firefox/patches/0001-add-extra-bracket-to-not-confuse-sed.patch
b/http/firefox/patches/0001-add-extra-bracket-to-not-confuse-sed.patch
deleted file mode 100644
index 583729b..0000000
--- a/http/firefox/patches/0001-add-extra-bracket-to-not-confuse-sed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7ed1d491ba9afb7c0a97ecbdac26aca64a0b943f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Mon, 16 Jan 2017 21:42:55 +0100
-Subject: [PATCH] add extra bracket to not confuse sed
-
----
- build/autoconf/icu.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
-index f401fc8..0b30df9 100644
---- a/build/autoconf/icu.m4
-+++ b/build/autoconf/icu.m4
-@@ -69,7 +69,7 @@ if test -n "$USE_ICU"; then
- fi
- fi
-
-- version=`sed -n
's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*$[0-9][0-9]*$[[:space:]]*$/\1/p'
"$icudir/common/unicode/uvernum.h"`
-+ version=`sed -n
's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*$[0-9][0-9]*$[[:space:]]*$/\1/p'
"$icudir/common/unicode/uvernum.h"`
- if test x"$version" = x; then
- AC_MSG_ERROR([cannot determine icu version number from uvernum.h
header file $lineno])
- fi
---
-2.11.0
-
diff --git
a/http/firefox/patches/firefox-50.0-system_graphite2_harfbuzz-1.patch
b/http/firefox/patches/firefox-50.0-system_graphite2_harfbuzz-1.patch
index 9bcf4ab..613fe71 100644
--- a/http/firefox/patches/firefox-50.0-system_graphite2_harfbuzz-1.patch
+++ b/http/firefox/patches/firefox-50.0-system_graphite2_harfbuzz-1.patch
@@ -238,14 +238,9 @@
https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-50.0-patches-01.tar.xz
if CONFIG['MOZ_ENABLE_SKIA']:
--- a/gfx/thebes/moz.build 2016-09-19 12:19:30.000000000 -0400
+++ b/gfx/thebes/moz.build 2016-10-11 13:17:56.861237732 -0400
-@@ -284,13 +284,16 @@
- # top of the android java runtime.
- DEFINES['MOZ_USING_ANDROID_JAVA_WIDGETS'] = True
-
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
+@@ -286,7 +286,10 @@
LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
+ LOCAL_INCLUDES += ['/media/libyuv/include']

-DEFINES['GRAPHITE2_STATIC'] = True
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
@@ -255,4 +250,3 @@
https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-50.0-patches-01.tar.xz

if CONFIG['CLANG_CXX']:
# Suppress warnings from Skia header files.
- SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
diff --git a/http/firefox/patches/update_h2_curve.patch
b/http/firefox/patches/update_h2_curve.patch
deleted file mode 100644
index a1f0ffa..0000000
--- a/http/firefox/patches/update_h2_curve.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Franziskus Kiefer <franziskuskiefer AT gmail.com>
-
-Update keybits in H2
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1290037
-
-diff --git a/netwerk/protocol/http/Http2Session.cpp
b/netwerk/protocol/http/Http2Session.cpp
---- a/netwerk/protocol/http/Http2Session.cpp
-+++ b/netwerk/protocol/http/Http2Session.cpp
-@@ -3516,18 +3516,18 @@ Http2Session::ConfirmTLSProfile()
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
- }
-
- uint32_t keybits = ssl->GetKEAKeyBits();
- if (kea == ssl_kea_dh && keybits < 2048) {
- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
- this, keybits));
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
-- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is
"security level" of 128
-- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d <
256\n",
-+ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
-+ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d <
224\n",
- this, keybits));
- RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
- }
-
- int16_t macAlgorithm = ssl->GetMACAlgorithmUsed();
- LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n",
- this, macAlgorithm));
- if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) {

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f5aecb22cee63db636962c2db3511d17ed63bcce), Pavel Vinogradov, 01/24/2017