diff --git a/.gitignore b/.gitignore index e69de29..b115ad2 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,28 @@ +onig-5.9.2.tar.gz +/onig-5.9.3.tar.gz +/onig-5.9.4.tar.gz +/onig-5.9.5.tar.gz +/onig-5.9.6.tar.gz +/onig-6.0.0.tar.gz +/onig-6.1.1.tar.gz +/onig-6.1.2.tar.gz +/onig-6.1.3.tar.gz +/onig-6.2.0.tar.gz +/onig-6.3.0.tar.gz +/onig-6.4.0.tar.gz +/onig-6.5.0.tar.gz +/onig-6.6.1.tar.gz +/onig-6.7.0.tar.gz +/onig-6.7.1.tar.gz +/onig-6.8.1.tar.gz +/onig-6.8.2.tar.gz +/onig-6.9.0.tar.gz +/onig-6.9.1.tar.gz +/onig-6.9.2-rc3.tar.gz +/onig-6.9.2.tar.gz +/onig-6.9.3.tar.gz +/onig-6.9.4-rc1.tar.gz +/onig-6.9.4-rc3.tar.gz +/onig-6.9.4.tar.gz +/onig-6.9.5-rev1.tar.gz +/onig-6.9.6-rc2.tar.gz diff --git a/0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch b/0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch new file mode 100644 index 0000000..cade98f --- /dev/null +++ b/0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch @@ -0,0 +1,29 @@ +From 43ec867797b765804d9c2ede8860bc871d1c5a58 Mon Sep 17 00:00:00 2001 +From: "K.Kosako" +Date: Mon, 12 Oct 2020 14:45:01 +0900 +Subject: [PATCH] fix #219: Binary incompatibilty between 6.9.5_rev1 -> + 6.9.2_rc2: reg_number_of_names + +--- + src/regposix.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/regposix.c b/src/regposix.c +index 87b2819..497ba02 100644 +--- a/src/regposix.c ++++ b/src/regposix.c +@@ -376,4 +376,10 @@ reg_foreach_name(onig_posix_regex_t* reg, + return onig_posix_reg_foreach_name(reg, func, arg); + } + +-#endif ++extern int ++reg_number_of_names(onig_posix_regex_t* reg) ++{ ++ return onig_posix_reg_number_of_names(reg); ++} ++ ++#endif /* USE_BINARY_COMPATIBLE_POSIX_API */ +-- +2.28.0 + diff --git a/oniguruma.spec b/oniguruma.spec new file mode 100644 index 0000000..0ac626a --- /dev/null +++ b/oniguruma.spec @@ -0,0 +1,276 @@ +%undefine _changelog_trimtime + +%global mainver 6.9.6 +%global betaver rc2 +%define prerelease 1 + +%global fedorarel 1 + +Name: oniguruma +Version: %{mainver} +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist} +Summary: Regular expressions library + +License: BSD +URL: https://github.com/kkos/oniguruma/ +Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz +# Upstream patches +Patch1: 0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch + +BuildRequires: gcc + +%description +Oniguruma is a regular expressions library. +The characteristics of this library is that different character encoding +for every regular expression object can be specified. +(supported APIs: GNU regex, POSIX and Oniguruma native) + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%setup -q -n onig-%{mainver} +%patch1 -p1 -b .compati +%{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in + + +%build +# This package fails its testsuite when compiled with LTO, but the real problem +# is that it ends up mixing and matching regexp bits between itself and glibc. +# Disable LTO +%define _lto_cflags %{nil} + +%configure \ + --enable-posix-api \ + --enable-binary-compatible-posix-api \ + --disable-silent-rules \ + --disable-static \ + --with-rubydir=%{_bindir} +%{__make} %{?_smp_mflags} + + +%install +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + INSTALL="%{__install} -c -p" +find $RPM_BUILD_ROOT -name '*.la' \ + -exec %{__rm} -f {} ';' + +%check +%{__make} check + +%ldconfig_scriptlets + + +%files +%defattr(-,root,root,-) +%doc AUTHORS +%license COPYING +%doc HISTORY +%doc README.md +%doc index.html +%lang(ja) %doc README_japanese +%lang(ja) %doc index_ja.html + +%{_libdir}/libonig.so.5* + +%files devel +%defattr(-,root,root,-) +%doc doc/API +%doc doc/CALLOUTS.API +%doc doc/CALLOUTS.BUILTIN +%doc doc/FAQ +%doc doc/RE +%doc doc/SYNTAX.md +%doc doc/UNICODE_PROPERTIES +%lang(ja) %doc doc/API.ja +%lang(ja) %doc doc/CALLOUTS.API.ja +%lang(ja) %doc doc/CALLOUTS.BUILTIN.ja +%lang(ja) %doc doc/FAQ.ja +%lang(ja) %doc doc/RE.ja + +%{_bindir}/onig-config + +%{_libdir}/libonig.so +%{_includedir}/onig*.h +%{_libdir}/pkgconfig/%{name}.pc + +%changelog +* Mon Oct 12 2020 Mamoru TASAKA - 6.9.6-0.1.rc2 +- 6.9.2 rc2 +- Apply upstream patch to keep binary compatibility with 6.9.5 + +* Thu Oct 1 2020 Mamoru TASAKA - 6.9.5-3.rev1 +- Apply upstream fix for CVE-2020-26159 + +* Tue Jul 28 2020 Fedora Release Engineering - 6.9.5-2.rev1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 1 2020 Jeff Law - 6.9.5-2.rev1 +- Disable LTO + +* Thu May 7 2020 Mamoru TASAKA - 6.9.5-1.rev1 +- 6.9.5 revised 1 + +* Wed Jan 29 2020 Fedora Release Engineering - 6.9.4-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Nov 29 2019 Mamoru TASAKA - 6.9.4-1 +- 6.9.4 final + +* Fri Nov 29 2019 Mamoru TASAKA - 6.9.4-0.2.rc3 +- 6.9.4 rc3 (CVE-2019-19204 CVE-2019-19203 CVE-2019-19012) + +* Sat Nov 9 2019 Mamoru TASAKA - 6.9.4-0.1.rc1 +- 6.9.4 rc1 (CVE-2019-19246) + +* Sun Aug 11 2019 Mamoru TASAKA - 6.9.3-1 +- 6.9.3 (CVE-2019-13224 CVE-2019-13225 CVE-2019-16163) + +* Thu Jul 25 2019 Fedora Release Engineering - 6.9.2-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jul 12 2019 Mamoru TASAKA - 6.9.2-2 +- Upstream patch for CVE-2019-13225 (#1728966) +- NON-upstream patch for CVE-2019-13224 (#1728971) + +* Tue May 7 2019 Mamoru TASAKA - 6.9.2-1 +- rc3 released as 6.9.2 final release + +* Wed Apr 24 2019 Mamoru TASAKA - 6.9.2-0.1.rc3 +- 6.9.2-rc3 + +* Fri Feb 01 2019 Fedora Release Engineering - 6.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Dec 12 2018 Mamoru TASAKA - 6.9.1-1 +- 6.9.1 + +* Wed Sep 12 2018 Mamoru TASAKA - 6.9.0-2 +- 6.9.0 + +* Sat Sep 8 2018 Mamoru TASAKA - 6.8.2-3 +- Bump release + +* Fri Jul 13 2018 Fedora Release Engineering - 6.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Apr 23 2018 Mamoru TASAKA - 6.8.2-1 +- 6.8.2 + +* Sun Apr 1 2018 Mamoru TASAKA - 6.8.1-1 +- 6.8.1 + +* Fri Feb 9 2018 Mamoru TASAKA - 6.7.1-1 +- 6.7.1 + +* Thu Feb 08 2018 Fedora Release Engineering - 6.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Dec 31 2017 Mamoru TASAKA - 6.7.0-1 +- 6.7.0 + +* Tue Sep 5 2017 Mamoru TASAKA - 6.6.1-1 +- 6.6.1 + +* Sun Aug 13 2017 Mamoru TASAKA - 6.5.0-1 +- 6.5.0 + +* Thu Aug 03 2017 Fedora Release Engineering - 6.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 6.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 5 2017 Mamoru TASAKA - 6.4.0-1 +- 6.4.0 + +* Tue May 30 2017 Mamoru TASAKA - 6.3.0-1 +- 6.3.0 + - CVEs 2017-9226 CVE-2017-9225 CVE-2017-9224 CVE-2017-9227 CVE-2017-9229 CVE-2017-9228 + +* Wed Apr 26 2017 Nils Philippsen - 6.2.0-2 +- remove unnecessary BR: ruby + +* Fri Apr 21 2017 Mamoru TASAKA - 6.2.0-1 +- 6.2.0 + +* Sat Feb 11 2017 Fedora Release Engineering - 6.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Dec 28 2016 Mamoru TASAKA - 6.1.3-1 +- 6.1.3 + +* Fri Nov 11 2016 Mamoru TASAKA - 6.1.2-1 +- 6.1.2 + +* Sun Oct 30 2016 Mamoru TASAKA - 6.1.1-1 +- 6.1.1 + +* Mon Jul 11 2016 Mamoru TASAKA - 6.0.0-1 +- 6.0.0 + +* Thu Feb 04 2016 Fedora Release Engineering - 5.9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 5.9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jan 2 2015 - 5.9.6-1 +- 5.9.6 + +* Sun Aug 17 2014 Fedora Release Engineering - 5.9.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 5.9.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Nov 11 2013 Mamoru TASAKA - 5.9.5-1 +- 5.9.5 + +* Sat Aug 03 2013 Fedora Release Engineering - 5.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 29 2013 Mamoru TASAKA - 5.9.4-1 +- 5.9.4 + +* Thu Feb 14 2013 Fedora Release Engineering - 5.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jan 4 2013 Mamoru TASAKA - 5.9.3-1 +- 5.9.3 + +* Fri Jul 20 2012 Fedora Release Engineering - 5.9.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 5 2012 Mamoru Tasaka - 5.9.2-3 +- F-17: rebuild against gcc47 + +* Tue Feb 08 2011 Fedora Release Engineering - 5.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 15 2010 Mamoru Tasaka - 5.9.2-1 +- 5.9.2 + +* Sat Jul 25 2009 Mamoru Tasaka - 5.9.1-3 +- F-12: Mass rebuild + +* Tue Feb 24 2009 Mamoru Tasaka - 5.9.1-2 +- F-11: Mass rebuild + +* Sat Feb 9 2008 Mamoru Tasaka +- Rebuild against gcc43 + +* Thu Dec 27 2007 Mamoru Tasaka - 5.9.1-1 +- 5.9.1 + +* Wed Dec 5 2007 Mamoru Tasaka - 5.9.0-1 +- Initial packaging + diff --git a/sources b/sources new file mode 100644 index 0000000..f7f33d2 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (onig-6.9.6-rc2.tar.gz) = 943c4cd3ddab5a41320b61541a5d83b172781871e9478a2c40ed4422877943e2f7c70cb7ef52e31b1836026b35a431b423fa464edde7796b520637c182741fd7