From c14828f76d1a7086bad90f4e2387757391fe7477 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 25 Mar 2007 17:28:28 +0000 Subject: [PATCH 01/38] Setup of module epel-release --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..b8e65af --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: epel-release +# $Id$ +NAME := epel-release +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 982f5c4c9fe7413b6b0b5a0cebf7d5d6100902df Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Jul 2019 09:17:12 -0400 Subject: [PATCH 02/38] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From e65f7f3d2352ae942835cf00c6713d950a12a296 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 18 Jul 2019 16:29:48 -0400 Subject: [PATCH 03/38] Update for RHEL-8 Add playground repo data Clean out 90-epel.preset to make sure we dont override RHEL-8 items. Just add items in which EPEL needs. --- 90-epel.preset | 3 + GPL | 347 +++++++++++++++++++++++++++++++++++++++++++ Makefile | 21 --- RPM-GPG-KEY-EPEL-8 | 28 ++++ epel-playground.repo | 26 ++++ epel-release.spec | 107 +++++++++++++ epel-testing.repo | 26 ++++ epel.repo | 35 +++++ 8 files changed, 572 insertions(+), 21 deletions(-) create mode 100644 90-epel.preset create mode 100644 GPL delete mode 100644 Makefile create mode 100644 RPM-GPG-KEY-EPEL-8 create mode 100644 epel-playground.repo create mode 100644 epel-release.spec create mode 100644 epel-testing.repo create mode 100644 epel.repo diff --git a/90-epel.preset b/90-epel.preset new file mode 100644 index 0000000..cd326d1 --- /dev/null +++ b/90-epel.preset @@ -0,0 +1,3 @@ +# Also see: +# https://fedoraproject.org/wiki/Starting_services_by_default + diff --git a/GPL b/GPL new file mode 100644 index 0000000..fd8bee7 --- /dev/null +++ b/GPL @@ -0,0 +1,347 @@ +***************************************************************************** +The following copyright applies to the Red Hat Linux compilation and any +portions of Red Hat Linux it does not conflict with. Whenever this +policy does conflict with the copyright of any individual portion of Red Hat +Linux, it does not apply. + +***************************************************************************** + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Makefile b/Makefile deleted file mode 100644 index b8e65af..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: epel-release -# $Id$ -NAME := epel-release -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/RPM-GPG-KEY-EPEL-8 b/RPM-GPG-KEY-EPEL-8 new file mode 100644 index 0000000..30b69a6 --- /dev/null +++ b/RPM-GPG-KEY-EPEL-8 @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFz3zvsBEADJOIIWllGudxnpvJnkxQz2CtoWI7godVnoclrdl83kVjqSQp+2 +dgxuG5mUiADUfYHaRQzxKw8efuQnwxzU9kZ70ngCxtmbQWGmUmfSThiapOz00018 ++eo5MFabd2vdiGo1y+51m2sRDpN8qdCaqXko65cyMuLXrojJHIuvRA/x7iqOrRfy +a8x3OxC4PEgl5pgDnP8pVK0lLYncDEQCN76D9ubhZQWhISF/zJI+e806V71hzfyL +/Mt3mQm/li+lRKU25Usk9dWaf4NH/wZHMIPAkVJ4uD4H/uS49wqWnyiTYGT7hUbi +ecF7crhLCmlRzvJR8mkRP6/4T/F3tNDPWZeDNEDVFUkTFHNU6/h2+O398MNY/fOh +yKaNK3nnE0g6QJ1dOH31lXHARlpFOtWt3VmZU0JnWLeYdvap4Eff9qTWZJhI7Cq0 +Wm8DgLUpXgNlkmquvE7P2W5EAr2E5AqKQoDbfw/GiWdRvHWKeNGMRLnGI3QuoX3U +pAlXD7v13VdZxNydvpeypbf/AfRyrHRKhkUj3cU1pYkM3DNZE77C5JUe6/0nxbt4 +ETUZBTgLgYJGP8c7PbkVnO6I/KgL1jw+7MW6Az8Ox+RXZLyGMVmbW/TMc8haJfKL +MoUo3TVk8nPiUhoOC0/kI7j9ilFrBxBU5dUtF4ITAWc8xnG6jJs/IsvRpQARAQAB +tChGZWRvcmEgRVBFTCAoOCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB +AgAiBQJc9877AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAh6kWrL4bW +oWagD/4xnLWws34GByVDQkjprk0fX7Iyhpm/U7BsIHKspHLL+Y46vAAGY/9vMvdE +0fcr9Ek2Zp7zE1RWmSCzzzUgTG6BFoTG1H4Fho/7Z8BXK/jybowXSZfqXnTOfhSF +alwDdwlSJvfYNV9MbyvbxN8qZRU1z7PEWZrIzFDDToFRk0R71zHpnPTNIJ5/YXTw +NqU9OxII8hMQj4ufF11040AJQZ7br3rzerlyBOB+Jd1zSPVrAPpeMyJppWFHSDAI +WK6x+am13VIInXtqB/Cz4GBHLFK5d2/IYspVw47Solj8jiFEtnAq6+1Aq5WH3iB4 +bE2e6z00DSF93frwOyWN7WmPIoc2QsNRJhgfJC+isGQAwwq8xAbHEBeuyMG8GZjz +xohg0H4bOSEujVLTjH1xbAG4DnhWO/1VXLX+LXELycO8ZQTcjj/4AQKuo4wvMPrv +9A169oETG+VwQlNd74VBPGCvhnzwGXNbTK/KH1+WRH0YSb+41flB3NKhMSU6dGI0 +SGtIxDSHhVVNmx2/6XiT9U/znrZsG5Kw8nIbbFz+9MGUUWgJMsd1Zl9R8gz7V9fp +n7L7y5LhJ8HOCMsY/Z7/7HUs+t/A1MI4g7Q5g5UuSZdgi0zxukiWuCkLeAiAP4y7 +zKK4OjJ644NDcWCHa36znwVmkz3ixL8Q0auR15Oqq2BjR/fyog== +=84m8 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/epel-playground.repo b/epel-playground.repo new file mode 100644 index 0000000..cb0d69f --- /dev/null +++ b/epel-playground.repo @@ -0,0 +1,26 @@ +[epel-playground] +name=Extra Packages for Enterprise Linux $release - Playground - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release + +[epel-playground-debuginfo] +name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 + +[epel-playground-source] +name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec new file mode 100644 index 0000000..0305785 --- /dev/null +++ b/epel-release.spec @@ -0,0 +1,107 @@ +Name: epel-release +Version: 8 +Release: 1 +Summary: Extra Packages for Enterprise Linux repository configuration + +Group: System Environment/Base +License: GPLv2 + +# This is a EPEL maintained package which is specific to +# our distribution. Thus the source is only available from +# within this srpm. +URL: http://download.fedoraproject.org/pub/epel +Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 +Source1: GPL +Source2: epel.repo +Source3: epel-testing.repo +Source4: epel-playground.repo +# EPEL default preset policy (borrowed from fedora's 90-default.preset) +Source5: 90-epel.preset + +BuildArch: noarch +Requires: redhat-release >= %{version} +# epel-release is only for enterprise linux, not fedora +Conflicts: fedora-release + +%description +This package contains the Extra Packages for Enterprise Linux (EPEL) repository +GPG key as well as configuration for yum. + +%prep +%setup -q -c -T +install -pm 644 %{SOURCE0} . +install -pm 644 %{SOURCE1} . + +%build + + +%install +rm -rf $RPM_BUILD_ROOT + +#GPG Key +install -Dpm 644 %{SOURCE0} \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 + +# yum +install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} \ + $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc GPL +%config(noreplace) /etc/yum.repos.d/* +/etc/pki/rpm-gpg/* +%{_prefix}/lib/systemd/system-preset/90-epel.preset + +%changelog +* Thu Jul 18 2019 Stephen Smoogen - 8-1 +- Update for RHEL-8 +- Add playground repo data +- Clean out 90-epel.preset to make sure we dont override RHEL-8 items. Just add items in which EPEL needs. + +* Mon Oct 02 2017 Kevin Fenzi - 7-11 +- Add Conflicts on fedora-release to prevent people from installing on Fedora systems. Fixes bug #1497702 + +* Sat Jun 24 2017 Kevin Fenzi - 7-10 +- Change mirrorlist= in repo files to be metalink= (as thats what they are). Fixes bug #1451212 + +* Tue Dec 27 2016 Kevin Fenzi - 7-9 +- Add preset for drbdlinks package. Fixes bug #1405744 + +* Sat Jul 23 2016 Kevin Fenzi - 7-8 +- Drop duplicate libstoragemgmt from presets. Fixes bug #1358971 + +* Fri Jun 03 2016 Kevin Fenzi - 7-7 +- Drop initial-setup from presets. Fixes bug #1342511 + +* Wed Mar 30 2016 Jason L Tibbitts III - 7-6 +- Remove macros.epel; let epel-rpm-macros handle it instead. + +* Tue Nov 25 2014 Rex Dieter 7-5 +- fix typo in macros.epel + +* Fri Nov 21 2014 Rex Dieter 7-4 +- add systemd 90-epel.preset + +* Fri Nov 21 2014 Rex Dieter 7-3 +- implement %%epel macro + +* Tue Sep 02 2014 Kevin Fenzi 7-2 +- Make repo files config(noreplace). Fixes bug #1135576 + +* Thu Aug 28 2014 Dennis Gilmore - 7-1 +- enable gpg checking now we are out of beta + +* Wed Jun 18 2014 Kevin Fenzi 7-0.2 +- Drop unneeded up2date post/postun +- Fixed up description. +- Fixes bugs #1052434 and #1093918 + +* Mon Dec 16 2013 Dennis Gilmore - 7-0.1 +- initial epel 7 build. gpg cheking is disabled + diff --git a/epel-testing.repo b/epel-testing.repo new file mode 100644 index 0000000..77565b4 --- /dev/null +++ b/epel-testing.repo @@ -0,0 +1,26 @@ +[epel-testing] +name=Extra Packages for Enterprise Linux $release - Testing - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release + +[epel-testing-debuginfo] +name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 + +[epel-testing-source] +name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 diff --git a/epel.repo b/epel.repo new file mode 100644 index 0000000..ec74fa1 --- /dev/null +++ b/epel.repo @@ -0,0 +1,35 @@ +[epel] +name=Extra Packages for Enterprise Linux $release - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release + +[epel-modules] +name=Extra Packages for Enterprise Linux $release - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release + +[epel-debuginfo] +name=Extra Packages for Enterprise Linux $release - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 + +[epel-source] +name=Extra Packages for Enterprise Linux $release - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/$release/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$release&arch=$basearch&infra=$infra&content=$contentdir +failovermethod=priority +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgcheck=1 From e98c609e48f24a558ef326601582e8f7108f6dff Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 1 Aug 2019 16:18:58 +0000 Subject: [PATCH 04/38] Make baseurl paths match dl.fedoraproject.org Add draft of epel8 packaging --- README-epel-8-packaging.md | 175 +++++++++++++++++++++++++++++++++++++ epel-playground.repo | 6 +- epel-release.spec | 9 +- epel-testing.repo | 6 +- epel.repo | 8 +- 5 files changed, 192 insertions(+), 12 deletions(-) create mode 100644 README-epel-8-packaging.md diff --git a/README-epel-8-packaging.md b/README-epel-8-packaging.md new file mode 100644 index 0000000..a561052 --- /dev/null +++ b/README-epel-8-packaging.md @@ -0,0 +1,175 @@ +# EPEL-8 Packaging Procedures + +## Introduction + +When a new Red Hat Enterprise Linux occurs, one of the steps to get +EPEL going for it is branching of various packages into new +namespace. The EPEL Steering Committee does not mass branch all +existing packages into the namespace because it has caused multiple +problems: + +1. The package maintainers did not want to support the package in the +newer version of EPEL. Package maintainers may only want to support +certain versions of Enterprise Linux or may want to wait until their +favourite derivative appears. + +2. The package does not work in the latest version of RHEL. With +multiple years between releases, software which worked on Fedora 18 +which would branch to EPEL-7 may not exist anymore with Fedora 28 and +EPEL-8 would need a completely different version. + +## Consumer request for packages + +People who are interested in getting packages into EPEL should contact +the package maintainer through +[bugzilla](https://bugzilla.redhat.com/). This allows for the requests +to be tracked and if the primary maintainer is not interested in +branching to EPEL, other ones can step in and do so. + +## EPEL Playground + +We have added an additional set of channels for EPEL-8 called +playground. It is meant to be sort of like Fedora Rawhide so that +packagers can work on versions of software which are too fast moving +or will have large API changes from what they are putting in the +regular channel. + +To try and make this transparent, we have made it so when a package is +built in epel8 it will normally also be built in +epel8-playground. This is done via a packages.cfg file which lists the +targets for fedpkg to build against. A successful package build will +then go through 2 different paths: + +* epel8 package will go into bodhi to be put into epel8-testing +* epel8-playground will bypass bodhi and go directly into + epel8-playground the next compose. + +If a packager needs to focus only on epel8 or epel8-playground they +can edit packages.cfg to change the ```target= epel8 +epel8-playground``` to ```target= epel8 ```. + +Packages in epel8-playground are primarily to be used in the following +manner: + +* To test out some new version of the package that might not be stable + yet. + +* To test out some new packaging of the package + +* To test a major version change of the package that they want to land + at the next epel8 minor release. + +* To build a package that will never be stable enough for epel8, but + still could be useful to some. + +* At minor RHEL releases (ie, 8.1, 8.2) people can pull in big changes + from playground to the main epel8 packages. Since people will be + upgrading and paying more attention than usual anyhow at those + points, it’s a great chance to do that change, but also you want to + make sure it’s panned out, so you can test before hand in + playground. + +Consumers should be aware that packages in EPEL8-playground are there +without any Service Level Expectations. You may want to only cherry +pick packages from there as needed. + +## Developer request for branching multiple packages + +Branching is handled the same way as requesting a branch using `fedpkg +request-branch`. A maintainer can request an epel8 branch using +`fedpkg request-branch epel8` which will create a ticket in +https://pagure.io/releng/fedora-scm-requests/issues and Release +Engineering will process these requests. + +To branch multiple packages please use this or a variant of this +script: + +``` +#!/usr/bin/sh +# Reminder to get an updated pagure token for releng tickets +# Usage: epel-8.sh foo bar goo blah blech +if [ $# -lt 1 ] +then + echo "At least one package name should be provided" +else + TMPDIR=`mktemp -d /tmp/epel8.XXXXXX` + pushd "$TMPDIR" + for pkg in "$@" + do + fedpkg clone "$pkg" + pushd "$pkg" + fedpkg request-branch epel8 + fedpkg request-branch epel8-playground + popd + done + rm -rfv "$TMPDIR" +fi +``` + +Releng will then work through the tickets in the system which is +adding branches to the PDC and src.fedoraproject.org. + + +## Known Issues + +1. /usr/bin/python does not exist. Choose ``/usr/bin/python3`` or +``/usr/bin/python2`` and patch appropriately. + +2. ``python2-sphinx`` is not shipped. Most packages should work with +python3-sphinx, and if it doesn't please open a bug. The python team +has been good about making fixes for this. + +3. When branching python packages, be aware that python in EL-8 is +python36 and not the version currently in rawhide. This has come up +with a couple of test packages where they assumed python37 or later. + +4. ``systemd-rpm-macros`` is not a separate packages. If needed, used +``BuildRequires: systemd`` + +5. While EL-8 comes with platform-python, it should NOT be used in +``Requires:`` unless absolutely neccessary. python3 should be used +instead. (Exceptions can be made but will be rare and need +justification.) + +**Accepted Exceptions:** +* Use python3.6dist(coverage) instead of python3-coverage. This + package is not shipped but is needed in %check code. + +6. Sometimes RHEL8 only has a python3 package for a dependency you +need for your build. (Example: python-bleach requires +python2-html5lib, but RHEL8 provides only python3-html5lib). For +EPEL-8.0 we only suggest one choice: + +* Choose not to have the python2 part of your package and patch + whatever to use python3. + +7. Python2 packages are discouraged. RHEL-8 will contain python2.7 +until probably the end of life of RHEL-7. However support upstream +will only be minimal. When modularity occurs, we suggest that you make +whatever python2 packages modules which can be pulled out when +RHEL-8.N no longer has python2. + +8. While a RHEL src.rpm might produce a -devel package, it may not +currently be in the build repository. When running into this please +open a ticket with https://pagure.io/epel/new_issue for us to put in a +request for it to be added to Red Hat's Code Ready Builder. After +modularity is enabled, changes to what is done will be needed. + +9. EPEL-8.0 may not work with the RHEL-8.1 beta. There seem to be +changes in dnf and zchunk which we have not worked out. This line will +be updated. + + +## Definitions + +1. Package maintainer. Person who has accepted responsibility to +package and maintain software in the Fedora Project ecosystem. The +main packager is usually someone focused on Fedora Linux, and +secondary packagers may be focused on particular use cases like EPEL. + +2. Consumer. A person who has subscribed to EPEL for packages but is +not a maintainer. + +3. PDC. Product Definition Center. A tool to help list the lifetime +and permissions that a product has so that branching and updates can +be better managed. diff --git a/epel-playground.repo b/epel-playground.repo index cb0d69f..ec567b2 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,6 +1,6 @@ [epel-playground] name=Extra Packages for Enterprise Linux $release - Playground - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/$basearch +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/$basearch/debug +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/SRPMS +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel-release.spec b/epel-release.spec index 0305785..83e3ae8 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 1 +Release: 2 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -17,6 +17,7 @@ Source3: epel-testing.repo Source4: epel-playground.repo # EPEL default preset policy (borrowed from fedora's 90-default.preset) Source5: 90-epel.preset +Source6: README-epel-8-packaging.md BuildArch: noarch Requires: redhat-release >= %{version} @@ -53,12 +54,16 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc GPL +%doc GPL %{SOURCE6} %config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Aug 1 2019 Stephen Smoogen - 8-2 +- Make baseurl paths match dl.fedoraproject.org +- Add draft of epel8 packaging + * Thu Jul 18 2019 Stephen Smoogen - 8-1 - Update for RHEL-8 - Add playground repo data diff --git a/epel-testing.repo b/epel-testing.repo index 77565b4..8f4ad36 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,6 +1,6 @@ [epel-testing] name=Extra Packages for Enterprise Linux $release - Testing - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/$basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/$basearch/debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/SRPMS +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel.repo b/epel.repo index ec74fa1..bdc00e7 100644 --- a/epel.repo +++ b/epel.repo @@ -1,6 +1,6 @@ [epel] name=Extra Packages for Enterprise Linux $release - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=1 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release [epel-modules] name=Extra Packages for Enterprise Linux $release - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release [epel-debuginfo] name=Extra Packages for Enterprise Linux $release - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/$release/$basearch/debug +#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -27,7 +27,7 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $release - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/$release/SRPMS +#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 From a22cc24750d85a9ca265392dbcb3d9a02a55d59d Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 1 Aug 2019 16:51:53 +0000 Subject: [PATCH 05/38] Fix docs Make it so we only build epel-release against epel8 --- epel-release.spec | 4 +++- package.cfg | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 83e3ae8..ffa4d01 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -32,6 +32,7 @@ GPG key as well as configuration for yum. %setup -q -c -T install -pm 644 %{SOURCE0} . install -pm 644 %{SOURCE1} . +install -pm 644 %{SOURCE6} . %build @@ -54,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc GPL %{SOURCE6} +%doc GPL README-epel-8-packaging.md %config(noreplace) /etc/yum.repos.d/* /etc/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset @@ -63,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 1 2019 Stephen Smoogen - 8-2 - Make baseurl paths match dl.fedoraproject.org - Add draft of epel8 packaging +- Fix docs * Thu Jul 18 2019 Stephen Smoogen - 8-1 - Update for RHEL-8 diff --git a/package.cfg b/package.cfg index 66ea79d..b728443 100644 --- a/package.cfg +++ b/package.cfg @@ -1,2 +1,2 @@ [koji] -targets = epel8 epel8-playground \ No newline at end of file +targets = epel8 From 57036bfd912393a4bf51487e7b4f26a9eb7e8e3d Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 1 Aug 2019 18:23:12 +0000 Subject: [PATCH 06/38] Make sure that the key name is named correctly --- epel-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index ffa4d01..8d98b58 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 2 +Release: 3 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -42,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT #GPG Key install -Dpm 644 %{SOURCE0} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version} # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Aug 1 2019 Stephen Smoogen - 8-3 +- Make sure that the key name is named correctly + * Thu Aug 1 2019 Stephen Smoogen - 8-2 - Make baseurl paths match dl.fedoraproject.org - Add draft of epel8 packaging From 2daff7c80bd808548b8ce210c9d5b1cc2130d560 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 1 Aug 2019 16:36:55 -0300 Subject: [PATCH 07/38] Use the correct dnf var for release --- epel-playground.repo | 18 +++++++++--------- epel-release.spec | 3 +++ epel-testing.repo | 24 ++++++++++++------------ epel.repo | 32 ++++++++++++++++---------------- 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/epel-playground.repo b/epel-playground.repo index ec567b2..b8ac302 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,26 +1,26 @@ [epel-playground] -name=Extra Packages for Enterprise Linux $release - Playground - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch +name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-playground-debuginfo] -name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch/debug +name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-playground-source] -name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/SRPMS +name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 8d98b58..6d6de8e 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Aug 1 2019 Pablo Greco +- Use the correct var for dnf to expand + * Thu Aug 1 2019 Stephen Smoogen - 8-3 - Make sure that the key name is named correctly diff --git a/epel-testing.repo b/epel-testing.repo index 8f4ad36..1c6fb48 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,26 +1,26 @@ [epel-testing] -name=Extra Packages for Enterprise Linux $release - Testing - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-testing-debuginfo] -name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-testing-source] -name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel.repo b/epel.repo index bdc00e7..05bf03b 100644 --- a/epel.repo +++ b/epel.repo @@ -1,35 +1,35 @@ [epel] -name=Extra Packages for Enterprise Linux $release - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=1 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-modules] -name=Extra Packages for Enterprise Linux $release - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - $basearch +#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-debuginfo] -name=Extra Packages for Enterprise Linux $release - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug +#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-source] -name=Extra Packages for Enterprise Linux $release - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/SRPMS -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$release&arch=$basearch&infra=$infra&content=$contentdir +name=Extra Packages for Enterprise Linux $releasever - $basearch - Source +#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 From 9da52b467755575970a6cb70db79493a8c35e195 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 1 Aug 2019 16:37:11 -0300 Subject: [PATCH 08/38] Update playground source url --- epel-playground.repo | 2 +- epel-release.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epel-playground.repo b/epel-playground.repo index b8ac302..2640d71 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -18,7 +18,7 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/SRPMS +#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel-release.spec b/epel-release.spec index 6d6de8e..f02bc95 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -63,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Aug 1 2019 Pablo Greco - Use the correct var for dnf to expand +- Update playground source url * Thu Aug 1 2019 Stephen Smoogen - 8-3 - Make sure that the key name is named correctly From 5b8f9944f462ee743c494b78807ed6edba70d0a8 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 1 Aug 2019 16:37:15 -0300 Subject: [PATCH 09/38] Remove epel-modules repo --- epel-release.spec | 1 + epel.repo | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index f02bc95..c198c28 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -64,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 1 2019 Pablo Greco - Use the correct var for dnf to expand - Update playground source url +- Remove epel-modules repo * Thu Aug 1 2019 Stephen Smoogen - 8-3 - Make sure that the key name is named correctly diff --git a/epel.repo b/epel.repo index 05bf03b..42a8413 100644 --- a/epel.repo +++ b/epel.repo @@ -7,15 +7,6 @@ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever -[epel-modules] -name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever - [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug #baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug From b59329d67602de41bd387043d47c9c70598d93dc Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 1 Aug 2019 16:39:08 -0300 Subject: [PATCH 10/38] Use https in baseurl --- epel-playground.repo | 6 +++--- epel-release.spec | 5 +++-- epel-testing.repo | 6 +++--- epel.repo | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/epel-playground.repo b/epel-playground.repo index 2640d71..c162827 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,6 +1,6 @@ [epel-playground] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel-release.spec b/epel-release.spec index c198c28..6d8c6b7 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 3 +Release: 4 Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -61,10 +61,11 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog -* Thu Aug 1 2019 Pablo Greco +* Thu Aug 1 2019 Pablo Greco - 8-4 - Use the correct var for dnf to expand - Update playground source url - Remove epel-modules repo +- Use https in baseurl * Thu Aug 1 2019 Stephen Smoogen - 8-3 - Make sure that the key name is named correctly diff --git a/epel-testing.repo b/epel-testing.repo index 1c6fb48..ee727c1 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,6 +1,6 @@ [epel-testing] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 diff --git a/epel.repo b/epel.repo index 42a8413..129fb01 100644 --- a/epel.repo +++ b/epel.repo @@ -1,6 +1,6 @@ [epel] name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=1 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 @@ -18,7 +18,7 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -#baseurl=http://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 From 0995c916b737d1a9175faf1cf25deca3cfd18696 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 1 Aug 2019 22:08:03 +0000 Subject: [PATCH 11/38] Put in %dist into release --- epel-release.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epel-release.spec b/epel-release.spec index 6d8c6b7..740fe69 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 4 +Release: 4%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base From f2598f0371e5783e80aa122ba23a80c6c4c52e00 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 5 Aug 2019 10:57:50 -0700 Subject: [PATCH 12/38] epel-playground.repo: Need a /os/ at the end. Signed-off-by: Kevin Fenzi --- epel-playground.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epel-playground.repo b/epel-playground.repo index c162827..86e4cb8 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,6 +1,6 @@ [epel-playground] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch +#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 From 0398dcb08fd10d254dad5a919746384241aaad75 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 6 Aug 2019 18:16:10 +0000 Subject: [PATCH 13/38] Fix playground release to have os/ on its name [Kevin Fenzi] Make sure all values of $release are $releasever --- epel-playground.repo | 6 +++--- epel-release.spec | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/epel-playground.repo b/epel-playground.repo index 86e4cb8..37fea92 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,7 +1,7 @@ [epel-playground] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os -metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgcheck=1 @@ -10,7 +10,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug -metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever @@ -19,7 +19,7 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir +metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever diff --git a/epel-release.spec b/epel-release.spec index 740fe69..0e08191 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 4%{dist} +Release: 5%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -61,6 +61,11 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Tue Aug 6 2019 Stephen Smoogen - 8-5%{dist} +- Fix playground release to have os/ on its name [Kevin Fenzi] +- Make sure all values of $release are $releasever + + * Thu Aug 1 2019 Pablo Greco - 8-4 - Use the correct var for dnf to expand - Update playground source url From 9b32700e816eea4e3a2f5e799e9ee918f793d5b1 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 16 Sep 2019 21:06:59 +0000 Subject: [PATCH 14/38] Change gpg key to use -8 versus -$releasever. This fixes bash problem --- epel-playground.repo | 6 +++--- epel-release.spec | 5 ++++- epel-testing.repo | 6 +++--- epel.repo | 6 +++--- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/epel-playground.repo b/epel-playground.repo index 37fea92..8e81eea 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -5,7 +5,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug @@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 [epel-playground-source] @@ -22,5 +22,5 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 0e08191..923a21a 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 5%{dist} +Release: 6%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Mon Sep 16 2019 Stephen Smoogen - 8-6%{dist} +- Change gpg key to use -8 versus -$releasever. This fixes bash problem + * Tue Aug 6 2019 Stephen Smoogen - 8-5%{dist} - Fix playground release to have os/ on its name [Kevin Fenzi] - Make sure all values of $release are $releasever diff --git a/epel-testing.repo b/epel-testing.repo index ee727c1..924a671 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -5,7 +5,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever failovermethod=priority enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug @@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Deb metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 [epel-testing-source] @@ -22,5 +22,5 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Sou metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 diff --git a/epel.repo b/epel.repo index 129fb01..411f2c1 100644 --- a/epel.repo +++ b/epel.repo @@ -5,7 +5,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$ failovermethod=priority enabled=1 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug @@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 [epel-source] @@ -22,5 +22,5 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch - Source metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir failovermethod=priority enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 From ad94ea654dd829b95cc06519f3dd7b48b6183084 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 10 Oct 2019 15:57:35 +0000 Subject: [PATCH 15/38] Remove failovermethod from EPEL8 tree. It is no longer needed. --- epel-playground.repo | 3 --- epel-release.spec | 5 ++++- epel-testing.repo | 3 --- epel.repo | 3 --- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/epel-playground.repo b/epel-playground.repo index 8e81eea..e1ee10b 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -2,7 +2,6 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -11,7 +10,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 @@ -20,7 +18,6 @@ gpgcheck=1 name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 923a21a..9710c43 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 6%{dist} +Release: 7%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Oct 10 2019 Stephen Smoogen - 8-7%{dist} +- Remove failovermethod from EPEL8 tree. It is no longer needed. + * Mon Sep 16 2019 Stephen Smoogen - 8-6%{dist} - Change gpg key to use -8 versus -$releasever. This fixes bash problem diff --git a/epel-testing.repo b/epel-testing.repo index 924a671..08050b3 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -2,7 +2,6 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -11,7 +10,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 @@ -20,7 +18,6 @@ gpgcheck=1 name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 diff --git a/epel.repo b/epel.repo index 411f2c1..5ab3021 100644 --- a/epel.repo +++ b/epel.repo @@ -2,7 +2,6 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -11,7 +10,6 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 @@ -20,7 +18,6 @@ gpgcheck=1 name=Extra Packages for Enterprise Linux $releasever - $basearch - Source #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir -failovermethod=priority enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 gpgcheck=1 From 26af6a99d7f5429b3932ef8c1cecce84073c8e1f Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Fri, 13 Dec 2019 14:09:37 -0600 Subject: [PATCH 16/38] Add modular repos. Signed-off-by: Merlin Mathesius --- epel-modular.repo | 23 +++++++++++++++++++++++ epel-release.spec | 12 +++++++++--- epel-testing-modular.repo | 23 +++++++++++++++++++++++ 3 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 epel-modular.repo create mode 100644 epel-testing-modular.repo diff --git a/epel-modular.repo b/epel-modular.repo new file mode 100644 index 0000000..5d4f968 --- /dev/null +++ b/epel-modular.repo @@ -0,0 +1,23 @@ +[epel-modular] +name=Extra Packages for Enterprise Linux Modular $releasever - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-modular-debuginfo] +name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-modular-source] +name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 9710c43..2887c36 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 7%{dist} +Release: 8%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -14,11 +14,14 @@ Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 Source1: GPL Source2: epel.repo Source3: epel-testing.repo -Source4: epel-playground.repo +Source4: epel-playground.repo # EPEL default preset policy (borrowed from fedora's 90-default.preset) Source5: 90-epel.preset Source6: README-epel-8-packaging.md +Source100: epel-modular.repo +Source101: epel-testing-modular.repo + BuildArch: noarch Requires: redhat-release >= %{version} # epel-release is only for enterprise linux, not fedora @@ -46,7 +49,7 @@ install -Dpm 644 %{SOURCE0} \ # yum install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} \ +install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE100} %{SOURCE101} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset @@ -61,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Fri Dec 13 2019 Merlin Mathesius - 8-8%{dist} +- Add modular repos. + * Thu Oct 10 2019 Stephen Smoogen - 8-7%{dist} - Remove failovermethod from EPEL8 tree. It is no longer needed. diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo new file mode 100644 index 0000000..03fb6ba --- /dev/null +++ b/epel-testing-modular.repo @@ -0,0 +1,23 @@ +[epel-testing-modular] +name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-testing-modular-debuginfo] +name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch/debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-testing-modular-source] +name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source +#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/SRPMS +metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 From a165aceeefb8e6853a225e4df4262945d6ebfe38 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 17:10:32 +0000 Subject: [PATCH 17/38] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index b728443..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 From ce09debe6873ca3a0ed2e6f98417e4856c6f56ee Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 31 Oct 2020 13:18:34 -0700 Subject: [PATCH 18/38] Enabled countme for epel8 repos - fixes bug 1825984 Signed-off-by: Kevin Fenzi --- epel-modular.repo | 1 + epel-playground.repo | 1 + epel-testing-modular.repo | 1 + epel-testing.repo | 1 + epel.repo | 1 + 5 files changed, 5 insertions(+) diff --git a/epel-modular.repo b/epel-modular.repo index 5d4f968..fd07f1c 100644 --- a/epel-modular.repo +++ b/epel-modular.repo @@ -4,6 +4,7 @@ name=Extra Packages for Enterprise Linux Modular $releasever - $basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 +countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-modular-debuginfo] diff --git a/epel-playground.repo b/epel-playground.repo index e1ee10b..6a22853 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -4,6 +4,7 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 +countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-playground-debuginfo] diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo index 03fb6ba..25db528 100644 --- a/epel-testing-modular.repo +++ b/epel-testing-modular.repo @@ -4,6 +4,7 @@ name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basear metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 +countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-modular-debuginfo] diff --git a/epel-testing.repo b/epel-testing.repo index 08050b3..b670f71 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -4,6 +4,7 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 +countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-debuginfo] diff --git a/epel.repo b/epel.repo index 5ab3021..61cd850 100644 --- a/epel.repo +++ b/epel.repo @@ -4,6 +4,7 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 +countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-debuginfo] From 7436783da11f85a7248eab305b7ac99d5d887bb9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 31 Oct 2020 13:29:13 -0700 Subject: [PATCH 19/38] Add countme feature for epel. Fixes bug #1825984 --- epel-release.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epel-release.spec b/epel-release.spec index 2887c36..832b7e3 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 8%{dist} +Release: 9%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Sat Oct 31 2020 Kevin Fenzi - 8-9 +- Add countme feature for epel. Fixes bug #1825984 + * Fri Dec 13 2019 Merlin Mathesius - 8-8%{dist} - Add modular repos. From f73269dee15b999b1745194f3a0265e7208d6fc4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 5 Dec 2020 13:12:26 -0800 Subject: [PATCH 20/38] Add x509watch.timer enabled by default. Fixes bug #1901721 --- 90-epel.preset | 4 +++- epel-release.spec | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/90-epel.preset b/90-epel.preset index cd326d1..e21aef2 100644 --- a/90-epel.preset +++ b/90-epel.preset @@ -1,3 +1,5 @@ # Also see: # https://fedoraproject.org/wiki/Starting_services_by_default - +# +# https://bugzilla.redhat.com/show_bug.cgi?id=1901721 +enable x509watch.timer diff --git a/epel-release.spec b/epel-release.spec index 832b7e3..f6e8be5 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 9%{dist} +Release: 10%{dist} Summary: Extra Packages for Enterprise Linux repository configuration Group: System Environment/Base @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Sat Dec 05 2020 Kevin Fenzi - 8-10 +- Add x509watch.timer enabled by default. Fixes bug #1901721 + * Sat Oct 31 2020 Kevin Fenzi - 8-9 - Add countme feature for epel. Fixes bug #1825984 From fe154087fd1805442424ae6b5bf663fde9fa352b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 16 Dec 2020 14:14:45 +0100 Subject: [PATCH 21/38] Replace hardcoded /etc with %{_sysconfdir} See https://bugzilla.redhat.com/show_bug.cgi?id=1852583#c2 --- epel-release.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index f6e8be5..48dd8da 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -59,8 +59,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc GPL README-epel-8-packaging.md -%config(noreplace) /etc/yum.repos.d/* -/etc/pki/rpm-gpg/* +%config(noreplace) %{_sysconfdir}/yum.repos.d/* +%{_sysconfdir}/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog From 9f03ce23e943c0cc5cfeaa359ddcac883c2b4c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 16 Dec 2020 14:15:42 +0100 Subject: [PATCH 22/38] Replace $RPM_BUILD_ROOT with %{buildroot} --- epel-release.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 48dd8da..4bece46 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -41,20 +41,20 @@ install -pm 644 %{SOURCE6} . %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} #GPG Key install -Dpm 644 %{SOURCE0} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version} + %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version} # yum -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +install -dm 755 %{buildroot}%{_sysconfdir}/yum.repos.d install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE100} %{SOURCE101} \ - $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset + %{buildroot}%{_sysconfdir}/yum.repos.d +install -pm 644 -D %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) From 041f1b0024091b762605b9f7d203df95afa1966e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 16 Dec 2020 14:16:40 +0100 Subject: [PATCH 23/38] Remove deprecated constructs --- epel-release.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 4bece46..f16ddf5 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -3,7 +3,6 @@ Version: 8 Release: 10%{dist} Summary: Extra Packages for Enterprise Linux repository configuration -Group: System Environment/Base License: GPLv2 # This is a EPEL maintained package which is specific to @@ -41,8 +40,6 @@ install -pm 644 %{SOURCE6} . %install -rm -rf %{buildroot} - #GPG Key install -Dpm 644 %{SOURCE0} \ %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version} @@ -53,11 +50,8 @@ install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE100} %{SOURCE101} \ %{buildroot}%{_sysconfdir}/yum.repos.d install -pm 644 -D %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset -%clean -rm -rf %{buildroot} %files -%defattr(-,root,root,-) %doc GPL README-epel-8-packaging.md %config(noreplace) %{_sysconfdir}/yum.repos.d/* %{_sysconfdir}/pki/rpm-gpg/* From cab5082e5f71e63d3f92d996ae4e7926b5793868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 16 Dec 2020 14:17:02 +0100 Subject: [PATCH 24/38] Move the license file from %doc to %license --- epel-release.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epel-release.spec b/epel-release.spec index f16ddf5..2a31753 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -52,7 +52,8 @@ install -pm 644 -D %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system-preset/9 %files -%doc GPL README-epel-8-packaging.md +%doc README-epel-8-packaging.md +%license GPL %config(noreplace) %{_sysconfdir}/yum.repos.d/* %{_sysconfdir}/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset From 06ecfc2e10f833708f842f594380c95d8a7d04b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 16 Dec 2020 14:18:06 +0100 Subject: [PATCH 25/38] Update the text of GPL, especially the FSF address See https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt See https://bugzilla.redhat.com/show_bug.cgi?id=1852583#c2 --- GPL | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/GPL b/GPL index fd8bee7..3c10746 100644 --- a/GPL +++ b/GPL @@ -6,15 +6,15 @@ Linux, it does not apply. ***************************************************************************** - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -23,7 +23,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -63,8 +63,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -118,7 +118,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -176,7 +176,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -233,7 +233,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -263,7 +263,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -285,9 +285,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -299,7 +299,7 @@ convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - Copyright (C) 19yy + Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -311,16 +311,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -343,5 +343,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. From 7b2d1272a827ed1147cfe496bff5a6b93c2740c3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 1 May 2021 15:51:40 -0700 Subject: [PATCH 26/38] Re-add commented out baseurls, change download to example and add note about using baseurls Keep the commented out baseurl in the repo files, but make it a invalid domain so people have to fill it in and add a note about metalink being more secure. This should allow people to still use sed to enable a baseurl for a local mirror or whatever. Signed-off-by: Kevin Fenzi --- epel-modular.repo | 12 +++++++++--- epel-playground.repo | 12 +++++++++--- epel-testing-modular.repo | 12 +++++++++--- epel-testing.repo | 12 +++++++++--- epel.repo | 12 +++++++++--- 5 files changed, 45 insertions(+), 15 deletions(-) diff --git a/epel-modular.repo b/epel-modular.repo index fd07f1c..58f6356 100644 --- a/epel-modular.repo +++ b/epel-modular.repo @@ -1,6 +1,8 @@ [epel-modular] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/SRPMS +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Modular/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/epel-playground.repo b/epel-playground.repo index 6a22853..5c3077b 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,6 +1,8 @@ [epel-playground] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/os metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo index 25db528..f8e93b8 100644 --- a/epel-testing-modular.repo +++ b/epel-testing-modular.repo @@ -1,6 +1,8 @@ [epel-testing-modular] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-testing-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/SRPMS +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/epel-testing.repo b/epel-testing.repo index b670f71..32fb7f3 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,6 +1,8 @@ [epel-testing] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/epel.repo b/epel.repo index 61cd850..37e983e 100644 --- a/epel.repo +++ b/epel.repo @@ -1,6 +1,8 @@ [epel] name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 From 0bf1a81fdc579c06440fbd820a8b1b19f0f3aeda Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 3 Jun 2021 04:37:19 -0500 Subject: [PATCH 27/38] Add epel-next-release subpackage --- README-epel-8-packaging.md | 24 ++++++++++++++++ epel-next-testing.repo | 30 ++++++++++++++++++++ epel-next.repo | 30 ++++++++++++++++++++ epel-release.spec | 56 ++++++++++++++++++++++++++++---------- 4 files changed, 125 insertions(+), 15 deletions(-) create mode 100644 epel-next-testing.repo create mode 100644 epel-next.repo diff --git a/README-epel-8-packaging.md b/README-epel-8-packaging.md index a561052..c835254 100644 --- a/README-epel-8-packaging.md +++ b/README-epel-8-packaging.md @@ -26,6 +26,30 @@ the package maintainer through to be tracked and if the primary maintainer is not interested in branching to EPEL, other ones can step in and do so. +## EPEL Next + +EPEL packages are built against RHEL. EPEL Next is an additional repository +that allows package maintainers to alternatively build against CentOS Stream. +This is sometimes necessary when CentOS Stream contains an upcoming RHEL +library rebase, or if an EPEL package has a minimum version build requirement +that is already in CentOS Stream but not yet in RHEL. EPEL Next has its own +distgit branches, koji build targets, and bodhi releases. + +EPEL Next packages have `.next` appended to the disttag (e.g. a disttag of +`.el8.next` for epel8-next) to provide an upgrade path from an EPEL package +that was built from the same distgit commit. A package maintainer can rebuild +the same commit for both EPEL and EPEL Next and get two different NVRs in koji. +Within six months, the build requirement necessitating building in EPEL Next +should be in RHEL, and at that time the package maintainer can do a normal +release bump commit in the EPEL branch and get a newer NVR than both the +previous EPEL and EPEL Next packages. + +To get started with EPEL Next, request the corresponding branch for the EPEL +release you are targeting, e.g. request an epel8-next branch to rebuild an +epel8 package against CentOS Stream 8. Once the branch is created you can +merge commits from other branches and submit a build just like you would for +other EPEL or Fedora branches. + ## EPEL Playground We have added an additional set of channels for EPEL-8 called diff --git a/epel-next-testing.repo b/epel-next-testing.repo new file mode 100644 index 0000000..fb46f46 --- /dev/null +++ b/epel-next-testing.repo @@ -0,0 +1,30 @@ +[epel-next-testing] +name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/$basearch/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-next-testing-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-next-testing-source] +name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Source +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/SRPMS/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel-next.repo b/epel-next.repo new file mode 100644 index 0000000..59027c0 --- /dev/null +++ b/epel-next.repo @@ -0,0 +1,30 @@ +[epel-next] +name=Extra Packages for Enterprise Linux $releasever - Next - $basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/next/$releasever/Everything/$basearch/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=1 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 + +[epel-next-debuginfo] +name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/next/$releasever/Everything/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 + +[epel-next-source] +name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Source +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/next/$releasever/Everything/SRPMS/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 2a31753..6caac1c 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 10%{dist} +Release: 11%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -11,32 +11,45 @@ License: GPLv2 URL: http://download.fedoraproject.org/pub/epel Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 Source1: GPL -Source2: epel.repo -Source3: epel-testing.repo -Source4: epel-playground.repo +Source2: README-epel-8-packaging.md # EPEL default preset policy (borrowed from fedora's 90-default.preset) -Source5: 90-epel.preset -Source6: README-epel-8-packaging.md +Source3: 90-epel.preset -Source100: epel-modular.repo -Source101: epel-testing-modular.repo + +Source100: epel.repo +Source101: epel-testing.repo +Source102: epel-next.repo +Source103: epel-next-testing.repo +Source104: epel-playground.repo +Source105: epel-modular.repo +Source106: epel-testing-modular.repo BuildArch: noarch Requires: redhat-release >= %{version} # epel-release is only for enterprise linux, not fedora Conflicts: fedora-release +Recommends: (epel-next-release if centos-stream-release) + %description This package contains the Extra Packages for Enterprise Linux (EPEL) repository GPG key as well as configuration for yum. + +%package -n epel-next-release +Summary: Extra Packages for Enterprise Linux Next repository configuration +Requires: %{name} = %{version}-%{release} + + +%description -n epel-next-release +This package contains the Extra Packages for Enterprise Linux (EPEL) Next +configuration for yum. + + %prep %setup -q -c -T -install -pm 644 %{SOURCE0} . install -pm 644 %{SOURCE1} . -install -pm 644 %{SOURCE6} . - -%build +install -pm 644 %{SOURCE2} . %install @@ -46,19 +59,32 @@ install -Dpm 644 %{SOURCE0} \ # yum install -dm 755 %{buildroot}%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE100} %{SOURCE101} \ +install -pm 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE105} %{SOURCE106} \ %{buildroot}%{_sysconfdir}/yum.repos.d -install -pm 644 -D %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset +install -pm 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset %files %doc README-epel-8-packaging.md %license GPL -%config(noreplace) %{_sysconfdir}/yum.repos.d/* +%config(noreplace) %{_sysconfdir}/yum.repos.d/epel.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-modular.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing-modular.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-playground.repo %{_sysconfdir}/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset + +%files -n epel-next-release +%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next-testing.repo + + %changelog +* Thu Jun 03 2021 Carl George - 8-11 +- Add epel-next-release subpackage + * Sat Dec 05 2020 Kevin Fenzi - 8-10 - Add x509watch.timer enabled by default. Fixes bug #1901721 From e48e79ee7c65e445d894b7c9dadeace9672b17ee Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 12 Jul 2021 20:02:08 -0500 Subject: [PATCH 28/38] Fixes spelling error Signed-off-by: Maxwell G --- epel-modular.repo | 6 +++--- epel-next-testing.repo | 6 +++--- epel-next.repo | 6 +++--- epel-playground.repo | 6 +++--- epel-testing-modular.repo | 6 +++--- epel-testing.repo | 6 +++--- epel.repo | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/epel-modular.repo b/epel-modular.repo index 58f6356..1090014 100644 --- a/epel-modular.repo +++ b/epel-modular.repo @@ -1,7 +1,7 @@ [epel-modular] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 @@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -22,7 +22,7 @@ gpgcheck=1 [epel-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Modular/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 diff --git a/epel-next-testing.repo b/epel-next-testing.repo index fb46f46..28dd3db 100644 --- a/epel-next-testing.repo +++ b/epel-next-testing.repo @@ -1,7 +1,7 @@ [epel-next-testing] name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-next-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -22,7 +22,7 @@ gpgcheck=1 [epel-next-testing-source] name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/SRPMS/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 diff --git a/epel-next.repo b/epel-next.repo index 59027c0..8538e32 100644 --- a/epel-next.repo +++ b/epel-next.repo @@ -1,7 +1,7 @@ [epel-next] name=Extra Packages for Enterprise Linux $releasever - Next - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/next/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 @@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-next-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/next/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -22,7 +22,7 @@ gpgcheck=1 [epel-next-source] name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/next/$releasever/Everything/SRPMS/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 diff --git a/epel-playground.repo b/epel-playground.repo index 5c3077b..8c5519a 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -1,7 +1,7 @@ [epel-playground] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/os metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -22,7 +22,7 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo index f8e93b8..0622abe 100644 --- a/epel-testing-modular.repo +++ b/epel-testing-modular.repo @@ -1,7 +1,7 @@ [epel-testing-modular] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -22,7 +22,7 @@ gpgcheck=1 [epel-testing-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Modular/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 diff --git a/epel-testing.repo b/epel-testing.repo index 32fb7f3..a3f68e6 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -1,7 +1,7 @@ [epel-testing] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -22,7 +22,7 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 diff --git a/epel.repo b/epel.repo index 37e983e..3f5c404 100644 --- a/epel.repo +++ b/epel.repo @@ -1,7 +1,7 @@ [epel] name=Extra Packages for Enterprise Linux $releasever - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 @@ -12,7 +12,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 @@ -22,7 +22,7 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $releasever - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 From 50e24524a993831fbcdcf7b025a98b82e8aeb44b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 30 Jul 2021 10:49:49 -0700 Subject: [PATCH 29/38] Enable certbot-renew.timer ( rhbz#1986205 ) --- 90-epel.preset | 4 ++++ epel-release.spec | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/90-epel.preset b/90-epel.preset index e21aef2..b3f4e22 100644 --- a/90-epel.preset +++ b/90-epel.preset @@ -3,3 +3,7 @@ # # https://bugzilla.redhat.com/show_bug.cgi?id=1901721 enable x509watch.timer +# +# https://bugzilla.redhat.com/show_bug.cgi?id=1986205 +# +enable certbot-renew.timer diff --git a/epel-release.spec b/epel-release.spec index 6caac1c..91b8b0e 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 11%{dist} +Release: 12%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -82,6 +82,9 @@ install -pm 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/9 %changelog +* Fri Jul 30 2021 Kevin Fenzi - 8-12 +- Enable certbot-renew.timer ( rhbz#1986205 ) + * Thu Jun 03 2021 Carl George - 8-11 - Add epel-next-release subpackage From a789d4f41064d5305180cca92e195ec86518cc3b Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Jul 2021 09:35:03 -0400 Subject: [PATCH 30/38] Change the baseurl to point to source/tree for srpms Signed-off-by: Mohan Boddu --- epel-modular.repo | 4 ++-- epel-next-testing.repo | 4 ++-- epel-next.repo | 4 ++-- epel-release.spec | 5 ++++- epel-testing-modular.repo | 4 ++-- epel-testing.repo | 4 ++-- epel.repo | 4 ++-- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/epel-modular.repo b/epel-modular.repo index 1090014..3ac79cc 100644 --- a/epel-modular.repo +++ b/epel-modular.repo @@ -22,8 +22,8 @@ gpgcheck=1 [epel-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Modular/SRPMS +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Modular/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/epel-next-testing.repo b/epel-next-testing.repo index 28dd3db..4581dfc 100644 --- a/epel-next-testing.repo +++ b/epel-next-testing.repo @@ -22,8 +22,8 @@ gpgcheck=1 [epel-next-testing-source] name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/SRPMS/ +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/epel-next.repo b/epel-next.repo index 8538e32..49601ab 100644 --- a/epel-next.repo +++ b/epel-next.repo @@ -22,8 +22,8 @@ gpgcheck=1 [epel-next-source] name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/next/$releasever/Everything/SRPMS/ +# place it's address here. +#baseurl=https://download.example/pub/epel/next/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/epel-release.spec b/epel-release.spec index 91b8b0e..4578940 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 12%{dist} +Release: 13%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -82,6 +82,9 @@ install -pm 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/9 %changelog +* Fri Sep 03 2021 Mohan Boddu - 8-13 +- Change the baseurl to point to source/tree for srpms + * Fri Jul 30 2021 Kevin Fenzi - 8-12 - Enable certbot-renew.timer ( rhbz#1986205 ) diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo index 0622abe..494b84a 100644 --- a/epel-testing-modular.repo +++ b/epel-testing-modular.repo @@ -22,8 +22,8 @@ gpgcheck=1 [epel-testing-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/SRPMS +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/epel-testing.repo b/epel-testing.repo index a3f68e6..a21a806 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -22,8 +22,8 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/SRPMS +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/epel.repo b/epel.repo index 3f5c404..eb3208d 100644 --- a/epel.repo +++ b/epel.repo @@ -22,8 +22,8 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $releasever - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Everything/SRPMS +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 From 7aa72a94b7519c1233675e24a6f587fad418b215 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 4 Sep 2021 10:26:07 -0700 Subject: [PATCH 31/38] epel-playground: add /tree to debug repo example. Fixes https://pagure.io/epel/issue/120 Signed-off-by: Kevin Fenzi --- epel-playground.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epel-playground.repo b/epel-playground.repo index 8c5519a..90fdc98 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -13,7 +13,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror # place its address here. -#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/debug +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/debug/tree metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 From 6b70e4bc5751f11d01399cfeaa87b8f0058f4bac Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 7 Oct 2021 23:51:30 -0500 Subject: [PATCH 32/38] Initial package for epel9-next --- .cvsignore | 0 README-epel-8-packaging.md | 199 ------------------------------------- RPM-GPG-KEY-EPEL-8 | 28 ------ RPM-GPG-KEY-EPEL-9 | 29 ++++++ epel-modular.repo | 12 +-- epel-next-testing.repo | 8 +- epel-next.repo | 8 +- epel-playground.repo | 10 +- epel-release.spec | 83 +++++++++++----- epel-testing-modular.repo | 8 +- epel-testing.repo | 12 +-- epel.repo | 12 +-- sources | 0 13 files changed, 120 insertions(+), 289 deletions(-) delete mode 100644 .cvsignore delete mode 100644 README-epel-8-packaging.md delete mode 100644 RPM-GPG-KEY-EPEL-8 create mode 100644 RPM-GPG-KEY-EPEL-9 delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/README-epel-8-packaging.md b/README-epel-8-packaging.md deleted file mode 100644 index c835254..0000000 --- a/README-epel-8-packaging.md +++ /dev/null @@ -1,199 +0,0 @@ -# EPEL-8 Packaging Procedures - -## Introduction - -When a new Red Hat Enterprise Linux occurs, one of the steps to get -EPEL going for it is branching of various packages into new -namespace. The EPEL Steering Committee does not mass branch all -existing packages into the namespace because it has caused multiple -problems: - -1. The package maintainers did not want to support the package in the -newer version of EPEL. Package maintainers may only want to support -certain versions of Enterprise Linux or may want to wait until their -favourite derivative appears. - -2. The package does not work in the latest version of RHEL. With -multiple years between releases, software which worked on Fedora 18 -which would branch to EPEL-7 may not exist anymore with Fedora 28 and -EPEL-8 would need a completely different version. - -## Consumer request for packages - -People who are interested in getting packages into EPEL should contact -the package maintainer through -[bugzilla](https://bugzilla.redhat.com/). This allows for the requests -to be tracked and if the primary maintainer is not interested in -branching to EPEL, other ones can step in and do so. - -## EPEL Next - -EPEL packages are built against RHEL. EPEL Next is an additional repository -that allows package maintainers to alternatively build against CentOS Stream. -This is sometimes necessary when CentOS Stream contains an upcoming RHEL -library rebase, or if an EPEL package has a minimum version build requirement -that is already in CentOS Stream but not yet in RHEL. EPEL Next has its own -distgit branches, koji build targets, and bodhi releases. - -EPEL Next packages have `.next` appended to the disttag (e.g. a disttag of -`.el8.next` for epel8-next) to provide an upgrade path from an EPEL package -that was built from the same distgit commit. A package maintainer can rebuild -the same commit for both EPEL and EPEL Next and get two different NVRs in koji. -Within six months, the build requirement necessitating building in EPEL Next -should be in RHEL, and at that time the package maintainer can do a normal -release bump commit in the EPEL branch and get a newer NVR than both the -previous EPEL and EPEL Next packages. - -To get started with EPEL Next, request the corresponding branch for the EPEL -release you are targeting, e.g. request an epel8-next branch to rebuild an -epel8 package against CentOS Stream 8. Once the branch is created you can -merge commits from other branches and submit a build just like you would for -other EPEL or Fedora branches. - -## EPEL Playground - -We have added an additional set of channels for EPEL-8 called -playground. It is meant to be sort of like Fedora Rawhide so that -packagers can work on versions of software which are too fast moving -or will have large API changes from what they are putting in the -regular channel. - -To try and make this transparent, we have made it so when a package is -built in epel8 it will normally also be built in -epel8-playground. This is done via a packages.cfg file which lists the -targets for fedpkg to build against. A successful package build will -then go through 2 different paths: - -* epel8 package will go into bodhi to be put into epel8-testing -* epel8-playground will bypass bodhi and go directly into - epel8-playground the next compose. - -If a packager needs to focus only on epel8 or epel8-playground they -can edit packages.cfg to change the ```target= epel8 -epel8-playground``` to ```target= epel8 ```. - -Packages in epel8-playground are primarily to be used in the following -manner: - -* To test out some new version of the package that might not be stable - yet. - -* To test out some new packaging of the package - -* To test a major version change of the package that they want to land - at the next epel8 minor release. - -* To build a package that will never be stable enough for epel8, but - still could be useful to some. - -* At minor RHEL releases (ie, 8.1, 8.2) people can pull in big changes - from playground to the main epel8 packages. Since people will be - upgrading and paying more attention than usual anyhow at those - points, it’s a great chance to do that change, but also you want to - make sure it’s panned out, so you can test before hand in - playground. - -Consumers should be aware that packages in EPEL8-playground are there -without any Service Level Expectations. You may want to only cherry -pick packages from there as needed. - -## Developer request for branching multiple packages - -Branching is handled the same way as requesting a branch using `fedpkg -request-branch`. A maintainer can request an epel8 branch using -`fedpkg request-branch epel8` which will create a ticket in -https://pagure.io/releng/fedora-scm-requests/issues and Release -Engineering will process these requests. - -To branch multiple packages please use this or a variant of this -script: - -``` -#!/usr/bin/sh -# Reminder to get an updated pagure token for releng tickets -# Usage: epel-8.sh foo bar goo blah blech -if [ $# -lt 1 ] -then - echo "At least one package name should be provided" -else - TMPDIR=`mktemp -d /tmp/epel8.XXXXXX` - pushd "$TMPDIR" - for pkg in "$@" - do - fedpkg clone "$pkg" - pushd "$pkg" - fedpkg request-branch epel8 - fedpkg request-branch epel8-playground - popd - done - rm -rfv "$TMPDIR" -fi -``` - -Releng will then work through the tickets in the system which is -adding branches to the PDC and src.fedoraproject.org. - - -## Known Issues - -1. /usr/bin/python does not exist. Choose ``/usr/bin/python3`` or -``/usr/bin/python2`` and patch appropriately. - -2. ``python2-sphinx`` is not shipped. Most packages should work with -python3-sphinx, and if it doesn't please open a bug. The python team -has been good about making fixes for this. - -3. When branching python packages, be aware that python in EL-8 is -python36 and not the version currently in rawhide. This has come up -with a couple of test packages where they assumed python37 or later. - -4. ``systemd-rpm-macros`` is not a separate packages. If needed, used -``BuildRequires: systemd`` - -5. While EL-8 comes with platform-python, it should NOT be used in -``Requires:`` unless absolutely neccessary. python3 should be used -instead. (Exceptions can be made but will be rare and need -justification.) - -**Accepted Exceptions:** -* Use python3.6dist(coverage) instead of python3-coverage. This - package is not shipped but is needed in %check code. - -6. Sometimes RHEL8 only has a python3 package for a dependency you -need for your build. (Example: python-bleach requires -python2-html5lib, but RHEL8 provides only python3-html5lib). For -EPEL-8.0 we only suggest one choice: - -* Choose not to have the python2 part of your package and patch - whatever to use python3. - -7. Python2 packages are discouraged. RHEL-8 will contain python2.7 -until probably the end of life of RHEL-7. However support upstream -will only be minimal. When modularity occurs, we suggest that you make -whatever python2 packages modules which can be pulled out when -RHEL-8.N no longer has python2. - -8. While a RHEL src.rpm might produce a -devel package, it may not -currently be in the build repository. When running into this please -open a ticket with https://pagure.io/epel/new_issue for us to put in a -request for it to be added to Red Hat's Code Ready Builder. After -modularity is enabled, changes to what is done will be needed. - -9. EPEL-8.0 may not work with the RHEL-8.1 beta. There seem to be -changes in dnf and zchunk which we have not worked out. This line will -be updated. - - -## Definitions - -1. Package maintainer. Person who has accepted responsibility to -package and maintain software in the Fedora Project ecosystem. The -main packager is usually someone focused on Fedora Linux, and -secondary packagers may be focused on particular use cases like EPEL. - -2. Consumer. A person who has subscribed to EPEL for packages but is -not a maintainer. - -3. PDC. Product Definition Center. A tool to help list the lifetime -and permissions that a product has so that branching and updates can -be better managed. diff --git a/RPM-GPG-KEY-EPEL-8 b/RPM-GPG-KEY-EPEL-8 deleted file mode 100644 index 30b69a6..0000000 --- a/RPM-GPG-KEY-EPEL-8 +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBFz3zvsBEADJOIIWllGudxnpvJnkxQz2CtoWI7godVnoclrdl83kVjqSQp+2 -dgxuG5mUiADUfYHaRQzxKw8efuQnwxzU9kZ70ngCxtmbQWGmUmfSThiapOz00018 -+eo5MFabd2vdiGo1y+51m2sRDpN8qdCaqXko65cyMuLXrojJHIuvRA/x7iqOrRfy -a8x3OxC4PEgl5pgDnP8pVK0lLYncDEQCN76D9ubhZQWhISF/zJI+e806V71hzfyL -/Mt3mQm/li+lRKU25Usk9dWaf4NH/wZHMIPAkVJ4uD4H/uS49wqWnyiTYGT7hUbi -ecF7crhLCmlRzvJR8mkRP6/4T/F3tNDPWZeDNEDVFUkTFHNU6/h2+O398MNY/fOh -yKaNK3nnE0g6QJ1dOH31lXHARlpFOtWt3VmZU0JnWLeYdvap4Eff9qTWZJhI7Cq0 -Wm8DgLUpXgNlkmquvE7P2W5EAr2E5AqKQoDbfw/GiWdRvHWKeNGMRLnGI3QuoX3U -pAlXD7v13VdZxNydvpeypbf/AfRyrHRKhkUj3cU1pYkM3DNZE77C5JUe6/0nxbt4 -ETUZBTgLgYJGP8c7PbkVnO6I/KgL1jw+7MW6Az8Ox+RXZLyGMVmbW/TMc8haJfKL -MoUo3TVk8nPiUhoOC0/kI7j9ilFrBxBU5dUtF4ITAWc8xnG6jJs/IsvRpQARAQAB -tChGZWRvcmEgRVBFTCAoOCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB -AgAiBQJc9877AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAh6kWrL4bW -oWagD/4xnLWws34GByVDQkjprk0fX7Iyhpm/U7BsIHKspHLL+Y46vAAGY/9vMvdE -0fcr9Ek2Zp7zE1RWmSCzzzUgTG6BFoTG1H4Fho/7Z8BXK/jybowXSZfqXnTOfhSF -alwDdwlSJvfYNV9MbyvbxN8qZRU1z7PEWZrIzFDDToFRk0R71zHpnPTNIJ5/YXTw -NqU9OxII8hMQj4ufF11040AJQZ7br3rzerlyBOB+Jd1zSPVrAPpeMyJppWFHSDAI -WK6x+am13VIInXtqB/Cz4GBHLFK5d2/IYspVw47Solj8jiFEtnAq6+1Aq5WH3iB4 -bE2e6z00DSF93frwOyWN7WmPIoc2QsNRJhgfJC+isGQAwwq8xAbHEBeuyMG8GZjz -xohg0H4bOSEujVLTjH1xbAG4DnhWO/1VXLX+LXELycO8ZQTcjj/4AQKuo4wvMPrv -9A169oETG+VwQlNd74VBPGCvhnzwGXNbTK/KH1+WRH0YSb+41flB3NKhMSU6dGI0 -SGtIxDSHhVVNmx2/6XiT9U/znrZsG5Kw8nIbbFz+9MGUUWgJMsd1Zl9R8gz7V9fp -n7L7y5LhJ8HOCMsY/Z7/7HUs+t/A1MI4g7Q5g5UuSZdgi0zxukiWuCkLeAiAP4y7 -zKK4OjJ644NDcWCHa36znwVmkz3ixL8Q0auR15Oqq2BjR/fyog== -=84m8 ------END PGP PUBLIC KEY BLOCK----- diff --git a/RPM-GPG-KEY-EPEL-9 b/RPM-GPG-KEY-EPEL-9 new file mode 100644 index 0000000..234c12f --- /dev/null +++ b/RPM-GPG-KEY-EPEL-9 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGE3mOsBEACsU+XwJWDJVkItBaugXhXIIkb9oe+7aadELuVo0kBmc3HXt/Yp +CJW9hHEiGZ6z2jwgPqyJjZhCvcAWvgzKcvqE+9i0NItV1rzfxrBe2BtUtZmVcuE6 +2b+SPfxQ2Hr8llaawRjt8BCFX/ZzM4/1Qk+EzlfTcEcpkMf6wdO7kD6ulBk/tbsW +DHX2lNcxszTf+XP9HXHWJlA2xBfP+Dk4gl4DnO2Y1xR0OSywE/QtvEbN5cY94ieu +n7CBy29AleMhmbnx9pw3NyxcFIAsEZHJoU4ZW9ulAJ/ogttSyAWeacW7eJGW31/Z +39cS+I4KXJgeGRI20RmpqfH0tuT+X5Da59YpjYxkbhSK3HYBVnNPhoJFUc2j5iKy +XLgkapu1xRnEJhw05kr4LCbud0NTvfecqSqa+59kuVc+zWmfTnGTYc0PXZ6Oa3rK +44UOmE6eAT5zd/ToleDO0VesN+EO7CXfRsm7HWGpABF5wNK3vIEF2uRr2VJMvgqS +9eNwhJyOzoca4xFSwCkc6dACGGkV+CqhufdFBhmcAsUotSxe3zmrBjqA0B/nxIvH +DVgOAMnVCe+Lmv8T0mFgqZSJdIUdKjnOLu/GRFhjDKIak4jeMBMTYpVnU+HhMHLq +uDiZkNEvEEGhBQmZuI8J55F/a6UURnxUwT3piyi3Pmr2IFD7ahBxPzOBCQARAQAB +tCdGZWRvcmEgKGVwZWw5KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAk4EEwEI +ADgWIQT/itE0RZcQbs6BO5GKOHK/MihGfAUCYTeY6wIbDwULCQgHAgYVCgkICwIE +FgIDAQIeAQIXgAAKCRCKOHK/MihGfFX/EACBPWv20+ttYu1A5WvtHJPzwbj0U4yF +3zTQpBglQ2UfkRpYdipTlT3Ih6j5h2VmgRPtINCc/ZE28adrWpBoeFIS2YAKOCLC +nZYtHl2nCoLq1U7FSttUGsZ/t8uGCBgnugTfnIYcmlP1jKKA6RJAclK89evDQX5n +R9ZD+Cq3CBMlttvSTCht0qQVlwycedH8iWyYgP/mF0W35BIn7NuuZwWhgR00n/VG +4nbKPOzTWbsP45awcmivdrS74P6mL84WfkghipdmcoyVb1B8ZP4Y/Ke0RXOnLhNe +CfrXXvuW+Pvg2RTfwRDtehGQPAgXbmLmz2ZkV69RGIr54HJv84NDbqZovRTMr7gL +9k3ciCzXCiYQgM8yAyGHV0KEhFSQ1HV7gMnt9UmxbxBE2pGU7vu3CwjYga5DpwU7 +w5wu1TmM5KgZtZvuWOTDnqDLf0cKoIbW8FeeCOn24elcj32bnQDuF9DPey1mqcvT +/yEo/Ushyz6CVYxN8DGgcy2M9JOsnmjDx02h6qgWGWDuKgb9jZrvRedpAQCeemEd +fhEs6ihqVxRFl16HxC4EVijybhAL76SsM2nbtIqW1apBQJQpXWtQwwdvgTVpdEtE +r4ArVJYX5LrswnWEQMOelugUG6S3ZjMfcyOa/O0364iY73vyVgaYK+2XtT2usMux +VL469Kj5m13T6w== +=Mjs/ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/epel-modular.repo b/epel-modular.repo index 3ac79cc..d898507 100644 --- a/epel-modular.repo +++ b/epel-modular.repo @@ -2,29 +2,29 @@ name=Extra Packages for Enterprise Linux Modular $releasever - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror # place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch +#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror # place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch/debug +#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Modular/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-next-testing.repo b/epel-next-testing.repo index 4581dfc..53d7531 100644 --- a/epel-next-testing.repo +++ b/epel-next-testing.repo @@ -7,7 +7,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-$rele enabled=0 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-next-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Debug @@ -16,15 +16,15 @@ name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearc #baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-next-testing-source] name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-next.repo b/epel-next.repo index 49601ab..bb1bc23 100644 --- a/epel-next.repo +++ b/epel-next.repo @@ -7,7 +7,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&a enabled=1 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-next-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Debug @@ -16,15 +16,15 @@ name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Debug #baseurl=https://download.example/pub/epel/next/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-next-source] name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/next/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-playground.repo b/epel-playground.repo index 90fdc98..3736236 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -2,21 +2,21 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror # place its address here. -#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/os +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror # place its address here. -#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/debug/tree +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/debug/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-playground-source] @@ -26,5 +26,5 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - #baseurl=https://download.example/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 4578940..12efb41 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,34 +1,40 @@ +%bcond_with base +%bcond_without next +%bcond_with modular +%bcond_with playground + Name: epel-release -Version: 8 -Release: 13%{dist} +Version: 9 +Release: 1%{dist} Summary: Extra Packages for Enterprise Linux repository configuration - License: GPLv2 # This is a EPEL maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. URL: http://download.fedoraproject.org/pub/epel -Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 +Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-%{version} Source1: GPL -Source2: README-epel-8-packaging.md -# EPEL default preset policy (borrowed from fedora's 90-default.preset) -Source3: 90-epel.preset - Source100: epel.repo -Source101: epel-testing.repo -Source102: epel-next.repo -Source103: epel-next-testing.repo -Source104: epel-playground.repo -Source105: epel-modular.repo -Source106: epel-testing-modular.repo - -BuildArch: noarch -Requires: redhat-release >= %{version} +Source101: epel-next.repo +Source102: epel-modular.repo +Source103: epel-playground.repo + +Source200: epel-testing.repo +Source201: epel-next-testing.repo +Source202: epel-testing-modular.repo + +# EPEL default preset policy (borrowed from fedora's 90-default.preset) +Source300: 90-epel.preset + +BuildArch: noarch +Requires: redhat-release >= %{version} # epel-release is only for enterprise linux, not fedora -Conflicts: fedora-release -Recommends: (epel-next-release if centos-stream-release) +Conflicts: fedora-release +%if %{with next} +Recommends: (epel-next-release if centos-stream-release) +%endif %description @@ -36,6 +42,7 @@ This package contains the Extra Packages for Enterprise Linux (EPEL) repository GPG key as well as configuration for yum. +%if %{with next} %package -n epel-next-release Summary: Extra Packages for Enterprise Linux Next repository configuration Requires: %{name} = %{version}-%{release} @@ -44,44 +51,66 @@ Requires: %{name} = %{version}-%{release} %description -n epel-next-release This package contains the Extra Packages for Enterprise Linux (EPEL) Next configuration for yum. +%endif %prep -%setup -q -c -T +%setup -q -c -T install -pm 644 %{SOURCE1} . -install -pm 644 %{SOURCE2} . %install -#GPG Key +# GPG Key install -Dpm 644 %{SOURCE0} \ %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version} -# yum +# yum repo configs install -dm 755 %{buildroot}%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE105} %{SOURCE106} \ - %{buildroot}%{_sysconfdir}/yum.repos.d -install -pm 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset +%if %{with base} +install -pm 644 %{SOURCE100} %{SOURCE200} %{buildroot}%{_sysconfdir}/yum.repos.d +%endif +%if %{with next} +install -pm 644 %{SOURCE101} %{SOURCE201} %{buildroot}%{_sysconfdir}/yum.repos.d +%endif +%if %{with modular} +install -pm 644 %{SOURCE102} %{SOURCE202} %{buildroot}%{_sysconfdir}/yum.repos.d +%endif +%if %{with playground} +install -pm 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/yum.repos.d +%endif + +# systemd presets +install -pm 644 -D %{SOURCE300} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset %files -%doc README-epel-8-packaging.md %license GPL +%if %{with base} %config(noreplace) %{_sysconfdir}/yum.repos.d/epel.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing.repo +%endif +%if %{with modular} %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-modular.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing-modular.repo +%endif +%if %{with playground} %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-playground.repo +%endif %{_sysconfdir}/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset +%if %{with next} %files -n epel-next-release %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next-testing.repo +%endif %changelog +* Fri Oct 08 2021 Carl George - 9-1 +- Initial package for epel9-next + * Fri Sep 03 2021 Mohan Boddu - 8-13 - Change the baseurl to point to source/tree for srpms diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo index 494b84a..f312bb2 100644 --- a/epel-testing-modular.repo +++ b/epel-testing-modular.repo @@ -7,7 +7,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$re enabled=0 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-testing-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug @@ -16,15 +16,15 @@ name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basear #baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-testing-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Modular/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-testing.repo b/epel-testing.repo index a21a806..0211f45 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -2,29 +2,29 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror # place its address here. -#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror # place its address here. -#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch/debug +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel.repo b/epel.repo index eb3208d..c162fe5 100644 --- a/epel.repo +++ b/epel.repo @@ -2,29 +2,29 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch # It is much more secure to use the metalink, but if you wish to use a local mirror # place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch +#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug # It is much more secure to use the metalink, but if you wish to use a local mirror # place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/debug +#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $releasever - $basearch - Source # It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 65609096ed8c842dcb9a50d05325616f8c42176b Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 1 Dec 2021 16:52:32 -0600 Subject: [PATCH 33/38] Enable epel9 repo files --- epel-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 12efb41..3eac880 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,11 +1,11 @@ -%bcond_with base +%bcond_without base %bcond_without next %bcond_with modular %bcond_with playground Name: epel-release Version: 9 -Release: 1%{dist} +Release: 2%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -108,6 +108,9 @@ install -pm 644 -D %{SOURCE300} %{buildroot}%{_prefix}/lib/systemd/system-preset %changelog +* Wed Dec 01 2021 Carl George - 9-2 +- Enable epel9 repo files + * Fri Oct 08 2021 Carl George - 9-1 - Initial package for epel9-next From 3750a54112b5c8ebaf71e1ffc716fa8c6f79fc1c Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 26 May 2022 15:07:44 -0700 Subject: [PATCH 34/38] Add crb script to allow users to --enable, --disable or --status the CRB repo. Signed-off-by: Troy Dawson --- crb | 78 +++++++++++++++++++++++++++++++++++++++++++++++ epel-release.spec | 21 +++++++++++-- 2 files changed, 97 insertions(+), 2 deletions(-) create mode 100755 crb diff --git a/crb b/crb new file mode 100755 index 0000000..6e99ddf --- /dev/null +++ b/crb @@ -0,0 +1,78 @@ +#!/bin/bash +# Enable / Disable / Status the codeready-builder(CRB) or equivalent repo. + +############### +# Show help +############### +usage() { + echo "Usage `basename $0` [ enable | disable | status ] " >&2 + echo >&2 + echo "Enable, Disable, or give the status of the CodeReady Builder (CRB) repo" >&2 + echo >&2 + echo "Options:" >&2 + echo " enable" >&2 + echo " Enable the CRB repo" >&2 + echo " disable" >&2 + echo " Disable the CRB repo" >&2 + echo " status" >&2 + echo " Show if rhe CRB repo is enabled or disabled" >&2 + echo " help" >&2 + echo " Show this options menu" >&2 + echo >&2 + popd &>/dev/null + exit 1 +} + + +# Show the status +show_status()( + # Determine if a version of CRB is enabled + crb_repo=$(dnf repolist | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt | awk '{print $1}') + if [ "${crb_repo}" == "" ] ; then + echo "CRB repo is disabled" + else + echo "CRB repo is enabled and named: ${crb_repo}" + fi +) + +# Enable or Disable the repo +enable_disable_repo(){ + command="$1" + # Determine which repo we need to change + crb_repo=$(dnf repolist --all | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt | awk '{print $1}') + + # Determine if we are on RHEL or not, then do the correct steps + if echo "${crb_repo}" | grep -q "codeready" ; then + # Only RHEL has a repo with codeready in it, use subcription-manager + subscription-manager repos ${command} ${crb_repo} + else + # Everything else uses dnf config-manager + dnf config-manager ${command} ${crb_repo} + fi +} + +############### +# Get our arguments +############### +key="$1" +case $key in +enable | --enable ) + echo "Enabling CRB repo" + enable_disable_repo --enable + show_status +;; +disable | --disable ) + echo "Disabling CRB repo" + enable_disable_repo --disable + show_status +;; +status | --status ) + show_status +;; +* ) + usage + exit 2 +;; +esac + +exit 0 diff --git a/epel-release.spec b/epel-release.spec index 3eac880..b3c4005 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -5,7 +5,7 @@ Name: epel-release Version: 9 -Release: 2%{dist} +Release: 3%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -28,6 +28,9 @@ Source202: epel-testing-modular.repo # EPEL default preset policy (borrowed from fedora's 90-default.preset) Source300: 90-epel.preset +# Add epel crb repo +Source301: crb + BuildArch: noarch Requires: redhat-release >= %{version} # epel-release is only for enterprise linux, not fedora @@ -82,6 +85,17 @@ install -pm 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/yum.repos.d # systemd presets install -pm 644 -D %{SOURCE300} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset +# Add epel crb repo +install -D -pm744 -t %{buildroot}%{_bindir} %{SOURCE301} + +%post +# Doing a check to see if crb is enabled is as hard and resource intense as enabling or disabling crb. +# So we will say crb is recommended, without first checking. But only on the initial install. +if [ "$1" -eq 1 ] ; then + echo "Many EPEL packages require the CodeReady Builder (CRB) repository." + echo "It is recommended that you run %{_bindir}/crb enable to enable the CRB repository." +fi + %files %license GPL @@ -98,7 +112,7 @@ install -pm 644 -D %{SOURCE300} %{buildroot}%{_prefix}/lib/systemd/system-preset %endif %{_sysconfdir}/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset - +%{_bindir}/crb %if %{with next} %files -n epel-next-release @@ -108,6 +122,9 @@ install -pm 644 -D %{SOURCE300} %{buildroot}%{_prefix}/lib/systemd/system-preset %changelog +* Wed Jun 29 2022 Troy Dawson - 9-3 +- Add crb script + * Wed Dec 01 2021 Carl George - 9-2 - Enable epel9 repo files From a70326a2769c012b456f436967e2de3de4fbf255 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 9 Aug 2022 06:38:25 -0700 Subject: [PATCH 35/38] Tweak crb script, Recommends dnf-command(config-manager) (#2115602) --- crb | 7 +++++++ epel-release.spec | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/crb b/crb index 6e99ddf..376b308 100755 --- a/crb +++ b/crb @@ -46,6 +46,13 @@ enable_disable_repo(){ # Only RHEL has a repo with codeready in it, use subcription-manager subscription-manager repos ${command} ${crb_repo} else + # Determine if dnf-command(config-manager) is installed + if ! rpm -q --whatprovides 'dnf-command(config-manager)' > /dev/null 2>&1 ; then + echo "Error: Please run: dnf install 'dnf-command(config-manager)'" >&2 + echo " before trying to enable/disable the CRB repo." >&2 + echo "Aborting"'!' >&2 + exit 1 + fi # Everything else uses dnf config-manager dnf config-manager ${command} ${crb_repo} fi diff --git a/epel-release.spec b/epel-release.spec index b3c4005..27510dd 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -5,7 +5,7 @@ Name: epel-release Version: 9 -Release: 3%{dist} +Release: 4%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -35,6 +35,9 @@ BuildArch: noarch Requires: redhat-release >= %{version} # epel-release is only for enterprise linux, not fedora Conflicts: fedora-release +# crb needs config-manager to run +# But only recommend it, incase people do not need crb +Recommends: dnf-command(config-manager) %if %{with next} Recommends: (epel-next-release if centos-stream-release) %endif @@ -122,6 +125,9 @@ fi %changelog +* Tue Aug 09 2022 Troy Dawson - 9-4 +- Tweak crb script, Recommends dnf-command(config-manager) (#2115602) + * Wed Jun 29 2022 Troy Dawson - 9-3 - Add crb script From 631a6701f18bfb5f2551b37421c67b0a8f7a1a21 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 14 Apr 2023 14:20:32 -0700 Subject: [PATCH 36/38] Tweak crb script, check os-release for RHEL (#2186721) --- crb | 24 ++++++++++++------------ epel-release.spec | 5 ++++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/crb b/crb index 376b308..07941a2 100755 --- a/crb +++ b/crb @@ -42,19 +42,19 @@ enable_disable_repo(){ crb_repo=$(dnf repolist --all | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt | awk '{print $1}') # Determine if we are on RHEL or not, then do the correct steps - if echo "${crb_repo}" | grep -q "codeready" ; then - # Only RHEL has a repo with codeready in it, use subcription-manager - subscription-manager repos ${command} ${crb_repo} + source /etc/os-release + if [[ "${NAME}" =~ "Red Hat" ]] ; then + subscription-manager repos ${command} ${crb_repo} else - # Determine if dnf-command(config-manager) is installed - if ! rpm -q --whatprovides 'dnf-command(config-manager)' > /dev/null 2>&1 ; then - echo "Error: Please run: dnf install 'dnf-command(config-manager)'" >&2 - echo " before trying to enable/disable the CRB repo." >&2 - echo "Aborting"'!' >&2 - exit 1 - fi - # Everything else uses dnf config-manager - dnf config-manager ${command} ${crb_repo} + # Determine if dnf-command(config-manager) is installed + if ! rpm -q --whatprovides 'dnf-command(config-manager)' > /dev/null 2>&1 ; then + echo "Error: Please run: dnf install 'dnf-command(config-manager)'" >&2 + echo " before trying to enable/disable the CRB repo." >&2 + echo "Aborting"'!' >&2 + exit 1 + fi + # Everything else uses dnf config-manager + dnf config-manager ${command} ${crb_repo} fi } diff --git a/epel-release.spec b/epel-release.spec index 27510dd..c97fb84 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -5,7 +5,7 @@ Name: epel-release Version: 9 -Release: 4%{dist} +Release: 5%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -125,6 +125,9 @@ fi %changelog +* Fri Apr 14 2023 Troy Dawson - 9-5 +- Tweak crb script, check os-release for RHEL (#2186721) + * Tue Aug 09 2022 Troy Dawson - 9-4 - Tweak crb script, Recommends dnf-command(config-manager) (#2115602) From f9f09ef74a7a6745f92ad0d49c0d7717eb499f0a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 15 Aug 2023 15:03:20 -0400 Subject: [PATCH 37/38] Add EPEL OpenH264 repository (#2053295) --- epel-cisco-openh264.repo | 33 +++++++++++++++++++++++++++++++++ epel-release.spec | 13 ++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 epel-cisco-openh264.repo diff --git a/epel-cisco-openh264.repo b/epel-cisco-openh264.repo new file mode 100644 index 0000000..b4fadde --- /dev/null +++ b/epel-cisco-openh264.repo @@ -0,0 +1,33 @@ +[epel-cisco-openh264] +name=Extra Packages for Enterprise Linux $releasever openh264 (From Cisco) - $basearch +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-cisco-openh264-$releasever&arch=$basearch +type=rpm +enabled=1 +metadata_expire=14d +repo_gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +skip_if_unavailable=True + +[epel-cisco-openh264-debuginfo] +name=Extra Packages for Enterprise Linux $releasever openh264 (From Cisco) - $basearch - Debug +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-cisco-openh264-debug-$releasever&arch=$basearch +type=rpm +enabled=0 +metadata_expire=14d +repo_gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +skip_if_unavailable=True + +[epel-cisco-openh264-source] +name=Extra Packages for Enterprise Linux $releasever openh264 (From Cisco) - $basearch - Source +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-cisco-openh264-source-$releasever&arch=$basearch +type=rpm +enabled=0 +metadata_expire=14d +repo_gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever +skip_if_unavailable=True + diff --git a/epel-release.spec b/epel-release.spec index c97fb84..59cfbbf 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,11 +1,12 @@ %bcond_without base %bcond_without next +%bcond_without open264 %bcond_with modular %bcond_with playground Name: epel-release Version: 9 -Release: 5%{dist} +Release: 6%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -20,6 +21,7 @@ Source100: epel.repo Source101: epel-next.repo Source102: epel-modular.repo Source103: epel-playground.repo +Source104: epel-cisco-openh264.repo Source200: epel-testing.repo Source201: epel-next-testing.repo @@ -84,6 +86,9 @@ install -pm 644 %{SOURCE102} %{SOURCE202} %{buildroot}%{_sysconfdir}/yum.repos.d %if %{with playground} install -pm 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/yum.repos.d %endif +%if %{with openh264} +install -pm 644 %{SOURCE104} %{buildroot}%{_sysconfdir}/yum.repos.d +%endif # systemd presets install -pm 644 -D %{SOURCE300} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset @@ -113,6 +118,9 @@ fi %if %{with playground} %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-playground.repo %endif +%if %{with openh264} +%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-cisco-openh264.repo +%endif %{_sysconfdir}/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset %{_bindir}/crb @@ -125,6 +133,9 @@ fi %changelog +* Tue Aug 15 2023 Neal Gompa - 9-6 +- Add EPEL OpenH264 repository (#2053295) + * Fri Apr 14 2023 Troy Dawson - 9-5 - Tweak crb script, check os-release for RHEL (#2186721) From 3a30f9e7dd669950b2eac37105f3323a6a26220f Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 17 Aug 2023 05:47:15 -0400 Subject: [PATCH 38/38] Fix typo to actually enable EPEL OpenH264 repo --- epel-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-release.spec b/epel-release.spec index 59cfbbf..af25619 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,12 +1,12 @@ %bcond_without base %bcond_without next -%bcond_without open264 +%bcond_without openh264 %bcond_with modular %bcond_with playground Name: epel-release Version: 9 -Release: 6%{dist} +Release: 7%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -133,6 +133,9 @@ fi %changelog +* Thu Aug 17 2023 Neal Gompa - 9-7 +- Fix typo to actually enable EPEL OpenH264 repo + * Tue Aug 15 2023 Neal Gompa - 9-6 - Add EPEL OpenH264 repository (#2053295)