diff --git a/Gemfile b/Gemfile index 667c5d0f916e359ef9e88ff08db67fbcf6ef19e3..b2a34074bb619082870c4049576d2d8890c27d11 100644 --- a/Gemfile +++ b/Gemfile @@ -121,7 +121,7 @@ group :development, :production do # to not rely on cron+rake gem 'clockwork' # as interface to LDAP - gem 'ruby-ldap', require: false + gem 'ruby-ldap3', require: false # to have better logs gem 'lograge' end diff --git a/Gemfile.lock b/Gemfile.lock index cf10042f111b105ef344d516f1fe9dd060ed2884..1ca7b413dca6e345e345a1a569f02f4d92cf9c9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,7 +228,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) - json (2.6.3) + json (2.10.1) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -416,7 +416,7 @@ GEM rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) - ruby-ldap (0.9.20) + ruby-ldap3 (0.10.4) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -596,7 +596,7 @@ DEPENDENCIES rubocop-performance rubocop-rails rubocop-rspec - ruby-ldap + ruby-ldap3 sassc-rails selenium-webdriver shoulda-matchers diff --git a/obs-bundled-gems.spec b/obs-bundled-gems.spec index 2df25c59dfbb5fab33fa7dd61fd817c7e824fc91..1b8096220797f7c1773e2ae2bccbb2d164e3980e 100644 --- a/obs-bundled-gems.spec +++ b/obs-bundled-gems.spec @@ -20,7 +20,7 @@ %global ruby_version 3.2.0 Name: obs-bundled-gems Version: 2.10.15 -Release: 9 +Release: 10 Summary: The Open Build Service -- Bundled Gems License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -145,6 +145,9 @@ done %doc README %changelog +* Thu Feb 20 2025 wangkai <13474090681@163.com> - 2.10.15-10 +- Replace ruby-ldap with ruby-ldap3 to fix service failed + * Wed May 15 2024 Wenlong Zhang - 2.10.15-9 - add loongarch64 support for obs-bundled-gems diff --git a/verdor.obscpio b/verdor.obscpio index c70c6feb8e5ae6bf9e98e508039ffdd14ff11b34..519667eb834ce57d24733e55ba36d1d851e65af2 100644 Binary files a/verdor.obscpio and b/verdor.obscpio differ