| 1 |
commit: 9a48f929d360f6e61e305898850339774b7fe663 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 14 02:50:48 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 02:51:49 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a48f929 |
| 7 |
|
| 8 |
dev-python/python-ldap: add 3.4.0_p20220420 |
| 9 |
|
| 10 |
Snapshot because a bunch of commits were needed to fix OpenLDAP 2.6+ |
| 11 |
compat and then there were some serious bugfixes too. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/835637 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-python/python-ldap/Manifest | 1 + |
| 17 |
dev-python/python-ldap/python-ldap-3.4.0-r1.ebuild | 2 +- |
| 18 |
...999.ebuild => python-ldap-3.4.0_p20220420.ebuild} | 20 ++++++++++++++------ |
| 19 |
dev-python/python-ldap/python-ldap-9999.ebuild | 8 ++++---- |
| 20 |
4 files changed, 20 insertions(+), 11 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest |
| 23 |
index 99a3c3c496f9..86ce9bf4aa32 100644 |
| 24 |
--- a/dev-python/python-ldap/Manifest |
| 25 |
+++ b/dev-python/python-ldap/Manifest |
| 26 |
@@ -1 +1,2 @@ |
| 27 |
DIST python-ldap-3.4.0.tar.gz 376169 BLAKE2B f514ddb6267fd8c21a1c4595669921a1256a8087a3a272b3751636313e7d79de9d34f4213aa57128679dc5a93db4ef7a71f7f92894a1802deb8c2ca9dfd92fe2 SHA512 d10c10f1d416a0f67e7669c6c0b5460a3484bc31f4af471d581a9207689e5687c08d1ad78ba8d47e0ce0c35d24d79e4b848b4c503534f211a36c1b882bee3605 |
| 28 |
+DIST python-ldap-3.4.0_p20220420.tar.gz 377780 BLAKE2B 433178138587dc09bfe1e6a8e894c001baf6e07c76266ca9d7c56b279f9e9ca5a642528a5869a837a9ee5576a2cf17afdeea313b4a8bc930926397738d6a5daf SHA512 0dfe8ff4737a630a08c7cd4d94f30c78fd1e0558ffc0609439d95ef064b72aef9d4ec4cdc0d40aaf1fc46396bdc0cbbdf0bf3cf6bb5e94bf8a9e3083b9ba1bf4 |
| 29 |
|
| 30 |
diff --git a/dev-python/python-ldap/python-ldap-3.4.0-r1.ebuild b/dev-python/python-ldap/python-ldap-3.4.0-r1.ebuild |
| 31 |
index 51eca9aab9f6..5c1563d0eb7e 100644 |
| 32 |
--- a/dev-python/python-ldap/python-ldap-3.4.0-r1.ebuild |
| 33 |
+++ b/dev-python/python-ldap/python-ldap-3.4.0-r1.ebuild |
| 34 |
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then |
| 35 |
inherit git-r3 |
| 36 |
else |
| 37 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 38 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" |
| 39 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-solaris" |
| 40 |
fi |
| 41 |
|
| 42 |
LICENSE="MIT PSF-2" |
| 43 |
|
| 44 |
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild |
| 45 |
similarity index 73% |
| 46 |
copy from dev-python/python-ldap/python-ldap-9999.ebuild |
| 47 |
copy to dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild |
| 48 |
index a01b853838d7..488fa3e27563 100644 |
| 49 |
--- a/dev-python/python-ldap/python-ldap-9999.ebuild |
| 50 |
+++ b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild |
| 51 |
@@ -2,8 +2,9 @@ |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
|
| 54 |
EAPI=8 |
| 55 |
-PYTHON_COMPAT=( pypy3 python3_{7..10} ) |
| 56 |
|
| 57 |
+DISTUTILS_USE_PEP517=setuptools |
| 58 |
+PYTHON_COMPAT=( pypy3 python3_{8..11} ) |
| 59 |
inherit distutils-r1 |
| 60 |
|
| 61 |
DESCRIPTION="Various LDAP-related Python modules" |
| 62 |
@@ -14,24 +15,31 @@ if [[ ${PV} == *9999* ]]; then |
| 63 |
EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git" |
| 64 |
inherit git-r3 |
| 65 |
else |
| 66 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 67 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" |
| 68 |
+ # Snapshot for various new OpenLDAP fixes, bug #835637 |
| 69 |
+ # (There were a bunch of followup commits and general other |
| 70 |
+ # serious bugfixes we want.) |
| 71 |
+ MY_COMMIT="7f30c4721ea2ca4373ed7860e6467781f0afa758" |
| 72 |
+ |
| 73 |
+ #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 74 |
+ SRC_URI="https://github.com/python-ldap/python-ldap/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" |
| 75 |
+ S="${WORKDIR}"/${PN}-${MY_COMMIT} |
| 76 |
+ |
| 77 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-solaris" |
| 78 |
fi |
| 79 |
|
| 80 |
LICENSE="MIT PSF-2" |
| 81 |
SLOT="0" |
| 82 |
IUSE="examples sasl ssl" |
| 83 |
|
| 84 |
-# < dep on openldap for bug #835637, ldap_r is gone |
| 85 |
RDEPEND=" |
| 86 |
>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}] |
| 87 |
>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}] |
| 88 |
- <net-nds/openldap-2.6:=[sasl?,ssl?] |
| 89 |
+ net-nds/openldap:=[sasl?,ssl?] |
| 90 |
" |
| 91 |
# We do not link against cyrus-sasl but we use some |
| 92 |
# of its headers during the build. |
| 93 |
DEPEND=" |
| 94 |
- <net-nds/openldap-2.6:=[sasl?,ssl?] |
| 95 |
+ net-nds/openldap:=[sasl?,ssl?] |
| 96 |
sasl? ( >=dev-libs/cyrus-sasl-2.1 ) |
| 97 |
" |
| 98 |
|
| 99 |
|
| 100 |
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild |
| 101 |
index a01b853838d7..6bcb8bc92611 100644 |
| 102 |
--- a/dev-python/python-ldap/python-ldap-9999.ebuild |
| 103 |
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild |
| 104 |
@@ -2,8 +2,9 @@ |
| 105 |
# Distributed under the terms of the GNU General Public License v2 |
| 106 |
|
| 107 |
EAPI=8 |
| 108 |
-PYTHON_COMPAT=( pypy3 python3_{7..10} ) |
| 109 |
|
| 110 |
+DISTUTILS_USE_PEP517=setuptools |
| 111 |
+PYTHON_COMPAT=( pypy3 python3_{8..11} ) |
| 112 |
inherit distutils-r1 |
| 113 |
|
| 114 |
DESCRIPTION="Various LDAP-related Python modules" |
| 115 |
@@ -22,16 +23,15 @@ LICENSE="MIT PSF-2" |
| 116 |
SLOT="0" |
| 117 |
IUSE="examples sasl ssl" |
| 118 |
|
| 119 |
-# < dep on openldap for bug #835637, ldap_r is gone |
| 120 |
RDEPEND=" |
| 121 |
>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}] |
| 122 |
>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}] |
| 123 |
- <net-nds/openldap-2.6:=[sasl?,ssl?] |
| 124 |
+ net-nds/openldap:=[sasl?,ssl?] |
| 125 |
" |
| 126 |
# We do not link against cyrus-sasl but we use some |
| 127 |
# of its headers during the build. |
| 128 |
DEPEND=" |
| 129 |
- <net-nds/openldap-2.6:=[sasl?,ssl?] |
| 130 |
+ net-nds/openldap:=[sasl?,ssl?] |
| 131 |
sasl? ( >=dev-libs/cyrus-sasl-2.1 ) |
| 132 |
" |
Archives