Merge #171497: staging-next 2022-05-04
Vladimír Čunát
2 years ago
commit
43c99bebda
@ -0,0 +1,22 @@ |
|||||||
|
diff --git a/configure.in b/configure.ac
|
||||||
|
similarity index 90%
|
||||||
|
rename from configure.in
|
||||||
|
rename to configure.ac
|
||||||
|
index 3ad98ca11da..8fad378faf4 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -1,13 +1,8 @@
|
||||||
|
AC_INIT(interface/interface.c)
|
||||||
|
|
||||||
|
-cp $srcdir/configure.guess $srcdir/config.guess
|
||||||
|
-cp $srcdir/configure.sub $srcdir/config.sub
|
||||||
|
-
|
||||||
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
|
-if test -z "$CC"; then
|
||||||
|
- AC_PROG_CC
|
||||||
|
-fi
|
||||||
|
+AC_PROG_CC
|
||||||
|
AC_PROG_RANLIB
|
||||||
|
AC_CHECK_PROG(AR,ar,ar)
|
||||||
|
AC_CHECK_PROG(INSTALL,install,install)
|
||||||
@ -0,0 +1,83 @@ |
|||||||
|
# shellcheck shell=bash |
||||||
|
|
||||||
|
# Setup hook that modifies Python dependencies versions. |
||||||
|
# |
||||||
|
# Example usage in a derivation: |
||||||
|
# |
||||||
|
# { …, pythonPackages, … }: |
||||||
|
# |
||||||
|
# pythonPackages.buildPythonPackage { |
||||||
|
# … |
||||||
|
# nativeBuildInputs = [ pythonPackages.pythonRelaxDepsHook ]; |
||||||
|
# |
||||||
|
# # This will relax the dependency restrictions |
||||||
|
# # e.g.: abc>1,<=2 -> abc |
||||||
|
# pythonRelaxDeps = [ "abc" ]; |
||||||
|
# # This will relax all dependencies restrictions instead |
||||||
|
# # pythonRelaxDeps = true; |
||||||
|
# # This will remove the dependency |
||||||
|
# # e.g.: cde>1,<=2 -> <nothing> |
||||||
|
# pythonRemoveDeps = [ "cde" ]; |
||||||
|
# # This will remove all dependencies from the project |
||||||
|
# # pythonRemoveDeps = true; |
||||||
|
# … |
||||||
|
# } |
||||||
|
|
||||||
|
_pythonRelaxDeps() { |
||||||
|
local -r metadata_file="$1" |
||||||
|
|
||||||
|
if [[ -z "${pythonRelaxDeps:-}" ]] || [[ "$pythonRelaxDeps" == 0 ]]; then |
||||||
|
return |
||||||
|
elif [[ "$pythonRelaxDeps" == 1 ]]; then |
||||||
|
sed -i "$metadata_file" -r \ |
||||||
|
-e 's/(Requires-Dist: \S*) \(.*\)/\1/' |
||||||
|
else |
||||||
|
for dep in $pythonRelaxDeps; do |
||||||
|
sed -i "$metadata_file" -r \ |
||||||
|
-e "s/(Requires-Dist: $dep) \(.*\)/\1/" |
||||||
|
done |
||||||
|
fi |
||||||
|
} |
||||||
|
|
||||||
|
_pythonRemoveDeps() { |
||||||
|
local -r metadata_file="$1" |
||||||
|
|
||||||
|
if [[ -z "${pythonRemoveDeps:-}" ]] || [[ "$pythonRemoveDeps" == 0 ]]; then |
||||||
|
return |
||||||
|
elif [[ "$pythonRemoveDeps" == 1 ]]; then |
||||||
|
sed -i "$metadata_file" \ |
||||||
|
-e '/Requires-Dist:.*/d' |
||||||
|
else |
||||||
|
for dep in $pythonRemoveDeps; do |
||||||
|
sed -i "$metadata_file" \ |
||||||
|
-e "/Requires-Dist: $dep/d" |
||||||
|
done |
||||||
|
fi |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
pythonRelaxDepsHook() { |
||||||
|
pushd dist |
||||||
|
|
||||||
|
local -r package="$pname-$version" |
||||||
|
local -r unpack_dir="unpacked" |
||||||
|
local -r metadata_file="$unpack_dir/$package/$package.dist-info/METADATA" |
||||||
|
local -r wheel=$(echo "$package"*".whl") |
||||||
|
|
||||||
|
@pythonInterpreter@ -m wheel unpack --dest "$unpack_dir" "$wheel" |
||||||
|
rm -rf "$wheel" |
||||||
|
|
||||||
|
_pythonRelaxDeps "$metadata_file" |
||||||
|
_pythonRemoveDeps "$metadata_file" |
||||||
|
|
||||||
|
if (( "${NIX_DEBUG:-0}" >= 1 )); then |
||||||
|
echo "pythonRelaxDepsHook: resulting METADATA:" |
||||||
|
cat "$unpack_dir/$package/$package.dist-info/METADATA" |
||||||
|
fi |
||||||
|
|
||||||
|
@pythonInterpreter@ -m wheel pack "$unpack_dir/$package" |
||||||
|
|
||||||
|
popd |
||||||
|
} |
||||||
|
|
||||||
|
postBuild+=" pythonRelaxDepsHook" |
||||||
@ -0,0 +1,4 @@ |
|||||||
|
import ./base.nix { |
||||||
|
version = "71.1"; |
||||||
|
sha256 = "sha256-Z6fm5R9h+vEwa2k1Mz4TssSKvY2m0vRs5q3KJLHiHr8="; |
||||||
|
} |
||||||
@ -1,6 +1,6 @@ |
|||||||
{ callPackage, ... }: |
{ callPackage, ... }: |
||||||
|
|
||||||
callPackage ./generic-v3.nix { |
callPackage ./generic-v3.nix { |
||||||
version = "3.19.3"; |
version = "3.19.4"; |
||||||
sha256 = "sha256-nA6L064MuyP5Si4MCLk2yg8PDM7RWggFEGQyibputYQ="; |
sha256 = "sha256-mxQ8XonVgctfaNAyd3vqQHMLHVnkjBa9EObk47vxH24="; |
||||||
} |
} |
||||||
|
|||||||
@ -0,0 +1,37 @@ |
|||||||
|
This patch was extracted from the Gentoo powerpc64le-qtwebengine
|
||||||
|
patchset, referenced here:
|
||||||
|
|
||||||
|
https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
|
||||||
|
|
||||||
|
and downloaded from here:
|
||||||
|
|
||||||
|
https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
|
||||||
|
|
||||||
|
From 4bbb4482e14ad27cf0bd5032b1b5d4abba29dc99 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Georgy Yakovlev <gyakovlev@gentoo.org>
|
||||||
|
Date: Fri, 27 Nov 2020 13:05:45 -0800
|
||||||
|
Subject: [PATCH] 5.15.2 ppc64le patchet
|
||||||
|
|
||||||
|
diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h
|
||||||
|
index ce1f3e8..fd39a16 100644
|
||||||
|
--- a/webrtc/typedefs.h
|
||||||
|
+++ b/webrtc/typedefs.h
|
||||||
|
@@ -38,6 +38,18 @@
|
||||||
|
#define WEBRTC_ARCH_X86
|
||||||
|
#define WEBRTC_ARCH_32_BITS
|
||||||
|
#define WEBRTC_ARCH_LITTLE_ENDIAN
|
||||||
|
+#elif defined(__PPC__)
|
||||||
|
+#define WEBRTC_ARCH_PPC_FAMILY
|
||||||
|
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||||
|
+#define WEBRTC_ARCH_LITTLE_ENDIAN
|
||||||
|
+#else
|
||||||
|
+#define WEBRTC_ARCH_BIG_ENDIAN
|
||||||
|
+#endif
|
||||||
|
+#if defined(__LP64__)
|
||||||
|
+#define WEBRTC_ARCH_64_BITS
|
||||||
|
+#else
|
||||||
|
+#define WEBRTC_ARCH_32_BITS
|
||||||
|
+#endif
|
||||||
|
#elif defined(__ARMEL__)
|
||||||
|
// TODO(ajm): We'd prefer to control platform defines here, but this is
|
||||||
|
// currently provided by the Android makefiles. Commented to avoid duplicate
|
||||||
@ -1,21 +1,84 @@ |
|||||||
{ lib, fetchPypi, buildPythonPackage, six }: |
{ lib |
||||||
|
, buildPythonPackage |
||||||
|
, deprecated |
||||||
|
, fetchFromGitHub |
||||||
|
, hiro |
||||||
|
, packaging |
||||||
|
, pymemcache |
||||||
|
, pymongo |
||||||
|
, pytest-asyncio |
||||||
|
, pytest-lazy-fixture |
||||||
|
, pytestCheckHook |
||||||
|
, pythonOlder |
||||||
|
, redis |
||||||
|
, setuptools |
||||||
|
, typing-extensions |
||||||
|
}: |
||||||
|
|
||||||
buildPythonPackage rec { |
buildPythonPackage rec { |
||||||
pname = "limits"; |
pname = "limits"; |
||||||
version = "2.4.0"; |
version = "2.6.1"; |
||||||
|
format = "setuptools"; |
||||||
|
|
||||||
src = fetchPypi { |
disabled = pythonOlder "3.7"; |
||||||
inherit pname version; |
|
||||||
sha256 = "sha256-jiK2PfJjECB6d7db1HRZnwpGE6fZFjZQ7TpCjpzHrjU="; |
src = fetchFromGitHub { |
||||||
|
owner = "alisaifee"; |
||||||
|
repo = pname; |
||||||
|
rev = version; |
||||||
|
# Upstream uses versioneer, which relies on git attributes substitution. |
||||||
|
# This leads to non-reproducible archives on github. Remove the substituted |
||||||
|
# file here, and recreate it later based on our version info. |
||||||
|
extraPostFetch = '' |
||||||
|
rm "$out/limits/_version.py" |
||||||
|
''; |
||||||
|
hash = "sha256-ja+YbRHCcZ5tFnoofdR44jbkkdDroVUdKeDOt6yE0LI="; |
||||||
}; |
}; |
||||||
|
|
||||||
propagatedBuildInputs = [ six ]; |
propagatedBuildInputs = [ |
||||||
|
deprecated |
||||||
|
packaging |
||||||
|
setuptools |
||||||
|
typing-extensions |
||||||
|
]; |
||||||
|
|
||||||
|
checkInputs = [ |
||||||
|
hiro |
||||||
|
pymemcache |
||||||
|
pymongo |
||||||
|
pytest-asyncio |
||||||
|
pytest-lazy-fixture |
||||||
|
pytestCheckHook |
||||||
|
redis |
||||||
|
]; |
||||||
|
|
||||||
|
postPatch = '' |
||||||
|
substituteInPlace pytest.ini \ |
||||||
|
--replace "--cov=limits" "" \ |
||||||
|
--replace "-K" "" |
||||||
|
# redis-py-cluster doesn't support redis > 4 |
||||||
|
substituteInPlace tests/conftest.py \ |
||||||
|
--replace "import rediscluster" "" |
||||||
|
|
||||||
|
# Recreate _version.py, deleted at fetch time due to non-reproducibility. |
||||||
|
echo 'def get_versions(): return {"version": "${version}"}' > limits/_version.py |
||||||
|
''; |
||||||
|
|
||||||
doCheck = false; # ifilter |
pythonImportsCheck = [ |
||||||
|
"limits" |
||||||
|
]; |
||||||
|
|
||||||
|
pytestFlagsArray = [ |
||||||
|
# All other tests require a running Docker instance |
||||||
|
"tests/test_limits.py" |
||||||
|
"tests/test_ratelimit_parser.py" |
||||||
|
"tests/test_limit_granularities.py" |
||||||
|
]; |
||||||
|
|
||||||
meta = with lib; { |
meta = with lib; { |
||||||
description = "Rate limiting utilities"; |
description = "Rate limiting utilities"; |
||||||
license = licenses.mit; |
|
||||||
homepage = "https://limits.readthedocs.org/"; |
homepage = "https://limits.readthedocs.org/"; |
||||||
|
license = licenses.mit; |
||||||
|
maintainers = with maintainers; [ ]; |
||||||
}; |
}; |
||||||
} |
} |
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,30 +0,0 @@ |
|||||||
From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Stenberg <daniel@haxx.se>
|
|
||||||
Date: Tue, 8 Mar 2022 13:38:13 +0100
|
|
||||||
Subject: [PATCH] openssl: fix CN check error code
|
|
||||||
|
|
||||||
Due to a missing 'else' this returns error too easily.
|
|
||||||
|
|
||||||
Regressed in: d15692ebb
|
|
||||||
|
|
||||||
Reported-by: Kristoffer Gleditsch
|
|
||||||
Fixes #8559
|
|
||||||
Closes #8560
|
|
||||||
---
|
|
||||||
lib/vtls/openssl.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
|
|
||||||
index 0b79fc50a9c5..4618beeb3867 100644
|
|
||||||
--- a/lib/vtls/openssl.c
|
|
||||||
+++ b/lib/vtls/openssl.c
|
|
||||||
@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn,
|
|
||||||
memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen);
|
|
||||||
peer_CN[peerlen] = '\0';
|
|
||||||
}
|
|
||||||
- result = CURLE_OUT_OF_MEMORY;
|
|
||||||
+ else
|
|
||||||
+ result = CURLE_OUT_OF_MEMORY;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else /* not a UTF8 name */
|
|
||||||
Loading…
Reference in new issue