intermediate changes

ref:48d7da65c885c476a8c592a79175b748e8ebea74

5 files changed, 12 insertions, 8 deletions

diff --git a/build/rules/contrib_restricted.policy b/build/rules/contrib_restricted.policy
index eef2571337..e556841b1f 100644
--- a/build/rules/contrib_restricted.policy
+++ b/build/rules/contrib_restricted.policy
@@ -6,6 +6,9 @@
 # scale_ipp filter for ffmpeg use Intel IPP hence it is nonfree
 ALLOW strm/cv/ffmpeg_adcv/toshik_filters -> contrib/restricted/ffmpeg-3-scale-ipp
 
+# libzvbi is GPL
+ALLOW strm/cv/ffmpeg_adcv/libavcodec -> contrib/restricted/libzvbi
+
 # CityHash-1.0.2 is a specific version hardwired into ClickHouse public interface
 ALLOW clickhouse -> contrib/restricted/cityhash-1.0.2
 ALLOW library/cpp/clickhouse -> contrib/restricted/cityhash-1.0.2
diff --git a/contrib/python/botocore/py2/.yandex_meta/yamaker.yaml b/contrib/python/botocore/py2/.yandex_meta/yamaker.yaml
index 981263c39e..bb413c6ab0 100644
--- a/contrib/python/botocore/py2/.yandex_meta/yamaker.yaml
+++ b/contrib/python/botocore/py2/.yandex_meta/yamaker.yaml
@@ -1,4 +1,5 @@
 additional_requirements:
+- certifi
 - six
 - library/python/resource
 exclude:
diff --git a/contrib/python/botocore/py2/patches/04-fix-yamake.patch b/contrib/python/botocore/py2/patches/04-fix-yamake.patch
index a491d9d4ce..4a1fbc2d4a 100644
--- a/contrib/python/botocore/py2/patches/04-fix-yamake.patch
+++ b/contrib/python/botocore/py2/patches/04-fix-yamake.patch
@@ -1,6 +1,6 @@
 --- contrib/python/botocore/py2/ya.make	(index)
 +++ contrib/python/botocore/py2/ya.make	(working tree)
-@@ -99,283 +97,283 @@ RESOURCE_FILES(
+@@ -100,283 +98,283 @@ RESOURCE_FILES(
      .dist-info/top_level.txt
      botocore/cacert.pem
      botocore/data/_retry.json
@@ -561,7 +561,7 @@
      botocore/data/ec2-instance-connect/2018-04-02/paginators-1.json
      botocore/data/ec2-instance-connect/2018-04-02/service-2.json
      botocore/data/ec2/2014-09-01/paginators-1.json
-@@ -404,364 +402,364 @@ RESOURCE_FILES(
+@@ -405,364 +403,364 @@ RESOURCE_FILES(
      botocore/data/ec2/2016-11-15/paginators-1.json
      botocore/data/ec2/2016-11-15/service-2.json
      botocore/data/ec2/2016-11-15/waiters-2.json
@@ -1276,7 +1276,7 @@
      botocore/data/route53/2013-04-01/examples-1.json
      botocore/data/route53/2013-04-01/paginators-1.json
      botocore/data/route53/2013-04-01/service-2.json
-@@ -776,146 +774,146 @@ RESOURCE_FILES(
+@@ -777,146 +775,146 @@ RESOURCE_FILES(
      botocore/data/s3/2006-03-01/paginators-1.json
      botocore/data/s3/2006-03-01/service-2.json
      botocore/data/s3/2006-03-01/waiters-2.json
diff --git a/contrib/python/botocore/py3/.yandex_meta/yamaker.yaml b/contrib/python/botocore/py3/.yandex_meta/yamaker.yaml
index 981263c39e..bb413c6ab0 100644
--- a/contrib/python/botocore/py3/.yandex_meta/yamaker.yaml
+++ b/contrib/python/botocore/py3/.yandex_meta/yamaker.yaml
@@ -1,4 +1,5 @@
 additional_requirements:
+- certifi
 - six
 - library/python/resource
 exclude:
diff --git a/contrib/python/botocore/py3/patches/04-fix-ya.make.patch b/contrib/python/botocore/py3/patches/04-fix-ya.make.patch
index f521b97e29..df206c1dac 100644
--- a/contrib/python/botocore/py3/patches/04-fix-ya.make.patch
+++ b/contrib/python/botocore/py3/patches/04-fix-ya.make.patch
@@ -6,7 +6,7 @@
  PY3_LIBRARY()
  
  OWNER(g:python-contrib)
-@@ -99,303 +97,303 @@ RESOURCE_FILES(
+@@ -100,303 +98,303 @@ RESOURCE_FILES(
      .dist-info/top_level.txt
      botocore/cacert.pem
      botocore/data/_retry.json
@@ -607,7 +607,7 @@
      botocore/data/ec2-instance-connect/2018-04-02/paginators-1.json
      botocore/data/ec2-instance-connect/2018-04-02/service-2.json
      botocore/data/ec2/2014-09-01/paginators-1.json
-@@ -424,401 +422,401 @@ RESOURCE_FILES(
+@@ -425,401 +423,401 @@ RESOURCE_FILES(
      botocore/data/ec2/2016-11-15/paginators-1.json
      botocore/data/ec2/2016-11-15/service-2.json
      botocore/data/ec2/2016-11-15/waiters-2.json
@@ -1396,7 +1396,7 @@
      botocore/data/route53/2013-04-01/examples-1.json
      botocore/data/route53/2013-04-01/paginators-1.json
      botocore/data/route53/2013-04-01/service-2.json
-@@ -829,161 +827,161 @@ RESOURCE_FILES(
+@@ -830,161 +828,161 @@ RESOURCE_FILES(
      botocore/data/route53resolver/2018-04-01/paginators-1.json
      botocore/data/route53resolver/2018-04-01/paginators-1.sdk-extras.json
      botocore/data/route53resolver/2018-04-01/service-2.json
@@ -1432,7 +1432,6 @@
 -    botocore/data/schemas/2019-12-02/waiters-2.json
 -    botocore/data/sdb/2009-04-15/paginators-1.json
 -    botocore/data/sdb/2009-04-15/service-2.json
--    botocore/data/sdk-default-configuration.json
 +    #botocore/data/s3control/2018-08-20/paginators-1.json
 +    #botocore/data/s3control/2018-08-20/service-2.json
 +    #botocore/data/s3outposts/2017-07-25/paginators-1.json
@@ -1457,7 +1456,7 @@
 +    #botocore/data/schemas/2019-12-02/waiters-2.json
 +    #botocore/data/sdb/2009-04-15/paginators-1.json
 +    #botocore/data/sdb/2009-04-15/service-2.json
-+    #botocore/data/sdk-default-configuration.json
+     botocore/data/sdk-default-configuration.json
      botocore/data/secretsmanager/2017-10-17/examples-1.json
      botocore/data/secretsmanager/2017-10-17/paginators-1.json
      botocore/data/secretsmanager/2017-10-17/service-2.json