diff options
Diffstat (limited to 'dev-ruby')
-rw-r--r-- | dev-ruby/Manifest.gz | bin | 108715 -> 108711 bytes | |||
-rw-r--r-- | dev-ruby/ruby-ldap/Manifest | 3 | ||||
-rw-r--r-- | dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r4.ebuild | 38 | ||||
-rw-r--r-- | dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r5.ebuild | 2 | ||||
-rw-r--r-- | dev-ruby/ruby-shadow/Manifest | 4 | ||||
-rw-r--r-- | dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32-taint.patch | 54 | ||||
-rw-r--r-- | dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32.patch | 31 | ||||
-rw-r--r-- | dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild | 16 |
8 files changed, 103 insertions, 45 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz Binary files differindex e7dd61ea8744..e984b60231ae 100644 --- a/dev-ruby/Manifest.gz +++ b/dev-ruby/Manifest.gz diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest index addfc976f790..c17d4e7bb03e 100644 --- a/dev-ruby/ruby-ldap/Manifest +++ b/dev-ruby/ruby-ldap/Manifest @@ -3,6 +3,5 @@ AUX ruby-ldap-0.9.20-ruby32.patch 794 BLAKE2B f55e9af5ac10131fa481a79d84b0e9b103 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 -EBUILD ruby-ldap-0.9.20-r5.ebuild 1054 BLAKE2B 069b9764875b2a458b8a6b808876a3694c1ce3f5acd1e14656a49f95a0b65632508627af1cf48f3c0e4a6e7cca7f036e355b7bc810b882bfedb4e5226f9c608d SHA512 c088d8e6e6773e402822672964c5ad384346801a8cce809b43a35366e330aad7b47360defa181332e0f40181a16a8689f901d42adf013163063ec584d42e8c3d +EBUILD ruby-ldap-0.9.20-r5.ebuild 1052 BLAKE2B 3087aa7b5e0c60ee20303b04e5d88aa65bd23afd508e3d8488a5d2a4507ccd2ccd5d0986b4f23ce67bfc826c3384ca8422792e689685236342e052edd5df903f SHA512 cda84dd5917a940a4ded2fa41e66a8302744824e5f09417ba4b6bad933b2d64dad2d891dd378faa7c02c5abe2b1630d22d8f197a28e7b377ea4c113556919088 MISC metadata.xml 394 BLAKE2B 65e22aa56253fa7572dd605f6a0f8e53b6cdd1dc4843df2782ac6b5b8a379facd546acc83bec32001992609532348dab8a4d5b5ad87fa6bad7a510c57de89601 SHA512 a40d822da59a87ff42fd7618f75d033c4acb3156cbd1e675a55073ae7b79390a1393a5604fc597c5bc2801ff594ed3f4605b89b69ec1ee69c536280887347203 diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r4.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r4.ebuild deleted file mode 100644 index 117ecd8ad824..000000000000 --- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -USE_RUBY="ruby26 ruby27 ruby30 ruby31" - -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 -) - -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 -} 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 index 9230db150bd6..d80d5bf26ec1 100644 --- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r5.ebuild +++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r5.ebuild @@ -14,7 +14,7 @@ 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" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="ssl" DEPEND=">=net-nds/openldap-2:= dev-libs/cyrus-sasl diff --git a/dev-ruby/ruby-shadow/Manifest b/dev-ruby/ruby-shadow/Manifest index 998306d50440..d380a2291d04 100644 --- a/dev-ruby/ruby-shadow/Manifest +++ b/dev-ruby/ruby-shadow/Manifest @@ -1,3 +1,5 @@ +AUX ruby-shadow-2.5.1-ruby32-taint.patch 2265 BLAKE2B 6fd9443e10f85578f22d17ae63728d19eec5b7823a147c3edcf7b3ddb4c9e1eb3adb6c4d78fd63e9914a695575bc29e7fd6929ca99d60a02a2fe7fa5d37a944a SHA512 6dc7211372537eb1f43f735c35e5241311b8b44b99cac1e3bd54fd0f74ceb5057cf519d3162a15224cad7851eb604e515978698a5b4466cabad15d13e757e3a1 +AUX ruby-shadow-2.5.1-ruby32.patch 1151 BLAKE2B 654a3776fdfdf9bfb5c3d431ac2709392483bc2f3f576c43855c458f1b69e224bff14975ffbb48c55866084b741beef7175738936ad06fe6dc770d91ce90cd1a SHA512 f56e3a94055b6c12ef3944662eaefd5f89193c6915a00820ee5ebe6ef9b6741a75b10465508af2f20939ea7b52a7e0f0710c83f320cfb9a7ea9434660dc717b4 DIST ruby-shadow-2.5.1.gem 11264 BLAKE2B 0371fbf8f01dd6907b26369c33e69bc11664282ce1005792cff70113b0a05bfe0ce0eddd15896a9c6bcc9de38671d73034414f354f34d2716fd4f9265d823cbf SHA512 401ba31f6f87b9b50597e3924c67ef9d0a8f566ea4649735caf59e2b706861babf9b3aa273b7c47ca1cc9c8b4fde79ab21d2e264cd7ba58041fe7b8f9fd87411 -EBUILD ruby-shadow-2.5.1.ebuild 520 BLAKE2B ec1f15c219e900dd105ceebec5665038da0c211f13655620ef53374d9da1b6cfd057eac0d66c45f1641e825cdcd6991458a3b92685b112dbe76bf47587637b9f SHA512 ef34e18fdf3a95a019824be29a67575305e030ef6cc485463a462be916b71f7cad901c1b2253e253a4560d4f3bf21b674f4a3f0ba20271ea7f22d4fc82d8126b +EBUILD ruby-shadow-2.5.1.ebuild 661 BLAKE2B e2e873361d1225067889323749b301560ce2b83a8af71418728d2760eaffa767b90dea4cabac695a78296a45c1e634e9d190f538804250d76cd8d348b4340d0c SHA512 b6c5f8155184e83ee85c3d698ea37dd029bf086f2968b6508b5ccd2cac399602c36c01677e6a471131638853bb5b4384f1c6517796b341feb6f78b6f43259efa MISC metadata.xml 348 BLAKE2B ea93f8284e10399b71c36f731411b2dd8dc21062add09b74199b8a0007270591e98f7a57c388cd54296cf2d34f450674336ee112c204ea476c401cc094b14ae2 SHA512 753e086ad25985267e80210e6bea514257e8b8c339b67aaafd1f6b444e4218aa72d7c176b2faf41cda705f1c6ce8ff162ed40c497092e65882c0790d690e9956 diff --git a/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32-taint.patch b/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32-taint.patch new file mode 100644 index 000000000000..4c66e63fbb1a --- /dev/null +++ b/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32-taint.patch @@ -0,0 +1,54 @@ +From 70330521b99e84c8f7445c213dfde0768f45a690 Mon Sep 17 00:00:00 2001 +From: Michael Hashizume <michael.hashizume@puppet.com> +Date: Thu, 20 Oct 2022 13:28:09 -0700 +Subject: [PATCH] Removes taint checking functions + +Taint checking has been completely removed from Ruby as of Ruby +3.2.0. This commit removes taint checking functions from ruby- +shadow. + +See https://bugs.ruby-lang.org/issues/16131 +--- + pwd/shadow.c | 6 +++--- + shadow/shadow.c | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/pwd/shadow.c b/pwd/shadow.c +index eeb96d4..46313d4 100644 +--- a/pwd/shadow.c ++++ b/pwd/shadow.c +@@ -56,8 +56,8 @@ static VALUE convert_pw_struct( struct passwd *entry ) + { + /* Hmm. Why custom pw_change instead of sp_lstchg? */ + return rb_struct_new(rb_sPasswdEntry, +- rb_tainted_str_new2(entry->pw_name), /* sp_namp */ +- rb_tainted_str_new2(entry->pw_passwd), /* sp_pwdp, encryped password */ ++ rb_str_new2(entry->pw_name), /* sp_namp */ ++ rb_str_new2(entry->pw_passwd), /* sp_pwdp, encryped password */ + Qnil, /* sp_lstchg, date when the password was last changed (in days since Jan 1, 1970) */ + Qnil, /* sp_min, days that password must stay same */ + Qnil, /* sp_max, days until password changes. */ +@@ -66,7 +66,7 @@ static VALUE convert_pw_struct( struct passwd *entry ) + INT2FIX(difftime(entry->pw_change, 0) / (24*60*60)), /* pw_change */ + INT2FIX(difftime(entry->pw_expire, 0) / (24*60*60)), /* sp_expire */ + Qnil, /* sp_flag */ +- rb_tainted_str_new2(entry->pw_class), /* sp_loginclass, user access class */ ++ rb_str_new2(entry->pw_class), /* sp_loginclass, user access class */ + NULL); + } + +diff --git a/shadow/shadow.c b/shadow/shadow.c +index 35a77a1..9a2ae70 100644 +--- a/shadow/shadow.c ++++ b/shadow/shadow.c +@@ -34,8 +34,8 @@ static VALUE rb_eFileLock; + static VALUE convert_pw_struct( struct spwd *entry ) + { + return rb_struct_new(rb_sPasswdEntry, +- rb_tainted_str_new2(entry->sp_namp), +- rb_tainted_str_new2(entry->sp_pwdp), ++ rb_str_new2(entry->sp_namp), ++ rb_str_new2(entry->sp_pwdp), + INT2FIX(entry->sp_lstchg), + INT2FIX(entry->sp_min), + INT2FIX(entry->sp_max), diff --git a/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32.patch b/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32.patch new file mode 100644 index 000000000000..3cbcf4b088b3 --- /dev/null +++ b/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32.patch @@ -0,0 +1,31 @@ +From eab4aba3f5e06ea8f124d3e5ff6b3fa88c4807cd Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Thu, 1 Dec 2022 12:23:05 +0900 +Subject: [PATCH] extconf.rb: use Rbconfig::CONFIG instead of mkmf CONFIG + +In mkmf.rb CONFIG is defined as CONFIG is defined as RbConfig::MAKEFILE_CONFIG +and RbConfig::MAKEFILE_CONFIG is almost same as RbConfig::CONFIG +except that RbConfig::MAKEFILE_CONFIG uses reference for other variables. + +Using CONFIG in extconf.rb causes error with ruby3.2 because now +CONFIG['host_os'] uses reference for target_os variable, and extconf.rb +expects that this variable is all expanded. So instead, use RbConfig::CONFIG . + +Closes #30 +--- + extconf.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extconf.rb b/extconf.rb +index d17f926..55dcff5 100644 +--- a/extconf.rb ++++ b/extconf.rb +@@ -14,7 +14,7 @@ + else; '' + end + +-implementation = case CONFIG['host_os'] ++implementation = case RbConfig::CONFIG['host_os'] + when /linux/i; 'shadow' + when /sunos|solaris/i; 'shadow' + when /freebsd|mirbsd|netbsd|openbsd/i; 'pwd' diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild index ef081802042c..a1d3d469c90a 100644 --- a/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild +++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby26 ruby27 ruby30 ruby31" +USE_RUBY="ruby31 ruby32" RUBY_FAKEGEM_TASK_TEST="" @@ -14,9 +14,19 @@ RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb) inherit ruby-fakegem DESCRIPTION="ruby shadow bindings" -HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net" +HOMEPAGE="https://github.com/apalmblad/ruby-shadow" LICENSE="|| ( public-domain Unlicense )" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86" IUSE="" + +PATCHES=( + "${FILESDIR}/${P}-ruby32.patch" + "${FILESDIR}/${P}-ruby32-taint.patch" +) + +all_ruby_prepare() { + sed -e '16i$CFLAGS += ENV["CFLAGS"]' \ + -i extconf.rb || die +} |