mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-25 08:58:27 -07:00
dev-python/python-nss: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/2363 Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
committed by
David Seifert
parent
994e779e56
commit
9b57097b15
@@ -1,38 +0,0 @@
|
||||
--- setup.py.orig 2010-02-17 22:51:13.762123843 +0200
|
||||
+++ setup.py 2010-02-17 22:53:26.538622241 +0200
|
||||
@@ -310,7 +310,7 @@
|
||||
nss_error_extension = \
|
||||
Extension('nss.error',
|
||||
sources = ['src/py_nspr_error.c'],
|
||||
- include_dirs = ['/usr/include/nss3', '/usr/include/nspr4'],
|
||||
+ include_dirs = ['/usr/include/nss', '/usr/include/nspr'],
|
||||
libraries = ['nspr4'],
|
||||
extra_compile_args = extra_compile_args,
|
||||
)
|
||||
@@ -318,7 +318,7 @@
|
||||
nss_io_extension = \
|
||||
Extension('nss.io',
|
||||
sources = ['src/py_nspr_io.c'],
|
||||
- include_dirs = ['/usr/include/nss3', '/usr/include/nspr4'],
|
||||
+ include_dirs = ['/usr/include/nss', '/usr/include/nspr'],
|
||||
libraries = ['nspr4'],
|
||||
extra_compile_args = extra_compile_args,
|
||||
)
|
||||
@@ -326,7 +326,7 @@
|
||||
nss_nss_extension = \
|
||||
Extension('nss.nss',
|
||||
sources = ['src/py_nss.c'],
|
||||
- include_dirs = ['src', '/usr/include/nss3', '/usr/include/nspr4'],
|
||||
+ include_dirs = ['src', '/usr/include/nss', '/usr/include/nspr'],
|
||||
libraries = ['nspr4', 'ssl3'],
|
||||
extra_compile_args = extra_compile_args,
|
||||
)
|
||||
@@ -334,7 +334,7 @@
|
||||
nss_ssl_extension = \
|
||||
Extension('nss.ssl',
|
||||
sources = ['src/py_ssl.c'],
|
||||
- include_dirs = ['src', '/usr/include/nss3', '/usr/include/nspr4'],
|
||||
+ include_dirs = ['src', '/usr/include/nss', '/usr/include/nspr'],
|
||||
libraries = ['nspr4', 'ssl3'],
|
||||
extra_compile_args = extra_compile_args,
|
||||
)
|
||||
@@ -1,25 +0,0 @@
|
||||
RCS file: /cvsroot/mozilla/security/python/nss/src/py_nss.c,v
|
||||
retrieving revision 1.23
|
||||
diff -b -u -r1.23 py_nss.c
|
||||
--- src/py_nss.c 6 Jun 2011 15:21:13 -0000 1.23
|
||||
+++ src/py_nss.c 17 Nov 2011 21:11:40 -0000
|
||||
@@ -4669,7 +4669,7 @@
|
||||
}
|
||||
|
||||
if (params.hashAlg) {
|
||||
- obj = oid_secitem_to_pystr_desc(¶ms->hashAlg->algorithm);
|
||||
+ obj = oid_secitem_to_pystr_desc(¶ms.hashAlg->algorithm);
|
||||
} else {
|
||||
obj = PyString_FromString("default, SHA-1");
|
||||
}
|
||||
@@ -4677,8 +4677,8 @@
|
||||
Py_CLEAR(obj);
|
||||
|
||||
if (params.maskAlg) {
|
||||
- obj = oid_secitem_to_pystr_desc(¶ms->maskAlg->algorithm);
|
||||
- if (SEC_QuickDERDecodeItem(pool, &mask_hash_alg,
|
||||
+ obj = oid_secitem_to_pystr_desc(¶ms.maskAlg->algorithm);
|
||||
+ if (SEC_QuickDERDecodeItem(arena, &mask_hash_alg,
|
||||
SEC_ASN1_GET(SECOID_AlgorithmIDTemplate),
|
||||
¶ms.maskAlg->parameters) == SECSuccess) {
|
||||
obj1 = oid_secitem_to_pystr_desc(&mask_hash_alg);
|
||||
Reference in New Issue
Block a user