From 97bfc75a4c48d3b5527a0c1665d12e83e39e57cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:42:18 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index d7589bc..96a4fdd 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 3 +%global baserelease 4 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -124,6 +124,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 6.9.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 6.9.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 56611f989dedf806dc3458b1467a527a095ef96b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 18 Nov 2024 15:14:29 +0900 Subject: [PATCH 2/8] Apply upstream patch for C23 --- oniguruma-issue312-c23-compliant.patch | 135 +++++++++++++++++++++++++ oniguruma.spec | 12 ++- 2 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 oniguruma-issue312-c23-compliant.patch diff --git a/oniguruma-issue312-c23-compliant.patch b/oniguruma-issue312-c23-compliant.patch new file mode 100644 index 0000000..adf9c2f --- /dev/null +++ b/oniguruma-issue312-c23-compliant.patch @@ -0,0 +1,135 @@ +From 5f1408dee4a01dee60c4cd67f2e2e46484ef50a5 Mon Sep 17 00:00:00 2001 +From: "K.Kosako" +Date: Mon, 18 Nov 2024 00:18:12 +0900 +Subject: [PATCH] fix #312: Build failure with GCC 15 (C23) + +--- + src/regparse.c | 44 ++++++++++++++++++++++++++++++++++++-------- + src/st.h | 9 +-------- + 2 files changed, 37 insertions(+), 16 deletions(-) + +diff --git a/src/regparse.c b/src/regparse.c +index 24bcbaac..9acdd6e2 100644 +--- a/src/regparse.c ++++ b/src/regparse.c +@@ -793,8 +793,13 @@ onig_print_names(FILE* fp, regex_t* reg) + #endif /* ONIG_DEBUG */ + + static int +-i_free_name_entry(UChar* key, NameEntry* e, void* arg ARG_UNUSED) ++i_free_name_entry(st_data_t akey, st_data_t ae, st_data_t arg ARG_UNUSED) + { ++ UChar* key; ++ NameEntry* e; ++ ++ key = (UChar* )akey; ++ e = (NameEntry* )ae; + xfree(e->name); + if (IS_NOT_NULL(e->back_refs)) xfree(e->back_refs); + xfree(key); +@@ -850,8 +855,14 @@ typedef struct { + } INamesArg; + + static int +-i_names(UChar* key ARG_UNUSED, NameEntry* e, INamesArg* arg) ++i_names(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t aarg) + { ++ NameEntry* e; ++ INamesArg* arg; ++ ++ e = (NameEntry* )ae; ++ arg = (INamesArg* )aarg; ++ + int r = (*(arg->func))(e->name, + e->name + e->name_len, + e->back_num, +@@ -883,9 +894,14 @@ onig_foreach_name(regex_t* reg, + } + + static int +-i_renumber_name(UChar* key ARG_UNUSED, NameEntry* e, GroupNumMap* map) ++i_renumber_name(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t amap) + { + int i; ++ NameEntry* e; ++ GroupNumMap* map; ++ ++ e = (NameEntry* )ae; ++ map = (GroupNumMap* )amap; + + if (e->back_num > 1) { + for (i = 0; i < e->back_num; i++) { +@@ -1374,9 +1390,14 @@ static int CalloutNameIDCounter; + #ifdef USE_ST_LIBRARY + + static int +-i_free_callout_name_entry(st_callout_name_key* key, CalloutNameEntry* e, +- void* arg ARG_UNUSED) ++i_free_callout_name_entry(st_data_t akey, st_data_t ae, st_data_t arg ARG_UNUSED) + { ++ st_callout_name_key* key; ++ CalloutNameEntry* e; ++ ++ key = (st_callout_name_key* )akey; ++ e = (CalloutNameEntry* )ae; ++ + if (IS_NOT_NULL(e)) { + xfree(e->name); + } +@@ -1870,10 +1891,14 @@ typedef intptr_t CalloutTagVal; + #define CALLOUT_TAG_LIST_FLAG_TAG_EXIST (1<<0) + + static int +-i_callout_callout_list_set(UChar* key, CalloutTagVal e, void* arg) ++i_callout_callout_list_set(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t arg) + { + int num; +- RegexExt* ext = (RegexExt* )arg; ++ CalloutTagVal e; ++ RegexExt* ext; ++ ++ e = (CalloutTagVal )ae; ++ ext = (RegexExt* )arg; + + num = (int )e - 1; + ext->callout_list[num].flag |= CALLOUT_TAG_LIST_FLAG_TAG_EXIST; +@@ -1926,8 +1951,11 @@ onig_callout_tag_is_exist_at_callout_num(regex_t* reg, int callout_num) + } + + static int +-i_free_callout_tag_entry(UChar* key, CalloutTagVal e, void* arg ARG_UNUSED) ++i_free_callout_tag_entry(st_data_t akey, st_data_t e ARG_UNUSED, st_data_t arg ARG_UNUSED) + { ++ UChar* key; ++ ++ key = (UChar* )akey; + xfree(key); + return ST_DELETE; + } +diff --git a/src/st.h b/src/st.h +index 5efee8bb..70798dc5 100644 +--- a/src/st.h ++++ b/src/st.h +@@ -34,13 +34,6 @@ enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK}; + #ifndef _ + # define _(args) args + #endif +-#ifndef ANYARGS +-# ifdef __cplusplus +-# define ANYARGS ... +-# else +-# define ANYARGS +-# endif +-#endif + + st_table *st_init_table _((struct st_hash_type *)); + st_table *st_init_table_with_size _((struct st_hash_type *, int)); +@@ -52,7 +45,7 @@ int st_delete _((st_table *, st_data_t *, st_data_t *)); + int st_delete_safe _((st_table *, st_data_t *, st_data_t *, st_data_t)); + int st_insert _((st_table *, st_data_t, st_data_t)); + int st_lookup _((st_table *, st_data_t, st_data_t *)); +-int st_foreach _((st_table *, int (*)(ANYARGS), st_data_t)); ++int st_foreach _((st_table *, int (*)(st_data_t, st_data_t, st_data_t), st_data_t)); + void st_add_direct _((st_table *, st_data_t, st_data_t)); + void st_free_table _((st_table *)); + void st_cleanup_safe _((st_table *, st_data_t)); diff --git a/oniguruma.spec b/oniguruma.spec index 96a4fdd..174bf27 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 4 +%global baserelease 5 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -33,6 +33,10 @@ License: BSD-2-Clause URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}%{?gitversion:-%{?gitversion}}.tar.gz Source1: create-tarball-from-git.sh +# https://github.com/kkos/oniguruma/issues/312 +# https://github.com/kkos/oniguruma/commit/5f1408dee4a01dee60c4cd67f2e2e46484ef50a5 +# make code C23 compliant +Patch0: oniguruma-issue312-c23-compliant.patch BuildRequires: make BuildRequires: gcc @@ -61,12 +65,15 @@ developing applications that use %{name}. %setup -q -n onig-%{mainver}%{?gitversion:-%{?gitversion}} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in +%patch -P0 -p1 -b .c23 %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} +%dnl %global optflags_orig %optflags +%dnl %global optflags %optflags_orig -std=gnu23 %if 0%{?git_snapshot} autoreconf -fi @@ -124,6 +131,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Nov 18 2024 Mamoru TASAKA - 6.9.9-5 +- Apply upstream patch for C23 compliance + * Thu Jul 18 2024 Fedora Release Engineering - 6.9.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 0860e50eac7cab084d8533021f90c068eb37db91 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Jan 2025 13:02:43 +0900 Subject: [PATCH 3/8] 6.9.10 --- oniguruma-issue312-c23-compliant.patch | 135 ------------------------- oniguruma.spec | 13 +-- sources | 2 +- 3 files changed, 6 insertions(+), 144 deletions(-) delete mode 100644 oniguruma-issue312-c23-compliant.patch diff --git a/oniguruma-issue312-c23-compliant.patch b/oniguruma-issue312-c23-compliant.patch deleted file mode 100644 index adf9c2f..0000000 --- a/oniguruma-issue312-c23-compliant.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 5f1408dee4a01dee60c4cd67f2e2e46484ef50a5 Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Mon, 18 Nov 2024 00:18:12 +0900 -Subject: [PATCH] fix #312: Build failure with GCC 15 (C23) - ---- - src/regparse.c | 44 ++++++++++++++++++++++++++++++++++++-------- - src/st.h | 9 +-------- - 2 files changed, 37 insertions(+), 16 deletions(-) - -diff --git a/src/regparse.c b/src/regparse.c -index 24bcbaac..9acdd6e2 100644 ---- a/src/regparse.c -+++ b/src/regparse.c -@@ -793,8 +793,13 @@ onig_print_names(FILE* fp, regex_t* reg) - #endif /* ONIG_DEBUG */ - - static int --i_free_name_entry(UChar* key, NameEntry* e, void* arg ARG_UNUSED) -+i_free_name_entry(st_data_t akey, st_data_t ae, st_data_t arg ARG_UNUSED) - { -+ UChar* key; -+ NameEntry* e; -+ -+ key = (UChar* )akey; -+ e = (NameEntry* )ae; - xfree(e->name); - if (IS_NOT_NULL(e->back_refs)) xfree(e->back_refs); - xfree(key); -@@ -850,8 +855,14 @@ typedef struct { - } INamesArg; - - static int --i_names(UChar* key ARG_UNUSED, NameEntry* e, INamesArg* arg) -+i_names(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t aarg) - { -+ NameEntry* e; -+ INamesArg* arg; -+ -+ e = (NameEntry* )ae; -+ arg = (INamesArg* )aarg; -+ - int r = (*(arg->func))(e->name, - e->name + e->name_len, - e->back_num, -@@ -883,9 +894,14 @@ onig_foreach_name(regex_t* reg, - } - - static int --i_renumber_name(UChar* key ARG_UNUSED, NameEntry* e, GroupNumMap* map) -+i_renumber_name(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t amap) - { - int i; -+ NameEntry* e; -+ GroupNumMap* map; -+ -+ e = (NameEntry* )ae; -+ map = (GroupNumMap* )amap; - - if (e->back_num > 1) { - for (i = 0; i < e->back_num; i++) { -@@ -1374,9 +1390,14 @@ static int CalloutNameIDCounter; - #ifdef USE_ST_LIBRARY - - static int --i_free_callout_name_entry(st_callout_name_key* key, CalloutNameEntry* e, -- void* arg ARG_UNUSED) -+i_free_callout_name_entry(st_data_t akey, st_data_t ae, st_data_t arg ARG_UNUSED) - { -+ st_callout_name_key* key; -+ CalloutNameEntry* e; -+ -+ key = (st_callout_name_key* )akey; -+ e = (CalloutNameEntry* )ae; -+ - if (IS_NOT_NULL(e)) { - xfree(e->name); - } -@@ -1870,10 +1891,14 @@ typedef intptr_t CalloutTagVal; - #define CALLOUT_TAG_LIST_FLAG_TAG_EXIST (1<<0) - - static int --i_callout_callout_list_set(UChar* key, CalloutTagVal e, void* arg) -+i_callout_callout_list_set(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t arg) - { - int num; -- RegexExt* ext = (RegexExt* )arg; -+ CalloutTagVal e; -+ RegexExt* ext; -+ -+ e = (CalloutTagVal )ae; -+ ext = (RegexExt* )arg; - - num = (int )e - 1; - ext->callout_list[num].flag |= CALLOUT_TAG_LIST_FLAG_TAG_EXIST; -@@ -1926,8 +1951,11 @@ onig_callout_tag_is_exist_at_callout_num(regex_t* reg, int callout_num) - } - - static int --i_free_callout_tag_entry(UChar* key, CalloutTagVal e, void* arg ARG_UNUSED) -+i_free_callout_tag_entry(st_data_t akey, st_data_t e ARG_UNUSED, st_data_t arg ARG_UNUSED) - { -+ UChar* key; -+ -+ key = (UChar* )akey; - xfree(key); - return ST_DELETE; - } -diff --git a/src/st.h b/src/st.h -index 5efee8bb..70798dc5 100644 ---- a/src/st.h -+++ b/src/st.h -@@ -34,13 +34,6 @@ enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK}; - #ifndef _ - # define _(args) args - #endif --#ifndef ANYARGS --# ifdef __cplusplus --# define ANYARGS ... --# else --# define ANYARGS --# endif --#endif - - st_table *st_init_table _((struct st_hash_type *)); - st_table *st_init_table_with_size _((struct st_hash_type *, int)); -@@ -52,7 +45,7 @@ int st_delete _((st_table *, st_data_t *, st_data_t *)); - int st_delete_safe _((st_table *, st_data_t *, st_data_t *, st_data_t)); - int st_insert _((st_table *, st_data_t, st_data_t)); - int st_lookup _((st_table *, st_data_t, st_data_t *)); --int st_foreach _((st_table *, int (*)(ANYARGS), st_data_t)); -+int st_foreach _((st_table *, int (*)(st_data_t, st_data_t, st_data_t), st_data_t)); - void st_add_direct _((st_table *, st_data_t, st_data_t)); - void st_free_table _((st_table *)); - void st_cleanup_safe _((st_table *, st_data_t)); diff --git a/oniguruma.spec b/oniguruma.spec index 174bf27..d5542a9 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -16,12 +16,12 @@ %global gitversion %{gitdate}git%{shortcommit} %endif -%global mainver 6.9.9 +%global mainver 6.9.10 #%%global postver 1 #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 5 +%global baserelease 1 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -33,10 +33,6 @@ License: BSD-2-Clause URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}%{?gitversion:-%{?gitversion}}.tar.gz Source1: create-tarball-from-git.sh -# https://github.com/kkos/oniguruma/issues/312 -# https://github.com/kkos/oniguruma/commit/5f1408dee4a01dee60c4cd67f2e2e46484ef50a5 -# make code C23 compliant -Patch0: oniguruma-issue312-c23-compliant.patch BuildRequires: make BuildRequires: gcc @@ -65,8 +61,6 @@ developing applications that use %{name}. %setup -q -n onig-%{mainver}%{?gitversion:-%{?gitversion}} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in -%patch -P0 -p1 -b .c23 - %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. @@ -131,6 +125,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 01 2025 Mamoru TASAKA - 6.9.10-1 +- 6.9.10 + * Mon Nov 18 2024 Mamoru TASAKA - 6.9.9-5 - Apply upstream patch for C23 compliance diff --git a/sources b/sources index 20063b9..65274b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.9.tar.gz) = 14d2afd0d2cf86012c9959f221e9a77e7787e709c9dd7295d159e0a9ba89df52fa3edc59f95a6d859c34181e2e2e53e21b932b3eceb4d6ddeb2a3445ef951e95 +SHA512 (onig-6.9.10.tar.gz) = f7cf33008ca0181322fb8efc8e6bb67a1f81677095a33d88134781b804e6a9fbf675f05789d762fdd3d9f0171f8dc4c2e960c2b6a09ddd03bfd35a5ab0920317 From 9f02b3ca58544d4721294daae7ce15b81be5e0dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 21:30:19 +0000 Subject: [PATCH 4/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index d5542a9..6e9d361 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 1 +%global baserelease 2 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -125,6 +125,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 6.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 01 2025 Mamoru TASAKA - 6.9.10-1 - 6.9.10 From f46c81b70cec6e869b7af9c61b37a5380fc65467 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Feb 2025 16:10:10 +0900 Subject: [PATCH 5/8] remove no longer needed comment --- oniguruma.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index 6e9d361..3df2fa2 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -66,8 +66,6 @@ developing applications that use %{name}. # is that it ends up mixing and matching regexp bits between itself and glibc. # Disable LTO %define _lto_cflags %{nil} -%dnl %global optflags_orig %optflags -%dnl %global optflags %optflags_orig -std=gnu23 %if 0%{?git_snapshot} autoreconf -fi From fcfa905419796bde85f9d531a7a9db3c3d0d2bbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:30:44 +0000 Subject: [PATCH 6/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 3df2fa2..3521ff4 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 2 +%global baserelease 3 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -123,6 +123,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 6.9.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 6.9.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6e4e54be4ccb5e526d008e5087105ec3e54976cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 22:50:05 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 3521ff4..afef3e1 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 3 +%global baserelease 4 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -123,6 +123,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 6.9.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 6.9.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 71120ad005cdcd58349c6591d82fb4a70b6eaa68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 10:20:57 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index afef3e1..54e6953 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 4 +%global baserelease 5 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -123,6 +123,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 16 2026 Fedora Release Engineering - 6.9.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Jan 16 2026 Fedora Release Engineering - 6.9.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild