change to https

.gitignore

@@ -3,7 +3,6 @@ BUILDROOT/
 RPMS/
 SRPMS/
 SOURCES/*.xz
-SOURCES/*.gz
 SOURCES/*.bz2
 SOURCES/*.rpm
 SOURCES/*.orig

SOURCES/EULA

@@ -1,9 +1,9 @@
-Rocky Linux 8 EULA
+Rocky Linux EULA
 
-Rocky Linux 8 comes with no warranties or guarantees of any kind, written or
+Rocky Linux comes with no warranties or guarantees of any kind, written or
 implied.
 
-The Distribution is released as GPLv2. Individual packages in the distribution
-come with their own licenses which are available on install as well as the
-distribution git forge. A copy of the GPLv2 license is included with the media
-of this distribution.
+The Distribution is released as 3-Clause BSD. Individual packages in the
+distribution come with their own licenses which are available on install as well
+as the distribution git forge. A copy of the 3-Clause BSD license is included
+with the media of this distribution.

SOURCES/LICENSE

@@ -1,31 +1,6 @@
 All elements of the Rocky Linux operating system that are developed
 by Contributors to the Rocky Linux project are licensed and made
-available to you under a dual MIT and BSD 3-Clause license.
-
-## Begin MIT License
-
-Copyright 2021 Rocky Linux Project Authors.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-## End MIT License
+available to you under the BSD 3-Clause license.
 
 ## Begin 3-Clause BSD License
 

SOURCES/Rocky-AppStream.repo

@@ -10,7 +10,7 @@
 
 [appstream]
 name=Rocky Linux $releasever - AppStream
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1

SOURCES/Rocky-BaseOS.repo

@@ -10,7 +10,7 @@
 
 [baseos]
 name=Rocky Linux $releasever - BaseOS
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1

SOURCES/Rocky-ContinuousRelease.repo

@@ -17,7 +17,7 @@
 
 [cr]
 name=Rocky Linux $releasever - ContinuousRelease
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=cr-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=cr-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/cr/$basearch/os/
 gpgcheck=1
 enabled=0

SOURCES/Rocky-Devel.repo

@@ -10,7 +10,7 @@
 
 [devel]
 name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT USE ONLY!
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
 gpgcheck=1
 enabled=0

SOURCES/Rocky-Extras.repo

@@ -10,7 +10,7 @@
 
 [extras]
 name=Rocky Linux $releasever - Extras
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
 gpgcheck=1
 enabled=1

SOURCES/Rocky-FastTrack.repo

@@ -10,7 +10,7 @@
 
 [fasttrack]
 name=Rocky Linux $releasever - FastTrack
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=fasttrack-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=fasttrack-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/fasttrack/$basearch/os/
 gpgcheck=1
 enabled=0

SOURCES/Rocky-HighAvailability.repo

@@ -10,7 +10,7 @@
 
 [ha]
 name=Rocky Linux $releasever - HighAvailability
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0

SOURCES/Rocky-NFV.repo

@@ -10,7 +10,7 @@
 
 [nfv]
 name=Rocky Linux $releasever - NFV
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=NFV-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/NFV/$basearch/os/
 gpgcheck=1
 enabled=0

SOURCES/Rocky-Plus.repo

@@ -10,7 +10,7 @@
 
 [plus]
 name=Rocky Linux $releasever - Plus
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/rockyplus/$basearch/os/
 gpgcheck=1
 enabled=0

SOURCES/Rocky-PowerTools.repo

@@ -10,7 +10,7 @@
 
 [powertools]
 name=Rocky Linux $releasever - PowerTools
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=0

SOURCES/Rocky-RT.repo

@@ -10,7 +10,7 @@
 
 [rt]
 name=Rocky Linux $releasever - Realtime
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
 gpgcheck=1
 enabled=0

SOURCES/Rocky-ResilientStorage.repo

@@ -10,7 +10,7 @@
 
 [resilient-storage]
 name=Rocky Linux $releasever - ResilientStorage
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever
 #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/os/
 gpgcheck=1
 enabled=0

SOURCES/Rocky-Sources.repo

@@ -1,34 +1,58 @@
 # Rocky-Sources.repo
 
-
 [baseos-source]
 name=Rocky Linux $releasever - BaseOS - Source
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=baseos-source-$releasever
-#baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/BaseOS/Source/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-source
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/Packages/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [appstream-source]
 name=Rocky Linux $releasever - AppStream - Source
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=appstream-source-$releasever
-#baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/AppStream/Source/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-source
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/Packages/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [extras-source]
 name=Rocky Linux $releasever - Extras - Source
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-source-$releasever
-#baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/extras/Source/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-source
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/Packages/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 [plus-source]
 name=Rocky Linux $releasever - Plus - Source
-mirrorlist=http://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=plus-source-$releasever
-#baseurl=http://dl.rockylinux.org/$contentdir/sources/$releasever/rockyplus/Source/
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Plus-$releasever-source
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Plus/source/tree/Packages/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+
+[ha-source]
+name=Rocky Linux $releasever - High Availability - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-source
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/Packages/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+
+[powertools-source]
+name=Rocky Linux $releasever - PowerTools - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever-source
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/source/tree/Packages/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+
+[resilient-storage-source]
+name=Rocky Linux $releasever - Resilient Storage - Source
+mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-source
+#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/Packages/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
+

SPECS/rocky-release.spec

@@ -6,10 +6,11 @@
 %define variant_lowercase server
 
 # Distribution Name and Version
-%define distro  Rocky Linux
+%define distro_name  Rocky Linux
+%define distro_code  Green Obsidian
 %define major   8
 %define minor   4
-%define rocky_rel 15
+%define rocky_rel 24
 %define upstream_rel %{major}.%{minor}
 
 %define base_release_version %{major}
@@ -26,8 +27,8 @@
 Name:           rocky-release
 Version:        %{major}.%{minor}
 Release:        %{rocky_rel}.el8
-Summary:        %{distro} release files
-License:        GPLv2
+Summary:        %{distro_name} release files
+License:        BSD-3-Clause
 URL:            https://rockylinux.org
 BuildArch:      noarch
 
@@ -46,7 +47,7 @@ Provides:       rocky-release-eula
 Provides:       redhat-release-eula
 
 # What are our requirements?
-Requires:       rocky-repos(%{base_release_version})
+Requires:       rocky-repos(%{major})
 
 # GPG Keys
 Source101:      RPM-GPG-KEY-rockyofficial
@@ -70,7 +71,7 @@ Source1203:     Rocky-Extras.repo
 # Rocky Add-ons
 Source1210:     Rocky-HighAvailability.repo
 Source1211:     Rocky-ResilientStorage.repo
-#Source1212:     Rocky-RT.repo
+Source1212:     Rocky-RT.repo
 #Source1213:     Rocky-NFV.repo
 
 # Rocky Special Stuff
@@ -78,18 +79,14 @@ Source1220:     Rocky-Media.repo
 #Source1221:     Rocky-Debuginfo.repo
 Source1222:     Rocky-Sources.repo
 Source1223:     Rocky-Devel.repo
-#Source1224:     Rocky-ContinuousRelease.repo
-#Source1225:     Rocky-FastTrack.repo
 Source1226:     Rocky-Plus.repo
-
-# Remove once testing is done
-Source4000:     Rocky-issue
+Source1300:     rocky.1.gz
 
 %description
-%{distro} release files.
+%{distro_name} release files.
 
 %package -n rocky-repos
-Summary:        %{distro} Package Repositories
+Summary:        %{distro_name} Package Repositories
 License:        GPLv2
 Provides:       rocky-repos(%{major}) = %{upstream_rel}
 Requires:       system-release = %{upstream_rel}
@@ -97,7 +94,7 @@ Requires:       rocky-gpg-keys
 Conflicts:      %{name} < 8.0
 
 %description -n rocky-repos
-%{distro} package repository files for yum/dnf
+%{distro_name} package repository files for yum/dnf
 
 %package -n rocky-gpg-keys
 Summary:        Rocky RPM GPG Keys
@@ -118,26 +115,28 @@ cp %{SOURCE201} %{SOURCE202} %{SOURCE203} .
 
 # create /etc/system-release and /etc/redhat-release
 install -d -m 0755 %{buildroot}%{_sysconfdir}
-echo "%{distro} release %{version}" > %{buildroot}%{_sysconfdir}/rocky-release
+echo "%{distro_name} release %{version} (%{distro_code})" > %{buildroot}%{_sysconfdir}/rocky-release
 echo "Derived from Red Hat Enterprise Linux %{version}" > %{buildroot}%{_sysconfdir}/rocky-release-upstream
 ln -s rocky-release %{buildroot}%{_sysconfdir}/system-release
 ln -s rocky-release %{buildroot}%{_sysconfdir}/redhat-release
+mkdir -p %{buildroot}%{_mandir}/man1
+install -p -m 0644 %{SOURCE1300} %{buildroot}%{_mandir}/man1/
 
 # Create the os-release file
 install -d -m 0755 %{buildroot}%{_prefix}/lib
 cat > %{buildroot}%{_prefix}/lib/os-release << EOF
-NAME="%{distro}"
-VERSION="%{major}.%{minor}"
+NAME="%{distro_name}"
+VERSION="%{major}.%{minor} (%{distro_code})"
 ID="rocky"
 ID_LIKE="rhel fedora"
 VERSION_ID="%{major}.%{minor}"
 PLATFORM_ID="platform:el%{major}"
-PRETTY_NAME="%{distro} %{major}.%{minor}"
-ANSI_COLOR="0;31"
-CPE_NAME="cpe:/o:rocky:rocky:%{major}"
+PRETTY_NAME="%{distro_name} %{major}.%{minor} (%{distro_code})"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:rocky:rocky:%{major}.%{minor}:GA"
 HOME_URL="https://rockylinux.org/"
 BUG_REPORT_URL="https://bugs.rockylinux.org/"
-ROCKY_SUPPORT_PRODUCT="Rocky Linux"
+ROCKY_SUPPORT_PRODUCT="%{distro_name}"
 ROCKY_SUPPORT_PRODUCT_VERSION="%{major}"
 EOF
 
@@ -145,18 +144,12 @@ EOF
 ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release
 
 # write cpe to /etc/system/release-cpe
-echo "cpe:/o:rocky:rocky:%{major}" > %{buildroot}%{_sysconfdir}/system-release-cpe
+echo "cpe:/o:rocky:rocky:%{major}.%{minor}:GA" > %{buildroot}%{_sysconfdir}/system-release-cpe
 
 # create /etc/issue and /etc/issue.net
-#echo '\S' > %{buildroot}%{_sysconfdir}/issue
-#echo 'Kernel \r on an \m' >> %{buildroot}%{_sysconfdir}/issue
-#cp %{buildroot}%{_sysconfdir}/issue{,.net}
-
-# Remove these once we are no longer testing
-install -m 0644 %{SOURCE4000} %{buildroot}%{_sysconfdir}/issue
-install -m 0644 %{SOURCE4000} %{buildroot}%{_sysconfdir}/issue.net
-# End
-
+echo '\S' > %{buildroot}%{_sysconfdir}/issue
+echo 'Kernel \r on an \m' >> %{buildroot}%{_sysconfdir}/issue
+cp %{buildroot}%{_sysconfdir}/issue{,.net}
 echo >> %{buildroot}%{_sysconfdir}/issue
 
 # set up the dist tag macros
@@ -184,7 +177,6 @@ install -m 0644 %{SOURCE302} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
 
 # dnf stuff
 install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
-echo "stock" > %{buildroot}%{_sysconfdir}/dnf/vars/infra
 echo "pub/rocky" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
 
 # Copy out GPG keys
@@ -200,7 +192,7 @@ install -p -m 0644 %{SOURCE1202} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1203} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1210} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1211} %{buildroot}%{_sysconfdir}/yum.repos.d/
-#install -p -m 0644 %{SOURCE1212} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE1212} %{buildroot}%{_sysconfdir}/yum.repos.d/
 #install -p -m 0644 %{SOURCE1213} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1220} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE1222} %{buildroot}%{_sysconfdir}/yum.repos.d/
@@ -223,17 +215,30 @@ install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %{_datadir}/rocky-release
 %{_prefix}/lib/os-release
 %{_prefix}/lib/systemd/system-preset/*
+%{_mandir}/man1/rocky.1.gz
 
 %files -n rocky-repos
 %license LICENSE
 %config(noreplace) %{_sysconfdir}/yum.repos.d/Rocky-*.repo
 %config(noreplace) %{_sysconfdir}/dnf/vars/contentdir
-%config(noreplace) %{_sysconfdir}/dnf/vars/infra
 
 %files -n rocky-gpg-keys
 %{_sysconfdir}/pki/rpm-gpg/
 
 %changelog
+* Sat Jun 05 2021 Louis Abel <label@rockylinux.org> - 8.4-24
+- Change all mirrorlist urls to https
+
+* Tue May 25 2021 Louis Abel <label@rockylinux.org> - 8.4-23
+- Add a version codename to satisfy vendors
+- Change license
+- Fix up /etc/os-release and CPE
+- Remove unused infra var
+- Change base_release_version to major
+
+* Wed May 19 2021 Louis Abel <label@rockylinux.org> - 8.4-16
+- Remove annoying /etc/issue banner
+
 * Sat May 08 2021 Louis Abel <label@rockylinux.org> - 8.4-15
 - Release for 8.4
 

code

@@ -0,0 +1,3 @@
+8:  Green Obsidian
+9:  Blue Onyx
+10: Smoky Quartz