[gentoo-commits] repo/gentoo:master commit in: dev-python/python-nss/files/

[David Seifert]

commit:     9b57097b15407b7ee19e3b5dd4f230fe3a6bf9b2
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail 
<DOT> com>
AuthorDate: Mon Sep 19 17:39:59 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 17:59:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b57097b

dev-python/python-nss: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2363

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-python/python-nss/files/gentoo_lib_name.patch  | 38 ----------------------
 .../files/python-nss-0.12-rsapssparams.patch       | 25 --------------
 2 files changed, 63 deletions(-)

diff --git a/dev-python/python-nss/files/gentoo_lib_name.patch 
b/dev-python/python-nss/files/gentoo_lib_name.patch
deleted file mode 100644
index 48dc291..00000000
--- a/dev-python/python-nss/files/gentoo_lib_name.patch
+++ /dev/null
@@ -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,
-               )

diff --git a/dev-python/python-nss/files/python-nss-0.12-rsapssparams.patch 
b/dev-python/python-nss/files/python-nss-0.12-rsapssparams.patch
deleted file mode 100644
index cea6f1d..00000000
--- a/dev-python/python-nss/files/python-nss-0.12-rsapssparams.patch
+++ /dev/null
@@ -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(&params->hashAlg->algorithm);
-+        obj = oid_secitem_to_pystr_desc(&params.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(&params->maskAlg->algorithm);
--        if (SEC_QuickDERDecodeItem(pool, &mask_hash_alg,
-+        obj = oid_secitem_to_pystr_desc(&params.maskAlg->algorithm);
-+        if (SEC_QuickDERDecodeItem(arena, &mask_hash_alg,
-                                    SEC_ASN1_GET(SECOID_AlgorithmIDTemplate),
-                                    &params.maskAlg->parameters) == 
SECSuccess) {
-             obj1 = oid_secitem_to_pystr_desc(&mask_hash_alg);