From f0926dd69945172313de762e2364a56f1f452257 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 4 May 2020 09:37:14 +0200 Subject: [PATCH 01/26] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 74cd3406c23b222d6b43d1a9609a12a3f2c2406e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 07:03:15 +0000 Subject: [PATCH 02/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index dc44cb3..6a4d922 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -83,6 +83,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.5.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 30 2020 Fedora Release Engineering - 2.5.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 066d75062b404b548971737391e6c9673e309cca Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 17:47:44 +0000 Subject: [PATCH 03/26] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 9b3dc8c8fc2b6dc74e65202e33c2ddc53703c250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 6 Jan 2021 21:57:01 +0100 Subject: [PATCH 04/26] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.0 --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 6a4d922..c0c54d3 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -83,6 +83,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Wed Jan 6 2021 Vít Ondruch - 2.5.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.0 + * Wed Jul 29 2020 Fedora Release Engineering - 2.5.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From d89d9dbfc9016b20f06a357973d57c57dc34f97d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 16:28:37 +0000 Subject: [PATCH 05/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index c0c54d3..94e0e30 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -83,6 +83,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.5.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 6 2021 Vít Ondruch - 2.5.0-14 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.0 From 145affc1d654fa6151cc3ce8abc1d9eff6ce374c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 12:39:51 +0000 Subject: [PATCH 06/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 94e0e30..d7d6ae3 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -83,6 +83,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.5.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 2.5.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a057df864ec2c2f4b547564956be1ebf61eb3429 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 19:13:22 +0000 Subject: [PATCH 07/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index d7d6ae3..14ce7f8 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -83,6 +83,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2.5.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.5.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 0a287e6d028f7134aa3353382f0f361d3aaab280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 26 Jan 2022 20:56:28 +0100 Subject: [PATCH 08/26] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.1 --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 14ce7f8..dae5813 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -83,6 +83,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Wed Jan 26 2022 Vít Ondruch - 2.5.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.1 + * Fri Jan 21 2022 Fedora Release Engineering - 2.5.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 2164ed318ae0188d940ec4d180b7510d5641961b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 02:15:25 +0000 Subject: [PATCH 09/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index dae5813..cd28aaa 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -83,6 +83,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.5.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 26 2022 Vít Ondruch - 2.5.0-18 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.1 From d1919849e78a7832f5197ebd121e86e37a6e3030 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Dec 2022 11:38:00 +0900 Subject: [PATCH 10/26] 2.5.1 --- .gitignore | 2 +- ruby-shadow-2.5.0-cflags.patch | 16 ---------------- ruby-shadow-2.5.1-cflags.patch | 11 +++++++++++ rubygem-ruby-shadow.spec | 11 +++++++---- sources | 2 +- 5 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 ruby-shadow-2.5.0-cflags.patch create mode 100644 ruby-shadow-2.5.1-cflags.patch diff --git a/.gitignore b/.gitignore index 2340ee4..08ccffa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/ruby-shadow-2.5.0.gem +/ruby-shadow-*.gem diff --git a/ruby-shadow-2.5.0-cflags.patch b/ruby-shadow-2.5.0-cflags.patch deleted file mode 100644 index 7f74b84..0000000 --- a/ruby-shadow-2.5.0-cflags.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- extconf.rb~ 2017-10-05 20:21:59.480315863 +0200 -+++ extconf.rb 2017-10-05 20:23:55.077931560 +0200 -@@ -6,12 +6,7 @@ - - require 'mkmf' - require 'rbconfig' -- --$CFLAGS = case RUBY_VERSION -- when /^1\.9/; '-DRUBY19' -- when /^2\./; '-DRUBY19' -- else; '' -- end -+$CFLAGS = "#{$CFLAGS} -DRUBY19" - - implementation = case CONFIG['host_os'] - when /linux/i; 'shadow' diff --git a/ruby-shadow-2.5.1-cflags.patch b/ruby-shadow-2.5.1-cflags.patch new file mode 100644 index 0000000..9c50d78 --- /dev/null +++ b/ruby-shadow-2.5.1-cflags.patch @@ -0,0 +1,11 @@ +--- ruby-shadow-2.5.1/extconf.rb.orig 2022-11-30 15:03:24.946310154 +0900 ++++ ruby-shadow-2.5.1/extconf.rb 2022-11-30 15:04:27.984276887 +0900 +@@ -7,7 +7,7 @@ + require 'mkmf' + require 'rbconfig' + +-$CFLAGS = case RUBY_VERSION ++$CFLAGS = "#{$CFLAGS} " + case RUBY_VERSION + when /^1\.9/; '-DRUBY19' + when /^2\./; '-DRUBY19' + when /^3\./; '-DRUBY19' diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index cd28aaa..976e6f8 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -1,14 +1,14 @@ %global gem_name ruby-shadow Name: rubygem-%{gem_name} -Version: 2.5.0 -Release: 19%{?dist} +Version: 2.5.1 +Release: 1%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: https://raw.githubusercontent.com/apalmblad/ruby-shadow/master/test/basic_test.rb -Patch0: ruby-shadow-2.5.0-cflags.patch +Patch0: ruby-shadow-2.5.1-cflags.patch BuildRequires: gcc BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -32,7 +32,7 @@ Documentation for %{name}. gem unpack %{SOURCE0} %setup -q -D -T -n %{gem_name}-%{version} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -%patch0 -p0 +%patch0 -p1 cp %{SOURCE1} . %build @@ -83,6 +83,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Thu Dec 1 2022 Mamoru TASAKA - 2.5.1-1 +- 2.5.1 + * Sat Jul 23 2022 Fedora Release Engineering - 2.5.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 9d8b6db..ca6544d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruby-shadow-2.5.0.gem) = 1abd54df1bd4f29e135093df9b22886a726824f8b72b742017fd31bdc3fa39e3d79410a747cf2ebe4117f75e665fb89c904375b5c44a674bec91a4cc37646520 +SHA512 (ruby-shadow-2.5.1.gem) = 401ba31f6f87b9b50597e3924c67ef9d0a8f566ea4649735caf59e2b706861babf9b3aa273b7c47ca1cc9c8b4fde79ab21d2e264cd7ba58041fe7b8f9fd87411 From ee2720c2122f3a0429843c2682df64e218fbe802 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Dec 2022 13:31:20 +0900 Subject: [PATCH 11/26] Backport upstream pull request for ruby3.2 build issue Add -Werror=implicit-function explicitly to detect such function --- ruby-shadow-2.5.1-cflags.patch | 2 +- ruby-shadow-2.5.1-extconf-ruby32-fix.patch | 29 ++++++++ ...dow-2.5.1-taintedness-ruby32-removal.patch | 72 +++++++++++++++++++ rubygem-ruby-shadow.spec | 16 ++++- 4 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 ruby-shadow-2.5.1-extconf-ruby32-fix.patch create mode 100644 ruby-shadow-2.5.1-taintedness-ruby32-removal.patch diff --git a/ruby-shadow-2.5.1-cflags.patch b/ruby-shadow-2.5.1-cflags.patch index 9c50d78..830334d 100644 --- a/ruby-shadow-2.5.1-cflags.patch +++ b/ruby-shadow-2.5.1-cflags.patch @@ -8,4 +8,4 @@ +$CFLAGS = "#{$CFLAGS} " + case RUBY_VERSION when /^1\.9/; '-DRUBY19' when /^2\./; '-DRUBY19' - when /^3\./; '-DRUBY19' + when /^3\./; '-DRUBY19 -DRUBY30' diff --git a/ruby-shadow-2.5.1-extconf-ruby32-fix.patch b/ruby-shadow-2.5.1-extconf-ruby32-fix.patch new file mode 100644 index 0000000..73cf451 --- /dev/null +++ b/ruby-shadow-2.5.1-extconf-ruby32-fix.patch @@ -0,0 +1,29 @@ +commit eab4aba3f5e06ea8f124d3e5ff6b3fa88c4807cd +Author: Mamoru TASAKA +Date: Thu Dec 1 12:23:05 2022 +0900 + + 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 + +diff --git a/extconf.rb b/extconf.rb +index d17f926..55dcff5 100644 +--- a/extconf.rb ++++ b/extconf.rb +@@ -14,7 +14,7 @@ $CFLAGS = case RUBY_VERSION + 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/ruby-shadow-2.5.1-taintedness-ruby32-removal.patch b/ruby-shadow-2.5.1-taintedness-ruby32-removal.patch new file mode 100644 index 0000000..1a9b09e --- /dev/null +++ b/ruby-shadow-2.5.1-taintedness-ruby32-removal.patch @@ -0,0 +1,72 @@ +commit 7b450355b540df43bab2617fe25437dc3dde12af +Author: Mamoru TASAKA +Date: Thu Dec 1 12:54:31 2022 +0900 + + Replace taintedness function with generic one + + Taintedness is deprecated from ruby 2.7.0 and is removed on ruby3.2.0preview3. + To keep compatibility with ruby older than 2.7, introduce -DRUBY30 compilation + flag from ruby3.0 and onwards, and replace taintedness function with generic one + when RUBY30 is defined (i.e. from ruby3.0 and onwards) + +diff --git a/extconf.rb b/extconf.rb +index d17f926..04f8f97 100644 +--- a/extconf.rb ++++ b/extconf.rb +@@ -10,7 +10,7 @@ require 'rbconfig' + $CFLAGS = case RUBY_VERSION + when /^1\.9/; '-DRUBY19' + when /^2\./; '-DRUBY19' +- when /^3\./; '-DRUBY19' ++ when /^3\./; '-DRUBY19 -DRUBY30' + else; '' + end + +diff --git a/pwd/shadow.c b/pwd/shadow.c +index eeb96d4..e73e0db 100644 +--- a/pwd/shadow.c ++++ b/pwd/shadow.c +@@ -56,8 +56,13 @@ static VALUE convert_pw_struct( struct passwd *entry ) + { + /* Hmm. Why custom pw_change instead of sp_lstchg? */ + return rb_struct_new(rb_sPasswdEntry, ++#if defined(RUBY30) ++ rb_str_new2(entry->pw_name), /* sp_namp */ ++ rb_str_new2(entry->pw_passwd), /* sp_pwdp, encryped password */ ++#else + rb_tainted_str_new2(entry->pw_name), /* sp_namp */ + rb_tainted_str_new2(entry->pw_passwd), /* sp_pwdp, encryped password */ ++#endif + 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 +71,11 @@ 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 */ ++#if defined(RUBY30) ++ rb_str_new2(entry->pw_class), /* sp_loginclass, user access class */ ++#else + rb_tainted_str_new2(entry->pw_class), /* sp_loginclass, user access class */ ++#endif + NULL); + } + +diff --git a/shadow/shadow.c b/shadow/shadow.c +index 35a77a1..5202ce5 100644 +--- a/shadow/shadow.c ++++ b/shadow/shadow.c +@@ -34,8 +34,13 @@ static VALUE rb_eFileLock; + static VALUE convert_pw_struct( struct spwd *entry ) + { + return rb_struct_new(rb_sPasswdEntry, ++#if defined(RUBY30) ++ rb_str_new2(entry->sp_namp), ++ rb_str_new2(entry->sp_pwdp), ++#else + rb_tainted_str_new2(entry->sp_namp), + rb_tainted_str_new2(entry->sp_pwdp), ++#endif + INT2FIX(entry->sp_lstchg), + INT2FIX(entry->sp_min), + INT2FIX(entry->sp_max), diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 976e6f8..27a3ac3 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,13 +2,19 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: https://raw.githubusercontent.com/apalmblad/ruby-shadow/master/test/basic_test.rb Patch0: ruby-shadow-2.5.1-cflags.patch +# https://github.com/apalmblad/ruby-shadow/pull/29 +# Ruby3.2 completely removes taintedness function +Patch1: ruby-shadow-2.5.1-taintedness-ruby32-removal.patch +# https://github.com/apalmblad/ruby-shadow/pull/31 +# Ruby3.2 mkmf CONFIG uses reference for other variables yet more +Patch2: ruby-shadow-2.5.1-extconf-ruby32-fix.patch BuildRequires: gcc BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -32,11 +38,13 @@ Documentation for %{name}. gem unpack %{SOURCE0} %setup -q -D -T -n %{gem_name}-%{version} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%patch1 -p1 +%patch2 -p1 %patch0 -p1 cp %{SOURCE1} . %build -export CONFIGURE_ARGS="--with-cflags='%{optflags}'" +export CONFIGURE_ARGS="--with-cflags='%{optflags} -Werror=implicit-function-declaration'" gem build %{gem_name}.gemspec # %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir @@ -83,6 +91,10 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Thu Dec 1 2022 Mamoru TASAKA - 2.5.1-2 +- Backport upstream pull request for ruby3.2 build issue +- Add -Werror=implicit-function explicitly to detect such function + * Thu Dec 1 2022 Mamoru TASAKA - 2.5.1-1 - 2.5.1 From 4c80d55c428f612fc8b11f1ce77da1ad2d55840b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Dec 2022 13:47:16 +0900 Subject: [PATCH 12/26] change to modern geminstall method --- rubygem-ruby-shadow.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 27a3ac3..bb7008f 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -35,9 +35,7 @@ BuildArch: noarch Documentation for %{name}. %prep -gem unpack %{SOURCE0} -%setup -q -D -T -n %{gem_name}-%{version} -gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%setup -q -n %{gem_name}-%{version} %patch1 -p1 %patch2 -p1 %patch0 -p1 @@ -45,7 +43,7 @@ cp %{SOURCE1} . %build export CONFIGURE_ARGS="--with-cflags='%{optflags} -Werror=implicit-function-declaration'" -gem build %{gem_name}.gemspec +gem build ../%{gem_name}-%{version}.gemspec # %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir # by default, so that we can move it into the buildroot in %%install From 5843fa735b5c5a2551ed996eec0eee5a65aff11d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 4 Jan 2023 10:28:37 +0900 Subject: [PATCH 13/26] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index bb7008f..f96cf9d 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -89,6 +89,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Wed Jan 04 2023 Mamoru TASAKA - 2.5.1-3 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 + * Thu Dec 1 2022 Mamoru TASAKA - 2.5.1-2 - Backport upstream pull request for ruby3.2 build issue - Add -Werror=implicit-function explicitly to detect such function From 2f0c75211e7c758f1ff7e318ec83a03e7c8575c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 21:06:43 +0000 Subject: [PATCH 14/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index f96cf9d..d16bcf2 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -89,6 +89,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 2.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 04 2023 Mamoru TASAKA - 2.5.1-3 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 From 2c2fbed8122d96182515cef77bc96fd548c6015a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 18:22:36 +0000 Subject: [PATCH 15/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index d16bcf2..bc2fd9a 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -89,6 +89,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 2.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 2.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 73d09480eb09ca1716a9f32b57c35fe3cbf51e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 3 Jan 2024 15:33:42 +0100 Subject: [PATCH 16/26] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.3 --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index bc2fd9a..14cfdff 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -89,6 +89,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Wed Jan 03 2024 Vít Ondruch - 2.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.3 + * Fri Jul 21 2023 Fedora Release Engineering - 2.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 798464bec36c9c532dbc08d4bba683a2dd36269f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:28:32 +0000 Subject: [PATCH 17/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 14cfdff..37d3267 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -89,6 +89,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 2.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 03 2024 Vít Ondruch - 2.5.1-6 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.3 From 46d7ffc9ee00ca7e2316d4970363eef7c03bc3f0 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 18/26] Eliminate use of obsolete %patchN syntax (#2283636) --- rubygem-ruby-shadow.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 37d3267..dfc01d1 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -36,9 +36,9 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P0 -p1 cp %{SOURCE1} . %build From a08979ab403366d9677b5f7a4fc7092a9cb2ee1c Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Mon, 1 Jul 2024 10:42:50 +0200 Subject: [PATCH 19/26] Use autosetup macro --- rubygem-ruby-shadow.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index dfc01d1..831cd0b 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,19 +2,19 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: https://raw.githubusercontent.com/apalmblad/ruby-shadow/master/test/basic_test.rb -Patch0: ruby-shadow-2.5.1-cflags.patch # https://github.com/apalmblad/ruby-shadow/pull/29 # Ruby3.2 completely removes taintedness function -Patch1: ruby-shadow-2.5.1-taintedness-ruby32-removal.patch +Patch0: ruby-shadow-2.5.1-taintedness-ruby32-removal.patch # https://github.com/apalmblad/ruby-shadow/pull/31 # Ruby3.2 mkmf CONFIG uses reference for other variables yet more -Patch2: ruby-shadow-2.5.1-extconf-ruby32-fix.patch +Patch1: ruby-shadow-2.5.1-extconf-ruby32-fix.patch +Patch2: ruby-shadow-2.5.1-cflags.patch BuildRequires: gcc BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -35,10 +35,7 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P0 -p1 +%autosetup -p1 -n %{gem_name}-%{version} cp %{SOURCE1} . %build @@ -89,6 +86,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Mon Jul 01 2024 Terje Rosten - 2.5.0-8 +- Use autosetup macro + * Fri Jan 26 2024 Fedora Release Engineering - 2.5.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4389bc63f758be6a24da56e041935c569b2f230d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:56:57 +0000 Subject: [PATCH 20/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 831cd0b..346f6ca 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Ruby shadow password module License: Public Domain URL: https://github.com/apalmblad/ruby-shadow @@ -86,6 +86,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2.5.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 01 2024 Terje Rosten - 2.5.0-8 - Use autosetup macro From 61458bff39404da8d16facad5f31d6f32c457ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 21 Oct 2024 14:27:48 +0000 Subject: [PATCH 21/26] Migrate to SPDX license For the analysis see https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/674 This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- rubygem-ruby-shadow.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 346f6ca..482a1b9 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 Release: 9%{?dist} Summary: Ruby shadow password module -License: Public Domain +License: LicenseRef-Fedora-UltraPermissive OR Unlicense URL: https://github.com/apalmblad/ruby-shadow Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: https://raw.githubusercontent.com/apalmblad/ruby-shadow/master/test/basic_test.rb From fa13bebe8fe091204d7202a2d80b91700e7c7419 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 16:46:10 +0900 Subject: [PATCH 22/26] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 482a1b9..5576e1f 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Ruby shadow password module License: LicenseRef-Fedora-UltraPermissive OR Unlicense URL: https://github.com/apalmblad/ruby-shadow @@ -86,6 +86,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Wed Jan 08 2025 Mamoru TASAKA - 2.5.1-10 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Fri Jul 19 2024 Fedora Release Engineering - 2.5.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a0734ffbccd773f7c40f7b95fbd95d62c3f950fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:59:58 +0000 Subject: [PATCH 23/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 5576e1f..9f64452 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Ruby shadow password module License: LicenseRef-Fedora-UltraPermissive OR Unlicense URL: https://github.com/apalmblad/ruby-shadow @@ -86,6 +86,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2.5.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 08 2025 Mamoru TASAKA - 2.5.1-10 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 From da888ebfd0dec324db1d9617f7f0b29abe6ae547 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:46:46 +0000 Subject: [PATCH 24/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 9f64452..3931ad7 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Ruby shadow password module License: LicenseRef-Fedora-UltraPermissive OR Unlicense URL: https://github.com/apalmblad/ruby-shadow @@ -86,6 +86,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.5.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 2.5.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9a38d4fa8fc42340b681cd0c53e58099be361034 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 8 Nov 2025 23:52:12 +0900 Subject: [PATCH 25/26] Adjust patches for ruby4_0 --- ruby-shadow-2.5.1-cflags.patch | 2 +- ruby-shadow-2.5.1-taintedness-ruby32-removal.patch | 2 +- rubygem-ruby-shadow.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ruby-shadow-2.5.1-cflags.patch b/ruby-shadow-2.5.1-cflags.patch index 830334d..6c0a474 100644 --- a/ruby-shadow-2.5.1-cflags.patch +++ b/ruby-shadow-2.5.1-cflags.patch @@ -8,4 +8,4 @@ +$CFLAGS = "#{$CFLAGS} " + case RUBY_VERSION when /^1\.9/; '-DRUBY19' when /^2\./; '-DRUBY19' - when /^3\./; '-DRUBY19 -DRUBY30' + when /^[34]\./; '-DRUBY19 -DRUBY30' diff --git a/ruby-shadow-2.5.1-taintedness-ruby32-removal.patch b/ruby-shadow-2.5.1-taintedness-ruby32-removal.patch index 1a9b09e..737f08b 100644 --- a/ruby-shadow-2.5.1-taintedness-ruby32-removal.patch +++ b/ruby-shadow-2.5.1-taintedness-ruby32-removal.patch @@ -18,7 +18,7 @@ index d17f926..04f8f97 100644 when /^1\.9/; '-DRUBY19' when /^2\./; '-DRUBY19' - when /^3\./; '-DRUBY19' -+ when /^3\./; '-DRUBY19 -DRUBY30' ++ when /^[34]\./; '-DRUBY19 -DRUBY30' else; '' end diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index 3931ad7..b84dfec 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Ruby shadow password module License: LicenseRef-Fedora-UltraPermissive OR Unlicense URL: https://github.com/apalmblad/ruby-shadow @@ -86,6 +86,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Sat Nov 08 2025 Mamoru TASAKA - 2.5.1-13 +- Adjust patches for ruby4_0 + * Fri Jul 25 2025 Fedora Release Engineering - 2.5.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 682f6ca7044970f781dc2e916783411824c76c6d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Jan 2026 00:48:58 +0900 Subject: [PATCH 26/26] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- rubygem-ruby-shadow.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-ruby-shadow.spec b/rubygem-ruby-shadow.spec index b84dfec..4d9b04a 100644 --- a/rubygem-ruby-shadow.spec +++ b/rubygem-ruby-shadow.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 2.5.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Ruby shadow password module License: LicenseRef-Fedora-UltraPermissive OR Unlicense URL: https://github.com/apalmblad/ruby-shadow @@ -86,6 +86,9 @@ popd %doc %{gem_instdir}/README.euc %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 2.5.1-14 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Sat Nov 08 2025 Mamoru TASAKA - 2.5.1-13 - Adjust patches for ruby4_0