gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-16 14:29:05 -07:00
Code Issues Projects Releases Wiki Activity

sys-libs/cracklib: enable py3.12, set DISTUTILS_EXT=1

Browse Source 
Closes: https://bugs.gentoo.org/929852
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2024-05-09 12:30:20 +01:00
parent e0dbada882
commit 4ef3f3e85b
2 changed files with 87 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sys-libs/cracklib/cracklib-2.9.11.ebuild
View File

@@ -1,13 +1,13 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# Note: ideally bump with sys-apps/cracklib-words
DISTUTILS_EXT=1
DISTUTILS_OPTIONAL=1
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 libtool multilib-minimal usr-ldscript
MY_P=${P/_}
@@ -35,6 +35,10 @@ BDEPEND="
python? ( ${DISTUTILS_DEPS} )
"
PATCHES=(
"${FILESDIR}"/${P}-py3.12-tests.patch
)
distutils_enable_tests unittest
pkg_setup() {

80
sys-libs/cracklib/files/cracklib-2.9.11-py3.12-tests.patch Normal file
View File

@@ -0,0 +1,80 @@
https://github.com/cracklib/cracklib/commit/a77a392272df3677f71c68e81fcdad1bc722732e
From a77a392272df3677f71c68e81fcdad1bc722732e Mon Sep 17 00:00:00 2001
From: Olivier Gayot <olivier.gayot@canonical.com>
Date: Thu, 30 Nov 2023 18:36:17 +0100
Subject: [PATCH] Fix test-suite so it can run with Python 3.12
The test suite still used the obsolete assertEquals() function which was
a deprecated alias for assertEqual() (without the s) and got dropped
from Python 3.12.
Use the replacement instead so the test-suite can run with Python 3.12.
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
--- a/python/test_cracklib.py
+++ b/python/test_cracklib.py
@@ -69,52 +69,52 @@ def test_simple(self):
def test_simple_lower(self):
for passwd in ['t' * i for i in range(
cracklib.MIN_LENGTH - cracklib.LOW_CREDIT)]:
- self.assertEquals(
+ self.assertEqual(
1, cracklib.simple(passwd),
'password {0} should be detected as too simple'.format(
passwd))
- self.assertEquals(0, cracklib.simple(
+ self.assertEqual(0, cracklib.simple(
't' * (cracklib.MIN_LENGTH - cracklib.LOW_CREDIT)))
def test_simple_upper(self):
for passwd in ['T' * i for i in range(
cracklib.MIN_LENGTH - cracklib.UP_CREDIT)]:
- self.assertEquals(
+ self.assertEqual(
1, cracklib.simple(passwd),
'password {0} should be detected as too simple'.format(
passwd))
- self.assertEquals(0, cracklib.simple(
+ self.assertEqual(0, cracklib.simple(
'T' * (cracklib.MIN_LENGTH - cracklib.UP_CREDIT)))
def test_simple_digit(self):
for passwd in ['1' * i for i in range(
cracklib.MIN_LENGTH - cracklib.DIG_CREDIT)]:
- self.assertEquals(
+ self.assertEqual(
1, cracklib.simple(passwd),
'password {0} should be detected as too simple'.format(
passwd))
- self.assertEquals(0, cracklib.simple(
+ self.assertEqual(0, cracklib.simple(
'1' * (cracklib.MIN_LENGTH - cracklib.DIG_CREDIT)))
def test_simple_other(self):
for passwd in ['#' * i for i in range(
cracklib.MIN_LENGTH - cracklib.OTH_CREDIT)]:
- self.assertEquals(
+ self.assertEqual(
1, cracklib.simple(passwd),
'password {0} should be detected as too simple'.format(
passwd))
- self.assertEquals(0, cracklib.simple(
+ self.assertEqual(0, cracklib.simple(
'#' * (cracklib.MIN_LENGTH - cracklib.OTH_CREDIT)))
def test_simple_combinations(self):
testset = '#a' * (cracklib.MIN_LENGTH // 2)
for passwd in [testset[:i] for i in range(
cracklib.MIN_LENGTH - cracklib.LOW_CREDIT - cracklib.OTH_CREDIT)]:
- self.assertEquals(
+ self.assertEqual(
1, cracklib.simple(passwd),
'password {0} should be detected as too simple'.format(
passwd))
- self.assertEquals(0, cracklib.simple(
+ self.assertEqual(0, cracklib.simple(
testset[:(cracklib.MIN_LENGTH - cracklib.LOW_CREDIT -
cracklib.OTH_CREDIT)]))