diff options
-rw-r--r-- | Makefile | 12 | ||||
-rw-r--r-- | RPM-GPG-KEY-remi2023 | 52 | ||||
-rw-r--r-- | RPM-GPG-KEY-remi2024 | 52 | ||||
-rw-r--r-- | remi-debug.repo | 4 | ||||
-rw-r--r-- | remi-modular-test.repo | 4 | ||||
-rw-r--r-- | remi-modular.repo | 5 | ||||
-rw-r--r-- | remi-php-test.repo | 19 | ||||
-rw-r--r-- | remi-php.repo | 20 | ||||
-rw-r--r-- | remi-release.spec | 129 | ||||
-rw-r--r-- | remi-test.repo | 2 | ||||
-rw-r--r-- | remi.repo | 3 |
11 files changed, 222 insertions, 80 deletions
@@ -2,13 +2,13 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile -f35: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f35.remi' --define 'fedora 35' +f40: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f40.remi' --define 'fedora 40' -f37: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f37.remi' --define 'fedora 37' +f39: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f36.remi' --define 'fedora 39' -f36: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f36.remi' --define 'fedora 36' +f38: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f38.remi' --define 'fedora 38' diff --git a/RPM-GPG-KEY-remi2023 b/RPM-GPG-KEY-remi2023 new file mode 100644 index 0000000..31d0696 --- /dev/null +++ b/RPM-GPG-KEY-remi2023 @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=qQfW +-----END PGP PUBLIC KEY BLOCK----- diff --git a/RPM-GPG-KEY-remi2024 b/RPM-GPG-KEY-remi2024 new file mode 100644 index 0000000..fe82d62 --- /dev/null +++ b/RPM-GPG-KEY-remi2024 @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=meaU +-----END PGP PUBLIC KEY BLOCK----- diff --git a/remi-debug.repo b/remi-debug.repo index 9d819ff..b10d344 100644 --- a/remi-debug.repo +++ b/remi-debug.repo @@ -3,7 +3,7 @@ name=Remi's RPM repository for Fedora $releasever - $basearch - debuginfo baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-remi/$basearch/ enabled=0 gpgcheck=1 -repo_gpgcheck=1 +repo_gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever [remi-test-debuginfo] @@ -11,5 +11,5 @@ name=Remi's test RPM repository for Fedora $releasever - $basearch - debuginfo baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test/$basearch/ enabled=0 gpgcheck=1 -repo_gpgcheck=1 +repo_gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever diff --git a/remi-modular-test.repo b/remi-modular-test.repo index b020fc7..bce3116 100644 --- a/remi-modular-test.repo +++ b/remi-modular-test.repo @@ -9,7 +9,7 @@ name=Remi's Modular testing repository - Fedora $releasever - $basearch mirrorlist=http://cdn.remirepo.net/fedora/$releasever/modular-test/$basearch/mirror enabled=0 gpgcheck=1 -repo_gpgcheck=1 +repo_gpgcheck=0 fastestmirror=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever @@ -19,6 +19,6 @@ name=Remi's Modular testing repository - Fedora $releasever - $basearch - debugi mirrorlist=http://cdn.remirepo.net/fedora/$releasever/debug-modular-test/$basearch/mirror enabled=0 gpgcheck=1 -repo_gpgcheck=1 +repo_gpgcheck=0 fastestmirror=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever diff --git a/remi-modular.repo b/remi-modular.repo index 0e839aa..144d4f1 100644 --- a/remi-modular.repo +++ b/remi-modular.repo @@ -9,7 +9,8 @@ name=Remi's Modular repository - Fedora $releasever - $basearch mirrorlist=http://cdn.remirepo.net/fedora/$releasever/modular/$basearch/mirror enabled=1 gpgcheck=1 -repo_gpgcheck=1 +# can be enabled if not behind a proxy because of possible cache issue +repo_gpgcheck=0 fastestmirror=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever @@ -19,6 +20,6 @@ name=Remi's Modular repository - Fedora $releasever - $basearch - debuginfo mirrorlist=http://cdn.remirepo.net/fedora/$releasever/debug-modular/$basearch/mirror enabled=0 gpgcheck=1 -repo_gpgcheck=1 +repo_gpgcheck=0 fastestmirror=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever diff --git a/remi-php-test.repo b/remi-php-test.repo deleted file mode 100644 index 4b69285..0000000 --- a/remi-php-test.repo +++ /dev/null @@ -1,19 +0,0 @@ -[remi-php@VER@-test] -name=Remi's RPM repository - Testing - PHP @DOTVER@ - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/test@VER@/$basearch/ -mirrorlist=http://cdn.remirepo.net/fedora/$releasever/test@VER@/$basearch/mirror -# WARNING: If you enable this repository, you must also enable "remi" and "remi-php@VER@" -enabled=0 -gpgcheck=1 -repo_gpgcheck=1 -fastestmirror=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever - -[remi-php@VER@-test-debuginfo] -name=Remi's PHP @DOTVER@ test RPM repository for Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test@VER@/$basearch/ -enabled=0 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever - diff --git a/remi-php.repo b/remi-php.repo deleted file mode 100644 index 370e2ca..0000000 --- a/remi-php.repo +++ /dev/null @@ -1,20 +0,0 @@ -[remi-php@VER@] -name=Remi's RPM repository - PHP @DOTVER@ - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/php@VER@/$basearch/ -mirrorlist=http://cdn.remirepo.net/fedora/$releasever/php@VER@/$basearch/mirror -# WARNING: If you enable this repository, you must also enable "remi" -enabled=0 -gpgcheck=1 -fastestmirror=1 -repo_gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever - -[remi-php@VER@-debuginfo] -name=Remi's PHP @DOTVER@ RPM repository for Fedora $releasever - $basearch - debuginfo -baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php@VER@/$basearch/ -enabled=0 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever - - diff --git a/remi-release.spec b/remi-release.spec index b6155b2..e1500c3 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -1,7 +1,7 @@ # remirepo spec file for remi-release (Fedora) # -# Copyright (c) 2006-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2006-2024 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -10,27 +10,25 @@ Name: remi-release Version: %{fedora} -%if %{fedora} == 37 +%if %{fedora} == 40 Release: 1%{?dist} %endif -%if %{fedora} == 36 -Release: 2%{?dist} +%if %{fedora} == 39 +Release: 4%{?dist} %endif -%if %{fedora} == 35 +%if %{fedora} == 38 Release: 5%{?dist} %endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi Group: System Environment/Base -License: CC-BY-SA +License: CC-BY-SA-4.0 URL: https://rpms.remirepo.net/ # Repository configuration files Source1: remi.repo Source2: remi-test.repo -Source3: remi-php.repo -Source4: remi-php-test.repo Source6: remi-modular.repo Source7: remi-modular-test.repo Source8: remi-debug.repo @@ -43,6 +41,8 @@ Source2019: RPM-GPG-KEY-remi2019 Source2020: RPM-GPG-KEY-remi2020 Source2021: RPM-GPG-KEY-remi2021 Source2022: RPM-GPG-KEY-remi2022 +Source2023: RPM-GPG-KEY-remi2023 +Source2024: RPM-GPG-KEY-remi2024 BuildArch: noarch @@ -50,11 +50,27 @@ Requires: /etc/yum.repos.d Requires: fedora-release >= %{fedora} # For smoth upgrade -%if %{fedora} >= 35 -Obsoletes: icu69 < 69.2 -Obsoletes: libicu69 < 69.2 -Obsoletes: libicu69-devel < 69.2 -Obsoletes: libicu69-doc < 69.2 +%if %{fedora} == 40 +# F40 have ICU 74.2-1 +Obsoletes: icu74 < 74.3 +Obsoletes: libicu74 < 74.3 +Obsoletes: libicu74-devel < 74.3 +Obsoletes: libicu74-doc < 74.3 +%endif +%if %{fedora} == 39 +# F39 have ICU 73.2-2 +Obsoletes: icu73 < 73.3 +Obsoletes: libicu73 < 73.3 +Obsoletes: libicu73-devel < 73.3 +Obsoletes: libicu73-doc < 73.3 +%endif +%if %{fedora} == 38 +# Only F38 have ICU 72.1-2 +# libicu72: remi has 72.1-1, F39+ has 72.1-2 +Obsoletes: icu72 < 72.2 +Obsoletes: libicu72 < 72.2 +Obsoletes: libicu72-devel < 72.2 +Obsoletes: libicu72-doc < 72.2 %endif %description @@ -86,10 +102,32 @@ Forum: https://forum.remirepo.net/ Twitter: https://twitter.com/RemiRepository +%package -n remi-crypto-legacy +Summary: Lower crypto policies to LEGACY +Conflicts: remi-crypto-default +Requires: crypto-policies +Requires(post): %{_bindir}/update-crypto-policies + +%description -n remi-crypto-legacy +Lower crypto policies to LEGACY +Only used for building. +** DO NOT USED ** + + +%package -n remi-crypto-default +Summary: Lower crypto policies to DEFAULT +Conflicts: remi-crypto-legacy +Requires: crypto-policies +Requires(post): %{_bindir}/update-crypto-policies + +%description -n remi-crypto-default +Lower crypto policies to DEFAULT +Only used for building. +** DO NOT USED ** + + %prep %setup -c -T -sed -e 's/@VER@/81/;s/@DOTVER@/8.1/' %{SOURCE3} >remi-php81.repo -sed -e 's/@VER@/81/;s/@DOTVER@/8.1/' %{SOURCE4} >remi-php81-test.repo %build @@ -105,26 +143,26 @@ install -Dp -m 644 %{SOURCE2019} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- install -Dp -m 644 %{SOURCE2020} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2020 install -Dp -m 644 %{SOURCE2021} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2021 install -Dp -m 644 %{SOURCE2022} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2022 +install -Dp -m 644 %{SOURCE2023} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2023 +install -Dp -m 644 %{SOURCE2024} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2024 -%if %{fedora} <= 37 -ln -s RPM-GPG-KEY-remi2022 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-37 +%if %{fedora} <= 41 +ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-41 +%endif +%if %{fedora} <= 40 +ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-40 %endif -%if %{fedora} <= 36 -ln -s RPM-GPG-KEY-remi2022 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-36 +%if %{fedora} <= 39 +ln -s RPM-GPG-KEY-remi2023 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-39 %endif -%if %{fedora} <= 35 -ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-35 +%if %{fedora} <= 38 +ln -s RPM-GPG-KEY-remi2023 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-38 %endif # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo install -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-test.repo -%if %{fedora} < 36 -install -m 644 remi-php81.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php81.repo -install -m 644 remi-php81-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php81-test.repo -%endif - install -Dp -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-modular.repo install -Dp -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-modular-test.repo @@ -133,13 +171,50 @@ install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debugi mkdir -p %{buildroot}/opt/remi +%post -n remi-crypto-legacy +%{_bindir}/update-crypto-policies --set LEGACY + +%post -n remi-crypto-default +%{_bindir}/update-crypto-policies --set DEFAULT + + %files %config(noreplace) %{_sysconfdir}/yum.repos.d/remi*.repo %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi* %dir /opt/remi +%files -n remi-crypto-legacy + +%files -n remi-crypto-default + %changelog +* Wed Feb 14 2024 Remi Collet <remi@remirepo.net> - 40-1 +- Fedora 40 using 2024 GPG key + +* Tue Jan 9 2024 Remi Collet <remi@remirepo.net> - 39-4, 38-5 +- Add 2024 GPG key (Fedora 40 and 41) + +* Wed Dec 20 2023 Remi Collet <remi@remirepo.net> - 39-3, 38-4 +- disable repo_gpgcheck as it raise too much issue being proxy + and CVE-2021-20271 is fixed in rpm + +* Mon Oct 30 2023 Remi Collet <remi@remirepo.net> - 39-2, 38-3, 37-3 +- only obsolete libicu compat package when it matches system version + libicu71 on F37, libicu72 on F38, libicu73 on F39 + +* Mon Aug 21 2023 Remi Collet <remi@remirepo.net> - 39-1 +- Fedora 39 using 2023 GPG key + +* Fri Apr 14 2023 Remi Collet <remi@remirepo.net> - 38-2 +- obsoletes icu72 for smoth upgrade from F36/F37 + +* Fri Feb 10 2023 Remi Collet <remi@remirepo.net> - 38-1 +- Fedora 38 using 2023 GPG key + +* Mon Jul 11 2022 Remi Collet <remi@remirepo.net> - 37-2, 36-3, 35-6 +- Add 2023 GPG key (Fedora 38 and 39) + * Mon Jul 11 2022 Remi Collet <remi@remirepo.net> - 37-1, 36-2, 35-5 - Fedora 36 GPG key - own /opt/remi diff --git a/remi-test.repo b/remi-test.repo index 494b45e..10f87f4 100644 --- a/remi-test.repo +++ b/remi-test.repo @@ -5,6 +5,6 @@ mirrorlist=http://cdn.remirepo.net/fedora/$releasever/test/$basearch/mirror # WARNING: If you enable this repository, you must also enable "remi" enabled=0 gpgcheck=1 -repo_gpgcheck=1 +repo_gpgcheck=0 fastestmirror=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever @@ -9,6 +9,7 @@ name=Remi's RPM repository - Fedora $releasever - $basearch mirrorlist=http://cdn.remirepo.net/fedora/$releasever/remi/$basearch/mirror enabled=1 gpgcheck=1 -repo_gpgcheck=1 +# can be enabled if not behind a proxy because of possible cache issue +repo_gpgcheck=0 fastestmirror=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever |