Add the GPG Key used for 2018 distributions

switch http mirrorlist to cdn.remirepo.net
fix package License (CC-BY-SA)

8 files changed, 92 insertions, 28 deletions

diff --git a/RPM-GPG-KEY-remi2018 b/RPM-GPG-KEY-remi2018
new file mode 100644
index 0000000..e2cc218
--- /dev/null
+++ b/RPM-GPG-KEY-remi2018
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+qk7agVI=
+=sJgk
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/remi-el.repo b/remi-el.repo
index 61a6bfc..a847e01 100644
--- a/remi-el.repo
+++ b/remi-el.repo
@@ -6,7 +6,7 @@
 name=Remi's RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/remi/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/remi/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/remi/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/remi/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
@@ -15,7 +15,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 name=Remi's PHP 5.5 RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/php55/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php55/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php55/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php55/mirror
 # NOTICE: common dependencies are in "remi-safe"
 enabled=0
 gpgcheck=1
@@ -25,7 +25,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 name=Remi's PHP 5.6 RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/php56/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php56/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php56/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php56/mirror
 # NOTICE: common dependencies are in "remi-safe"
 enabled=0
 gpgcheck=1
@@ -35,7 +35,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/test/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test/mirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1
diff --git a/remi-php54.repo b/remi-php54.repo
index c363c41..9927a06 100644
--- a/remi-php54.repo
+++ b/remi-php54.repo
@@ -5,7 +5,7 @@
 name=Remi's PHP 5.4 RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/php54/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php54/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php54/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php54/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-php70.repo b/remi-php70.repo
index 800efe8..7a6d316 100644
--- a/remi-php70.repo
+++ b/remi-php70.repo
@@ -5,7 +5,7 @@
 name=Remi's PHP 7.0 RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/php70/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php70/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php70/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php70/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
@@ -21,7 +21,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 name=Remi's PHP 7.0 test RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/test70/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test70/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test70/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test70/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-php71.repo b/remi-php71.repo
index 06d1b98..b27a2af 100644
--- a/remi-php71.repo
+++ b/remi-php71.repo
@@ -5,7 +5,7 @@
 name=Remi's PHP 7.1 RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/php71/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php71/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php71/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php71/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
@@ -21,7 +21,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 name=Remi's PHP 7.1 test RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/test71/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test71/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test71/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test71/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-php72.repo b/remi-php72.repo
index 5f5d970..9205075 100644
--- a/remi-php72.repo
+++ b/remi-php72.repo
@@ -5,7 +5,7 @@
 name=Remi's PHP 7.2 RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/php72/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php72/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php72/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php72/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
@@ -21,7 +21,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 name=Remi's PHP 7.2 test RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/test72/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test72/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test72/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test72/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-release-el.spec b/remi-release-el.spec
index 9337295..a30a833 100644
--- a/remi-release-el.spec
+++ b/remi-release-el.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for remi-release (RHEL, CentOS)
 #
-# Copyright (c) 2006-2017 Remi Collet
+# Copyright (c) 2006-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -8,30 +8,37 @@
 #
 Name:           remi-release
 %if %{rhel} == 7
-Version:        7.3
-Release:        2%{?dist}
+Version:        7.4
+Release:        1%{?dist}
 %endif
 %if %{rhel} == 6
 Version:        6.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 Summary:        YUM configuration for remi repository
 Summary(fr):    Configuration de YUM pour le dépôt remi
 
 Group:          System Environment/Base
-License:        GPL
+License:        CC-BY-SA
 URL:            https://remirepo.net
-Source0:        RPM-GPG-KEY-remi
+
+# Repository configuration files
 Source1:        remi-el.repo
 Source2:        remi-safe.repo
 Source3:        remi-php70.repo
 Source4:        remi-php71.repo
 Source5:        remi-php54.repo
-Source6:        RPM-GPG-KEY-remi2017
 Source7:        remi-php72.repo
 
+# GPG Keys
+Source2000:     RPM-GPG-KEY-remi
+Source2017:     RPM-GPG-KEY-remi2017
+Source2018:     RPM-GPG-KEY-remi2018
+
+
 BuildArchitectures: noarch
 
+
 Requires:       yum
 # Sadly system-release and redhat-release are not versionned
 Requires:       redhat-release
@@ -60,8 +67,9 @@ For PHP 7.2 you must enable the remi-php72 repository:
 
 Software Collections are in the "remi-safe" repository.
 
-FAQ:   https://blog.remirepo.net/pages/English-FAQ
-Forum: https://forum.remirepo.net/
+FAQ:     https://blog.remirepo.net/pages/English-FAQ
+Forum:   https://forum.remirepo.net/
+Twitter: https://twitter.com/RemiRepository
 
 %description -l fr
 Ce paquetage contient le fichier de configuration de YUM pour utiliser
@@ -83,21 +91,19 @@ Pour PHP 7.2 vous devez activer le dépôt remi-php72
 
 Les "Software Collections" sont dans le dépôt "remi-safe".
 
-FAQ:   https://blog.remirepo.net/pages/FAQ-en-Francais
-Forum: https://forum.remirepo.net/
+FAQ:     https://blog.remirepo.net/pages/FAQ-en-Francais
+Forum:   https://forum.remirepo.net/
+Twitter: https://twitter.com/RemiRepository
 
 
 %prep
 %setup -c -T
 sed -e "s/VERSION/%{rhel}/" %{SOURCE1} | tee remi.repo
-
-%if %{rhel} >= 6
 sed -e "s/VERSION/%{rhel}/" %{SOURCE2} | tee remi-safe.repo
 sed -e "s/VERSION/%{rhel}/" %{SOURCE3} | tee remi-php70.repo
 sed -e "s/VERSION/%{rhel}/" %{SOURCE4} | tee remi-php71.repo
 sed -e "s/VERSION/%{rhel}/" %{SOURCE5} | tee remi-php54.repo
 sed -e "s/VERSION/%{rhel}/" %{SOURCE7} | tee remi-php72.repo
-%endif
 
 
 %build
@@ -106,8 +112,9 @@ echo empty build
 
 %install
 # PGP
-install -Dp -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
-install -Dp -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2017
+install -Dp -m 644 %{SOURCE2000} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
+install -Dp -m 644 %{SOURCE2017} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2017
+install -Dp -m 644 %{SOURCE2018} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2018
 
 # YUM
 for repo in *repo
@@ -122,6 +129,11 @@ done
 
 
 %changelog
+* Tue Jan 16 2018 Remi Collet <remmi@remirepo.net> - 6.9-2 and 7.4-1
+- Add the GPG Key used for 2018 distributions
+- switch http mirrorlist to cdn.remirepo.net
+- fix package License (CC-BY-SA)
+
 * Thu Jun 29 2017 Remi Collet <remmi@remirepo.net> - 6.9-1 and 7.3-2
 - add remi-php72 repository configuration
 
diff --git a/remi-safe.repo b/remi-safe.repo
index b6f28a5..23a1452 100644
--- a/remi-safe.repo
+++ b/remi-safe.repo
@@ -6,7 +6,7 @@
 name=Safe Remi's RPM repository for Enterprise Linux VERSION - $basearch
 #baseurl=http://rpms.remirepo.net/enterprise/VERSION/safe/$basearch/
 #mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/safe/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/safe/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/safe/mirror
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi