gentoo auto-resync : 15:09:2023 - 16:50:39

5 files changed, 97 insertions, 2 deletions

diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index f076dcdb885b..addfc976f790 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1,5 +1,8 @@
 AUX ruby-ldap-0.9.20-clang16-fix.patch 368 BLAKE2B 30c359696d8db213b2fe9b6f4f32d8b6583b7141ecc95e56e97cb736eac31218da6d0298c5810b39bc4110b22c90cc04993f5de3f1f7908bf9291011b3ecb348 SHA512 67675d6f045be53aeee10eaa9635b9d92dd6819234da4561ce0bc89ed79bad8ac1382fa8553fdb666a92bf4ea0b26c15c8f7b81ccfdd574a6ad38627f35097ea
+AUX ruby-ldap-0.9.20-ruby32.patch 794 BLAKE2B f55e9af5ac10131fa481a79d84b0e9b1033498d13972938366a4a02e4f5d80d633ae504e3ac549e9f0961199da273403dd650b8fb1f180087b071e17d9ad5fc9 SHA512 e77ab48aa41b92cd30f3394d646cab675f65b8853f6e7e5f47aeffe2d7eae7aafadb37412a812966818cc73357f585282e57ed5a02788288c39424cacf5617c8
+AUX ruby-ldap-0.9.20-tainted.patch 757 BLAKE2B fa19d46b574be9c4727661af796cc20ecdb8fcf4a9e295dd22e4187a705fb40f93475de5e05aac39dfca9ba83145538abcd9e5663f733fdcc8c34c49e098dde1 SHA512 7c093d5f46974a54ef34ec7f203362aa3b9747f43629051a12133a99c9ca7a7d511c81d6764a69a213972c80a45fd595be55f72cb541121be233a3b8bd129427
 DIST ruby-ldap-0.9.20.gem 67072 BLAKE2B 626a35ab764dacfb37c727d867e1d435222730a3e7ea745ee4e7ec051ce3a822cc5a1230b463bc12f4a2390db667ed3b61deceb9842c014f64cdf43a26d285f9 SHA512 4f4902e7eaf4fe0cd421d58c73ce4e625d61ee20ef02363d3cf5754c66237e0f378ac433b234c2b86d5f5284ae03b7ae6c46d3575c512487bc1a931d021c9517
 EBUILD ruby-ldap-0.9.20-r3.ebuild 924 BLAKE2B 2d1d6de133628c3be046ae146f8a3d43a43d0df3c560558b1780d85a686d8c949948e6ce19d95533207143daed0a4435008f5189834bfa81ee5c0d4b195b9b98 SHA512 abbb5b84f7e6ba20ff06999f996c2230f7971624f4923229db59c173a2808a029bbe38be7d5dea1f393f7ea00e61c7b0d04832c12fe44045f9ae6e290a43faf5
 EBUILD ruby-ldap-0.9.20-r4.ebuild 985 BLAKE2B aee2235f42612113704fec3b917fdb79cbb89d993e2d1e22bd1dff9c74391799ac620ae1a98c7780c7623ac253b3fc204e5c9045a096b522881b6ee3720446ac SHA512 62c82db2a3d7efdb74149a43eb26b649b355306f0593184bb5d765e4f234d35702d486ce1dc13418d2a9689daee1d1c85b5c49931684e55fbc99e4738283acaf
-MISC metadata.xml 391 BLAKE2B c7512c86b40f4a8cd418e12633883da21a0ad0d9de73d05307f5f2b0fc2aca31b9835cd709f5f0a52b487cf7197253a3a2b579d38ff44c91ae50d8469ac3716c SHA512 763bd735ebffb233f9a66e77754de2092c868585565a2c0e770f9e8909d0bf7e3bc312658f6d6d0f124e93c45e06ea9bbd864137ad5d7a1e3979f56e24713180
+EBUILD ruby-ldap-0.9.20-r5.ebuild 1054 BLAKE2B 069b9764875b2a458b8a6b808876a3694c1ce3f5acd1e14656a49f95a0b65632508627af1cf48f3c0e4a6e7cca7f036e355b7bc810b882bfedb4e5226f9c608d SHA512 c088d8e6e6773e402822672964c5ad384346801a8cce809b43a35366e330aad7b47360defa181332e0f40181a16a8689f901d42adf013163063ec584d42e8c3d
+MISC metadata.xml 394 BLAKE2B 65e22aa56253fa7572dd605f6a0f8e53b6cdd1dc4843df2782ac6b5b8a379facd546acc83bec32001992609532348dab8a4d5b5ad87fa6bad7a510c57de89601 SHA512 a40d822da59a87ff42fd7618f75d033c4acb3156cbd1e675a55073ae7b79390a1393a5604fc597c5bc2801ff594ed3f4605b89b69ec1ee69c536280887347203
diff --git a/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-ruby32.patch b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-ruby32.patch
new file mode 100644
index 000000000000..b7b101db2f30
--- /dev/null
+++ b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-ruby32.patch
@@ -0,0 +1,24 @@
+From aa43040eb6b6d591e42a19ee385fc1ba17c7202b Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Tue, 27 Dec 2022 17:19:45 -0800
+Subject: [PATCH] Don't use rb_cData
+
+This fixes ruby-ldap on Ruby 3.2+
+---
+ conn.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/conn.c b/conn.c
+index e628695..39eeb5f 100644
+--- a/conn.c
++++ b/conn.c
+@@ -1855,7 +1855,8 @@ Init_ldap_conn ()
+ {
+   rb_ldap_sort_obj = Qnil;
+ 
+-  rb_cLDAP_Conn = rb_define_class_under (rb_mLDAP, "Conn", rb_cData);
++  rb_cLDAP_Conn = rb_define_class_under (rb_mLDAP, "Conn", rb_cObject);
++  rb_undef_alloc_func(rb_cLDAP_Conn);
+   rb_define_attr (rb_cLDAP_Conn, "referrals", 1, 0);
+   rb_define_attr (rb_cLDAP_Conn, "controls", 1, 0);
+   rb_define_attr (rb_cLDAP_Conn, "sasl_quiet", 1, 1);
diff --git a/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-tainted.patch b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-tainted.patch
new file mode 100644
index 000000000000..84c9ee29610d
--- /dev/null
+++ b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-tainted.patch
@@ -0,0 +1,28 @@
+From 849ca6bb46bf4826d51648feddd453142281e541 Mon Sep 17 00:00:00 2001
+From: Hisashi MINAMINO <minamino@iij.ad.jp>
+Date: Thu, 28 May 2020 14:04:05 +0900
+Subject: [PATCH] for ruby-2.7
+
+---
+ rbldap.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/rbldap.h b/rbldap.h
+index 1fa04e1..b7b1765 100644
+--- a/rbldap.h
++++ b/rbldap.h
+@@ -205,3 +205,14 @@ VALUE rb_ldap_mod_vals (VALUE);
+         rb_define_method(rb_cLDAP_Mod,method,cfunc,argc)
+ 
+ #endif
++
++#if RUBY_VERSION_CODE >= 270
++# if defined rb_tainted_str_new
++#  undef rb_tainted_str_new
++# endif
++# if defined rb_tainted_str_new2
++#  undef rb_tainted_str_new2
++# endif
++# define rb_tainted_str_new(p,l)	rb_str_new((p),(l))
++# define rb_tainted_str_new2(p)		rb_str_new_cstr((p))
++#endif
diff --git a/dev-ruby/ruby-ldap/metadata.xml b/dev-ruby/ruby-ldap/metadata.xml
index 99b7b414bd44..8ae599f79692 100644
--- a/dev-ruby/ruby-ldap/metadata.xml
+++ b/dev-ruby/ruby-ldap/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ruby-activeldap</remote-id>
-		<remote-id type="sourceforge">ruby-ldap</remote-id>
+		<remote-id type="github">bearded/ruby-ldap</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r5.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r5.ebuild
new file mode 100644
index 000000000000..9230db150bd6
--- /dev/null
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
+
+DESCRIPTION="A Ruby interface to some LDAP libraries"
+HOMEPAGE="https://github.com/bearded/ruby-ldap"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="ssl"
+DEPEND=">=net-nds/openldap-2:=
+	dev-libs/cyrus-sasl
+	ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+# Current test set is interactive due to certificate generation and requires
+# running LDAP daemon
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.20-clang16-fix.patch
+	"${FILESDIR}"/${PN}-0.9.20-ruby32.patch
+	"${FILESDIR}"/${PN}-0.9.20-tainted.patch
+)
+
+each_ruby_configure() {
+	local myconf="--with-openldap2"
+	if ! use ssl ; then
+		myconf="${myconf} --without-libcrypto --without-libssl"
+	fi
+	RUBY_FAKEGEM_EXTENSION_OPTIONS=${myconf} each_fakegem_configure
+}